summaryrefslogtreecommitdiff
path: root/src/plugins/coreplugin/editmode.cpp
diff options
context:
space:
mode:
authordt <qtc-committer@nokia.com>2010-09-14 15:15:57 +0200
committerdt <qtc-committer@nokia.com>2010-09-14 15:23:11 +0200
commit08ccda586254de7ff4c66ccdb98d9843847080be (patch)
treef5a2f84c816c92f5beeb71712bc4abacc0f93520 /src/plugins/coreplugin/editmode.cpp
parentf068e1159615ee2e1140008359e998ed95c778fd (diff)
downloadqt-creator-08ccda586254de7ff4c66ccdb98d9843847080be.tar.gz
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
Diffstat (limited to 'src/plugins/coreplugin/editmode.cpp')
-rw-r--r--src/plugins/coreplugin/editmode.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/plugins/coreplugin/editmode.cpp b/src/plugins/coreplugin/editmode.cpp
index 2470c4f4d6..f8ba81af0b 100644
--- a/src/plugins/coreplugin/editmode.cpp
+++ b/src/plugins/coreplugin/editmode.cpp
@@ -114,6 +114,11 @@ QString EditMode::id() const
return QLatin1String(Constants::MODE_EDIT);
}
+QString EditMode::type() const
+{
+ return QLatin1String(Constants::MODE_EDIT_TYPE);
+}
+
Context EditMode::context() const
{
static Context contexts(Constants::C_EDIT_MODE,