diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2018-02-01 16:38:19 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2018-02-06 08:07:39 +0000 |
| commit | 608a5ff89a327389ecea13a42f54e04b1300352a (patch) | |
| tree | e2a5771d1cccde930a76df977f54b94e979763f8 | |
| parent | e8dbc168146aa81eb8ad2ee426f5f7b9c4f6cf10 (diff) | |
ModelEditor: Add the zoom actions to tool bar
And remove the Tools > Model Editor menu, which is no longer needed.
Change-Id: Ib5b4a3a63408e69a2a65ffb87864db2f3ceef367
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
| -rw-r--r-- | src/plugins/modeleditor/actionhandler.cpp | 19 | ||||
| -rw-r--r-- | src/plugins/modeleditor/modeleditor.cpp | 9 |
2 files changed, 12 insertions, 16 deletions
diff --git a/src/plugins/modeleditor/actionhandler.cpp b/src/plugins/modeleditor/actionhandler.cpp index 69a9ed59a2..1e3d5563a4 100644 --- a/src/plugins/modeleditor/actionhandler.cpp +++ b/src/plugins/modeleditor/actionhandler.cpp @@ -154,11 +154,6 @@ void ActionHandler::createActions() d->deleteAction = deleteCommand->action(); d->selectAllAction = registerCommand(Core::Constants::SELECTALL, &ModelEditor::selectAll, d->context)->action(); - Core::ActionContainer *menuModelEditor = Core::ActionManager::createMenu(Constants::MENU_ID); - menuModelEditor->menu()->setTitle(tr("Model Editor")); - Core::ActionContainer *menuTools = Core::ActionManager::actionContainer(Core::Constants::M_TOOLS); - menuTools->addMenu(menuModelEditor); - Core::Command *exportDiagramCommand = registerCommand( Constants::EXPORT_DIAGRAM, &ModelEditor::exportDiagram, d->context, tr("Export Diagram...")); @@ -173,17 +168,9 @@ void ActionHandler::createActions() mfile->addAction(exportSelectedElementsCommand, Core::Constants::G_FILE_EXPORT); d->exportSelectedElementsAction = exportSelectedElementsCommand->action(); - Core::Command *zoomInCommand = registerCommand( - Core::Constants::ZOOM_IN, &ModelEditor::zoomIn, d->context); - menuModelEditor->addAction(zoomInCommand); - - Core::Command *zoomOutCommand = registerCommand( - Core::Constants::ZOOM_OUT, &ModelEditor::zoomOut, d->context); - menuModelEditor->addAction(zoomOutCommand); - - Core::Command *resetZoomCommand = registerCommand( - Core::Constants::ZOOM_RESET, &ModelEditor::resetZoom, d->context); - menuModelEditor->addAction(resetZoomCommand); + registerCommand(Core::Constants::ZOOM_IN, &ModelEditor::zoomIn, d->context); + registerCommand(Core::Constants::ZOOM_OUT, &ModelEditor::zoomOut, d->context); + registerCommand(Core::Constants::ZOOM_RESET, &ModelEditor::resetZoom, d->context); d->openParentDiagramAction = registerCommand( Constants::OPEN_PARENT_DIAGRAM, &ModelEditor::openParentDiagram, Core::Context(), diff --git a/src/plugins/modeleditor/modeleditor.cpp b/src/plugins/modeleditor/modeleditor.cpp index 3fa5aad9a9..6cbd513eb7 100644 --- a/src/plugins/modeleditor/modeleditor.cpp +++ b/src/plugins/modeleditor/modeleditor.cpp @@ -325,6 +325,15 @@ void ModelEditor::init(QWidget *parent) toolbarLayout->addWidget(d->diagramSelector, 1); toolbarLayout->addStretch(1); + toolbarLayout->addWidget(createToolbarCommandButton(Core::Constants::ZOOM_RESET, + [this]() { resetZoom(); }, + d->toolbar)); + toolbarLayout->addWidget(createToolbarCommandButton(Core::Constants::ZOOM_IN, + [this]() { zoomIn(); }, + d->toolbar)); + toolbarLayout->addWidget(createToolbarCommandButton(Core::Constants::ZOOM_OUT, + [this]() { zoomOut(); }, + d->toolbar)); toolbarLayout->addWidget(createToolbarCommandButton(Constants::ACTION_ADD_PACKAGE, [this]() { onAddPackage(); }, d->toolbar)); |