summaryrefslogtreecommitdiff
path: root/src/plugins/quickopen
diff options
context:
space:
mode:
authorcon <qtc-committer@nokia.com>2009-06-22 10:53:21 +0200
committercon <qtc-committer@nokia.com>2009-06-22 18:13:33 +0200
commit3a851daf2cf5449b5355bd3a47b39c1582e4bb54 (patch)
treecf66bdb8764c46cf716b4b98323e95aacf2b8f54 /src/plugins/quickopen
parent2f7b3e1257cdbe8d1cf68a3efaf332eb378c53bb (diff)
downloadqt-creator-3a851daf2cf5449b5355bd3a47b39c1582e4bb54.tar.gz
Activating Locator when already in the locator window didn't work.
For example when you typed Ctrl+l and find that you don't want to use the goto line filter after all.
Diffstat (limited to 'src/plugins/quickopen')
-rw-r--r--src/plugins/quickopen/quickopenplugin.cpp2
-rw-r--r--src/plugins/quickopen/quickopentoolwindow.cpp5
2 files changed, 4 insertions, 3 deletions
diff --git a/src/plugins/quickopen/quickopenplugin.cpp b/src/plugins/quickopen/quickopenplugin.cpp
index fcbd194bda..b3f17669a5 100644
--- a/src/plugins/quickopen/quickopenplugin.cpp
+++ b/src/plugins/quickopen/quickopenplugin.cpp
@@ -129,7 +129,7 @@ bool QuickOpenPlugin::initialize(const QStringList &, QString *)
void QuickOpenPlugin::openQuickOpen()
{
- m_quickOpenToolWindow->setFocus();
+ m_quickOpenToolWindow->show("");
}
void QuickOpenPlugin::extensionsInitialized()
diff --git a/src/plugins/quickopen/quickopentoolwindow.cpp b/src/plugins/quickopen/quickopentoolwindow.cpp
index 7c53047390..86d46769df 100644
--- a/src/plugins/quickopen/quickopentoolwindow.cpp
+++ b/src/plugins/quickopen/quickopentoolwindow.cpp
@@ -438,7 +438,8 @@ void QuickOpenToolWindow::acceptCurrentEntry()
void QuickOpenToolWindow::show(const QString &text, int selectionStart, int selectionLength)
{
m_fileLineEdit->hideHintText();
- m_fileLineEdit->setText(text);
+ if (!text.isEmpty())
+ m_fileLineEdit->setText(text);
if (!m_fileLineEdit->hasFocus())
m_fileLineEdit->setFocus();
else
@@ -447,7 +448,7 @@ void QuickOpenToolWindow::show(const QString &text, int selectionStart, int sele
if (selectionStart >= 0)
m_fileLineEdit->setSelection(selectionStart, selectionLength);
else
- m_fileLineEdit->deselect();
+ m_fileLineEdit->selectAll();
}
void QuickOpenToolWindow::filterSelected()