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

Fix Shortcut for right sidebar

Browse Source 
Ctrl+0 was confliciting with "Reset Font Size".

Task-number: QTCREATORBUG-17857
Change-Id: I280c65446fd1f8ce3af66b06760ed7b9b210e8c3
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Thomas Hartmann
2017-04-19 11:58:48 +02:00
parent 2ed089ba7f
commit cbf8e0b2d6
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -710,7 +710,7 @@ void MainWindow::registerDefaultActions()
m_toggleRightSideBarAction->setCheckable(true); m_toggleRightSideBarAction->setCheckable(true);
cmd = ActionManager::registerAction(m_toggleRightSideBarAction, Constants::TOGGLE_RIGHT_SIDEBAR); cmd = ActionManager::registerAction(m_toggleRightSideBarAction, Constants::TOGGLE_RIGHT_SIDEBAR);
cmd->setAttribute(Command::CA_UpdateText); cmd->setAttribute(Command::CA_UpdateText);
cmd->setDefaultKeySequence(QKeySequence(UseMacShortcuts ? tr("Ctrl+Meta+0") : tr("Ctrl+0"))); cmd->setDefaultKeySequence(QKeySequence(UseMacShortcuts ? tr("Ctrl+Shift+0") : tr("Alt+Shift+0")));
connect(m_toggleRightSideBarAction, &QAction::triggered, connect(m_toggleRightSideBarAction, &QAction::triggered,
this, [this](bool visible) { setSidebarVisible(visible, Side::Right); }); this, [this](bool visible) { setSidebarVisible(visible, Side::Right); });
ProxyAction *toggleRightSideBarProxyAction = ProxyAction *toggleRightSideBarProxyAction =

4
src/plugins/coreplugin/progressmanager/progressmanager.cpp
View File

@@ -340,9 +340,7 @@ void ProgressManagerPrivate::init()
toggleProgressView->setIcon(QIcon(p)); toggleProgressView->setIcon(QIcon(p));
Command *cmd = ActionManager::registerAction(toggleProgressView, Command *cmd = ActionManager::registerAction(toggleProgressView,
"QtCreator.ToggleProgressDetails"); "QtCreator.ToggleProgressDetails");
cmd->setDefaultKeySequence(QKeySequence(HostOsInfo::isMacHost()
? tr("Ctrl+Shift+0")
: tr("Alt+Shift+0")));
connect(toggleProgressView, &QAction::toggled, connect(toggleProgressView, &QAction::toggled,
this, &ProgressManagerPrivate::progressDetailsToggled); this, &ProgressManagerPrivate::progressDetailsToggled);
toggleButton->setDefaultAction(cmd->action()); toggleButton->setDefaultAction(cmd->action());