From 2ee57b31d2cef83d00dfc6886cc93d1fb43711ed Mon Sep 17 00:00:00 2001
From: con <qtc-committer@nokia.com>
Date: Fri, 8 Oct 2010 12:39:06 +0200
Subject: [PATCH] Don't override user's shortcut settings for navigation panes
at startup.
The action manager was reading the settings before the navigation panels
had their commands registered.
Task-number: QTCREATORBUG-2005
Reviewed-by: hjk
---
src/plugins/coreplugin/mainwindow.cpp | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/plugins/coreplugin/mainwindow.cpp b/src/plugins/coreplugin/mainwindow.cpp
index f32b3b2a18b..487976bb0c9 100644
--- a/src/plugins/coreplugin/mainwindow.cpp
+++ b/src/plugins/coreplugin/mainwindow.cpp
@@ -325,16 +325,14 @@ bool MainWindow::init(QString *errorMessage)
void MainWindow::extensionsInitialized()
{
m_editorManager->init();
-
m_statusBarManager->extensionsInitalized();
-
OutputPaneManager::instance()->init();
-
- m_actionManager->initialize();
m_vcsManager->extensionsInitialized();
-
m_navigationWidget->setFactories(ExtensionSystem::PluginManager::instance()->getObjects<INavigationWidgetFactory>());
+ // reading the shortcut settings must be done after all shortcuts have been registered
+ m_actionManager->initialize();
+
readSettings();
updateContext();
--
GitLab