Changeset 372

Timestamp:

Dec 2, 2009, 4:30:02 AM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

tools: Patched qdesigner to make it compile without Drag&Drop.

Location:

trunk/tools

Files:

• designer/src/components/formeditor/tool_widgeteditor.cpp (modified) (6 diffs)
• designer/src/components/formeditor/tool_widgeteditor.h (modified) (1 diff)
• designer/src/components/lib/lib.pro (modified) (1 diff)
• designer/src/components/objectinspector/objectinspector.cpp (modified) (4 diffs)
• designer/src/components/propertyeditor/paletteeditor.cpp (modified) (1 diff)
• designer/src/components/widgetbox/widgetbox.cpp (modified) (3 diffs)
• designer/src/designer/assistantclient.cpp (modified) (1 diff)
• designer/src/designer/main.cpp (modified) (1 diff)
• designer/src/designer/mainwindow.cpp (modified) (2 diffs)
• designer/src/lib/shared/actionrepository.cpp (modified) (11 diffs)
• designer/src/lib/shared/formwindowbase_p.h (modified) (1 diff)
• designer/src/lib/shared/orderdialog.cpp (modified) (1 diff)
• designer/src/lib/shared/orderdialog_nodnd.ui (copied) (copied from trunk/tools/designer/src/lib/shared/orderdialog.ui ) (1 diff)
• designer/src/lib/shared/qdesigner_dnditem.cpp (modified) (7 diffs)
• designer/src/lib/shared/qdesigner_menu.cpp (modified) (6 diffs)
• designer/src/lib/shared/qdesigner_menubar.cpp (modified) (6 diffs)
• designer/src/lib/shared/qdesigner_tabwidget.cpp (modified) (5 diffs)
• designer/src/lib/shared/qdesigner_toolbar.cpp (modified) (6 diffs)
• designer/src/lib/shared/qtresourceview.cpp (modified) (4 diffs)
• designer/src/lib/shared/shared.pri (modified) (1 diff)
• shared/qtgradienteditor/qtcolorbutton.cpp (modified) (1 diff)

trunk/tools/designer/src/components/formeditor/tool_widgeteditor.cpp

@@ -166 +166 @@
         return !passive && handleContextMenu(widget, managedWidget, static_cast<QContextMenuEvent*>(event));
 
+
     case QEvent::DragEnter:
         return handleDragEnterMoveEvent(widget, managedWidget, static_cast<QDragEnterEvent *>(event), true);
@@ -174 +175 @@
     case QEvent::Drop:
         return handleDropEvent(widget, managedWidget, static_cast<QDropEvent *>(event));
+
     default:
         break;
@@ -247 +249 @@
 }
 
+
 bool WidgetEditorTool::handleDragEnterMoveEvent(QWidget *widget, QWidget * /*managedWidget*/, QDragMoveEvent *e, bool isEnter)
 {
@@ -315 +318 @@
     return true;
 }
+
 
 bool WidgetEditorTool::restoreDropHighlighting()
@@ -326 +330 @@
 }
 
+
 bool WidgetEditorTool::handleDragLeaveEvent(QWidget *, QWidget *, QDragLeaveEvent *event)
 {
@@ -334 +339 @@
     return false;
 }
+
 
 QWidget *WidgetEditorTool::editor() const

trunk/tools/designer/src/components/formeditor/tool_widgeteditor.h

@@ -84 +84 @@
     bool handlePaintEvent(QWidget *widget, QWidget *managedWidget, QPaintEvent *e);
 
+
     bool handleDragEnterMoveEvent(QWidget *widget, QWidget *managedWidget, QDragMoveEvent *e, bool isEnter);
     bool handleDragLeaveEvent(QWidget *widget, QWidget *managedWidget, QDragLeaveEvent *e);
     bool handleDropEvent(QWidget *widget, QWidget *managedWidget, QDropEvent *e);
+
 
 private:

trunk/tools/designer/src/components/lib/lib.pro

@@ -1 +1 @@
 TEMPLATE = lib
 TARGET = QtDesignerComponents
+
 contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
 CONFIG += qt depend_prl no_objective_c designer

trunk/tools/designer/src/components/objectinspector/objectinspector.cpp

