summaryrefslogtreecommitdiff
path: root/src/plugins/qmljstools/qmljsfunctionfilter.cpp
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@digia.com>2013-05-31 12:52:53 +0200
committerEike Ziller <eike.ziller@digia.com>2013-06-05 09:43:14 +0200
commit7c8db79817ed436176f6055b5c6f8ccf6df16c4c (patch)
tree28c65055a97c872468055db6e96fb51f70e83f1d /src/plugins/qmljstools/qmljsfunctionfilter.cpp
parentf99ce422b475c000e1bbdadf13da232dd54d9cca (diff)
downloadqt-creator-7c8db79817ed436176f6055b5c6f8ccf6df16c4c.tar.gz
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>
Diffstat (limited to 'src/plugins/qmljstools/qmljsfunctionfilter.cpp')
-rw-r--r--src/plugins/qmljstools/qmljsfunctionfilter.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/plugins/qmljstools/qmljsfunctionfilter.cpp b/src/plugins/qmljstools/qmljsfunctionfilter.cpp
index 13710f5dd0..33c1eb9356 100644
--- a/src/plugins/qmljstools/qmljsfunctionfilter.cpp
+++ b/src/plugins/qmljstools/qmljsfunctionfilter.cpp
@@ -111,6 +111,5 @@ QList<Locator::FilterEntry> FunctionFilter::matchesFor(QFutureInterface<Locator:
void FunctionFilter::accept(Locator::FilterEntry selection) const
{
const LocatorData::Entry entry = qvariant_cast<LocatorData::Entry>(selection.internalData);
- Core::EditorManager::openEditorAt(entry.fileName, entry.line, entry.column,
- Core::Id(), Core::EditorManager::ModeSwitch);
+ Core::EditorManager::openEditorAt(entry.fileName, entry.line, entry.column);
}