forked from qt-creator/qt-creator
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
This commit is contained in:
@@ -479,6 +479,7 @@ public:
|
||||
DebugMode(QObject *parent = 0) : BaseMode(parent)
|
||||
{
|
||||
setDisplayName(QCoreApplication::translate("Debugger::Internal::DebugMode", "Debug"));
|
||||
setType(Core::Constants::MODE_EDIT_TYPE);
|
||||
setId(MODE_DEBUG);
|
||||
setIcon(QIcon(__(":/fancyactionbar/images/mode_Debug.png")));
|
||||
setPriority(P_MODE_DEBUG);
|
||||
@@ -2587,7 +2588,7 @@ void DebuggerPlugin::gotoLocation(const QString &file, int line, bool setMarker)
|
||||
bool newEditor = false;
|
||||
ITextEditor *editor =
|
||||
BaseTextEditor::openEditorAt(file, line, 0, QString(),
|
||||
EditorManager::IgnoreNavigationHistory | EditorManager::NoModeSwitch,
|
||||
EditorManager::IgnoreNavigationHistory,
|
||||
&newEditor);
|
||||
if (!editor)
|
||||
return;
|
||||
@@ -2608,8 +2609,7 @@ void DebuggerPlugin::openTextEditor(const QString &titlePattern0,
|
||||
IEditor *editor = editorManager->openEditorWithContents(
|
||||
Core::Constants::K_DEFAULT_TEXT_EDITOR_ID, &titlePattern, contents);
|
||||
QTC_ASSERT(editor, return);
|
||||
editorManager->activateEditor(editor,
|
||||
EditorManager::IgnoreNavigationHistory|EditorManager::NoModeSwitch);
|
||||
editorManager->activateEditor(editor, EditorManager::IgnoreNavigationHistory);
|
||||
}
|
||||
|
||||
void DebuggerPlugin::writeSettings() const
|
||||
|
||||
Reference in New Issue
Block a user