feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fixes: Pressing return in search panel didn't run the search.

Browse Source 
It did so only if the focus was on the search term line edit.

Task-number: QTCREATORBUG-6114
Change-Id: I0cf051ed0f5f4e7403d7c36eb2173a71de370276
Reviewed-on: http://codereview.qt-project.org/5252
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
This commit is contained in:
Eike Ziller
2011-09-20 17:23:05 +02:00
parent 106473c4b5
commit a70c767b92
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/plugins/find/findtoolwindow.cpp
View File

@@ -64,7 +64,6 @@ FindToolWindow::FindToolWindow(FindPlugin *plugin, QWidget *parent)
connect(m_ui.regExp, SIGNAL(toggled(bool)), m_plugin, SLOT(setRegularExpression(bool))); connect(m_ui.regExp, SIGNAL(toggled(bool)), m_plugin, SLOT(setRegularExpression(bool)));
connect(m_ui.filterList, SIGNAL(activated(int)), this, SLOT(setCurrentFilter(int))); connect(m_ui.filterList, SIGNAL(activated(int)), this, SLOT(setCurrentFilter(int)));
connect(m_ui.searchTerm, SIGNAL(textChanged(QString)), this, SLOT(updateButtonStates())); connect(m_ui.searchTerm, SIGNAL(textChanged(QString)), this, SLOT(updateButtonStates()));
connect(m_ui.searchTerm, SIGNAL(returnPressed()), this, SLOT(search()));
m_findCompleter->setModel(m_plugin->findCompletionModel()); m_findCompleter->setModel(m_plugin->findCompletionModel());
m_ui.searchTerm->setCompleter(m_findCompleter); m_ui.searchTerm->setCompleter(m_findCompleter);
@@ -86,6 +85,20 @@ FindToolWindow *FindToolWindow::instance()
return m_instance; return m_instance;
} }
bool FindToolWindow::event(QEvent *event)
{
if (event->type() == QEvent::KeyPress) {
QKeyEvent *ke = static_cast<QKeyEvent *>(event);
if ((ke->key() == Qt::Key_Return || ke->key() == Qt::Key_Enter)
&& ke->modifiers() == Qt::NoModifier) {
ke->accept();
search();
return true;
}
}
return QWidget::event(event);
}
bool FindToolWindow::eventFilter(QObject *obj, QEvent *event) bool FindToolWindow::eventFilter(QObject *obj, QEvent *event)
{ {
if (obj == m_ui.searchTerm && event->type() == QEvent::KeyPress) { if (obj == m_ui.searchTerm && event->type() == QEvent::KeyPress) {

1
src/plugins/find/findtoolwindow.h
View File

@@ -62,6 +62,7 @@ public:
void writeSettings(); void writeSettings();
protected: protected:
bool event(QEvent *event);
bool eventFilter(QObject *obj, QEvent *event); bool eventFilter(QObject *obj, QEvent *event);
private slots: private slots: