From cd66cb007eecb8ee9912af9855c414e0e805fef1 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 21 Nov 2019 09:39:22 +0530
Subject: [PATCH] Fix #1853241 [Viewer: lookup icon should be a
 library](https://bugs.launchpad.net/calibre/+bug/1853241)

---
 imgsrc/generic-library.svg           | 111 +++++++++++++++++++++++++++
 resources/images/generic-library.png | Bin 0 -> 3118 bytes
 src/calibre/gui2/viewer/toolbars.py  |   2 +-
 3 files changed, 112 insertions(+), 1 deletion(-)
 create mode 100644 imgsrc/generic-library.svg
 create mode 100644 resources/images/generic-library.png

diff --git a/imgsrc/generic-library.svg b/imgsrc/generic-library.svg
new file mode 100644
index 0000000000..8d0a4fb504
--- /dev/null
+++ b/imgsrc/generic-library.svg
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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"
+   fill="#000000"
+   viewBox="0 0 17 17"
+   version="1.1"
+   x="0px"
+   y="0px"
+   id="svg18"
+   sodipodi:docname="library.svg"
+   inkscape:version="0.92.4 5da689c313, 2019-01-14">
+  <metadata
+     id="metadata24">
+    <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>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs22">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient848">
+      <stop
+         style="stop-color:#191579;stop-opacity:1"
+         offset="0"
+         id="stop844" />
+      <stop
+         style="stop-color:#5989e3;stop-opacity:1"
+         offset="1"
+         id="stop846" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient848"
+       id="linearGradient850"
+       x1="8.8487625"
+       y1="17.227978"
+       x2="8.4970684"
+       y2="-0.060158744"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="2560"
+     inkscape:window-height="1400"
+     id="namedview20"
+     showgrid="false"
+     inkscape:zoom="13.882353"
+     inkscape:cx="-9.7245763"
+     inkscape:cy="8.5"
+     inkscape:window-x="0"
+     inkscape:window-y="40"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg18" />
+  <g
+     id="g842"
+     style="fill-opacity:1;fill:url(#linearGradient850)">
+    <path
+       id="path2"
+       d="M1.7866,6.5 L15.9196,6.5 C16.8236,6.5 17.1906,5.336 16.4496,4.818 L11.5146,1.363 C9.9166,0.244 7.7896,0.244 6.1916,1.363 L1.2566,4.818 C0.5156,5.336 0.8826,6.5 1.7866,6.5"
+       style="fill-opacity:1;fill:url(#linearGradient850)" />
+    <polygon
+       id="polygon4"
+       points="1.853 12.5 3.853 12.5 3.853 7.5 1.853 7.5"
+       style="fill-opacity:1;fill:url(#linearGradient850)" />
+    <polygon
+       id="polygon6"
+       points="4.853 12.5 6.853 12.5 6.853 7.5 4.853 7.5"
+       style="fill-opacity:1;fill:url(#linearGradient850)" />
+    <polygon
+       id="polygon8"
+       points="7.853 12.5 9.853 12.5 9.853 7.5 7.853 7.5"
+       style="fill-opacity:1;fill:url(#linearGradient850)" />
+    <polygon
+       id="polygon10"
+       points="10.853 12.5 12.853 12.5 12.853 7.5 10.853 7.5"
+       style="fill-opacity:1;fill:url(#linearGradient850)" />
+    <polygon
+       id="polygon12"
+       points="13.853 12.5 15.853 12.5 15.853 7.5 13.853 7.5"
+       style="fill-opacity:1;fill:url(#linearGradient850)" />
+    <polygon
+       id="polygon14"
+       points="0.853 16.5 16.853 16.5 16.853 15.5 0.853 15.5"
+       style="fill-opacity:1;fill:url(#linearGradient850)" />
+    <polygon
+       id="polygon16"
+       points="1.853 14.5 15.853 14.5 15.853 13.5 1.853 13.5"
+       style="fill-opacity:1;fill:url(#linearGradient850)" />
+  </g>
+</svg>
diff --git a/resources/images/generic-library.png b/resources/images/generic-library.png
new file mode 100644
index 0000000000000000000000000000000000000000..fe7b07e36edd30187db9294c27eab9012e0fded2
GIT binary patch
literal 3118
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
IM6N<$f+ohyUH||9

literal 0
HcmV?d00001

diff --git a/src/calibre/gui2/viewer/toolbars.py b/src/calibre/gui2/viewer/toolbars.py
index f9058f05b4..32bce959db 100644
--- a/src/calibre/gui2/viewer/toolbars.py
+++ b/src/calibre/gui2/viewer/toolbars.py
@@ -50,7 +50,7 @@ def all_actions():
             'previous': Action('previous.png', _('Previous page'), 'previous'),
             'toc': Action('toc.png', _('Table of Contents'), 'toggle_toc'),
             'bookmarks': Action('bookmarks.png', _('Bookmarks'), 'toggle_bookmarks'),
-            'lookup': Action('search.png', _('Lookup words'), 'toggle_lookup'),
+            'lookup': Action('generic-library.png', _('Lookup words'), 'toggle_lookup'),
             'chrome': Action('tweaks.png', _('Show viewer controls'), 'show_chrome'),
             'mode': Action('scroll.png', _('Toggle paged mode'), 'toggle_paged_mode'),
             'print': Action('print.png', _('Print book'), 'print'),