From e194f67ae11e526b9b4f103824984f1ebe3aeb34 Mon Sep 17 00:00:00 2001
From: Sebastian Sauer <mail@dipe.org>
Date: Fri, 12 Nov 2010 22:55:58 +0000
Subject: [PATCH] * make pressing return in dirBox do startSearch() too (same
 as with nameBox and containingText) * proper redirect the tabwidget's
 startSearch with the dialogs startSearch. This fixes the before unused
 connect(nameBox,SIGNAL(activated(int)) which got removed and makes using
 user3 not needed any longer cause we are handling returnPressed() direct now
 (same like it was done at containingText).

svn path=/trunk/KDE/kdebase/apps/; revision=1196288
---
 kfind/kfinddlg.cpp | 6 ++++--
 kfind/kftabdlg.cpp | 5 ++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/kfind/kfinddlg.cpp b/kfind/kfinddlg.cpp
index 3277e6984d..8af5043816 100644
--- a/kfind/kfinddlg.cpp
+++ b/kfind/kfinddlg.cpp
@@ -79,8 +79,10 @@ KfindDlg::KfindDlg(const KUrl & url, QWidget *parent)
   vBox->addWidget(win, 1);
   vBox->addWidget(mStatusBar, 0);
 
-  connect(this, SIGNAL(user3Clicked()),
-	  this, SLOT(startSearch()));
+  connect(tabWidget, SIGNAL(startSearch()),
+          this, SLOT(startSearch()));
+  //connect(this, SIGNAL(user3Clicked()),
+  //        this, SLOT(startSearch()));
   connect(this, SIGNAL(user2Clicked()),
 	  this, SLOT(stopSearch()));
   connect(this, SIGNAL(user1Clicked()),
diff --git a/kfind/kftabdlg.cpp b/kfind/kftabdlg.cpp
index 56cc6441e0..a5e246e61d 100644
--- a/kfind/kftabdlg.cpp
+++ b/kfind/kftabdlg.cpp
@@ -166,9 +166,12 @@ KfindTabWidget::KfindTabWidget(QWidget *parent)
     connect( browseB, SIGNAL(clicked()),
              this, SLOT(getDirectory()) );
 
-    connect( nameBox, SIGNAL(activated(int)),
+    connect( nameBox, SIGNAL(returnPressed()),
              this, SIGNAL(startSearch()));
 
+    connect( dirBox, SIGNAL(returnPressed()),
+             this, SIGNAL(startSearch()));
+    
     // ************ Page Two
 
     pages[1] = new QWidget;