diff options
| author | Thomas Hartmann <thomas.hartmann@qt.io> | 2017-05-19 10:39:32 +0200 |
|---|---|---|
| committer | Thomas Hartmann <thomas.hartmann@qt.io> | 2017-05-22 09:13:20 +0000 |
| commit | 81aac69f452fdee755e53329c7a5a026450fa959 (patch) | |
| tree | a06f5620c7d616066ad0b2febe06fcab00c336e4 /src/plugins/qmldesigner/shortcutmanager.cpp | |
| parent | 77e7d222f63c14801894dcebdce5c5974e925f4d (diff) | |
QmlDesigner: Avoid conflict on F2
F2 is also used by the text editor.
We avoid a conflict by defining F2 just in the form editor
and navigator.
To avoid conflict we remove the action from the shortcut manager,
since we already have an action in the context menu.
Change-Id: Ib4c30a271da8f106210f5a86cfe0088386b87403
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to 'src/plugins/qmldesigner/shortcutmanager.cpp')
| -rw-r--r-- | src/plugins/qmldesigner/shortcutmanager.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/plugins/qmldesigner/shortcutmanager.cpp b/src/plugins/qmldesigner/shortcutmanager.cpp index 0e1889d058..e5a72bf18c 100644 --- a/src/plugins/qmldesigner/shortcutmanager.cpp +++ b/src/plugins/qmldesigner/shortcutmanager.cpp @@ -86,7 +86,6 @@ ShortCutManager::ShortCutManager() m_restoreDefaultViewAction(tr("&Restore Default View"), 0), m_toggleLeftSidebarAction(tr("Toggle &Left Sidebar"), 0), m_toggleRightSidebarAction(tr("Toggle &Right Sidebar"), 0), - m_goIntoComponentAction(tr("&Go into Component"), 0), m_switchTextFormAction(tr("Switch Text/Design"), 0), m_escapeAction(this) { @@ -188,11 +187,6 @@ void ShortCutManager::registerActions(const Core::Context &qmlDesignerMainContex command = Core::ActionManager::registerAction(&m_redoAction, Core::Constants::REDO, qmlDesignerMainContext); designerActionManager.addCreatorCommand(command, ComponentCoreConstants::editCategory, 300, Utils::Icons::REDO_TOOLBAR.icon()); - //GoIntoComponent - command = Core::ActionManager::registerAction(&m_goIntoComponentAction, - Constants::GO_INTO_COMPONENT, qmlDesignerMainContext); - command->setDefaultKeySequence(QKeySequence(Qt::Key_F2)); - //Edit Menu m_deleteAction.setIcon(QIcon::fromTheme(QLatin1String("edit-cut"), Utils::Icons::EDIT_CLEAR_TOOLBAR.icon())); |