From cd7813f8a8365e6bc3c8ccc65ff098d4730de518 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 8 Jun 2017 13:59:13 +0530
Subject: [PATCH] Add a button to hide the search bar

Fixes #1696067 [[Enhancement] UI changes](https://bugs.launchpad.net/calibre/+bug/1696067)
---
 src/calibre/gui2/init.py       | 47 +++++++++++++++++++++++++++++++---
 src/calibre/gui2/search_box.py |  1 +
 2 files changed, 45 insertions(+), 3 deletions(-)

diff --git a/src/calibre/gui2/init.py b/src/calibre/gui2/init.py
index 461b264083..76ac25b328 100644
--- a/src/calibre/gui2/init.py
+++ b/src/calibre/gui2/init.py
@@ -315,6 +315,35 @@ class GridViewButton(LayoutButton):  # {{{
             self.toggle()
 
 
+# }}}
+
+class SearchBarButton(LayoutButton):  # {{{
+
+    def __init__(self, gui):
+        sc = 'Shift+Alt+/'
+        LayoutButton.__init__(self, I('search.png'), _('Search bar'), parent=gui, shortcut=sc)
+        self.set_state_to_show()
+        self.action_toggle = QAction(self.icon(), _('Toggle') + ' ' + self.label, self)
+        gui.addAction(self.action_toggle)
+        gui.keyboard.register_shortcut('search bar toggle' + self.label, unicode(self.action_toggle.text()),
+                                    default_keys=(sc,), action=self.action_toggle)
+        self.action_toggle.triggered.connect(self.toggle)
+        self.toggled.connect(self.update_state)
+
+    def update_state(self, checked):
+        if checked:
+            self.set_state_to_hide()
+        else:
+            self.set_state_to_show()
+
+    def save_state(self):
+        gprefs['search bar visible'] = bool(self.isChecked())
+
+    def restore_state(self):
+        if gprefs.get('search bar visible', True):
+            self.toggle()
+
+
 # }}}
 
 class VLTabs(QTabBar):  # {{{
@@ -481,7 +510,7 @@ class LayoutMixin(object):  # {{{
             self.bd_splitter.addWidget(self.book_details)
             self.bd_splitter.setCollapsible(self.bd_splitter.other_index, False)
             self.centralwidget.layout().addWidget(self.bd_splitter)
-            button_order = ('tb', 'bd', 'gv', 'cb')
+            button_order = ('sb', 'tb', 'bd', 'gv', 'cb')
         # }}}
         else:  # wide {{{
             self.bd_splitter = Splitter('book_details_splitter',
@@ -496,16 +525,21 @@ class LayoutMixin(object):  # {{{
             self.bd_splitter.setSizePolicy(QSizePolicy(QSizePolicy.Expanding,
                 QSizePolicy.Expanding))
             self.centralwidget.layout().addWidget(self.bd_splitter)
-            button_order = ('tb', 'cb', 'gv', 'bd')
+            button_order = ('sb', 'tb', 'cb', 'gv', 'bd')
         # }}}
 
         self.status_bar = StatusBar(self)
         stylename = unicode(self.style().objectName())
         self.grid_view_button = GridViewButton(self)
+        self.search_bar_button = SearchBarButton(self)
         self.grid_view_button.toggled.connect(self.toggle_grid_view)
+        self.search_bar_button.toggled.connect(self.toggle_search_bar)
 
         for x in button_order:
-            button = self.grid_view_button if x == 'gv' else getattr(self, x+'_splitter').button
+            if hasattr(self, x + '_splitter'):
+                button = getattr(self, x + '_splitter').button
+            else:
+                button = self.grid_view_button if x == 'gv' else self.search_bar_button
             button.setIconSize(QSize(24, 24))
             if isosx and stylename != u'Calibre':
                 button.setStyleSheet('''
@@ -562,6 +596,11 @@ class LayoutMixin(object):  # {{{
     def toggle_grid_view(self, show):
         self.library_view.alternate_views.show_view('grid' if show else None)
 
+    def toggle_search_bar(self, show):
+        self.search_bar.setVisible(show)
+        if show:
+            self.search.setFocus(Qt.OtherFocusReason)
+
     def bd_cover_changed(self, id_, cdata):
         self.library_view.model().db.set_cover(id_, cdata)
         self.refresh_cover_browser()
@@ -622,12 +661,14 @@ class LayoutMixin(object):  # {{{
             s.update_desired_state()
             s.save_state()
         self.grid_view_button.save_state()
+        self.search_bar_button.save_state()
 
     def read_layout_settings(self):
         # View states are restored automatically when set_database is called
         for x in ('cb', 'tb', 'bd'):
             getattr(self, x+'_splitter').restore_state()
         self.grid_view_button.restore_state()
+        self.search_bar_button.restore_state()
 
     def update_status_bar(self, *args):
         v = self.current_view()
diff --git a/src/calibre/gui2/search_box.py b/src/calibre/gui2/search_box.py
index 8a98576413..d561eac63e 100644
--- a/src/calibre/gui2/search_box.py
+++ b/src/calibre/gui2/search_box.py
@@ -490,6 +490,7 @@ class SearchBoxMixin(object):  # {{{
         self.library_view.model().set_highlight_only(config['highlight_search_matches'])
 
     def focus_search_box(self, *args):
+        self.search_bar_button.setChecked(True)
         self.search.setFocus(Qt.OtherFocusReason)
         self.search.lineEdit().selectAll()