From 211b65aad4cb660ac08b15e81ac88466b8e91a98 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 31 Oct 2016 18:09:26 +0530
Subject: [PATCH] Edit Book: Proper icon for the split file action. Fixes
 #1637989 [Incorrect icon in edit book and edit
 metadata](https://bugs.launchpad.net/calibre/+bug/1637989)

---
 imgsrc/document-split.svg                   | 152 ++++++++++++++++++++
 resources/images/document-split.png         | Bin 0 -> 2618 bytes
 src/calibre/gui2/comments_editor.py         |   4 +-
 src/calibre/gui2/tweak_book/manage_fonts.py |   2 +-
 src/calibre/gui2/tweak_book/ui.py           |   2 +-
 5 files changed, 156 insertions(+), 4 deletions(-)
 create mode 100644 imgsrc/document-split.svg
 create mode 100644 resources/images/document-split.png

diff --git a/imgsrc/document-split.svg b/imgsrc/document-split.svg
new file mode 100644
index 0000000000..5075615335
--- /dev/null
+++ b/imgsrc/document-split.svg
@@ -0,0 +1,152 @@
+<?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="128"
+   height="128"
+   viewBox="0 0 128 128"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="document-split.svg">
+  <defs
+     id="defs4">
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4141"
+       id="linearGradient4147"
+       x1="64.402176"
+       y1="1023.1872"
+       x2="63.597828"
+       y2="953.27203"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.3265309,0,0,-0.3265309,43.102023,1283.843)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4141">
+      <stop
+         style="stop-color:#016324;stop-opacity:1"
+         offset="0"
+         id="stop4143" />
+      <stop
+         style="stop-color:#16fb67;stop-opacity:1"
+         offset="1"
+         id="stop4145" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4141"
+       id="linearGradient4157"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.3265309,0,0,0.3265309,43.102023,691.95274)"
+       x1="64.402176"
+       y1="1023.1872"
+       x2="63.597828"
+       y2="953.27203" />
+  </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.5602"
+     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: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
+       id="path6"
+       overflow="visible"
+       display="inline"
+       visibility="visible"
+       style="color:#000000;text-indent:0;text-transform:none;direction:ltr;block-progression:tb;baseline-shift:baseline;display:inline;overflow:visible;visibility:visible;fill:#3027dd;fill-opacity:1;fill-rule:nonzero;stroke:none;marker:none;enable-background:accumulate"
+       d="m 22.181976,924.64788 c -2.716253,0.0137 -4.199861,2.31457 -4.18181,4.1087 l 0,53.22899 c 2.23e-4,2.1513 1.992284,4.1085 4.18181,4.1087 l 83.636194,0 c 2.18953,-2e-4 4.18159,-1.9574 4.18181,-4.1087 l 0,-31.31595 c 0.003,-1.07662 -0.44623,-2.14762 -1.21969,-2.91033 L 86.477307,925.84625 c -0.77621,-0.75997 -1.86633,-1.20097 -2.96212,-1.19837 z m 4.18181,8.21739 52.969595,0 0,17.80435 c 2.34e-4,2.26907 1.872355,4.10846 4.181806,4.10869 l 18.121173,0 0,23.09856 -75.272574,0 z m 61.333211,5.77792 8.0587,7.91773 -8.0587,0 z"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccccccccccccccccccc" />
+    <path
+       sodipodi:nodetypes="cccccccccccccc"
+       inkscape:connector-curvature="0"
+       d="m 22.18198,990.27288 c -2.716253,0.0137 -4.199861,2.31457 -4.18181,4.1087 l 0,53.22902 c 2.23e-4,2.1513 1.992284,4.1085 4.18181,4.1087 l 83.6362,0 c 2.18953,-2e-4 4.18159,-1.9574 4.18181,-4.1087 l -0.21907,-53.19292 c -0.005,-1.88755 -0.90332,-4.04296 -3.14069,-4.05551 z m 4.18181,8.21739 74.66602,0 0.60656,45.01163 -75.27258,0 z"
+       style="color:#000000;text-indent:0;text-transform:none;direction:ltr;block-progression:tb;baseline-shift:baseline;display:inline;overflow:visible;visibility:visible;fill:#3027dd;fill-opacity:1;fill-rule:nonzero;stroke:none;marker:none;enable-background:accumulate"
+       visibility="visible"
+       display="inline"
+       overflow="visible"
+       id="path4139" />
+    <path
+       inkscape:connector-curvature="0"
+       d="m 84.244916,970.00105 q 0,-1.03174 -0.751276,-1.7857 L 65.779338,950.43753 Q 65.028063,949.68357 64,949.68357 q -1.028062,0 -1.779338,0.75396 L 44.50636,968.21535 q -0.751276,0.75396 -0.751276,1.7857 0,1.03177 0.751276,1.7857 0.751277,0.75399 1.779339,0.75399 l 35.428602,0 q 1.028063,0 1.779339,-0.75399 0.751275,-0.75393 0.751275,-1.7857 z"
+       id="path4"
+       style="fill:url(#linearGradient4147);fill-opacity:1" />
+    <path
+       style="fill:url(#linearGradient4157);fill-opacity:1"
+       id="path4155"
+       d="m 84.244916,1005.7947 q 0,1.0317 -0.751276,1.7857 l -17.714302,17.7778 q -0.751275,0.754 -1.779338,0.754 -1.028062,0 -1.779338,-0.754 L 44.50636,1007.5804 q -0.751276,-0.754 -0.751276,-1.7857 0,-1.0318 0.751276,-1.7857 0.751277,-0.754 1.779339,-0.754 l 35.428602,0 q 1.028063,0 1.779339,0.754 0.751275,0.7539 0.751275,1.7857 z"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/resources/images/document-split.png b/resources/images/document-split.png
new file mode 100644
index 0000000000000000000000000000000000000000..b8026a61b6b9398f4154cd6eddc139028cbef275
GIT binary patch
literal 2618
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

