From 406944a17ed14e3b15625834b60c2f28b97a3a56 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 10 Dec 2019 11:27:53 +0530
Subject: [PATCH] Fix icons in text edit widget toolbar for dark themes

---
 imgsrc/code.svg                              |  13 +++++++------
 resources/images/code.png                    | Bin 1577 -> 1577 bytes
 src/calibre/gui2/tweak_book/editor/widget.py |   2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/imgsrc/code.svg b/imgsrc/code.svg
index b704717a1c..e3866fae5e 100644
--- a/imgsrc/code.svg
+++ b/imgsrc/code.svg
@@ -14,7 +14,7 @@
    viewBox="0 0 128 128"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
+   inkscape:version="0.92.4 5da689c313, 2019-01-14"
    sodipodi:docname="code.svg">
   <defs
      id="defs4" />
@@ -25,17 +25,17 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="1"
+     inkscape:zoom="5.6568542"
      inkscape:cx="19.843024"
      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-width="2560"
+     inkscape:window-height="1400"
      inkscape:window-x="0"
-     inkscape:window-y="32"
+     inkscape:window-y="40"
      inkscape:window-maximized="0" />
   <metadata
      id="metadata7">
@@ -89,6 +89,7 @@
     <path
        inkscape:connector-curvature="0"
        d="m 41.265039,1017.4603 -3.314134,3.3141 q -0.662836,0.6629 -1.524529,0.6629 -0.861692,0 -1.524481,-0.6629 L 4.0141368,989.88668 Q 3.3513,989.22388 3.3513,988.3622 q 0,-0.86167 0.6628368,-1.52454 L 34.901895,955.94989 q 0.662789,-0.66273 1.524481,-0.66273 0.861693,0 1.524529,0.66273 l 3.314134,3.31417 q 0.662789,0.66281 0.662789,1.52455 0,0.86167 -0.662789,1.52448 l -26.049143,26.04911 26.049143,26.0491 q 0.662789,0.6628 0.662789,1.5245 0,0.8616 -0.662789,1.5245 z m 39.173095,-70.72369 -24.723471,85.57099 q -0.265123,0.8617 -1.02741,1.2926 -0.76224,0.4307 -1.557621,0.1656 l -4.109552,-1.1268 q -0.861648,-0.2651 -1.292492,-1.0273 -0.430844,-0.7623 -0.165722,-1.624 l 24.723471,-85.57098 q 0.265123,-0.86167 1.027363,-1.29251 0.762287,-0.43084 1.557668,-0.1657 l 4.109505,1.12681 q 0.861695,0.26514 1.292539,1.02738 0.430844,0.7623 0.165722,1.62391 z m 43.547726,43.15007 -30.887755,30.88772 q -0.66284,0.6629 -1.524481,0.6629 -0.861695,0 -1.524528,-0.6629 l -3.314137,-3.3141 q -0.662833,-0.6629 -0.662833,-1.5245 0,-0.8617 0.662833,-1.5245 L 112.78411,988.3622 86.734959,962.31309 q -0.662833,-0.66281 -0.662833,-1.52448 0,-0.86174 0.662833,-1.52455 l 3.314137,-3.31417 q 0.662833,-0.66273 1.524528,-0.66273 0.861641,0 1.524481,0.66273 l 30.887755,30.88777 q 0.66284,0.66287 0.66284,1.52454 0,0.86168 -0.66284,1.52448 z"
-       id="path4" />
+       id="path4"
+       style="fill:#2271d5;fill-opacity:1" />
   </g>
 </svg>
diff --git a/resources/images/code.png b/resources/images/code.png
index 840461d42128a3dea71ca52d90b83ebbc24aed23..ba6940ab2edd98053e7998a694917035b1ac68d2 100644
GIT binary patch
delta 422
zcmah^y-EW?5LU2EFNBcn&K^++*!TjrmKMH&q)@{C+(qp!kKhaV0I7WdE4zT)&&-{O
zl@AhUb|V%Rfn}Kae%bY4J$O1Rw+GkTi`DD-d^1~Nw)h<R@8NuNTvW4LJh|`T;Y+#q
z@nb#mczV}O^AA&0YKap^*`flAI;Tm|Pko&&8*O`)*Wf#C8<Th78x<&Xoe7O`t+u2*
zgQOX^t#Jr}O5h-m#*q%FJpw<6Cdi^$8d}3_Iypj=Vgug-gP~;^M~jQ~fuqw-ks^o`
zyEvS4#OVH7#8t*<CZr~&aPF=qojkcRv5ESX@mHi(PFdtd<!(>No;i%Rf1*ozzIu5(
HygB*-4Xed7

delta 422
hcmZ3<vyx|mUOmIWf{|{&6!zeM{;U1X=A(=$EC5@h2=xE}

diff --git a/src/calibre/gui2/tweak_book/editor/widget.py b/src/calibre/gui2/tweak_book/editor/widget.py
index f49ee8abd5..11509790c5 100644
--- a/src/calibre/gui2/tweak_book/editor/widget.py
+++ b/src/calibre/gui2/tweak_book/editor/widget.py
@@ -40,7 +40,7 @@ def create_icon(text, palette=None, sz=None, divider=2, fill='white'):
         qDrawShadeRect(p, img.rect(), palette, fill=fill, lineWidth=1, midLineWidth=1)
     f = p.font()
     f.setFamily('Liberation Sans'), f.setPixelSize(int(sz // divider)), f.setBold(True)
-    p.setFont(f), p.setPen(Qt.black)
+    p.setFont(f), p.setPen(QColor('#2271d5'))
     p.drawText(img.rect().adjusted(2, 2, -2, -2), Qt.AlignCenter, text)
     p.end()
     return QIcon(QPixmap.fromImage(img))