From ddbf86859272474b01735709f72cbf99f547a741 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 10 Dec 2019 13:56:04 +0530
Subject: [PATCH] Fix toolbar extender button not visible in dark theme

---
 imgsrc/h-ellipsis.svg           | 113 ++++++++++++++++++++++++++++++++
 imgsrc/v-ellipsis.svg           | 113 ++++++++++++++++++++++++++++++++
 resources/images/h-ellipsis.png | Bin 0 -> 1222 bytes
 resources/images/v-ellipsis.png | Bin 0 -> 1213 bytes
 src/calibre/gui2/__init__.py    |   2 +
 5 files changed, 228 insertions(+)
 create mode 100644 imgsrc/h-ellipsis.svg
 create mode 100644 imgsrc/v-ellipsis.svg
 create mode 100644 resources/images/h-ellipsis.png
 create mode 100644 resources/images/v-ellipsis.png

diff --git a/imgsrc/h-ellipsis.svg b/imgsrc/h-ellipsis.svg
new file mode 100644
index 0000000000..f10f37f281
--- /dev/null
+++ b/imgsrc/h-ellipsis.svg
@@ -0,0 +1,113 @@
+<?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: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.92.4 5da689c313, 2019-01-14"
+   sodipodi:docname="h-ellipsis.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="5.656854"
+     inkscape:cx="49.127063"
+     inkscape:cy="69.707741"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     units="px"
+     inkscape:window-width="2560"
+     inkscape:window-height="1400"
+     inkscape:window-x="0"
+     inkscape:window-y="40"
+     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)">
+    <g
+       id="g831"
+       style="fill:#2271d5;fill-opacity:1"
+       transform="rotate(90,22.052892,1030.5691)">
+      <circle
+         r="11.092738"
+         cy="953.03094"
+         cx="16.484426"
+         id="path4148"
+         style="fill:#2271d5;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <circle
+         style="fill:#2271d5;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="circle4152"
+         cx="16.484426"
+         cy="988.05438"
+         r="11.092738" />
+      <circle
+         r="11.092738"
+         cy="1023.0778"
+         cx="16.484426"
+         id="circle4156"
+         style="fill:#2271d5;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    </g>
+  </g>
+</svg>
diff --git a/imgsrc/v-ellipsis.svg b/imgsrc/v-ellipsis.svg
new file mode 100644
index 0000000000..f2849df6e4
--- /dev/null
+++ b/imgsrc/v-ellipsis.svg
@@ -0,0 +1,113 @@
+<?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: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.92.4 5da689c313, 2019-01-14"
+   sodipodi:docname="v-ellipsis.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="5.656854"
+     inkscape:cx="49.127063"
+     inkscape:cy="69.707741"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     units="px"
+     inkscape:window-width="2560"
+     inkscape:window-height="1400"
+     inkscape:window-x="0"
+     inkscape:window-y="40"
+     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)">
+    <g
+       id="g831"
+       style="fill:#2271d5;fill-opacity:1"
+       transform="translate(47.19938,0.53033011)">
+      <circle
+         r="11.092738"
+         cy="953.03094"
+         cx="16.484426"
+         id="path4148"
+         style="fill:#2271d5;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <circle
+         style="fill:#2271d5;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="circle4152"
+         cx="16.484426"
+         cy="988.05438"
+         r="11.092738" />
+      <circle
+         r="11.092738"
+         cy="1023.0778"
+         cx="16.484426"
+         id="circle4156"
+         style="fill:#2271d5;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    </g>
+  </g>
+</svg>
diff --git a/resources/images/h-ellipsis.png b/resources/images/h-ellipsis.png
new file mode 100644
index 0000000000000000000000000000000000000000..2f31e01229705eca0b66349f0244291f15aa14a4
GIT binary patch
literal 1222
zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H3?#oinD~={f$?a7Plzj!%fRrTq2WJ6=zoWX
z{l;l$v>UFf<la_jxGz)qSSsy|c*#ZWtgGr}H$Z{~=QXmg0~yLC7Zvj_%NJZzE4-;(
zbXh6?szSkawZcnEMb{PcZzvRBk}tTdoOeyB@Va8r6@`MU%Ei}}@~<csUR5r*qEvhp
z$WY9`rciiY1*oj(igLkKrJ}1!h1V1dFDvAOxdqphiY_Y`TvIN*rc`iQu?VC^xd>?B
zRi%QfATCe=&=8;kutu;6KrLWph1Y-@K`Mb<m==)YBB1$Kl!4+P1XO$ls26A~kPEa0
z=nRlJ&~TtL3c$*MCWEwJQ3Sdlq6OrBn0By6s8LWh*ix8EpcL3}xFAF$$O^D7C<!wV
zMG#p5G3@v`g=>M)IISeeFPMRmiJ66!jh%y&i<^g+Pe52yOk7f0R!%`lO<hA%M_1p#
z*woD0#@5c>!O_Xt#m(K*+b19}C^RfQDmo@MF(o}Kx1gxFw5+1Cx~{&lskybiqqBSB
z^jWj#&0nx^(UN7$SFBpQZsVrSTefc7x$nr)6DLofIeYHnr7JgX-M(}0{=-L4pFMx^
z^405iA3lEi{N?Mn?>~P2`u+D`-@;!&2Qo={x;TbNNWMMz()>!I1lxnznm!(?OOIYk
zTeH+QThep(q!lW<Q5nlG=qW`@OMSn8yKv6o-~aBV&ne&c_2EuEjipn9yfm>ASL$`v
z?of-0p4Vr(#BJ5$Qc=kWXRpB0E$<T4gtl#e&OZH5os6SQwcMGalk@Kd9SJPRZ}WaO
zFHAvE@@{v`#|&YXmvar*Rcw-M`fyev+~#!K{<qF1wWpeu(<dy`|5=bDyWnNEVofUF
zWwS}W4IiX$9V-$Lc(?rRZL^A3i5Iw8?xbEgt#ZRk^2&T3eZgIQhd0$v?9+<iN-nu_
z@O1Gmw#1i9U(4$7zx>4@AIUB9ra>{euPN3b=ZC8!qs^QJPk4CTH9HR#bWBpK$XK#O
zw2jT{R-%QkC%es-pd#+J(^Kv=K4en;{&3;UNo5jJnlBp`HcpcM5a4|>Qo=8=NUkk;
zN=#FGjMuk=6E=GsWR%!;L_?#wUvZb)<OHb&*-9*zwRbJMcG%rE_Ibj}g|C%#)L&*b
zPQPH#>~?5_%Kp>~8CE);>m^O*aoX=*o;kZ;A>p}5F85N76My|~-!J;H>W}B;8c~_2
zn@x1D9167Yy?npwhxVT{p~<cSPwJnn>J;Mmbg%eo3agM{-n=K9UQYAr2%4?7BWGEu
zvWsT#;~2Bs(^^^9YVW>v^?L1EBi6!JuXQC~OSjAVxyCH?IQ@3tyVvfQ7J%YZ^tgSF
W>=LERWjUOn^2pQG&t;ucLK6U}!ZADm

literal 0
HcmV?d00001

diff --git a/resources/images/v-ellipsis.png b/resources/images/v-ellipsis.png
new file mode 100644
index 0000000000000000000000000000000000000000..fcabeef0b82a5726630f88d4e33a500276798585
GIT binary patch
literal 1213
zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H3?#oinD~={f$>CuPlzj!%fRrTq2WJ6=zrt1
zGujPTRdR2Omt54&0x^`z?<y3Wm#erWQ+QRa_@+YXRr!KzvSl~a3U8|9UQ{l+EMEd-
zUs5T(tdw_6spz_5{tboVOY#MmRf?~w6kb)%yQY|bS+VGfLcvv)f@{jf*A)w|D&${P
zD7vOna2=>!srV{TL^1!Ga?us#f~$(f*OY;}fQ%v_31nYWgs_W1Y$c#dkl+>NqN^Y_
zNcI}gaG(~j6vzay)D<P50+4}MfZ{;5V$n54pe~>+kXry$40P%hkQERv&<dcXg&;S8
z)Pn^TVS2$LP%D6JkV=RNV3i>2KwKmQb{k9(XfN0npaPIM$O|wMrUh&}+yt=UFezkX
z39(JT{W=Pa$>}9Qe!&ckOw6oo?A$zj`~rePA`+5P(lWA&O3JEg>Kd9_+B$mr21dqa
z<`$M#Hnw(-POcuFegT0Yq2UoxvGECs$tkI68QHmcg+=AHbq!6;Ev;=Gos%X{n=y0N
z>^bx1FI>E2>GD;p*KOFidCS%vyLRu{yYJwk!$*!DJAUHS=?fRH-ne<|&fWVDA3uHe
z{MGBX@7{m>^6mT2U%&tS{kK_ZM*;%_6R)R>V~B+0+k-!YdkSUPKa@-F>h9R2)antq
zPUbb&)+eX7PI<!Tx+JDE!b?^5R_*`YM!~_qZSLPcvuD2H=gPeaJ%-05lK(l@J&C)2
zp?!J!X@QPC(=^Y$Uf&e=)IeM{+DTyb?4+)3CLXQzmz24dZmFv}o7ZxI@t1Aeh2meT
z;m&I5ZG5~FRxUg3dqQT(Y2gztFFr9DZ7tc!JTqz6oc43-Ryob*Tz}Q_I;xlV*tIXb
z;;{anz>*}NueG9Ero}!FlE3cw?gWSUpT1N@21(yq&U2mdcN-R@<lox5RRHKNpM)a5
zt@~waerrg%DHzRGw_LxQsp@H=o|oBj$DHpf!ABN^8u|6BdF)+wJx8<U+r{^aExTS!
zkKmm7Cevz8i;rn+(u9@Ez135cN?tbl=*C(pY@VklzToprzNr^>`s}aZu-f_fOQ*w2
zlfCzrIKL7L<`s9!uGF3`rPFw)Q$A+Gj=9YYDX#a`Ez^IvNj6Q24-5|#X#xh9@RT!u
z*TypM{Vsi7NkH-<=egJSc=mp>5I<|?wDy^Ja7=U9MGf0?4zEP_rgbT9X|Ll~_|j9?
z$#f#c_wqxFl(I{zY%{BNl{h`qh^<lxcAw67qUB`~r&aum4a`>IFTU%t%>BdpOQtzU
zdGEcY&a0YNx?OX~cD0@^rPX?8rJ<h3y|c~?Mdx`xtiQNTm&5Dex4othOC*wk(fH^3
ZKZcc#E9UlOW}E{RL!PdFF6*2UngEiZEo=Y)

literal 0
HcmV?d00001

diff --git a/src/calibre/gui2/__init__.py b/src/calibre/gui2/__init__.py
index 8843478043..a467282452 100644
--- a/src/calibre/gui2/__init__.py
+++ b/src/calibre/gui2/__init__.py
@@ -1093,6 +1093,8 @@ class Application(QApplication):
             'MessageBoxQuestion': 'dialog_question.png',
             'BrowserReload': 'view-refresh.png',
             'LineEditClearButton': 'clear_left.png',
+            'ToolBarHorizontalExtensionButton': 'v-ellipsis.png',
+            'ToolBarVerticalExtensionButton': 'h-ellipsis.png',
         }):
             if v not in pcache:
                 p = I(v)