summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDarjus Loktevic <darjus@linux-6j1x.site>2010-03-02 21:27:03 -0800
committerDarjus Loktevic <darjus@linux-6j1x.site>2010-03-02 21:27:03 -0800
commitf24d3182f08480502cbf7bcfd1a0775e57722197 (patch)
treec9cb769bc83ee0f94a4b78ad2e079bb998f6e615 /src
parentrekonq 0.3.97 (diff)
downloadrekonq-f24d3182f08480502cbf7bcfd1a0775e57722197.tar.xz
* Added continue search by <Enter> key (similar to Firefox, enter the
search term and press <Enter> for next result). * Removed focusNextPrevChild if the search fails as it does not seem to make sense. It's the same as you would press <Tab> to focus the next item on the page. Why "Search" should do that? Some context: found that when searching some websites, when the match is not found, the page would suddenly scroll to some location and focus a link or search edit. Hope this makes sense.
Diffstat (limited to 'src')
-rw-r--r--src/findbar.cpp1
-rw-r--r--src/mainwindow.cpp9
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);
}