Switch less often to edit mode
This change
* Removes IMode::type, ModeManager::activateModeType, and
IEditor::preferredModeType, and adds IEditor::isDesignModePreferred
instead
* Adapts the mode switching code in EditorManager to handle multiple
windows, for example switching to edit mode should only happen if
the editor/view is in the main window. Otherwise the editor window
should be raised and focused
* Renames EditorManager::NoActivate --> DoNotChangeCurrentEditor
* Reverts the EditorManager::ModeSwitch logic to switch mode or
make the current editor visible by default, introducing
DoNotMakeVisible flag instead
* Fixes a few instances where EditorManager::ModeSwitch should have been
used
One non-trivial problem left: If you open a .ui file and switch to an
external editor window, edit mode is activated, because the current
editor no longer is a .ui file, which means that the design mode gets
deactivated.
Change-Id: I76c5c2391eb4090143b778fb103acff3a5a1ff41
Reviewed-by:
David Schulz <david.schulz@digia.com>
Showing
- src/plugins/analyzerbase/analyzermanager.cpp 0 additions, 1 deletionsrc/plugins/analyzerbase/analyzermanager.cpp
- src/plugins/bazaar/bazaarplugin.cpp 1 addition, 3 deletionssrc/plugins/bazaar/bazaarplugin.cpp
- src/plugins/clearcase/clearcaseplugin.cpp 6 additions, 8 deletionssrc/plugins/clearcase/clearcaseplugin.cpp
- src/plugins/coreplugin/basefilewizard.cpp 1 addition, 1 deletionsrc/plugins/coreplugin/basefilewizard.cpp
- src/plugins/coreplugin/designmode.cpp 0 additions, 1 deletionsrc/plugins/coreplugin/designmode.cpp
- src/plugins/coreplugin/documentmanager.cpp 1 addition, 1 deletionsrc/plugins/coreplugin/documentmanager.cpp
- src/plugins/coreplugin/editmode.cpp 0 additions, 1 deletionsrc/plugins/coreplugin/editmode.cpp
- src/plugins/coreplugin/editormanager/editormanager.cpp 24 additions, 31 deletionssrc/plugins/coreplugin/editormanager/editormanager.cpp
- src/plugins/coreplugin/editormanager/editormanager.h 2 additions, 3 deletionssrc/plugins/coreplugin/editormanager/editormanager.h
- src/plugins/coreplugin/editormanager/editorview.cpp 6 additions, 6 deletionssrc/plugins/coreplugin/editormanager/editorview.cpp
- src/plugins/coreplugin/editormanager/ieditor.h 1 addition, 1 deletionsrc/plugins/coreplugin/editormanager/ieditor.h
- src/plugins/coreplugin/editormanager/openeditorsview.cpp 1 addition, 1 deletionsrc/plugins/coreplugin/editormanager/openeditorsview.cpp
- src/plugins/coreplugin/editormanager/openeditorswindow.cpp 2 additions, 3 deletionssrc/plugins/coreplugin/editormanager/openeditorswindow.cpp
- src/plugins/coreplugin/editortoolbar.cpp 1 addition, 1 deletionsrc/plugins/coreplugin/editortoolbar.cpp
- src/plugins/coreplugin/imode.h 0 additions, 3 deletionssrc/plugins/coreplugin/imode.h
- src/plugins/coreplugin/mainwindow.cpp 2 additions, 4 deletionssrc/plugins/coreplugin/mainwindow.cpp
- src/plugins/coreplugin/modemanager.cpp 4 additions, 19 deletionssrc/plugins/coreplugin/modemanager.cpp
- src/plugins/coreplugin/modemanager.h 0 additions, 1 deletionsrc/plugins/coreplugin/modemanager.h
- src/plugins/cpaster/cpasterplugin.cpp 1 addition, 1 deletionsrc/plugins/cpaster/cpasterplugin.cpp
- src/plugins/cppeditor/cppeditor.cpp 1 addition, 1 deletionsrc/plugins/cppeditor/cppeditor.cpp
Loading
Please register or sign in to comment