From 2649aba801efdbf57f10b55a5e6c46dbd13cdbb4 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Thu, 29 Jan 2009 10:52:28 +0100
Subject: Fixed Find bar use.

---
 TODO               |  3 ++-
 src/findbar.cpp    |  4 ++--
 src/mainwindow.cpp | 20 ++++++++++----------
 src/rekonqui.rc    |  2 +-
 4 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/TODO b/TODO
index 3e3cecf7..e8fa7215 100644
--- a/TODO
+++ b/TODO
@@ -21,8 +21,9 @@ ROAD to 0.0.3 (third release)
 
 --- REMOVE ALL FOCUS TO QStackedWidget in mainview!!
 --- improve searchbar features
---- bookmarks line
+++- bookmarks line
 --- fix sessions && ui dimension
+--- fix KConfigXT use
 
 + ----------------------------------------------------
 
diff --git a/src/findbar.cpp b/src/findbar.cpp
index e3f4b231..449e24fa 100644
--- a/src/findbar.cpp
+++ b/src/findbar.cpp
@@ -58,8 +58,8 @@ FindBar::FindBar(KXmlGuiWindow *mainwindow)
     m_lineEdit = new KLineEdit(this);
     setFocusProxy(m_lineEdit);
     m_lineEdit->setMaximumWidth( 250 );
-    connect( m_lineEdit, SIGNAL( returnPressed() ), mainwindow, SLOT( slotFindNext() ) );
-    connect( m_lineEdit, SIGNAL( textEdited(const QString &) ), mainwindow, SLOT( slotFindNext() ) );
+//     connect( m_lineEdit, SIGNAL( returnPressed() ), mainwindow, SLOT( slotFind() ) );
+    connect( m_lineEdit, SIGNAL( textChanged(const QString &) ), mainwindow, SLOT( slotFind(const QString &) ) );
     layout->addWidget( m_lineEdit );
 
     // buttons
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 87ae0ac0..c7c1a47e 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -551,14 +551,8 @@ void MainWindow::slotFind(const QString & search)
 {
     if (!currentTab())
         return;
-    if (!search.isEmpty()) 
-    {
-        m_lastSearch = search;
-        if (!currentTab()->findText(m_lastSearch))
-        {
-            slotUpdateStatusbar( QString(m_lastSearch) + i18n(" not found.") );
-        }
-    }
+    m_lastSearch = search;
+    slotFindNext();
 }
 
 
@@ -572,7 +566,10 @@ void MainWindow::slotFindNext()
 {
     if (!currentTab() && m_lastSearch.isEmpty())
         return;
-    currentTab()->findText(m_lastSearch);
+    if (!currentTab()->findText(m_lastSearch, QWebPage::FindWrapsAroundDocument))
+    {
+        slotUpdateStatusbar( QString(m_lastSearch) + i18n(" not found.") );
+    }
 }
 
 
@@ -580,7 +577,10 @@ void MainWindow::slotFindPrevious()
 {
     if (!currentTab() && m_lastSearch.isEmpty())
         return;
-    currentTab()->findText(m_lastSearch, QWebPage::FindBackward);
+    if (!currentTab()->findText(m_lastSearch, QWebPage::FindBackward))
+    {
+        slotUpdateStatusbar( QString(m_lastSearch) + i18n(" not found.") );
+    }
 }
 
 
diff --git a/src/rekonqui.rc b/src/rekonqui.rc
index 5016192f..861f8538 100644
--- a/src/rekonqui.rc
+++ b/src/rekonqui.rc
@@ -67,7 +67,7 @@
 </ToolBar>
 
 <!--  ============ Bookmarks ToolBar =========== -->
-<ToolBar name="bookmarksToolBar" fullWidth="true" iconSize="16" newline="true" position="top"><text>Bookmarks Toolbar</text>
+<ToolBar name="bookmarksToolBar" fullWidth="true" iconSize="8" newline="true" position="top"><text>Bookmarks Toolbar</text>
 </ToolBar>
 
 </kpartgui>
-- 
cgit v1.2.1