diff options
| author | Pulse Build System <qt-info@nokia.com> | 2010-01-27 10:27:40 (GMT) |
|---|---|---|
| committer | Pulse Build System <qt-info@nokia.com> | 2010-01-27 10:27:40 (GMT) |
| commit | 7a2f867546ed8c40b77b533c0cd21d4f3d2e9cd5 (patch) | |
| tree | df204a19c6945606452c04e3c3cd7ff2e2b54e02 /tools | |
| parent | ec90f6ed28ec735ce963c4257ea1095ecbc6c6ba (diff) | |
| parent | be0807cf52a11f0bc4dc5b06c9a91bc2980667d3 (diff) | |
| download | Qt-7a2f867546ed8c40b77b533c0cd21d4f3d2e9cd5.zip Qt-7a2f867546ed8c40b77b533c0cd21d4f3d2e9cd5.tar.gz Qt-7a2f867546ed8c40b77b533c0cd21d4f3d2e9cd5.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-integration
* '4.6' of git@scm.dev.nokia.troll.no:qt/berlin-staging-1:
Designer: Add lower/raise to context menu.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/designer/src/components/formeditor/formwindow.cpp | 5 | ||||
| -rw-r--r-- | tools/designer/src/components/formeditor/formwindow.h | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/tools/designer/src/components/formeditor/formwindow.cpp b/tools/designer/src/components/formeditor/formwindow.cpp index 2d013c9..9fd084d 100644 --- a/tools/designer/src/components/formeditor/formwindow.cpp +++ b/tools/designer/src/components/formeditor/formwindow.cpp @@ -2219,6 +2219,11 @@ QMenu *FormWindow::createPopupMenu(QWidget *w) QToolBoxHelper::addToolBoxContextMenuActions(toolBox, popup); } + if (manager->actionLower()->isEnabled()) { + popup->addAction(manager->actionLower()); + popup->addAction(manager->actionRaise()); + popup->addSeparator(); + } popup->addAction(manager->actionCut()); popup->addAction(manager->actionCopy()); } diff --git a/tools/designer/src/components/formeditor/formwindow.h b/tools/designer/src/components/formeditor/formwindow.h index eed7417..3eee476 100644 --- a/tools/designer/src/components/formeditor/formwindow.h +++ b/tools/designer/src/components/formeditor/formwindow.h @@ -278,8 +278,6 @@ private: void checkPreviewGeometry(QRect &r); - void finishContextMenu(QWidget *w, QWidget *menuParent, QContextMenuEvent *e); - bool handleContextMenu(QWidget *widget, QWidget *managedWidget, QContextMenuEvent *e); bool handleMouseButtonDblClickEvent(QWidget *widget, QWidget *managedWidget, QMouseEvent *e); bool handleMousePressEvent(QWidget *widget, QWidget *managedWidget, QMouseEvent *e); |