@@ -346 +346 @@
 void ObjectInspector::ObjectInspectorPrivate::handleDragEnterMoveEvent(const QWidget *objectInspectorWidget, QDragMoveEvent * event, bool isDragEnter)
 {
+
     if (!m_formWindow) {
         event->ignore();
@@ -379 +380 @@
     else
         event->ignore();
+
 }
 void  ObjectInspector::ObjectInspectorPrivate::dropEvent (QDropEvent * event)
 {
+
     if (!m_formWindow || !m_formFakeDropTarget) {
         event->ignore();
@@ -399 +402 @@
     }
     mimeData->acceptEvent(event);
+
 }
 
@@ -818 +822 @@
 void  ObjectInspector::dragEnterEvent (QDragEnterEvent * event)
 {
+
     m_impl->handleDragEnterMoveEvent(this, event, true);
+
 }
 
 void  ObjectInspector::dragMoveEvent(QDragMoveEvent * event)
 {
+
     m_impl->handleDragEnterMoveEvent(this, event, false);
+
 }
 
 void  ObjectInspector::dragLeaveEvent(QDragLeaveEvent * /* event*/)
 {
+
     m_impl->restoreDropHighlighting();
+
 }
 
 void  ObjectInspector::dropEvent (QDropEvent * event)
 {
+
     m_impl->dropEvent(event);
+
 
 QT_END_NAMESPACE

trunk/tools/designer/src/components/propertyeditor/paletteeditor.cpp

@@ -88 +88 @@
                 this, SLOT(paletteChanged(const QPalette &)));
     ui.paletteView->setSelectionBehavior(QAbstractItemView::SelectRows);
+
     ui.paletteView->setDragEnabled(true);
     ui.paletteView->setDropIndicatorShown(true);
+
     ui.paletteView->setRootIsDecorated(false);
     ui.paletteView->setColumnHidden(2, true);

trunk/tools/designer/src/components/widgetbox/widgetbox.cpp

@@ -180 +180 @@
                                                bool acceptEventsFromWidgetBox)
 {
+
     const QDesignerMimeData *mimeData = qobject_cast<const QDesignerMimeData *>(event->mimeData());
     if (!mimeData) {
@@ -196 +197 @@
     mimeData->acceptEvent(event);
     return mimeData;
+
+
+
 }
 
 void WidgetBox::dragEnterEvent (QDragEnterEvent * event)
 {
+
     // We accept event originating from the widget box also here,
     // because otherwise Windows will not show the DnD pixmap.
     checkDragEvent(event, true);
+
 }
 
 void WidgetBox::dragMoveEvent(QDragMoveEvent * event)
 {
+
     checkDragEvent(event, true);
+
 }
 
 void WidgetBox::dropEvent(QDropEvent * event)
 {
+
     const QDesignerMimeData *mimeData = checkDragEvent(event, false);
     if (!mimeData)
@@ -218 +227 @@
     dropWidgets(mimeData->items(), event->pos());
     QDesignerMimeData::removeMovedWidgetsFromSourceForm(mimeData->items());
+
 }
 

trunk/tools/designer/src/designer/assistantclient.cpp

@@ -120 +120 @@
 #endif
 
-#if defined(Q_OS_WIN)
+#if defined(Q_OS_WIN)
     app += QLatin1String(".exe");
 #endif

trunk/tools/designer/src/designer/main.cpp

@@ -57 +57 @@
     reporterPath += QDir::separator();
     reporterPath += QLatin1String("qtusagereporter");
-#if defined(Q_OS_WIN)
+#if defined(Q_OS_WIN)
     reporterPath += QLatin1String(".exe");
 #endif

trunk/tools/designer/src/designer/mainwindow.cpp

@@ -177 +177 @@
     // dropped.
     switch (event->type()) {
+
     case QEvent::DragEnter: {
         QDragEnterEvent *e = static_cast<QDragEnterEvent*>(event);
@@ -196 +197 @@
     }
         break;
+
     default:
         break;

trunk/tools/designer/src/lib/shared/actionrepository.cpp

@@ -291 +291 @@
 static bool handleImageDragEnterMoveEvent(QDropEvent *event)
 {
+
     QtResourceView::ResourceType type;
     const bool rc = QtResourceView::decodeMimeData(event->mimeData(), &type) && type ==  QtResourceView::ResourceImage;
@@ -298 +299 @@
         event->ignore();
     return rc;
+
+
+
 }
 
 static void handleImageDropEvent(const QAbstractItemView *iv, QDropEvent *event, ActionModel *am)
 {
+
     const QModelIndex index = iv->indexAt(event->pos());
     if (!index.isValid()) {
@@ -307 +312 @@
         return;
     }
+
 
     if (!handleImageDragEnterMoveEvent(event))
         return;
 
+
     am->dropMimeData(event->mimeData(),  event->proposedAction(), index.row(), 0, iv->rootIndex());
+
 }
 
@@ -322 +330 @@
         return;
 
+
     QDrag *drag = new QDrag(dragParent);
     QMimeData *data = model->mimeData(indexes);
@@ -329 +338 @@
 
     drag->start(supportedActions);
+
 }
 
@@ -336 +346 @@
     m_model(model)
 {
+
     setDragEnabled(true);
     setAcceptDrops(true);
     setDropIndicatorShown(true);
     setDragDropMode(DragDrop);
+
     setModel(model);
     setRootIsDecorated(false);
@@ -368 +380 @@
 void ActionTreeView::dragEnterEvent(QDragEnterEvent *event)
 {
+
     handleImageDragEnterMoveEvent(event);
+
 }
 
 void ActionTreeView::dragMoveEvent(QDragMoveEvent *event)
 {
+
     handleImageDragEnterMoveEvent(event);
+
 }
 
 void ActionTreeView::dropEvent(QDropEvent *event)
 {
+
     handleImageDropEvent(this, event, m_model);
+
 }
 
@@ -414 +432 @@
     m_model(model)
 {
+
     setDragEnabled(true);
     setAcceptDrops(true);
     setDropIndicatorShown(true);
     setDragDropMode(DragDrop);
+
     setModel(model);
     setTextElideMode(Qt::ElideMiddle);