diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2016-07-11 10:46:05 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2016-07-11 10:46:05 +0200 |
| commit | 546df37c9894c5d444e3c40a21110077b8dc7a44 (patch) | |
| tree | 15e4ac4676373bdd25ccac527baca38706d15368 /src/plugins/modeleditor/actionhandler.cpp | |
| parent | 717ff381401d559a338c1d4613c6af53735dcb91 (diff) | |
| parent | 9650adad140dbcec0ee5f464c2bbcb9d9da05133 (diff) | |
Merge remote-tracking branch 'origin/4.1'
Conflicts:
README.md
src/plugins/modeleditor/actionhandler.cpp
Change-Id: I65c2885593b881eda94872168a3891cab9cafe71
Diffstat (limited to 'src/plugins/modeleditor/actionhandler.cpp')
| -rw-r--r-- | src/plugins/modeleditor/actionhandler.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/modeleditor/actionhandler.cpp b/src/plugins/modeleditor/actionhandler.cpp index 8f0d31a983..eeec74e89a 100644 --- a/src/plugins/modeleditor/actionhandler.cpp +++ b/src/plugins/modeleditor/actionhandler.cpp @@ -199,10 +199,10 @@ void ActionHandler::createActions() Constants::OPEN_PARENT_DIAGRAM, [this]() { openParentDiagram(); }, Core::Context(), true, tr("Open Parent Diagram"), QKeySequence(QStringLiteral("Ctrl+Shift+P")))->action(); d->openParentDiagramAction->setIcon(QIcon(QStringLiteral(":/modeleditor/up.png"))); - registerCommand(Constants::ACTION_ADD_PACKAGE, nullptr, Core::Context()); - registerCommand(Constants::ACTION_ADD_COMPONENT, nullptr, Core::Context()); - registerCommand(Constants::ACTION_ADD_CLASS, nullptr, Core::Context()); - registerCommand(Constants::ACTION_ADD_CANVAS_DIAGRAM, nullptr, Core::Context()); + registerCommand(Constants::ACTION_ADD_PACKAGE, nullptr, Core::Context(), true, tr("Add Package")); + registerCommand(Constants::ACTION_ADD_COMPONENT, nullptr, Core::Context(), true, tr("Add Component")); + registerCommand(Constants::ACTION_ADD_CLASS, nullptr, Core::Context(), true, tr("Add Class")); + registerCommand(Constants::ACTION_ADD_CANVAS_DIAGRAM, nullptr, Core::Context(), true, tr("Add Canvas Diagram")); d->synchronizeBrowserAction = registerCommand( Constants::ACTION_SYNC_BROWSER, nullptr, Core::Context(), true, tr("Synchronize Browser and Diagram<br><i><small>Press&Hold for options</small></i>"))->action(); |