literal 0
HcmV?d00001

diff --git a/src/calibre/gui2/comments_editor.py b/src/calibre/gui2/comments_editor.py
index db93eefa42..5182e6d842 100644
--- a/src/calibre/gui2/comments_editor.py
+++ b/src/calibre/gui2/comments_editor.py
@@ -110,7 +110,7 @@ class EditorWidget(QWebView):  # {{{
                     _('Align justified'), False),
                 ('Undo', 'undo', 'edit-undo', _('Undo'), False),
                 ('Redo', 'redo', 'edit-redo', _('Redo'), False),
-                ('RemoveFormat', 'remove_format', 'trash', _('Remove formatting'), False),
+                ('RemoveFormat', 'remove_format', 'edit-clear', _('Remove formatting'), False),
                 ('Copy', 'copy', 'edit-copy', _('Copy'), False),
                 ('Paste', 'paste', 'edit-paste', _('Paste'), False),
                 ('Cut', 'cut', 'edit-cut', _('Cut'), False),
@@ -166,7 +166,7 @@ class EditorWidget(QWebView):  # {{{
         self.action_insert_link.triggered.connect(self.insert_link)
         self.pageAction(QWebPage.ToggleBold).changed.connect(self.update_link_action)
         self.action_insert_link.setEnabled(False)
-        self.action_clear = QAction(QIcon(I('edit-clear.png')), _('Clear'), self)
+        self.action_clear = QAction(QIcon(I('trash.png')), _('Clear'), self)
         self.action_clear.triggered.connect(self.clear_text)
 
         self.page().setLinkDelegationPolicy(QWebPage.DelegateAllLinks)
diff --git a/src/calibre/gui2/tweak_book/manage_fonts.py b/src/calibre/gui2/tweak_book/manage_fonts.py
index 0f65284251..d4ee672c0c 100644
--- a/src/calibre/gui2/tweak_book/manage_fonts.py
+++ b/src/calibre/gui2/tweak_book/manage_fonts.py
@@ -223,7 +223,7 @@ class ManageFonts(Dialog):
         s.addWidget(fv), s.addWidget(c)
 
         self.cb = b = QPushButton(_('&Change selected fonts'))
-        b.setIcon(QIcon(I('auto_author_sort.png')))
+        b.setIcon(QIcon(I('wizard.png')))
         b.clicked.connect(self.change_fonts)
         l.addWidget(b)
         self.rb = b = QPushButton(_('&Remove selected fonts'))
diff --git a/src/calibre/gui2/tweak_book/ui.py b/src/calibre/gui2/tweak_book/ui.py
index 7520e079ae..1c1d43fabb 100644
--- a/src/calibre/gui2/tweak_book/ui.py
+++ b/src/calibre/gui2/tweak_book/ui.py
@@ -430,7 +430,7 @@ class Main(MainWindow):
         self.action_auto_sync_preview = reg('sync-right.png', _('Sync preview position to editor position'), None, 'sync-preview-to-editor', (), _(
             'Sync preview position to editor position'))
         self.action_reload_preview = reg('view-refresh.png', _('Refresh preview'), None, 'reload-preview', ('F5',), _('Refresh preview'))
-        self.action_split_in_preview = reg('auto_author_sort.png', _('Split this file'), None, 'split-in-preview', (), _(
+        self.action_split_in_preview = reg('document-split.png', _('Split this file'), None, 'split-in-preview', (), _(
             'Split file in the preview panel'))
         self.action_find_next_preview = reg('arrow-down.png', _('Find Next'), None, 'find-next-preview', (), _('Find next in preview'))
         self.action_find_prev_preview = reg('arrow-up.png', _('Find Previous'), None, 'find-prev-preview', (), _('Find previous in preview'))