feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

ModelEditor: Add the zoom actions to tool bar

Browse Source 
And remove the Tools > Model Editor menu, which is no longer needed.

Change-Id: Ib5b4a3a63408e69a2a65ffb87864db2f3ceef367
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Eike Ziller
2018-02-01 16:38:19 +01:00
parent e8dbc16814
commit 608a5ff89a
2 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/plugins/modeleditor/actionhandler.cpp
View File

@@ -154,11 +154,6 @@ void ActionHandler::createActions()
d->deleteAction = deleteCommand->action(); d->deleteAction = deleteCommand->action();
d->selectAllAction = registerCommand(Core::Constants::SELECTALL, &ModelEditor::selectAll, d->context)->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( Core::Command *exportDiagramCommand = registerCommand(
Constants::EXPORT_DIAGRAM, &ModelEditor::exportDiagram, d->context, Constants::EXPORT_DIAGRAM, &ModelEditor::exportDiagram, d->context,
tr("Export Diagram...")); tr("Export Diagram..."));
@@ -173,17 +168,9 @@ void ActionHandler::createActions()
mfile->addAction(exportSelectedElementsCommand, Core::Constants::G_FILE_EXPORT); mfile->addAction(exportSelectedElementsCommand, Core::Constants::G_FILE_EXPORT);
d->exportSelectedElementsAction = exportSelectedElementsCommand->action(); d->exportSelectedElementsAction = exportSelectedElementsCommand->action();
Core::Command *zoomInCommand = registerCommand( registerCommand(Core::Constants::ZOOM_IN, &ModelEditor::zoomIn, d->context);
Core::Constants::ZOOM_IN, &ModelEditor::zoomIn, d->context); registerCommand(Core::Constants::ZOOM_OUT, &ModelEditor::zoomOut, d->context);
menuModelEditor->addAction(zoomInCommand); registerCommand(Core::Constants::ZOOM_RESET, &ModelEditor::resetZoom, d->context);
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);
d->openParentDiagramAction = registerCommand( d->openParentDiagramAction = registerCommand(
Constants::OPEN_PARENT_DIAGRAM, &ModelEditor::openParentDiagram, Core::Context(), Constants::OPEN_PARENT_DIAGRAM, &ModelEditor::openParentDiagram, Core::Context(),

9
src/plugins/modeleditor/modeleditor.cpp
View File

@@ -325,6 +325,15 @@ void ModelEditor::init(QWidget *parent)
toolbarLayout->addWidget(d->diagramSelector, 1); toolbarLayout->addWidget(d->diagramSelector, 1);
toolbarLayout->addStretch(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, toolbarLayout->addWidget(createToolbarCommandButton(Constants::ACTION_ADD_PACKAGE,
[this]() { onAddPackage(); }, [this]() { onAddPackage(); },
d->toolbar)); d->toolbar));