From 4f4392be2273b8ee250d7fc34d0bf42667102ec5 Mon Sep 17 00:00:00 2001
From: Charles Haley <>
Date: Thu, 14 Apr 2011 17:49:49 +0100
Subject: [PATCH] Add a tool button to the search line to toggle highlighting.

---
 resources/images/highlight_only_off.png | Bin 0 -> 810 bytes
 resources/images/highlight_only_on.png  | Bin 0 -> 396 bytes
 src/calibre/gui2/layout.py              |   4 ++++
 src/calibre/gui2/preferences/search.py  |   2 +-
 src/calibre/gui2/search_box.py          |  18 +++++++++++++++++-
 5 files changed, 22 insertions(+), 2 deletions(-)
 create mode 100644 resources/images/highlight_only_off.png
 create mode 100644 resources/images/highlight_only_on.png

diff --git a/resources/images/highlight_only_off.png b/resources/images/highlight_only_off.png
new file mode 100644
index 0000000000000000000000000000000000000000..603d60a686050bd9ba4a7c73d39cbd914c3b657f
GIT binary patch
literal 810
zcmV+_1J(SAP)<h;3K|Lk000e1NJLTq004LZ004Lh0ssI2wg#bv00006bW%=J0RI60
z0RJ~w8+`x(010qNS#tmY4#WTe4#WYKD-Ig~00PQML_t(|+U?s%cEd0bM8PKSe`k6j
z*$O5|gc)E$|E08%>%j~N+kt-_C!evw_LI-HZS}7T*na*ot)<(G-_TmL{pw3v%eCKp
zPivv>ph0VyDxg7Yf$E?^>(Q#ALF=Jfph4^Y8lge!&f1|t>z=xxLF?wW(V03<_0=^D
z4Q!zGeZ7~Cw+`?!a-RS+XkC#EG-!R77&K^onItr5T}~Jpv@RqM4O*YID?J6%`l}sk
zZydCK?|JE<wRW#-G_6(pxEaz~uMKCo8Z^o0p0=Yj&#5uvoOn*P{2Z-;l6bk`@`Xjo
zIwkkro1xM_dp_%mS8!TOR5#Z_>*1;=m1sRy%j_Mk2Wp%qrFC!Z^U<{Ks%zq(*6sDK
zu+X}(fu$^3w=}k9NbBl`7iVc*m&7VKtt%4RZg3o&R=rMiUk9zrNpGN`bs>eFN?a~D
zOJz$KZ;$`efd;L=Q-cPrKhlH-tzRiagVxXVp+Re)v?WX<r5$))cA8BY(E!r#pqvMd
z+}2Z}k=S}RG_qPRfJRE|HPFasJ@4_ZRFcyL%SQBH8Yl+G^?GRJur>jW1lH@X(eDL*
zO}8?l9|e9Cu?3B|*5z}Ci+`7n%ep_-+=zY_ZVKBfG@@A>hDIoB+t7$(Z5|pytUW*@
zg0&N9xVQEL4d2$TpyAls8#KIHJA{VIlN>&wAGxyj3=L1#&Y|JvB!_=!__#fWfQAF>
zDA2HO9S9nxtz$vMu5~zQ7`2WF4U5)6p<&KCE;MXehlYkB>*&z1Vx0gQCaiNnW4(16
zXe?eX$OQdpk+rRj=+l~iLMbUUrk^gzcj@?T@{aes(3oqT8X6O=vqNK+HKBni)`Whh
zZB6J`s@8d*qf040Uvor%r!=k!eUgSXq0bYyCUh}bYpZ9$?Zho%lM-4kAaq^B)`YHZ
o%$m?G4OkPpv0iIJx7TI;1J4%X+x44Eg#Z8m07*qoM6N<$g6+P1cK`qY

literal 0
HcmV?d00001

diff --git a/resources/images/highlight_only_on.png b/resources/images/highlight_only_on.png
new file mode 100644
index 0000000000000000000000000000000000000000..8d679e56e4870373022ec29595c54d7b0333fe1c
GIT binary patch
literal 396
zcmeAS@N?(olHy`uVBq!ia0vp^6(G#P1SGeyEo=o+Y$ZW{!3_UF&^$uA7AV45;1OBO
zz`%C|gc+x5^GP!>FzR@^IEGZ*dV6~#Z-WC5i=+Lb|I>U$br_9B7hHAKuPH09xc~Jl
z`=8bef(w<M+*|rMWCg91N?cxaAOtLp=Xr9AVT!{PPP}d3$J>ofCrkw{vv(NxM4;M*
zqT`OFn-02TP!wQwE|QA8gUWc^Ex7%GAhNS3vIkt`d492>bq_Ew89ZJ6T-G@yGywqX
C<cF^S

literal 0
HcmV?d00001

diff --git a/src/calibre/gui2/layout.py b/src/calibre/gui2/layout.py
index c01e708933..ebd2acfe1d 100644
--- a/src/calibre/gui2/layout.py
+++ b/src/calibre/gui2/layout.py
@@ -196,6 +196,10 @@ class SearchBar(QWidget): # {{{
         l.addWidget(x)
         x.setToolTip(_("Reset Quick Search"))
 
+        x = parent.highlight_only_button = QToolButton(self)
+        x.setIcon(QIcon(I('arrow-down.png')))
+        l.addWidget(x)
+
         x = parent.search_options_button = QToolButton(self)
         x.setIcon(QIcon(I('config.png')))
         x.setObjectName("search_option_button")
diff --git a/src/calibre/gui2/preferences/search.py b/src/calibre/gui2/preferences/search.py
index db93cbd525..7bdb12ec55 100644
--- a/src/calibre/gui2/preferences/search.py
+++ b/src/calibre/gui2/preferences/search.py
@@ -171,10 +171,10 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
         return ConfigWidgetBase.commit(self)
 
     def refresh_gui(self, gui):
+        gui.set_highlight_only_button_icon()
         if self.muc_changed:
             gui.tags_view.set_new_model()
         gui.search.search_as_you_type(config['search_as_you_type'])
-        gui.library_view.model().set_highlight_only(config['highlight_search_matches'])
         gui.search.do_search()
 
     def clear_histories(self, *args):
diff --git a/src/calibre/gui2/search_box.py b/src/calibre/gui2/search_box.py
index 70324ffadc..98367fb808 100644
--- a/src/calibre/gui2/search_box.py
+++ b/src/calibre/gui2/search_box.py
@@ -10,7 +10,7 @@ import re
 
 from PyQt4.Qt import QComboBox, Qt, QLineEdit, QStringList, pyqtSlot, QDialog, \
                      pyqtSignal, QCompleter, QAction, QKeySequence, QTimer, \
-                     QString
+                     QString, QIcon
 
 from calibre.gui2 import config
 from calibre.gui2.dialogs.confirm_delete import confirm
@@ -383,6 +383,22 @@ class SearchBoxMixin(object): # {{{
         self.advanced_search_button.setStatusTip(self.advanced_search_button.toolTip())
         self.clear_button.setStatusTip(self.clear_button.toolTip())
         self.search_options_button.clicked.connect(self.search_options_button_clicked)
+        self.set_highlight_only_button_icon()
+        self.highlight_only_button.clicked.connect(self.highlight_only_clicked)
+        tt = _('Enable or disable search highlighting.') + '<br>'
+        tt += config.help('highlight_search_matches')
+        self.highlight_only_button.setToolTip(tt)
+
+    def highlight_only_clicked(self, state):
+        config['highlight_search_matches'] = not config['highlight_search_matches']
+        self.set_highlight_only_button_icon()
+
+    def set_highlight_only_button_icon(self):
+        if config['highlight_search_matches']:
+            self.highlight_only_button.setIcon(QIcon(I('highlight_only_on.png')))
+        else:
+            self.highlight_only_button.setIcon(QIcon(I('highlight_only_off.png')))
+        self.library_view.model().set_highlight_only(config['highlight_search_matches'])
 
     def focus_search_box(self, *args):
         self.search.setFocus(Qt.OtherFocusReason)