Changeset 372 for trunk/tools/designer/src/lib/shared

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/designer/src/lib/shared

Files:

• actionrepository.cpp (modified) (11 diffs)
• formwindowbase_p.h (modified) (1 diff)
• orderdialog.cpp (modified) (1 diff)
• orderdialog_nodnd.ui (copied) (copied from trunk/tools/designer/src/lib/shared/orderdialog.ui ) (1 diff)
• qdesigner_dnditem.cpp (modified) (7 diffs)
• qdesigner_menu.cpp (modified) (6 diffs)
• qdesigner_menubar.cpp (modified) (6 diffs)
• qdesigner_tabwidget.cpp (modified) (5 diffs)
• qdesigner_toolbar.cpp (modified) (6 diffs)
• qtresourceview.cpp (modified) (4 diffs)
• shared.pri (modified) (1 diff)

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);
@@ -449 +469 @@
 void ActionListView::dragEnterEvent(QDragEnterEvent *event)
 {
+
     handleImageDragEnterMoveEvent(event);
+
 }
 
 void ActionListView::dragMoveEvent(QDragMoveEvent *event)
 {
+
     handleImageDragEnterMoveEvent(event);
+
 }
 
 void ActionListView::dropEvent(QDropEvent *event)
 {
+
     handleImageDropEvent(this, event, m_model);
+
 }
 
@@ -647 +673 @@
 void ActionRepositoryMimeData::accept(QDragMoveEvent *event) const
 {
+
     if (event->proposedAction() == m_dropAction) {
         event->acceptProposedAction();
@@ -653 +680 @@
         event->accept();
     }
+
 }
 

trunk/tools/designer/src/lib/shared/formwindowbase_p.h

@@ -170 +170 @@
         CRLFLineTerminator,
         NativeLineTerminator =
-#if defined (Q_OS_WIN)
+#if defined (Q_OS_WIN)
             CRLFLineTerminator
 #else

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

@@ -46 +46 @@
 #include "orderdialog_p.h"
 #include "iconloader_p.h"
-#include "ui_orderdialog.h"
+#ifndef QT_NO_DRAGANDDROP
+# include "ui_orderdialog.h"
+#else
+# include "ui_orderdialog_nodnd.h"
+#endif
 
 #include <QtDesigner/QExtensionManager>

trunk/tools/designer/src/lib/shared/orderdialog_nodnd.ui

@@ -82 +82 @@
           <height>0</height>
          </size>
-        </property>
-        <property name="dragDropMode" >
-         <enum>QAbstractItemView::InternalMove</enum>
         </property>
         <property name="selectionMode" >

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

@@ -154 +154 @@
         drag->setPixmap(QPixmap::fromImage(image));
 #else
+
         drag->setPixmap(widgetPixmap);
+
 #endif
     }
@@ -189 +191 @@
         QPixmap pixmap = QPixmap::fromImage(image);
         pixmap.setMask(mask);
+
         drag->setPixmap(pixmap);
+
     }
         break;
@@ -197 +201 @@
     m_globalStartPos =  m_items.first()->decoration()->pos() +  m_items.first()->hotSpot();
     m_hotSpot = m_globalStartPos - decorationTopLeft;
+
     drag->setHotSpot(m_hotSpot);
 
     drag->setMimeData(this);
+
 }
 
@@ -219 +225 @@
         return Qt::IgnoreAction;
 
+
     QDrag *drag = new QDrag(dragSource);
     QDesignerMimeData *mimeData = new QDesignerMimeData(items, drag);
@@ -237 +244 @@
 
     return executedAction;
+
+
+
 }
 
@@ -270 +280 @@
 void QDesignerMimeData::acceptEventWithAction(Qt::DropAction desiredAction, QDropEvent *e)
 {
+
     if (e->proposedAction() == desiredAction) {
         e->acceptProposedAction();
@@ -276 +287 @@
         e->accept();
     }
+
 }
 

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

@@ -165 +165 @@
     }
 
+
     QDrag *drag = new QDrag(this);
     drag->setPixmap(ActionRepositoryMimeData::actionDragPixmap(action));
     drag->setMimeData(new ActionRepositoryMimeData(action, dropAction));
+
 
     const int old_index = m_currentIndex;
     m_currentIndex = -1;
 
