From c868fdd32eddc4c9dbf5bd909425968b3b9dd4b8 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 1 Sep 2016 14:11:47 +0530
Subject: [PATCH] Workaround for Win10's broken scaling of taskbar icons

Also set the app user model id explicitly for all three main calibre GUI
programs.
---
 icons/ebook-edit.ico                | Bin 61077 -> 78029 bytes
 icons/favicon.ico                   | Bin 30042 -> 46994 bytes
 icons/library.ico                   | Bin 30042 -> 46994 bytes
 icons/make_ico_files.py             |   7 +++++--
 icons/viewer.ico                    | Bin 54308 -> 71260 bytes
 src/calibre/gui2/main.py            |  12 +++++++++++-
 src/calibre/gui2/tweak_book/main.py |   2 +-
 src/calibre/gui2/ui.py              |   1 +
 src/calibre/gui2/viewer/main.py     |  11 ++++++++++-
 9 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/icons/ebook-edit.ico b/icons/ebook-edit.ico
index e499af829aa4257b5c2b63c938ca0681f34c8b1a..6c850dbd82275025e7397698e3ab841374981dc2 100644
GIT binary patch
delta 11348
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
K=CEFR_5TC=8q$pb

delta 673
zcmZvZu}Z{16h&`HFr7)Wtx2Ixs;w+6jD`3G;wOkdA(Nkw{RJyQQVAB*Y2&69L>Mbe
zQ!cpVdEaDKmtf%L%-naA_a=GyNN(QaQy@ZuJXe;uN`Nx}WjXF|>EF?t&%^!zxR^1(
zOY@5s7>@4GtK?V&c&>pa1#AR3st?k&i~nRbLpf@o<g0y5s@w>#r%#bLXXL?V@@gUO
z1X&NnD|TE{1I1SHmQs4ZVkX;C!RI!rx%OhcmIg*vlr&VYts`kKXVpHpdYEqo=_K=9
z8hCa!3iZ1^4ni(>*+FwV<5V1$uLszSV*zZ&0uLI<sNZvdkv32t)Q@2{i~pE0;24~;
z2)@#?K4ne6p+BVwzLI5-#xHoA(w~5)Qvbn}n%Dm#9Nd!uPfk2?K&o{S8@LXXZuIpF
KM`#bP7wr#cAJgUl

diff --git a/icons/favicon.ico b/icons/favicon.ico
index b8b7c1fd5edb72480579569553c3d7263c5f3eea..892dc7ec00f55f2c56acb2a39fe3e4d1902ffa55 100644
GIT binary patch
delta 8556
zcmbW63tUuH8o=)`!_0s@Q*gi+DEI{N*(PeR>aJyi=&C7*yqUCA422mSn87q3h&Wsy
zq4`Xd1~dt901FYdvV4@=3|d=JR<5q8)w<QL+qd62bLTRTJAymE-^X|Fxrg)p&v(A>
zoOAE_?6#=<p4(i85i#zJpC8d7%nK5Rna?mxNQmXW3d>utY}6?3KAd5)0~jVY)^a~|
z3d8tJ#DBma`Ts@H4D)1R?X;1SXhug%Eq_GxIjPerV!S3Y042sEQq<Czx*EwCKdp{w
z8=zxaMHbParXoh|C^8+x2#GJ2b0R@410Cb*EJawRu?XOAD579*>yiT|glRh%(am3g
zVOkkcM+kyajnKB5bOP^N9d#^M9xLOX3v1+}&ymeZYe~b-4=f-$;yHXyJt(MSxaW`5
z*j+8D$A~&O4M6Y30G0y0uogUq7C)5H|8t?y)ATuUIjKk79*d$wA(2FXqS(5X0f}yP
zx`5~0*bYg-ijV|9reEAirhoj!ZcD$o_ay^oPbyfIbZkvt(#3Ac>ZBI6dT~#ETCZu!
z=4<0J8_n-!HMZAgHnr>VIw!lyoRHOQ8kKtb3MNSB4-BfYP+f2qYSfibt;)yiXW>|0
zUwzsHasQcd?B(&{?0$u>L_TQNLAFH^#9mRzsgwoD#d%3n(VisRXwtD?Mk?65kuvXH
z*0!NqUB+Gx>g|6Y4C-@GQ&0hhf)!xMpTsT?4bta$iTlMRbhbY*{;;d|GmYj0T>Da=
z_F5YQZESp>!E8s6yZ1xvz;%S*0~Ois`m})VH{NJILmMAC78}=-#zCiZL;9a+;|GF$
z#YgjkvB`<O#wnRzW8iT`8XR5ks%u$|=C7&sqF|ZFN^0Do8NwO%XP@oygg!^E^$F85
z9=+jl#i!5c_Ydyf49BZ?!@Es2aOuM{@Z}d~`02-c@ZiDE@b%Z9!^fA-!RdESz=>mf
z;f?*JP`)KE$?9OMmS<nQ=#Hch38^1mK$g)w+X7pV$irTsuw6R7H%5)MWvfnq=d*#_
z2z&H6X&O!2u2Gj-hIaru!izcrBZlc82Tl@^49o%+nEBg)8JXhrT#muDW_1$SidLNp
z8;Y0Gvf?!vcF#z?0s%}(W|L_O$0_$(Qh(K-f>x_rDQL(5f6-s`X+c^6OwpJOknH^d
z#JTk#RyBj<z<m%swbTw(2(xT+E^K)<2TERD0Xy}Y?qOy%nbJ8-nfHCl2#g3r`aU;U
zzU*}GUL>*vNZnOUAbzHZClk-x3ew{D_<Q1fN75qIV%WcX1JoYh4@VB^VQpb%_egPS
zT5BcsxMCT0O*kJ?=e+}6P<rm_up?qZ62SAo9lJ6|N;0g(hlI9xO*&L;*HN(z3&CN>
zkUzvzzGWHnf(5)Ur}`*dP<rpbWk*DO=e5mbSLR4rq)LHJ>y}Z%*I!!)dn?w%wvyF$
z{&YpzMk$v^$vn!q$Sk3h9hgGreO&p{x8yQ-Di45Y&>Ra{=xp%F*z-tA;xkR&BG|p7
z7}jbsoc!oAg|ZvX-%!fqqh%gBl+vJX;e6@mrkbZu>n9YJOvo%dASN^c+=eZ*D|2)u
zfgl52du$(&iIBL~cCdvY$y_I~PIm0^(Na&-EL`nL_T06OxVTC)2r=nYw^b1`Run!L
z{8qo!B}?hXm#L$UzERE=2L<+Ym|`*-O<`P^$>qw%Pon_sa5nwj?-2^C)x}c9M7P27
z!8iML=&7y)??w79ts9Q)1Y`XXlAuD?vCq?Z>)EHi@Wmy2zSX+uU42^UK!Mppj6=|4
zh6X&Rt6)$guxZkO0k*?HTu!>Z4`+wUgWKR#qd~|xMnxuPT;_3?i``AsI+;~ByRhC*
ze-WNY+YaL43t>pJvvo4SBuWn-*a{?<>T3@PS<h-Rze25(%(=|P<SBl%4XWqS{(OPn
zi!dm?;|gIw$ypfD{5u3FcSDb9t6UBR$rLhA9(a8dY~7R#Wt&$C@)+9>^E}76=)1#t
z!_Q3<jyPQK_5Fivd<OJc^(I8t|I?-2by_72{8x&yFcC_C-Ku6qVNL;<Wi*}RMnO8v
zR0;-7D26@Q%6|<ixKWbMm;L8xKKn^fFZUnGrU|ixQdc%6)sBqJg1r`OvMaNV88T|b
zJ7m<5l<rN4=XRDC+NH1KEQrJSEy0f>TNK=sF2{}MTw8c@{e4*$oS!j{cHpDbsql}A
zWuyb5)B3b<A^1^MH(<n`t9C-lZ1*6x@P+w{LBA!Bf>s~JjH|1JJv-MzVSchp_<07C
z6q)}^;71U69Ef<_&~9*q|2%&#7z6#_y@gLh-JsqG-rG&J1<8eivv<;F@O(<yDHD`1
zu??fiW(Q?UP7>wNz7o24x3<*6u{SG7aQfQJQp#p?I2R!DA=wS>kqFr22ze!C3N-ih
zqH;QV7(xb$Yg7x7lE!R&P*~K{=Uii0bC%=@iC4@OM~uuS^PhN(^xA9Qh;Z8x<J|Po
zJjO?JqbWv}daxA(=j{bv(J#Q1^IfChqy-IcAEsLyT|pWRN`h$>+d#w@u58MN>zn8f
zdt9#YZH@}%Nz5-jN5akhXG^|VT(VWscaa#^ke~(YAuyrP<p^0_v%RbU%1iTUVvy|t
zi8(6^(Y8F<jqU3>U&$t2L?_L0bkuK0^Po=Q%OiHYlFX+!U)NB;j(&2uP=a`lb<S?b
zGTSh-cH+&-?Q}W9Fr#y{Z3i4Xk=bafBzeJp6WI&jGI4UM!PRLUPsdGC-)+g@dtnUl
zh9CE>Kxg-KQ*G6!4HHU{X|*?C@}aACLdsmFh?SkJC1hugGn8X&BIbE+{H5WhEr@7z
z#Jrw6hsSIf9E^yV#Yrv@LsB+_PqflbNLg2iWU(dl55Cw5Abw8~mq$s%+h0PwTaJjA
zl45zp)|e4Ad1}-{k<s@3&TgeAz9}zN;pCT(o30F4uT|O_PCfmV9DVaUF-+&U9S!fM
zI+`W-ZBs|`rY}A}**05-%@A0Fy~a7mpJSPA{E=x6lbAiD2qYged~Nb2-FR&Xmn-ri
zrW57Mh4_pk`tf}2%j0Q)6`a+lMNSlen{B)SGperI2`O_NJ;(0@J-A6X%h*2MN;K)$
z>Y|N~ME`mt7a9V6c%pAMq&O#UjcS_<zQnV4!GEF>(*Funlk3E`AG*zltE`galTE&j
z>urN0AOW(j2KAVe4-Vxz0~*xHE&!9y-T{w@M9BUWsCL6`f8smebsI3#XxhL5Vyu6N
zbT=IdaS(Yz99$af2K8_kK(nhZLt^7sFr~B(;tqZQ&+KY}sbvk_2EtD#M+p$k0nNz^
zb&fdX9^;-z!hE1P@Bj?+#4ey@!{&p}xD=3t&w;TkcfptyJLq+{!>q~tK7ooQlWb-E
z34;*SnV1M3ip&pAb?`HvK5ev68u*TP&QZrQlB2HD06!Dl>~vbgh1F>LHH@}PsDH6?
z;8e=<UC*6OoF*!F0hHBx0~VdQYA2+uI}TfExZz=)$=H@4X|#C;d1W9!GDL7pHSkx1
zI=(SB;_RvMVc*sd4*u=iE$P2oF?n61PH{n(bNN05Ojd&W3joC*m(uH~Eawfgqq}4{
zYh*WFAIb&1T%tT_!Z;35z*{;$v^yCW%@^sH*lKk(RI2=4*}rfbNJtf2|2Jedm_QM`
z#LhFsOG3j%?BlnmXRY?d$xWZID?<bEL-<^wuuvLJKqO*OF^peY3VB!V!h{_Bj_0sL
z74D~b31>&@)_#lqM6yiCgdb+bkhyBU$sUo3kWzJ?zkg&`8qFIy6Ee{Ut}Hz9q;qVC
z&RE$k3;5bwMJ?cqr>M%6g@O-mz>3DJc0$U!<0cH$3w$3o5(`3mIQ>n4pco}sb#ScZ
z+SY<c*sQ~N5&?yI$)LdvCwa3kQm24cl}a_aF3d+E&vA{_;KHg=B~HUrh+AY@u?l-T
z(u*w$_F_$vB|<Da{tn<CHV25744O@QNv>^KNbqS^qYbp<k_Y(+j|N}7H2GLp_u@>F
zwpI?JDa+G+<gPqlaT_3guMx(lt%b1Xav<c-F99iYWU&j-D+-z9<?^z0&h2suO-UE=
zshE@j;(-aYMbhi2g==7FLT;B9#LM<pvZ2ER*?W;Pwxuuaf$i2z;*_5R>&40jJ;fp~
zCpWRzEA9SAIw<atQ&*NAZ#!a%(J@jsw!aj|ZJ9Q3(qcw28U7Ec!f{)%X7!?q?uaHY
zacx$ksm6B9=(ydDl#|mY(Gk*ziC&@W8L2Nkws;1AtWO(-U;ElW<a#I*z3Si<f47;t
zEtSl-NhPw0B_9`*g7qRKIOX-AjUl3hZr_NPJCD-*-QsuY(;_4pP3DNsdJXM^X-@{u
z^TpVz>-I?@Jyo1}o(YM23L8Z>6WLeLgBrTqCcAEI_-`TU&DVl6jqR~WluFL)u+~A8
zHu5<Zbu&G+)aUrHMH8f2a=!WKUk4s}-uICK)ly~vr^QrD7^{|%`wj^stmRyJr}m}w
zwQ|OC!Rb~!6DJRBG&R`jXEDrcJXhxGS#=D#*Wqb>7h20br&^2uU{}C!_o#tX>{^Ss
zdQ>w^DyOx@q#RoVi$*8YdwY#%*!Bf3??qfadmZ!8a?k5uxqCZ}|N0Qm$(??i65gJe
G82vvYO&@{)

delta 637
zcmZ{gF-ycS7>3{2KnLO4<>nStaFWA8xGr~t_zT48Kt~tBKX5ihcTop7XD30rIt2X}
zPMux+14rZAB(3eCfrsaNzkF#(@4q)bzr-ORAQ8unQ=CiS2tb;;{LKCfdy|RJJHW}9
z16<AgA_MB|^>|Na#Ur5ZNYUe(b<ksr_3W2h*2a`?azD-umlhwP7Vm-tLlpB3_xdPi
z6*)k6BwCC}#P1QbB&^Am!_-N0rP<|E_`339Jl%eHnr`ORr2#64Dh-{__<|;PZu{Qz
zp|#I?9@%qRd#nGPxH)B=3kBC`UHDvJW(Qj<pVtlKc5dB)a{XXs?0#VW@+sgqI)`o$
XLrb5-+VwlH2HE~(UevlgST3?38$Q92

diff --git a/icons/library.ico b/icons/library.ico
index b8b7c1fd5edb72480579569553c3d7263c5f3eea..892dc7ec00f55f2c56acb2a39fe3e4d1902ffa55 100644
GIT binary patch
delta 8556
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
G82vvYO&@{)

delta 637
zcmZ{gF-ycS7>3{2KnLO4<>nStaFWA8xGr~t_zT48Kt~tBKX5ihcTop7XD30rIt2X}
zPMux+14rZAB(3eCfrsaNzkF#(@4q)bzr-ORAQ8unQ=CiS2tb;;{LKCfdy|RJJHW}9
z16<AgA_MB|^>|Na#Ur5ZNYUe(b<ksr_3W2h*2a`?azD-umlhwP7Vm-tLlpB3_xdPi
z6*)k6BwCC}#P1QbB&^Am!_-N0rP<|E_`339Jl%eHnr`ORr2#64Dh-{__<|;PZu{Qz
zp|#I?9@%qRd#nGPxH)B=3kBC`UHDvJW(Qj<pVtlKc5dB)a{XXs?0#VW@+sgqI)`o$
XLrb5-+VwlH2HE~(UevlgST3?38$Q92

diff --git a/icons/make_ico_files.py b/icons/make_ico_files.py
index 8f1fc2fe7e..c7e7423a70 100644
--- a/icons/make_ico_files.py
+++ b/icons/make_ico_files.py
@@ -19,12 +19,15 @@ for name, src in sources.iteritems():
     os.mkdir('ico_temp')
     try:
         names = []
-        for sz in (16, 32, 48, 256):
+        for sz in (16, 24, 32, 48, 64, 256):
             iname = os.path.join('ico_temp', '{0}x{0}.png'.format(sz))
             subprocess.check_call(['rsvg-convert', src, '-w', str(sz), '-h', str(sz), '-o', iname])
             subprocess.check_call(['optipng', '-o7', '-strip', 'all', iname])
+            if sz >= 128:
+                names.append('-r')  # store as raw PNG to reduce size
+            else:
+                names.extend(['-t', '0'])  # see https://bugzilla.gnome.org/show_bug.cgi?id=755200
             names.append(iname)
-        names[-1:-1] = ['-r']
         subprocess.check_call(['icotool', '-c', '--output=' + name+'.ico'] + names)
     finally:
         shutil.rmtree('ico_temp')
diff --git a/icons/viewer.ico b/icons/viewer.ico
index a4599ba598f2e249aa8db34e295aaabe0a25de07..7f229f96434373d3683cc51afefa29e8a59167f3 100644
GIT binary patch
delta 11363
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

delta 672
zcmZ{gF;2uV5Ji7Tq|iCdRuoAATcp~Gf`T-N6CiGY#34XV#~HTThGGkZgwi6B8*l-N
zJwhZJ7fXge##yWtSo(SM|BUR|A5YoiI=uiAWGD({h1(3c1W;8!e$D)u*<um=32;5*
z0GH0sm%w=Ta#d&NBEX<JqEcWJsb}5iziJJj>M2Lbs(a1q!pgKBSb!Ghom;L(z)*Rh
z+0sWU9k9~?G?DBEm?W%s+9DBYDMv|4eRemq`k1G3ad6^S@UCIO-03Vi@CV;K^Re;7
zoh5n5q4r5k)V}(X>?3Nv=dH9H(8gc1%-P018Ty<bK9V=eBzPqs%=?&W$d!(L()uC~
pK}^0X)GN(DESc*8O1+sUclP9s8qLK8%EZC?TwnSC=uYqF%WvB!;R^r&

diff --git a/src/calibre/gui2/main.py b/src/calibre/gui2/main.py
index 0c84a66d14..9349511240 100644
--- a/src/calibre/gui2/main.py
+++ b/src/calibre/gui2/main.py
@@ -100,7 +100,7 @@ def init_qt(args):
     override = 'calibre-gui' if islinux else None
     app = Application(args, override_program_name=override)
     app.file_event_hook = EventAccumulator()
-    app.setWindowIcon(QIcon(I('lt.png', allow_user_override=False)))
+    app.setWindowIcon(QIcon(I('library.png', allow_user_override=False)))
     return app, opts, args
 
 
@@ -462,6 +462,16 @@ def main(args=sys.argv):
         gui_debug = args[1]
         args = ['calibre']
 
+    if iswindows:
+        # Ensure that all ebook editor instances are grouped together in the task
+        # bar. This prevents them from being grouped with viewer process when
+        # launched from within calibre, as both use calibre-parallel.exe
+        import ctypes
+        try:
+            ctypes.windll.shell32.SetCurrentProcessExplicitAppUserModelID('com.calibre-ebook.main-gui')
+        except Exception:
+            pass  # Only available on windows 7 and newer
+
     try:
         app, opts, args = init_qt(args)
     except AbortInit:
diff --git a/src/calibre/gui2/tweak_book/main.py b/src/calibre/gui2/tweak_book/main.py
index fed5d43e20..535a8b0502 100644
--- a/src/calibre/gui2/tweak_book/main.py
+++ b/src/calibre/gui2/tweak_book/main.py
@@ -48,7 +48,7 @@ def _run(args, notify=None):
         import ctypes
         try:
             ctypes.windll.shell32.SetCurrentProcessExplicitAppUserModelID('com.calibre-ebook.edit-book')
-        except:
+        except Exception:
             pass  # Only available on windows 7 and newer
 
     # The following two lines are needed to prevent circular imports causing
diff --git a/src/calibre/gui2/ui.py b/src/calibre/gui2/ui.py
index 6a83ea11a4..1335846de3 100644
--- a/src/calibre/gui2/ui.py
+++ b/src/calibre/gui2/ui.py
@@ -134,6 +134,7 @@ class Main(MainWindow, MainWindowMixin, DeviceMixin, EmailMixin,  # {{{
     def __init__(self, opts, parent=None, gui_debug=None):
         global _gui
         MainWindow.__init__(self, opts, parent=parent, disable_automatic_gc=True)
+        self.setWindowIcon(QIcon(I('library.png', allow_user_override=False)))
         self.jobs_pointer = Pointer(self)
         self.proceed_requested.connect(self.do_proceed,
                 type=Qt.QueuedConnection)
diff --git a/src/calibre/gui2/viewer/main.py b/src/calibre/gui2/viewer/main.py
index 7ebc95fd45..37a1bec7ff 100644
--- a/src/calibre/gui2/viewer/main.py
+++ b/src/calibre/gui2/viewer/main.py
@@ -16,7 +16,7 @@ from calibre.gui2 import (
     Application, ORG_NAME, APP_UID, choose_files, info_dialog, error_dialog,
     open_url, setup_gui_option_parser)
 from calibre.ebooks.oeb.iterator.book import EbookIterator
-from calibre.constants import islinux, filesystem_encoding, DEBUG
+from calibre.constants import islinux, filesystem_encoding, DEBUG, iswindows
 from calibre.utils.config import Config, StringConfig, JSONConfig
 from calibre.customize.ui import available_input_formats
 from calibre import as_unicode, force_unicode, isbytestring, prints
@@ -1207,6 +1207,15 @@ def main(args=sys.argv):
     # Ensure viewer can continue to function if GUI is closed
     os.environ.pop('CALIBRE_WORKER_TEMP_DIR', None)
     reset_base_dir()
+    if iswindows:
+        # Ensure that all ebook editor instances are grouped together in the task
+        # bar. This prevents them from being grouped with viewer process when
+        # launched from within calibre, as both use calibre-parallel.exe
+        import ctypes
+        try:
+            ctypes.windll.shell32.SetCurrentProcessExplicitAppUserModelID('com.calibre-ebook.viewer')
+        except Exception:
+            pass  # Only available on windows 7 and newer
 
     parser = option_parser()
     opts, args = parser.parse_args(args)