From 621f12fc8be94a13fd2e5d2f84ec65f1a39e7b61 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 10 Jun 2017 16:19:08 +0530
Subject: [PATCH] Use a gear icon for advanced search and restore Saved search
 discoverability

---
 imgsrc/gear.svg                | 120 +++++++++++++++++++++++++++++++++
 resources/images/gear.png      | Bin 0 -> 7319 bytes
 src/calibre/gui2/layout.py     |   6 +-
 src/calibre/gui2/search_box.py |   2 +-
 4 files changed, 126 insertions(+), 2 deletions(-)
 create mode 100644 imgsrc/gear.svg
 create mode 100644 resources/images/gear.png

diff --git a/imgsrc/gear.svg b/imgsrc/gear.svg
new file mode 100644
index 0000000000..c40d1c7064
--- /dev/null
+++ b/imgsrc/gear.svg
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="136.53334"
+   height="136.53334"
+   viewBox="0 0 128 128"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.92.1 r"
+   sodipodi:docname="gear.svg">
+  <defs
+     id="defs4">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4492">
+      <stop
+         style="stop-color:#191579;stop-opacity:1"
+         offset="0"
+         id="stop4488" />
+      <stop
+         style="stop-color:#5989e3;stop-opacity:1"
+         offset="1"
+         id="stop4490" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4492"
+       id="radialGradient4494"
+       cx="64"
+       cy="988.36219"
+       fx="64"
+       fy="988.36219"
+       r="54.909133"
+       gradientTransform="matrix(1,0,0,1.075641,0,-74.760718)"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11.2"
+     inkscape:cx="50.110881"
+     inkscape:cy="69.707741"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     units="px"
+     inkscape:window-width="3840"
+     inkscape:window-height="2128"
+     inkscape:window-x="0"
+     inkscape:window-y="32"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Kovid Goyal</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:rights>
+          <cc:Agent>
+            <dc:title />
+          </cc:Agent>
+        </dc:rights>
+        <dc:publisher>
+          <cc:Agent>
+            <dc:title />
+          </cc:Agent>
+        </dc:publisher>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/3.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/3.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-924.36216)">
+    <path
+       inkscape:connector-curvature="0"
+       d="M 69.537107,929.29967 H 58.46289 a 7.3828109,7.3828109 0 0 0 -7.382811,7.38281 v 9.30234 a 44.296865,44.296865 0 0 0 -17.300388,10.00369 l -8.071871,-4.66346 a 7.3828109,7.3828109 0 0 0 -10.089842,2.70703 l -5.537108,9.59766 a 7.3828109,7.3828109 0 0 0 2.707031,10.08984 l 8.059569,4.65117 a 44.136904,44.136904 0 0 0 0,19.9951 l -8.059569,4.65115 a 7.3828109,7.3828109 0 0 0 -2.707031,10.0899 l 5.537108,9.5853 a 7.3828109,7.3828109 0 0 0 10.089842,2.707 l 8.071871,-4.6634 a 44.296865,44.296865 0 0 0 17.300388,10.0037 v 9.3024 a 7.3828109,7.3828109 0 0 0 7.382811,7.3828 h 11.074217 a 7.3828109,7.3828109 0 0 0 7.382812,-7.3828 v -9.3024 a 44.296865,44.296865 0 0 0 17.30039,-10.0037 l 8.071871,4.6634 a 7.3828109,7.3828109 0 0 0 10.08984,-2.707 l 5.53711,-9.5853 a 7.3828109,7.3828109 0 0 0 -2.70703,-10.0899 l -8.05957,-4.65114 a 44.136904,44.136904 0 0 0 0,-19.99511 l 8.05957,-4.65117 a 7.3828109,7.3828109 0 0 0 2.70703,-10.08984 l -5.53711,-9.58536 a 7.3828109,7.3828109 0 0 0 -10.08984,-2.70703 l -8.071871,4.66348 a 44.296865,44.296865 0 0 0 -17.30039,-10.01601 v -9.30234 a 7.3828109,7.3828109 0 0 0 -7.382812,-7.38281 z m 12.91992,59.06249 a 18.457027,18.457027 0 1 1 -18.457028,-18.45703 18.457027,18.457027 0 0 1 18.457028,18.45703 z"
+       id="path4"
+       style="stroke-width:1.23046851;fill-opacity:1;fill:url(#radialGradient4494)" />
+  </g>
+</svg>
diff --git a/resources/images/gear.png b/resources/images/gear.png
new file mode 100644
index 0000000000000000000000000000000000000000..9220638f49a9e7aba33bf8cf5ca818b1c60a0c55
GIT binary patch
literal 7319
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

literal 0
HcmV?d00001

diff --git a/src/calibre/gui2/layout.py b/src/calibre/gui2/layout.py
index fb7e6c1e10..e5906faf82 100644
--- a/src/calibre/gui2/layout.py
+++ b/src/calibre/gui2/layout.py
@@ -214,7 +214,7 @@ class SearchBar(QWidget):  # {{{
         x.setMinimumContentsLength(10)
         l.addWidget(x)
 
-        parent.advanced_search_toggle_action = ac = parent.search.add_action('search.png', QLineEdit.LeadingPosition)
+        parent.advanced_search_toggle_action = ac = parent.search.add_action('gear.png', QLineEdit.LeadingPosition)
         parent.addAction(ac)
         parent.keyboard.register_shortcut('advanced search toggle',
                 _('Advanced search'), default_keys=("Shift+Ctrl+F",),
@@ -222,6 +222,8 @@ class SearchBar(QWidget):  # {{{
 
         self.search_button = QToolButton()
         self.search_button.setToolButtonStyle(Qt.ToolButtonTextOnly)
+        self.search_button.setIcon(QIcon(I('search.png')))
+        self.search_button.setToolButtonStyle(Qt.ToolButtonTextBesideIcon)
         self.search_button.setText(_('Search'))
         self.search_button.setAutoRaise(True)
         self.search_button.setCursor(Qt.PointingHandCursor)
@@ -264,6 +266,8 @@ class SearchBar(QWidget):  # {{{
         x.setToolTip(_(
             'Use an existing Saved search or create a new one'
         ))
+        x.setText(_('Saved search'))
+        x.setToolButtonStyle(Qt.ToolButtonTextBesideIcon)
         x.setCursor(Qt.PointingHandCursor)
         x.setPopupMode(x.InstantPopup)
         x.setAutoRaise(True)
diff --git a/src/calibre/gui2/search_box.py b/src/calibre/gui2/search_box.py
index 33a08e3097..9446eae4a7 100644
--- a/src/calibre/gui2/search_box.py
+++ b/src/calibre/gui2/search_box.py
@@ -447,7 +447,7 @@ class SearchBoxMixin(object):  # {{{
 
     def init_search_box_mixin(self):
         self.search.initialize('main_search_history', colorize=True,
-                help_text=_('Search (For advanced search click the icon to the left)'))
+                help_text=_('Search (For advanced search click the gear icon to the left)'))
         self.search.cleared.connect(self.search_box_cleared)
         # Queued so that search.current_text will be correct
         self.search.changed.connect(self.search_box_changed,