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

ModelEditor: Move export actions to File menu

Browse Source 
Only visible when a model editor is active

Change-Id: Ia21045188867b23815bd05432d1fd4699de8bd61
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Eike Ziller
2018-02-01 13:58:07 +01:00
parent e1d2d35c20
commit dcfa07ba76
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/coreplugin/coreconstants.h
View File

@@ -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_OPEN[] = "QtCreator.Group.File.Open";
const char G_FILE_PROJECT[] = "QtCreator.Group.File.Project"; const char G_FILE_PROJECT[] = "QtCreator.Group.File.Project";
const char G_FILE_SAVE[] = "QtCreator.Group.File.Save"; 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_CLOSE[] = "QtCreator.Group.File.Close";
const char G_FILE_PRINT[] = "QtCreator.Group.File.Print"; const char G_FILE_PRINT[] = "QtCreator.Group.File.Print";
const char G_FILE_OTHER[] = "QtCreator.Group.File.Other"; const char G_FILE_OTHER[] = "QtCreator.Group.File.Other";

2
src/plugins/coreplugin/mainwindow.cpp
View File

@@ -428,6 +428,7 @@ void MainWindow::registerDefaultContainers()
filemenu->appendGroup(Constants::G_FILE_OPEN); filemenu->appendGroup(Constants::G_FILE_OPEN);
filemenu->appendGroup(Constants::G_FILE_PROJECT); filemenu->appendGroup(Constants::G_FILE_PROJECT);
filemenu->appendGroup(Constants::G_FILE_SAVE); filemenu->appendGroup(Constants::G_FILE_SAVE);
filemenu->appendGroup(Constants::G_FILE_EXPORT);
filemenu->appendGroup(Constants::G_FILE_CLOSE); filemenu->appendGroup(Constants::G_FILE_CLOSE);
filemenu->appendGroup(Constants::G_FILE_PRINT); filemenu->appendGroup(Constants::G_FILE_PRINT);
filemenu->appendGroup(Constants::G_FILE_OTHER); filemenu->appendGroup(Constants::G_FILE_OTHER);
@@ -482,6 +483,7 @@ void MainWindow::registerDefaultActions()
// File menu separators // File menu separators
mfile->addSeparator(Constants::G_FILE_SAVE); mfile->addSeparator(Constants::G_FILE_SAVE);
mfile->addSeparator(Constants::G_FILE_EXPORT);
mfile->addSeparator(Constants::G_FILE_PRINT); mfile->addSeparator(Constants::G_FILE_PRINT);
mfile->addSeparator(Constants::G_FILE_CLOSE); mfile->addSeparator(Constants::G_FILE_CLOSE);
mfile->addSeparator(Constants::G_FILE_OTHER); mfile->addSeparator(Constants::G_FILE_OTHER);

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

@@ -135,6 +135,7 @@ QAction *ActionHandler::exportSelectedElementsAction() const
void ActionHandler::createActions() void ActionHandler::createActions()
{ {
Core::ActionContainer *medit = Core::ActionManager::actionContainer(Core::Constants::M_EDIT); 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->undoAction = registerCommand(Core::Constants::UNDO, &ModelEditor::undo, d->context)->action();
d->redoAction = registerCommand(Core::Constants::REDO, &ModelEditor::redo, 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( Core::Command *exportDiagramCommand = registerCommand(
Constants::EXPORT_DIAGRAM, &ModelEditor::exportDiagram, d->context, true, Constants::EXPORT_DIAGRAM, &ModelEditor::exportDiagram, d->context, true,
tr("Export Diagram...")); tr("Export Diagram..."));
menuModelEditor->addAction(exportDiagramCommand); exportDiagramCommand->setAttribute(Core::Command::CA_Hide);
mfile->addAction(exportDiagramCommand, Core::Constants::G_FILE_EXPORT);
d->exportDiagramAction = exportDiagramCommand->action(); d->exportDiagramAction = exportDiagramCommand->action();
Core::Command *exportSelectedElementsCommand = registerCommand( Core::Command *exportSelectedElementsCommand = registerCommand(
Constants::EXPORT_SELECTED_ELEMENTS, &ModelEditor::exportSelectedElements, d->context, true, Constants::EXPORT_SELECTED_ELEMENTS, &ModelEditor::exportSelectedElements, d->context, true,
tr("Export Selected Elements...")); 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(); d->exportSelectedElementsAction = exportSelectedElementsCommand->action();
menuModelEditor->addSeparator(d->context);
Core::Command *zoomInCommand = registerCommand( Core::Command *zoomInCommand = registerCommand(
Core::Constants::ZOOM_IN, &ModelEditor::zoomIn, d->context); Core::Constants::ZOOM_IN, &ModelEditor::zoomIn, d->context);
menuModelEditor->addAction(zoomInCommand); menuModelEditor->addAction(zoomInCommand);