From a77f4a46cf877b5abf47a9bee2c1296368b313f1 Mon Sep 17 00:00:00 2001
From: Rahul Raturi <rhlrtr44@gmail.com>
Date: Sun, 19 Jun 2016 12:46:12 +0530
Subject: [PATCH] Add a search bar in dialog

* For further searching without closing the dialog.
* Pressing <Enter> after inserting a search query in the search
box would result in closing the dialog rather than searching. This
needs to be fixed.
---
 picard/ui/searchdialog.py | 35 +++++++++++++++++++++++++++++++++--
 1 file changed, 33 insertions(+), 2 deletions(-)

diff --git a/picard/ui/searchdialog.py b/picard/ui/searchdialog.py
index 1912c9bb8..ee90dbb4b 100644
--- a/picard/ui/searchdialog.py
+++ b/picard/ui/searchdialog.py
@@ -22,8 +22,8 @@ from functools import partial
 from picard import config
 from picard.file import File
 from picard.ui import PicardDialog
-from picard.ui.util import StandardButton
-from picard.util import format_time
+from picard.ui.util import StandardButton, ButtonLineEdit
+from picard.util import format_time, icontheme
 from picard.mbxml import artist_credit_from_node
 
 
@@ -48,6 +48,35 @@ class TracksTable(QtGui.QTableWidget):
                 QtGui.QHeaderView.Interactive)
 
 
+class SearchBox(QtGui.QWidget):
+
+    def __init__(self, parent):
+        self.parent = parent
+        QtGui.QWidget.__init__(self, parent)
+        self.search_action = QtGui.QAction(icontheme.lookup('system-search'),
+                _(u"Search"), self)
+        self.search_action.triggered.connect(self.search)
+        self.setupUi()
+
+    def setupUi(self):
+        self.setMaximumHeight(35)
+        layout = QtGui.QHBoxLayout(self)
+        layout.setMargin(1)
+        layout.setSpacing(1)
+        self.search_edit = ButtonLineEdit(self)
+        layout.addWidget(self.search_edit)
+        self.search_button = QtGui.QToolButton(self)
+        self.search_button.setAutoRaise(True)
+        self.search_button.setDefaultAction(self.search_action)
+        self.search_button.setIconSize(QtCore.QSize(22, 22))
+        layout.addWidget(self.search_button)
+        self.setLayout(layout)
+
+    def search(self):
+        text = self.search_edit.text()
+        self.parent.search(text)
+
+
 class SearchDialog(PicardDialog):
 
     options = [
@@ -89,6 +118,8 @@ class SearchDialog(PicardDialog):
         self.verticalLayout = QtGui.QVBoxLayout(self)
         self.verticalLayout.setObjectName(_("verticalLayout"))
 
+        self.search_box = SearchBox(self)
+        self.verticalLayout.addWidget(self.search_box)
         self.buttonBox = QtGui.QDialogButtonBox(self)
         self.buttonBox.addButton(
                 StandardButton(StandardButton.OK),