From 08ccda586254de7ff4c66ccdb98d9843847080be Mon Sep 17 00:00:00 2001 From: dt Date: Tue, 14 Sep 2010 15:15:57 +0200 Subject: EditorManager: Change openEditor/activateEditor to not do mode switching Also introduce a indirection, modes have now types, edit and debug have the same type, and editors do have a prefered type of modes instead of a prefered mode. That fixes the bug that if the prefered qml editing mode was set to design, then in switching between qml editors would - in Edit Mode: stay in edit mode - in Debug Mode: switch to debug mode --- src/plugins/cpptools/cppfilesettingspage.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/plugins/cpptools/cppfilesettingspage.cpp') diff --git a/src/plugins/cpptools/cppfilesettingspage.cpp b/src/plugins/cpptools/cppfilesettingspage.cpp index 397cb91280..6355c3e3f2 100644 --- a/src/plugins/cpptools/cppfilesettingspage.cpp +++ b/src/plugins/cpptools/cppfilesettingspage.cpp @@ -285,7 +285,8 @@ void CppFileSettingsWidget::slotEdit() QString path = licenseTemplatePath(); // Edit existing file with C++ if (!path.isEmpty()) { - Core::EditorManager::instance()->openEditor(path, QLatin1String(CppEditor::Constants::CPPEDITOR_ID)); + Core::EditorManager::instance()->openEditor(path, QLatin1String(CppEditor::Constants::CPPEDITOR_ID), + Core::EditorManager::ModeSwitch); return; } // Pick a file name and write new template, edit with C++ @@ -301,7 +302,8 @@ void CppFileSettingsWidget::slotEdit() file.write(tr(licenseTemplateTemplate).toUtf8()); file.close(); setLicenseTemplatePath(path); - Core::EditorManager::instance()->openEditor(path, QLatin1String(CppEditor::Constants::CPPEDITOR_ID)); + Core::EditorManager::instance()->openEditor(path, QLatin1String(CppEditor::Constants::CPPEDITOR_ID), + Core::EditorManager::ModeSwitch); } // --------------- CppFileSettingsPage -- cgit v1.2.1