Changeset 372 for trunk/tools


Ignore:
Timestamp:
Dec 2, 2009, 4:30:02 AM (15 years ago)
Author:
Dmitry A. Kuminov
Message:

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

Location:
trunk/tools
Files:
20 edited
1 copied

Legend:

Unmodified
Added
Removed

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

    r2 r372  
    166166        return !passive && handleContextMenu(widget, managedWidget, static_cast<QContextMenuEvent*>(event));
    167167
     168
    168169    case QEvent::DragEnter:
    169170        return handleDragEnterMoveEvent(widget, managedWidget, static_cast<QDragEnterEvent *>(event), true);
    … …  
    174175    case QEvent::Drop:
    175176        return handleDropEvent(widget, managedWidget, static_cast<QDropEvent *>(event));
     177
    176178    default:
    177179        break;
    … …  
    247249}
    248250
     251
    249252bool WidgetEditorTool::handleDragEnterMoveEvent(QWidget *widget, QWidget * /*managedWidget*/, QDragMoveEvent *e, bool isEnter)
    250253{
    … …  
    315318    return true;
    316319}
     320
    317321
    318322bool WidgetEditorTool::restoreDropHighlighting()
    … …  
    326330}
    327331
     332
    328333bool WidgetEditorTool::handleDragLeaveEvent(QWidget *, QWidget *, QDragLeaveEvent *event)
    329334{
    … …  
    334339    return false;
    335340}
     341
    336342
    337343QWidget *WidgetEditorTool::editor() const

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

    r2 r372  
    8484    bool handlePaintEvent(QWidget *widget, QWidget *managedWidget, QPaintEvent *e);
    8585
     86
    8687    bool handleDragEnterMoveEvent(QWidget *widget, QWidget *managedWidget, QDragMoveEvent *e, bool isEnter);
    8788    bool handleDragLeaveEvent(QWidget *widget, QWidget *managedWidget, QDragLeaveEvent *e);
    8889    bool handleDropEvent(QWidget *widget, QWidget *managedWidget, QDropEvent *e);
     90
    8991
    9092private:

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

    r2 r372  
    11TEMPLATE = lib
    22TARGET = QtDesignerComponents
     3
    34contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
    45CONFIG += qt depend_prl no_objective_c designer

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

    r2 r372  
    346346void ObjectInspector::ObjectInspectorPrivate::handleDragEnterMoveEvent(const QWidget *objectInspectorWidget, QDragMoveEvent * event, bool isDragEnter)
    347347{
     348
    348349    if (!m_formWindow) {
    349350        event->ignore();
    … …  
    379380    else
    380381        event->ignore();
     382
    381383}
    382384void  ObjectInspector::ObjectInspectorPrivate::dropEvent (QDropEvent * event)
    383385{
     386
    384387    if (!m_formWindow || !m_formFakeDropTarget) {
    385388        event->ignore();
    … …  
    399402    }
    400403    mimeData->acceptEvent(event);
     404
    401405}
    402406
    … …  
    818822void  ObjectInspector::dragEnterEvent (QDragEnterEvent * event)
    819823{
     824
    820825    m_impl->handleDragEnterMoveEvent(this, event, true);
     826
    821827}
    822828
    823829void  ObjectInspector::dragMoveEvent(QDragMoveEvent * event)
    824830{
     831
    825832    m_impl->handleDragEnterMoveEvent(this, event, false);
     833
    826834}
    827835
    828836void  ObjectInspector::dragLeaveEvent(QDragLeaveEvent * /* event*/)
    829837{
     838
    830839    m_impl->restoreDropHighlighting();
     840
    831841}
    832842
    833843void  ObjectInspector::dropEvent (QDropEvent * event)
    834844{
     845
    835846    m_impl->dropEvent(event);
     847
    836848
    837849QT_END_NAMESPACE

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

    r2 r372  
    8888                this, SLOT(paletteChanged(const QPalette &)));
    8989    ui.paletteView->setSelectionBehavior(QAbstractItemView::SelectRows);
     90
    9091    ui.paletteView->setDragEnabled(true);
    9192    ui.paletteView->setDropIndicatorShown(true);
     93
    9294    ui.paletteView->setRootIsDecorated(false);
    9395    ui.paletteView->setColumnHidden(2, true);

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

    r2 r372  
    180180                                               bool acceptEventsFromWidgetBox)
    181181{
     182
    182183    const QDesignerMimeData *mimeData = qobject_cast<const QDesignerMimeData *>(event->mimeData());
    183184    if (!mimeData) {
    … …  
    196197    mimeData->acceptEvent(event);
    197198    return mimeData;
     199
     200
     201
    198202}
    199203
    200204void WidgetBox::dragEnterEvent (QDragEnterEvent * event)
    201205{
     206
    202207    // We accept event originating from the widget box also here,
    203208    // because otherwise Windows will not show the DnD pixmap.
    204209    checkDragEvent(event, true);
     210
    205211}
    206212
    207213void WidgetBox::dragMoveEvent(QDragMoveEvent * event)
    208214{
     215
    209216    checkDragEvent(event, true);
     217
    210218}
    211219
    212220void WidgetBox::dropEvent(QDropEvent * event)
    213221{
     222
    214223    const QDesignerMimeData *mimeData = checkDragEvent(event, false);
    215224    if (!mimeData)
    … …  
    218227    dropWidgets(mimeData->items(), event->pos());
    219228    QDesignerMimeData::removeMovedWidgetsFromSourceForm(mimeData->items());
     229
    220230}
    221231

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

    r2 r372  
    120120#endif
    121121
    122 #if defined(Q_OS_WIN)
     122#if defined(Q_OS_WIN)
    123123    app += QLatin1String(".exe");
    124124#endif

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

    r2 r372  
    5757    reporterPath += QDir::separator();
    5858    reporterPath += QLatin1String("qtusagereporter");
    59 #if defined(Q_OS_WIN)
     59#if defined(Q_OS_WIN)
    6060    reporterPath += QLatin1String(".exe");
    6161#endif

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

    r2 r372  
    177177    // dropped.
    178178    switch (event->type()) {
     179
    179180    case QEvent::DragEnter: {
    180181        QDragEnterEvent *e = static_cast<QDragEnterEvent*>(event);
    … …  
    196197    }
    197198        break;
     199
    198200    default:
    199201        break;

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

    r2 r372  
    291291static bool handleImageDragEnterMoveEvent(QDropEvent *event)
    292292{
     293
    293294    QtResourceView::ResourceType type;
    294295    const bool rc = QtResourceView::decodeMimeData(event->mimeData(), &type) && type ==  QtResourceView::ResourceImage;
    … …  
    298299        event->ignore();
    299300    return rc;
     301
     302
     303
    300304}
    301305
    302306static void handleImageDropEvent(const QAbstractItemView *iv, QDropEvent *event, ActionModel *am)
    303307{
     308
    304309    const QModelIndex index = iv->indexAt(event->pos());
    305310    if (!index.isValid()) {
    … …  
    307312        return;
    308313    }
     314
    309315
    310316    if (!handleImageDragEnterMoveEvent(event))
    311317        return;
    312318
     319
    313320    am->dropMimeData(event->mimeData(),  event->proposedAction(), index.row(), 0, iv->rootIndex());
     321
    314322}
    315323
    … …  
    322330        return;
    323331
     332
    324333    QDrag *drag = new QDrag(dragParent);
    325334    QMimeData *data = model->mimeData(indexes);
    … …  
    329338
    330339    drag->start(supportedActions);
     340
    331341}
    332342
    … …  
    336346    m_model(model)
    337347{
     348
    338349    setDragEnabled(true);
    339350    setAcceptDrops(true);
    340351    setDropIndicatorShown(true);
    341352    setDragDropMode(DragDrop);
     353
    342354    setModel(model);
    343355    setRootIsDecorated(false);
    … …  
    368380void ActionTreeView::dragEnterEvent(QDragEnterEvent *event)
    369381{
     382
    370383    handleImageDragEnterMoveEvent(event);
     384
    371385}
    372386
    373387void ActionTreeView::dragMoveEvent(QDragMoveEvent *event)
    374388{
     389
    375390    handleImageDragEnterMoveEvent(event);
     391
    376392}
    377393
    378394void ActionTreeView::dropEvent(QDropEvent *event)
    379395{
     396
    380397    handleImageDropEvent(this, event, m_model);
     398
    381399}
    382400
    … …  
    414432    m_model(model)
    415433{
     434
    416435    setDragEnabled(true);
    417436    setAcceptDrops(true);
    418437    setDropIndicatorShown(true);
    419438    setDragDropMode(DragDrop);
     439
    420440    setModel(model);
    421441    setTextElideMode(Qt::ElideMiddle);
    … …  
    449469void ActionListView::dragEnterEvent(QDragEnterEvent *event)
    450470{
     471
    451472    handleImageDragEnterMoveEvent(event);
     473
    452474}
    453475
    454476void ActionListView::dragMoveEvent(QDragMoveEvent *event)
    455477{
     478
    456479    handleImageDragEnterMoveEvent(event);
     480
    457481}
    458482
    459483void ActionListView::dropEvent(QDropEvent *event)
    460484{
     485
    461486    handleImageDropEvent(this, event, m_model);
     487
    462488}
    463489
    … …  
    647673void ActionRepositoryMimeData::accept(QDragMoveEvent *event) const
    648674{
     675
    649676    if (event->proposedAction() == m_dropAction) {
    650677        event->acceptProposedAction();
    … …  
    653680        event->accept();
    654681    }
     682
    655683}
    656684

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

    r2 r372  
    170170        CRLFLineTerminator,
    171171        NativeLineTerminator =
    172 #if defined (Q_OS_WIN)
     172#if defined (Q_OS_WIN)
    173173            CRLFLineTerminator
    174174#else

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

    r2 r372  
    4646#include "orderdialog_p.h"
    4747#include "iconloader_p.h"
    48 #include "ui_orderdialog.h"
     48#ifndef QT_NO_DRAGANDDROP
     49# include "ui_orderdialog.h"
     50#else
     51# include "ui_orderdialog_nodnd.h"
     52#endif
    4953
    5054#include <QtDesigner/QExtensionManager>

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

    r362 r372  
    8282          <height>0</height>
    8383         </size>
    84         </property>
    85         <property name="dragDropMode" >
    86          <enum>QAbstractItemView::InternalMove</enum>
    8784        </property>
    8885        <property name="selectionMode" >

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

    r2 r372  
    154154        drag->setPixmap(QPixmap::fromImage(image));
    155155#else
     156
    156157        drag->setPixmap(widgetPixmap);
     158
    157159#endif
    158160    }
    … …  
    189191        QPixmap pixmap = QPixmap::fromImage(image);
    190192        pixmap.setMask(mask);
     193
    191194        drag->setPixmap(pixmap);
     195
    192196    }
    193197        break;
    … …  
    197201    m_globalStartPos =  m_items.first()->decoration()->pos() +  m_items.first()->hotSpot();
    198202    m_hotSpot = m_globalStartPos - decorationTopLeft;
     203
    199204    drag->setHotSpot(m_hotSpot);
    200205
    201206    drag->setMimeData(this);
     207
    202208}
    203209
    … …  
    219225        return Qt::IgnoreAction;
    220226
     227
    221228    QDrag *drag = new QDrag(dragSource);
    222229    QDesignerMimeData *mimeData = new QDesignerMimeData(items, drag);
    … …  
    237244
    238245    return executedAction;
     246
     247
     248
    239249}
    240250
    … …  
    270280void QDesignerMimeData::acceptEventWithAction(Qt::DropAction desiredAction, QDropEvent *e)
    271281{
     282
    272283    if (e->proposedAction() == desiredAction) {
    273284        e->acceptProposedAction();
    … …  
    276287        e->accept();
    277288    }
     289
    278290}
    279291

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

    r2 r372  
    165165    }
    166166
     167
    167168    QDrag *drag = new QDrag(this);
    168169    drag->setPixmap(ActionRepositoryMimeData::actionDragPixmap(action));
    169170    drag->setMimeData(new ActionRepositoryMimeData(action, dropAction));
     171
    170172
    171173    const int old_index = m_currentIndex;
    172174    m_currentIndex = -1;
    173175
     176
    174177    if (drag->start(dropAction) == Qt::IgnoreAction) {
     178
     179
     180
    175181        if (dropAction == Qt::MoveAction) {
    176182            QAction *previous = safeActionAt(index);
    … …  
    712718void QDesignerMenu::dragEnterEvent(QDragEnterEvent *event)
    713719{
     720
    714721    const ActionRepositoryMimeData *d = qobject_cast<const ActionRepositoryMimeData*>(event->mimeData());
    715722    if (!d || d->actionList().empty()) {
    … …  
    734741        break;
    735742    }
     743
    736744}
    737745
    738746void QDesignerMenu::dragMoveEvent(QDragMoveEvent *event)
    739747{
     748
    740749    if (actionGeometry(m_addSeparator).contains(event->pos())) {
    741750        event->ignore();
    … …  
    773782        break;
    774783    }
     784
    775785}
    776786
    … …  
    784794void QDesignerMenu::dropEvent(QDropEvent *event)
    785795{
     796
    786797    m_showSubMenuTimer->stop();
    787798    hideSubMenu();
    … …  
    820831        event->ignore();
    821832    }
     833
    822834    adjustIndicator(QPoint(-1, -1));
    823835}

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

    r2 r372  
    328328    hideMenu(index);
    329329
     330
    330331    QDrag *drag = new QDrag(this);
    331332    drag->setPixmap(ActionRepositoryMimeData::actionDragPixmap(action));
    332333    drag->setMimeData(new ActionRepositoryMimeData(action, Qt::MoveAction));
     334
    333335
    334336    const int old_index = m_currentIndex;
    335337    m_currentIndex = -1;
    336338
     339
    337340    if (drag->start(Qt::MoveAction) == Qt::IgnoreAction) {
     341
     342
     343
    338344        InsertActionIntoCommand *cmd = new InsertActionIntoCommand(fw);
    339345        cmd->init(this, action, safeActionAt(index));
    … …  
    629635void QDesignerMenuBar::dragEnterEvent(QDragEnterEvent *event)
    630636{
     637
    631638    const ActionRepositoryMimeData *d = qobject_cast<const ActionRepositoryMimeData*>(event->mimeData());
    632639    if (!d || d->actionList().empty()) {
    … …  
    650657        break;
    651658    }
     659
    652660}
    653661
    654662void QDesignerMenuBar::dragMoveEvent(QDragMoveEvent *event)
    655663{
     664
    656665    const ActionRepositoryMimeData *d = qobject_cast<const ActionRepositoryMimeData*>(event->mimeData());
    657666    if (!d || d->actionList().empty()) {
    … …  
    674683        break;
    675684    }
     685
    676686}
    677687
    … …  
    687697    m_dragging = false;
    688698
     699
    689700    if (const ActionRepositoryMimeData *d = qobject_cast<const ActionRepositoryMimeData*>(event->mimeData())) {
    690701
    … …  
    707718    }
    708719    event->ignore();
     720
    709721}
    710722

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

    r2 r372  
    215215
    216216            m_mousePressed = false;
     217
    217218            QDrag *drg = new QDrag(m_tabWidget);
    218219            drg->setMimeData(new qdesigner_internal::MyMimeData(m_tabWidget));
     220
    219221
    220222            m_dragIndex = index;
    … …  
    225227                QLabel *label = new QLabel(m_dragLabel);
    226228                label->adjustSize();
     229
    227230                drg->setPixmap(QPixmap::grabWidget(label));
     231
    228232                label->deleteLater();
    229233            } else {
     234
    230235                drg->setPixmap(m_dragIcon.pixmap(22, 22));
     236
    231237            }
    232238
    233239            m_tabWidget->removeTab(m_dragIndex);
    234240
     241
    235242            const Qt::DropActions dropAction = drg->start(Qt::MoveAction);
     243
     244
     245
    236246
    237247            if (dropAction == Qt::IgnoreAction) {
    … …  
    253263    case QEvent::DragEnter:
    254264    case QEvent::DragMove: {
     265
    255266        QDragMoveEvent *de = static_cast<QDragMoveEvent*>(e);
    256267        if (!qdesigner_internal::MyMimeData::fromMyTab(de->mimeData(), m_tabWidget))
    … …  
    282293        m_dropIndicator->setGeometry(pos.x(), pos.y() , 3, rect.height());
    283294        m_dropIndicator->show();
     295
     296
     297
     298
    284299    } break;
    285300
    286301    case QEvent::Drop: {
     302
    287303        QDropEvent *de = static_cast<QDropEvent*>(e);
    288304        if (!qdesigner_internal::MyMimeData::fromMyTab(de->mimeData(), m_tabWidget))
    … …  
    298314        cmd->init(m_tabWidget, m_dragPage, m_dragIcon, m_dragLabel, m_dragIndex, newIndex);
    299315        fw->commandHistory()->push(cmd);
     316
     317
     318
    300319    } break;
    301320

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

    r2 r372  
    122122    case QEvent::ContextMenu:
    123123        return handleContextMenuEvent(static_cast<QContextMenuEvent*>(event));
     124
    124125    case QEvent::DragEnter:
    125126    case QEvent::DragMove:
    … …  
    129130    case QEvent::Drop:
    130131        return handleDropEvent(static_cast<QDropEvent *>(event));
     132
    131133    case QEvent::MouseButtonPress:
    132134        return handleMousePressEvent(static_cast<QMouseEvent*>(event));
    … …  
    327329}
    328330
     331
    329332bool ToolBarEventFilter::handleDragEnterMoveEvent(QDragMoveEvent *event)
    330333{
    … …  
    400403    return true;
    401404}
     405
    402406
    403407void ToolBarEventFilter::startDrag(const QPoint &pos, Qt::KeyboardModifiers modifiers)
    … …  
    420424    }
    421425
     426
    422427    QDrag *drag = new QDrag(m_toolBar);
    423428    drag->setPixmap(ActionRepositoryMimeData::actionDragPixmap( action));
    … …  
    425430
    426431    if (drag->start(dropAction) == Qt::IgnoreAction) {
     432
     433
     434
    427435        hideDragIndicator();
    428436        if (dropAction == Qt::MoveAction) {

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

    r2 r372  
    9494    QListWidget(parent)
    9595{
     96
    9697    setDragEnabled(true);
     98
    9799}
    98100
    … …  
    106108        return;
    107109
     110
    108111    const QString filePath = item->data(Qt::UserRole).toString();
    109112    const QIcon icon = item->icon();
    … …  
    122125    drag->setMimeData(mimeData);
    123126    drag->exec(Qt::CopyAction);
     127
    124128}
    125129
    … …  
    605609void QtResourceView::setDragEnabled(bool dragEnabled)
    606610{
     611
    607612    d_ptr->m_listWidget->setDragEnabled(dragEnabled);
     613
    608614}
    609615
    610616bool QtResourceView::dragEnabled() const
    611617{
     618
    612619    return d_ptr->m_listWidget->dragEnabled();
     620
    613621}
    614622

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

    r2 r372  
    188188
    189189RESOURCES += $$PWD/shared.qrc
     190
     191
     192
     193
     194

  • trunk/tools/shared/qtgradienteditor/qtcolorbutton.cpp

    r2 r372  
    126126    d_ptr = new QtColorButtonPrivate;
    127127    d_ptr->q_ptr = this;
     128
    128129    d_ptr->m_dragging = false;
     130
    129131    d_ptr->m_backgroundCheckered = true;
    130132
Note: See TracChangeset for help on using the changeset viewer.