From dcfa07ba7615799b0cd0c8accfc1a11954a5edb2 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Thu, 1 Feb 2018 13:58:07 +0100 Subject: [PATCH] ModelEditor: Move export actions to File menu Only visible when a model editor is active Change-Id: Ia21045188867b23815bd05432d1fd4699de8bd61 Reviewed-by: Alessandro Portale --- src/plugins/coreplugin/coreconstants.h | 1 + src/plugins/coreplugin/mainwindow.cpp | 2 ++ src/plugins/modeleditor/actionhandler.cpp | 9 +++++---- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/plugins/coreplugin/coreconstants.h b/src/plugins/coreplugin/coreconstants.h index d7d2c6a3ac8..e125ff9929c 100644 --- a/src/plugins/coreplugin/coreconstants.h +++ b/src/plugins/coreplugin/coreconstants.h @@ -148,6 +148,7 @@ const char G_FILE_NEW[] = "QtCreator.Group.File.New"; const char G_FILE_OPEN[] = "QtCreator.Group.File.Open"; const char G_FILE_PROJECT[] = "QtCreator.Group.File.Project"; const char G_FILE_SAVE[] = "QtCreator.Group.File.Save"; +const char G_FILE_EXPORT[] = "QtCreator.Group.File.Export"; const char G_FILE_CLOSE[] = "QtCreator.Group.File.Close"; const char G_FILE_PRINT[] = "QtCreator.Group.File.Print"; const char G_FILE_OTHER[] = "QtCreator.Group.File.Other"; diff --git a/src/plugins/coreplugin/mainwindow.cpp b/src/plugins/coreplugin/mainwindow.cpp index 3627639c49f..3f4c39cb2bf 100644 --- a/src/plugins/coreplugin/mainwindow.cpp +++ b/src/plugins/coreplugin/mainwindow.cpp @@ -428,6 +428,7 @@ void MainWindow::registerDefaultContainers() filemenu->appendGroup(Constants::G_FILE_OPEN); filemenu->appendGroup(Constants::G_FILE_PROJECT); filemenu->appendGroup(Constants::G_FILE_SAVE); + filemenu->appendGroup(Constants::G_FILE_EXPORT); filemenu->appendGroup(Constants::G_FILE_CLOSE); filemenu->appendGroup(Constants::G_FILE_PRINT); filemenu->appendGroup(Constants::G_FILE_OTHER); @@ -482,6 +483,7 @@ void MainWindow::registerDefaultActions() // File menu separators mfile->addSeparator(Constants::G_FILE_SAVE); + mfile->addSeparator(Constants::G_FILE_EXPORT); mfile->addSeparator(Constants::G_FILE_PRINT); mfile->addSeparator(Constants::G_FILE_CLOSE); mfile->addSeparator(Constants::G_FILE_OTHER); diff --git a/src/plugins/modeleditor/actionhandler.cpp b/src/plugins/modeleditor/actionhandler.cpp index 57a96024629..17de4270d52 100644 --- a/src/plugins/modeleditor/actionhandler.cpp +++ b/src/plugins/modeleditor/actionhandler.cpp @@ -135,6 +135,7 @@ QAction *ActionHandler::exportSelectedElementsAction() const void ActionHandler::createActions() { Core::ActionContainer *medit = Core::ActionManager::actionContainer(Core::Constants::M_EDIT); + Core::ActionContainer *mfile = Core::ActionManager::actionContainer(Core::Constants::M_FILE); d->undoAction = registerCommand(Core::Constants::UNDO, &ModelEditor::undo, d->context)->action(); d->redoAction = registerCommand(Core::Constants::REDO, &ModelEditor::redo, d->context)->action(); @@ -161,17 +162,17 @@ void ActionHandler::createActions() Core::Command *exportDiagramCommand = registerCommand( Constants::EXPORT_DIAGRAM, &ModelEditor::exportDiagram, d->context, true, tr("Export Diagram...")); - menuModelEditor->addAction(exportDiagramCommand); + exportDiagramCommand->setAttribute(Core::Command::CA_Hide); + mfile->addAction(exportDiagramCommand, Core::Constants::G_FILE_EXPORT); d->exportDiagramAction = exportDiagramCommand->action(); Core::Command *exportSelectedElementsCommand = registerCommand( Constants::EXPORT_SELECTED_ELEMENTS, &ModelEditor::exportSelectedElements, d->context, true, tr("Export Selected Elements...")); - menuModelEditor->addAction(exportSelectedElementsCommand); + exportSelectedElementsCommand->setAttribute(Core::Command::CA_Hide); + mfile->addAction(exportSelectedElementsCommand, Core::Constants::G_FILE_EXPORT); d->exportSelectedElementsAction = exportSelectedElementsCommand->action(); - menuModelEditor->addSeparator(d->context); - Core::Command *zoomInCommand = registerCommand( Core::Constants::ZOOM_IN, &ModelEditor::zoomIn, d->context); menuModelEditor->addAction(zoomInCommand);