diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2010-01-27 09:41:48 (GMT) |
|---|---|---|
| committer | Prasanth Ullattil <prasanth.ullattil@nokia.com> | 2010-01-27 15:30:30 (GMT) |
| commit | e08030924344cf8ce22cd399f33c6ff01e1e07ee (patch) | |
| tree | 65721c3f3444237985343188c62beee9857ea94a | |
| parent | ac0462a6f077316fffd555f45522e38a1e6f53d2 (diff) | |
| download | Qt-e08030924344cf8ce22cd399f33c6ff01e1e07ee.zip Qt-e08030924344cf8ce22cd399f33c6ff01e1e07ee.tar.gz Qt-e08030924344cf8ce22cd399f33c6ff01e1e07ee.tar.bz2 | |
Designer: Add lower/raise to context menu.
Task-number: QTCREATORBUG-592
| -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); |