diff options
| author | Andrea Diamantini <adjam7@gmail.com> | 2010-03-03 14:08:04 +0100 |
|---|---|---|
| committer | Andrea Diamantini <adjam7@gmail.com> | 2010-03-03 14:08:04 +0100 |
| commit | 859d0099366f1624bda7b93e66e39a28847d83df (patch) | |
| tree | f50cbb0cc49566b7e670e1b17fcd073adbc91a75 | |
| parent | Removing call to non-extant slot.. (diff) | |
| parent | * Added continue search by <Enter> key (similar to Firefox, enter the (diff) | |
| download | rekonq-859d0099366f1624bda7b93e66e39a28847d83df.tar.xz | |
Merge commit 'refs/merge-requests/100' of git://gitorious.org/rekonq/mainline into LastFindBarFixes
| -rw-r--r-- | src/findbar.cpp | 1 | ||||
| -rw-r--r-- | src/mainwindow.cpp | 9 |
2 files changed, 2 insertions, 8 deletions
diff --git a/src/findbar.cpp b/src/findbar.cpp index bb693ab0..03fe2180 100644 --- a/src/findbar.cpp +++ b/src/findbar.cpp @@ -82,6 +82,7 @@ FindBar::FindBar(QWidget *parent) setFocusProxy(m_lineEdit); m_lineEdit->setMaximumWidth(250); connect(m_lineEdit, SIGNAL(textChanged(const QString &)), window, SLOT(find(const QString &))); + connect(m_lineEdit, SIGNAL(returnPressed()), mainwindow, SLOT(findNext())); layout->addWidget(m_lineEdit); // buttons diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 39dd9a40..a09c25e8 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -794,10 +794,7 @@ void MainWindow::findNext() return; if(m_findBar->isHidden()) - { - currentTab()->view()->page()->focusNextPrevChild(true); - return; - } + return; QWebPage::FindFlags options = QWebPage::FindWrapsAroundDocument; if (m_findBar->matchCase()) @@ -805,8 +802,6 @@ void MainWindow::findNext() bool found = currentTab()->view()->findText(m_lastSearch, options); m_findBar->notifyMatch(found); - if(!found) - currentTab()->view()->page()->focusNextPrevChild(true); } @@ -821,8 +816,6 @@ void MainWindow::findPrevious() bool found = currentTab()->view()->findText(m_lastSearch, options); m_findBar->notifyMatch(found); - if(!found) - currentTab()->view()->page()->focusNextPrevChild(true); } |