+
     if (drag->start(dropAction) == Qt::IgnoreAction) {
+
+
+
         if (dropAction == Qt::MoveAction) {
             QAction *previous = safeActionAt(index);
@@ -712 +718 @@
 void QDesignerMenu::dragEnterEvent(QDragEnterEvent *event)
 {
+
     const ActionRepositoryMimeData *d = qobject_cast<const ActionRepositoryMimeData*>(event->mimeData());
     if (!d || d->actionList().empty()) {
@@ -734 +741 @@
         break;
     }
+
 }
 
 void QDesignerMenu::dragMoveEvent(QDragMoveEvent *event)
 {
+
     if (actionGeometry(m_addSeparator).contains(event->pos())) {
         event->ignore();
@@ -773 +782 @@
         break;
     }
+
 }
 
@@ -784 +794 @@
 void QDesignerMenu::dropEvent(QDropEvent *event)
 {
+
     m_showSubMenuTimer->stop();
     hideSubMenu();
@@ -820 +831 @@
         event->ignore();
     }
+
     adjustIndicator(QPoint(-1, -1));
 }

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

@@ -328 +328 @@
     hideMenu(index);
 
+
     QDrag *drag = new QDrag(this);
     drag->setPixmap(ActionRepositoryMimeData::actionDragPixmap(action));
     drag->setMimeData(new ActionRepositoryMimeData(action, Qt::MoveAction));
+
 
     const int old_index = m_currentIndex;
     m_currentIndex = -1;
 
+
     if (drag->start(Qt::MoveAction) == Qt::IgnoreAction) {
+
+
+
         InsertActionIntoCommand *cmd = new InsertActionIntoCommand(fw);
         cmd->init(this, action, safeActionAt(index));
@@ -629 +635 @@
 void QDesignerMenuBar::dragEnterEvent(QDragEnterEvent *event)
 {
+
     const ActionRepositoryMimeData *d = qobject_cast<const ActionRepositoryMimeData*>(event->mimeData());
     if (!d || d->actionList().empty()) {
@@ -650 +657 @@
         break;
     }
+
 }
 
 void QDesignerMenuBar::dragMoveEvent(QDragMoveEvent *event)
 {
+
     const ActionRepositoryMimeData *d = qobject_cast<const ActionRepositoryMimeData*>(event->mimeData());
     if (!d || d->actionList().empty()) {
@@ -674 +683 @@
         break;
     }
+
 }
 
@@ -687 +697 @@
     m_dragging = false;
 
+
     if (const ActionRepositoryMimeData *d = qobject_cast<const ActionRepositoryMimeData*>(event->mimeData())) {
 
@@ -707 +718 @@
     }
     event->ignore();
+
 }
 

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

@@ -215 +215 @@
 
             m_mousePressed = false;
+
             QDrag *drg = new QDrag(m_tabWidget);
             drg->setMimeData(new qdesigner_internal::MyMimeData(m_tabWidget));
+
 
             m_dragIndex = index;
@@ -225 +227 @@
                 QLabel *label = new QLabel(m_dragLabel);
                 label->adjustSize();
+
                 drg->setPixmap(QPixmap::grabWidget(label));
+
                 label->deleteLater();
             } else {
+
                 drg->setPixmap(m_dragIcon.pixmap(22, 22));
+
             }
 
             m_tabWidget->removeTab(m_dragIndex);
 
+
             const Qt::DropActions dropAction = drg->start(Qt::MoveAction);
+
+
+
 
             if (dropAction == Qt::IgnoreAction) {
@@ -253 +263 @@
     case QEvent::DragEnter:
     case QEvent::DragMove: {
+
         QDragMoveEvent *de = static_cast<QDragMoveEvent*>(e);
         if (!qdesigner_internal::MyMimeData::fromMyTab(de->mimeData(), m_tabWidget))
@@ -282 +293 @@
         m_dropIndicator->setGeometry(pos.x(), pos.y() , 3, rect.height());
         m_dropIndicator->show();
+
+
+
+
     } break;
 
     case QEvent::Drop: {
+
         QDropEvent *de = static_cast<QDropEvent*>(e);
         if (!qdesigner_internal::MyMimeData::fromMyTab(de->mimeData(), m_tabWidget))
@@ -298 +314 @@
         cmd->init(m_tabWidget, m_dragPage, m_dragIcon, m_dragLabel, m_dragIndex, newIndex);
         fw->commandHistory()->push(cmd);
+
+
+
     } break;
 

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

@@ -122 +122 @@
     case QEvent::ContextMenu:
         return handleContextMenuEvent(static_cast<QContextMenuEvent*>(event));
+
     case QEvent::DragEnter:
     case QEvent::DragMove:
@@ -129 +130 @@
     case QEvent::Drop:
         return handleDropEvent(static_cast<QDropEvent *>(event));
+
     case QEvent::MouseButtonPress:
         return handleMousePressEvent(static_cast<QMouseEvent*>(event));
@@ -327 +329 @@
 }
 
+
 bool ToolBarEventFilter::handleDragEnterMoveEvent(QDragMoveEvent *event)
 {
@@ -400 +403 @@
     return true;
 }
+
 
 void ToolBarEventFilter::startDrag(const QPoint &pos, Qt::KeyboardModifiers modifiers)
@@ -420 +424 @@
     }
 
+
     QDrag *drag = new QDrag(m_toolBar);
     drag->setPixmap(ActionRepositoryMimeData::actionDragPixmap( action));
@@ -425 +430 @@
 
     if (drag->start(dropAction) == Qt::IgnoreAction) {
+
+
+
         hideDragIndicator();
         if (dropAction == Qt::MoveAction) {

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

@@ -94 +94 @@
     QListWidget(parent)
 {
+
     setDragEnabled(true);
+
 }
 
@@ -106 +108 @@
         return;
 
+
     const QString filePath = item->data(Qt::UserRole).toString();
     const QIcon icon = item->icon();
@@ -122 +125 @@
     drag->setMimeData(mimeData);
     drag->exec(Qt::CopyAction);
+
 }
 
@@ -605 +609 @@
 void QtResourceView::setDragEnabled(bool dragEnabled)
 {
+
     d_ptr->m_listWidget->setDragEnabled(dragEnabled);
+
 }
 
 bool QtResourceView::dragEnabled() const
 {
+
     return d_ptr->m_listWidget->dragEnabled();
+
 }
 

trunk/tools/designer/src/lib/shared/shared.pri

@@ -188 +188 @@
 
 RESOURCES += $$PWD/shared.qrc
+
+
+
+
+