diff options
author | Thomas Hartmann <thomas.hartmann@qt.io> | 2017-03-23 12:18:53 +0100 |
---|---|---|
committer | Thomas Hartmann <thomas.hartmann@qt.io> | 2017-03-24 11:21:33 +0000 |
commit | 975c283ec75867070b600e0be4f649462e2e5d61 (patch) | |
tree | f9a19c4bbeee583d5ac1cb2b3c8416cfb4231aed /src/plugins/qmldesigner/shortcutmanager.cpp | |
parent | b021660c1e6e00f5034439b6eaa143742c4d4007 (diff) |
QmlDesigner: Use the same usage pattern for sidebars as edit mode
Change-Id: Ia1ec631b8b486e98e957b5dbcccbc7b91baecb0f
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Diffstat (limited to 'src/plugins/qmldesigner/shortcutmanager.cpp')
-rw-r--r-- | src/plugins/qmldesigner/shortcutmanager.cpp | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/src/plugins/qmldesigner/shortcutmanager.cpp b/src/plugins/qmldesigner/shortcutmanager.cpp index 3a68952530..0e1889d058 100644 --- a/src/plugins/qmldesigner/shortcutmanager.cpp +++ b/src/plugins/qmldesigner/shortcutmanager.cpp @@ -82,7 +82,6 @@ ShortCutManager::ShortCutManager() m_copyAction(tr("&Copy"), tr("Copy \"%1\""), Utils::ParameterAction::EnabledWithParameter), m_pasteAction(tr("&Paste"), tr("Paste \"%1\""), Utils::ParameterAction::EnabledWithParameter), m_selectAllAction(tr("Select &All"), tr("Select All \"%1\""), Utils::ParameterAction::EnabledWithParameter), - m_hideSidebarsAction(tr("Toggle Sidebars"), 0), m_collapseExpandStatesAction(tr("Toggle States Editor"), 0), m_restoreDefaultViewAction(tr("&Restore Default View"), 0), m_toggleLeftSidebarAction(tr("Toggle &Left Sidebar"), 0), @@ -115,8 +114,6 @@ void ShortCutManager::registerActions(const Core::Context &qmlDesignerMainContex connect(&m_selectAllAction,&QAction::triggered, this, &ShortCutManager::selectAll); - connect(&m_hideSidebarsAction, &QAction::triggered, this, &ShortCutManager::toggleSidebars); - connect(&m_restoreDefaultViewAction, &QAction::triggered, QmlDesignerPlugin::instance()->mainWidget(), @@ -233,15 +230,8 @@ void ShortCutManager::registerActions(const Core::Context &qmlDesignerMainContex Core::ActionContainer *viewsMenu = Core::ActionManager::actionContainer(Core::Constants::M_WINDOW_VIEWS); - command = Core::ActionManager::registerAction(&m_toggleLeftSidebarAction, Constants::TOGGLE_LEFT_SIDEBAR, qmlDesignerMainContext); - command->setAttribute(Core::Command::CA_Hide); - command->setDefaultKeySequence(QKeySequence("Ctrl+Shift+0")); - viewsMenu->addAction(command); - - command = Core::ActionManager::registerAction(&m_toggleRightSidebarAction, Constants::TOGGLE_RIGHT_SIDEBAR, qmlDesignerMainContext); - command->setAttribute(Core::Command::CA_Hide); - command->setDefaultKeySequence(QKeySequence("Ctrl+Alt+Shift+0")); - viewsMenu->addAction(command); + Core::ActionManager::registerAction(&m_toggleLeftSidebarAction, Core::Constants::TOGGLE_LEFT_SIDEBAR, qmlDesignerMainContext); + Core::ActionManager::registerAction(&m_toggleRightSidebarAction, Core::Constants::TOGGLE_RIGHT_SIDEBAR, qmlDesignerMainContext); command = Core::ActionManager::registerAction(&m_collapseExpandStatesAction, Constants::TOGGLE_STATES_EDITOR, qmlDesignerMainContext); command->setAttribute(Core::Command::CA_Hide); @@ -260,8 +250,6 @@ void ShortCutManager::registerActions(const Core::Context &qmlDesignerMainContex command->setDefaultKeySequence(QKeySequence(Qt::Key_Escape)); m_escapeAction.setEnabled(false); - Core::ActionManager::registerAction(&m_hideSidebarsAction, Core::Constants::TOGGLE_LEFT_SIDEBAR, qmlDesignerMainContext); - connect(designerActionManager.view(), &DesignerActionManagerView::selectionChanged, this, [this](bool itemsSelected, bool rootItemIsSelected) { m_deleteAction.setEnabled(itemsSelected && !rootItemIsSelected); m_cutAction.setEnabled(itemsSelected && !rootItemIsSelected); @@ -353,11 +341,6 @@ void ShortCutManager::selectAll() currentDesignDocument()->selectAll(); } -void ShortCutManager::toggleSidebars() -{ - QmlDesignerPlugin::instance()->mainWidget()->toggleSidebars(); -} - void ShortCutManager::toggleLeftSidebar() { QmlDesignerPlugin::instance()->mainWidget()->toggleLeftSidebar(); |