From e9d075049b060ab1ce24399af2e9060ebcfcd0fd Mon Sep 17 00:00:00 2001
From: Christophe Dumez <chris@qbittorrent.org>
Date: Sun, 26 Aug 2012 10:10:50 +0300
Subject: [PATCH] Add "clear" functionality to search field (closes #59)

---
 src/searchengine/search.ui        | 46 ++-----------------------------
 src/searchengine/searchengine.cpp | 11 +++++++-
 src/searchengine/searchengine.h   |  2 ++
 3 files changed, 14 insertions(+), 45 deletions(-)

diff --git a/src/searchengine/search.ui b/src/searchengine/search.ui
index c5de22c97..fb59f6938 100644
--- a/src/searchengine/search.ui
+++ b/src/searchengine/search.ui
@@ -15,20 +15,7 @@
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
-    <layout class="QHBoxLayout" name="horizontalLayout">
-     <item>
-      <widget class="QLineEdit" name="search_pattern">
-       <property name="maximumSize">
-        <size>
-         <width>16777215</width>
-         <height>22</height>
-        </size>
-       </property>
-       <property name="contextMenuPolicy">
-        <enum>Qt::CustomContextMenu</enum>
-       </property>
-      </widget>
-     </item>
+    <layout class="QHBoxLayout" name="searchBarLayout">
      <item>
       <widget class="QComboBox" name="comboCategory"/>
      </item>
@@ -112,20 +99,8 @@
    </item>
    <item>
     <layout class="QVBoxLayout">
-     <property name="spacing">
-      <number>6</number>
-     </property>
-     <property name="margin">
-      <number>0</number>
-     </property>
      <item>
       <layout class="QHBoxLayout">
-       <property name="spacing">
-        <number>6</number>
-       </property>
-       <property name="margin">
-        <number>0</number>
-       </property>
        <item>
         <widget class="QPushButton" name="download_button">
          <property name="enabled">
@@ -173,22 +148,5 @@
   </layout>
  </widget>
  <resources/>
- <connections>
-  <connection>
-   <sender>search_pattern</sender>
-   <signal>returnPressed()</signal>
-   <receiver>search_button</receiver>
-   <slot>click()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>421</x>
-     <y>37</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>685</x>
-     <y>45</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
+ <connections/>
 </ui>
diff --git a/src/searchengine/searchengine.cpp b/src/searchengine/searchengine.cpp
index 3965cb94e..3ea83790e 100644
--- a/src/searchengine/searchengine.cpp
+++ b/src/searchengine/searchengine.cpp
@@ -58,12 +58,19 @@
 #include "qinisettings.h"
 #include "mainwindow.h"
 #include "iconprovider.h"
+#include "lineedit.h"
 
 #define SEARCHHISTORY_MAXSIZE 50
 
 /*SEARCH ENGINE START*/
-SearchEngine::SearchEngine(MainWindow *parent) : QWidget(parent), mp_mainWindow(parent) {
+SearchEngine::SearchEngine(MainWindow* parent)
+  : QWidget(parent)
+  , search_pattern(new LineEdit)
+  , mp_mainWindow(parent)
+{
   setupUi(this);
+  searchBarLayout->insertWidget(0, search_pattern);
+  connect(search_pattern, SIGNAL(returnPressed()), search_button, SLOT(click()));
   // Icons
   search_button->setIcon(IconProvider::instance()->getIcon("edit-find"));
   download_button->setIcon(IconProvider::instance()->getIcon("download"));
@@ -98,6 +105,7 @@ SearchEngine::SearchEngine(MainWindow *parent) : QWidget(parent), mp_mainWindow(
         );
   // Fill in category combobox
   fillCatCombobox();
+
   connect(search_pattern, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(displayPatternContextMenu(QPoint)));
   connect(search_pattern, SIGNAL(textEdited(QString)), this, SLOT(searchTextEdited(QString)));
 }
@@ -189,6 +197,7 @@ SearchEngine::~SearchEngine() {
     downloader->waitForFinished();
     delete downloader;
   }
+  delete search_pattern;
   delete searchTimeout;
   delete searchProcess;
   delete supported_engines;
diff --git a/src/searchengine/searchengine.h b/src/searchengine/searchengine.h
index 2545eec56..a02d33cdd 100644
--- a/src/searchengine/searchengine.h
+++ b/src/searchengine/searchengine.h
@@ -44,6 +44,7 @@
 class DownloadThread;
 class SearchEngine;
 class MainWindow;
+class LineEdit;
 
 QT_BEGIN_NAMESPACE
 class QTimer;
@@ -122,6 +123,7 @@ private slots:
 
 private:
   // Search related
+  LineEdit* search_pattern;
   QProcess *searchProcess;
   QList<QProcess*> downloaders;
   bool search_stopped;