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

1 files changed, 3 insertions, 0 deletions

diff --git a/src/plugins/coreplugin/coreconstants.h b/src/plugins/coreplugin/coreconstants.h
index 13081d5ecc..32c525ddd5 100644
--- a/src/plugins/coreplugin/coreconstants.h
+++ b/src/plugins/coreplugin/coreconstants.h
@@ -68,8 +68,11 @@ const char * const IDE_REVISION_STR      = "";
 
 //modes
 const char * const MODE_WELCOME          = "Welcome";
+const char * const MODE_WELCOME_TYPE     = "Type.Welcome";
 const char * const MODE_EDIT             = "Edit";
+const char * const MODE_EDIT_TYPE        = "Type.Edit";
 const char * const MODE_DESIGN           = "Design";
+const char * const MODE_DESIGN_TYPE      = "Type.Design";
 const int          P_MODE_WELCOME        = 100;
 const int          P_MODE_EDIT           = 90;
 const int          P_MODE_DESIGN         = 89;