move the search-button from the toolbar into the configurator widget

svn path=/trunk/KDE/kdebase/apps/; revision=1048239

4 files changed, 8 insertions, 11 deletions

diff --git a/src/search/dolphinsearchbox.cpp b/src/search/dolphinsearchbox.cpp
index c9a86111f..9f228140b 100644
--- a/src/search/dolphinsearchbox.cpp
+++ b/src/search/dolphinsearchbox.cpp
@@ -236,7 +236,6 @@ void DolphinSearchCompleter::highlighted(const QModelIndex& index)
 DolphinSearchBox::DolphinSearchBox(QWidget* parent) :
     QWidget(parent),
     m_searchInput(0),
-    m_searchButton(0),
     m_completer(0)
 {
     QHBoxLayout* hLayout = new QHBoxLayout(this);
@@ -251,14 +250,6 @@ DolphinSearchBox::DolphinSearchBox(QWidget* parent) :
     hLayout->addWidget(m_searchInput);
     connect(m_searchInput, SIGNAL(returnPressed()),
             this, SLOT(emitSearchSignal()));
-
-    m_searchButton = new QToolButton(this);
-    m_searchButton->setAutoRaise(true);
-    m_searchButton->setIcon(KIcon("edit-find"));
-    m_searchButton->setToolTip(i18nc("@info:tooltip", "Click to begin the search"));
-    hLayout->addWidget(m_searchButton);
-    connect(m_searchButton, SIGNAL(clicked()),
-            this, SLOT(emitSearchSignal()));
 }
 
 DolphinSearchBox::~DolphinSearchBox()
diff --git a/src/search/dolphinsearchbox.h b/src/search/dolphinsearchbox.h
index 81c412aa0..fea7129b1 100644
--- a/src/search/dolphinsearchbox.h
+++ b/src/search/dolphinsearchbox.h
@@ -29,7 +29,6 @@ class KUrl;
 class QCompleter;
 class QModelIndex;
 class QStandardItemModel;
-class QToolButton;
 
 /**
  * @brief Helper class used for completition for the DolphinSearchBox.
@@ -89,7 +88,6 @@ private slots:
 
 private:
     KLineEdit* m_searchInput;
-    QToolButton* m_searchButton;
 
     DolphinSearchCompleter* m_completer;
 };
diff --git a/src/search/dolphinsearchoptionsconfigurator.cpp b/src/search/dolphinsearchoptionsconfigurator.cpp
index 6271350cc..d0b7cace2 100644
--- a/src/search/dolphinsearchoptionsconfigurator.cpp
+++ b/src/search/dolphinsearchoptionsconfigurator.cpp
@@ -64,6 +64,12 @@ DolphinSearchOptionsConfigurator::DolphinSearchOptionsConfigurator(QWidget* pare
     m_searchWhatBox->addItem(i18nc("@label", "Text"));
     m_searchWhatBox->addItem(i18nc("@label", "Filenames"));
 
+    // add button "Search"
+    QPushButton* searchButton = new QPushButton(this);
+    searchButton->setIcon(KIcon("edit-find"));
+    searchButton->setText(i18nc("@action:button", "Search"));
+    searchButton->setToolTip(i18nc("@info", "Start searching"));
+
     // add button "Save"
     QPushButton* saveButton = new QPushButton(this);
     saveButton->setIcon(KIcon("document-save"));
@@ -95,6 +101,7 @@ DolphinSearchOptionsConfigurator::DolphinSearchOptionsConfigurator(QWidget* pare
 
     QHBoxLayout* lastLineLayout = new QHBoxLayout();
     lastLineLayout->addWidget(new QWidget(this), 1); // filler
+    lastLineLayout->addWidget(searchButton);
     lastLineLayout->addWidget(saveButton);
     lastLineLayout->addWidget(closeButton);
 
diff --git a/src/search/searchcriterionselector.cpp b/src/search/searchcriterionselector.cpp
index 34756cc30..f685e50fc 100644
--- a/src/search/searchcriterionselector.cpp
+++ b/src/search/searchcriterionselector.cpp
@@ -53,6 +53,7 @@ SearchCriterionSelector::SearchCriterionSelector(Type type, QWidget* parent) :
 
     m_removeButton = new QPushButton(this);
     m_removeButton->setIcon(KIcon("list-remove"));
+    m_removeButton->setToolTip(i18nc("@info", "Remove search option"));
     m_removeButton->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
     connect(m_removeButton, SIGNAL(clicked()), this, SIGNAL(removeCriterion()));