From 63ce266351683a94630d7aba58405301b8a8d993 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 17 Oct 2022 00:46:05 +0200 Subject: [PATCH] Use different icons for the timeline in dark/light modes. --- cscript | 15 +- graphics/select_black.png | Bin 0 -> 1318 bytes graphics/select_white.png | Bin 0 -> 1266 bytes graphics/sequence_black.png | Bin 0 -> 486 bytes graphics/sequence_white.png | Bin 0 -> 539 bytes graphics/snap_black.png | Bin 0 -> 1235 bytes graphics/snap_white.png | Bin 0 -> 1246 bytes .../src/{timeline.svg => timeline_black.svg} | 0 graphics/src/timeline_white.svg | 189 ++++++++++++++++++ graphics/update | 6 +- graphics/wscript | 15 +- graphics/zoom_all_black.png | Bin 0 -> 957 bytes graphics/zoom_all_white.png | Bin 0 -> 1118 bytes graphics/zoom_black.png | Bin 0 -> 924 bytes graphics/zoom_white.png | Bin 0 -> 1094 bytes platform/osx/make_dmg.sh | 10 +- platform/windows/wscript | 15 +- src/wx/full_config_dialog.cc | 10 - src/wx/timeline_dialog.cc | 10 +- src/wx/wx_util.cc | 7 + src/wx/wx_util.h | 1 + 21 files changed, 241 insertions(+), 37 deletions(-) create mode 100644 graphics/select_black.png create mode 100644 graphics/select_white.png create mode 100644 graphics/sequence_black.png create mode 100644 graphics/sequence_white.png create mode 100644 graphics/snap_black.png create mode 100644 graphics/snap_white.png rename graphics/src/{timeline.svg => timeline_black.svg} (100%) create mode 100644 graphics/src/timeline_white.svg create mode 100644 graphics/zoom_all_black.png create mode 100644 graphics/zoom_all_white.png create mode 100644 graphics/zoom_black.png create mode 100644 graphics/zoom_white.png diff --git a/cscript b/cscript index 54af98a7d..f0f0d3fbf 100644 --- a/cscript +++ b/cscript @@ -368,11 +368,16 @@ def make_spec(filename, version, target, options, requires=None): if can_build_disk(target): print('%{_datadir}/applications/dcpomatic2_disk.desktop', file=f) print('%{_datadir}/dcpomatic2/dcpomatic2_server_small.png', file=f) - print('%{_datadir}/dcpomatic2/select.png', file=f) - print('%{_datadir}/dcpomatic2/sequence.png', file=f) - print('%{_datadir}/dcpomatic2/snap.png', file=f) - print('%{_datadir}/dcpomatic2/zoom.png', file=f) - print('%{_datadir}/dcpomatic2/zoom_all.png', file=f) + print('%{_datadir}/dcpomatic2/select_white.png', file=f) + print('%{_datadir}/dcpomatic2/select_black.png', file=f) + print('%{_datadir}/dcpomatic2/sequence_white.png', file=f) + print('%{_datadir}/dcpomatic2/sequence_black.png', file=f) + print('%{_datadir}/dcpomatic2/snap_white.png', file=f) + print('%{_datadir}/dcpomatic2/snap_black.png', file=f) + print('%{_datadir}/dcpomatic2/zoom_white.png', file=f) + print('%{_datadir}/dcpomatic2/zoom_black.png', file=f) + print('%{_datadir}/dcpomatic2/zoom_all_white.png', file=f) + print('%{_datadir}/dcpomatic2/zoom_all_black.png', file=f) print('%{_datadir}/dcpomatic2/tick.png', file=f) print('%{_datadir}/dcpomatic2/no_tick.png', file=f) print('%{_datadir}/dcpomatic2/link.png', file=f) diff --git a/graphics/select_black.png b/graphics/select_black.png new file mode 100644 index 0000000000000000000000000000000000000000..aa0dbdcc5d8f6daa0a2b7edc78d69d1d259f92fe GIT binary patch literal 1318 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 literal 0 HcmV?d00001 diff --git a/graphics/sequence_black.png b/graphics/sequence_black.png new file mode 100644 index 0000000000000000000000000000000000000000..c16b7096f5130dc0d0142bdbba8d251e782f8f61 GIT binary patch literal 486 zcmV@P)pF8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H10dq-2 zK~z|U?Up@D!%!54pIeI`LB+XKrA`r?^Cvnx2*pVpEJ9uE;8KT9iVn^aGt@;v`YXCR zq)Uo{g1B@k(hryGVglNUc=Mi@d(TM%2?+@cM*Li5O#L*J{nEi*yo5GJxy4yf_YR&!aRPax5jQV?yfA zZx}#INu$x=*|w3L4i|#~`%qP_zcn8jO3>N-FqNqzq cNcca#0XM~NbCyIL(*OVf07*qoM6N<$f>({tNB{r; literal 0 HcmV?d00001 diff --git a/graphics/sequence_white.png b/graphics/sequence_white.png new file mode 100644 index 0000000000000000000000000000000000000000..67592d0d976ed9c05cad422e5e001b9438a9daf3 GIT binary patch literal 539 zcmV+$0_6RPP)pF8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H10jNnt zK~z|U?Up@D!(bGJpDRIZ5IYItq}CuJ*bd$MAH+?nb&n5{rn5ZWur7{Ux1F z_Z8Rcbra7nrhX$sxqd=br&YBS#^YN7RCQJ#9xn0yCb0i!0aP`i_xBZi|AtCsjYJ|A zW;lQ~SOSjYz~duyI@g?>j8ZOJ+}(wpJvcxznPfMYV{vW{4i4b_+{X8NbV02TDs50P z0|TT|DR#117G`FM9UmiSXV7j3r!?D4_+m4=0YrpMCd2N=29uVBeRPCeUBSzX*??~n zY7KuhfT~if)mYu!Bws4wZg1mz9$F~C*x2s}_=xMeY!!>_9UkJYtk7;Yp-=$Z?iH(= zJzvnh3;G?Mj^j|hxPVT_?^#3Do;zZYAG~deh=@@K8jS{wkHf^oGWmR!R_lq=(`Tlp zOg`_+P$d)*PvY@)VzDK%*(#p*^rrzn1i6)XJcn)11LZIQjE>?yL0UjDln4Cp4~dB` dA|m2fc?I^ctzK?=odW;>002ovPDHLkV1n|!=g9y7 literal 0 HcmV?d00001 diff --git a/graphics/snap_black.png b/graphics/snap_black.png new file mode 100644 index 0000000000000000000000000000000000000000..01580dcbdb690e930e136809cbda251e813c8838 GIT binary patch literal 1235 zcmV;^1T6cBP)pF8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H11Yk)- zK~z|Uwbx&0T~!ta@ZUb?ByH76Ost)Dl4_?|jdn&&r3I??;A9S7IfnmC@_jsGxt9mdhv9|CxI!%`jIdmco%=dmCFqpmSJ;q z%F{W&%ZPp0LFmE7GX~$_5c(X=a4gMA=)>C_iI7*Bc7(>J-h!;^y zn8agBQ7gjbDFcCG4{>4{#Es)L@!oPx#K5aqy( z0&iyI|5_sGB=KG1bHu+A-yoh{!v4ilM8pdh67Ue>^NR$UCjN!EmYRktSVjIY@!Lgw zpPaM3XEE~5l(FAa6cqtR%L>SqZ}U&wh4r``x8V7}bQiS)i-_+fPdSZCssub0C_Y;x z0r?A1?3-;hL21c9K_Ra#xv! zlSu2Gb|F@+`e9;AN&ez8$Y=2Y;!73rUYX0nt@RGit|32H;qZ9*&8MxPy&_~B?xofk zZ)|44;+gZ-DgVB$BK-xin_A$F6_C&35yT@EFLis_7yd)pB9qAVH&*NmM=(qpd94Wn z|A4nDCT=7|ev350+JcL=R2cqu?slLF0moBLe^fDX9g1?V=}K@ZbW|7)Vy1%~YeImW z1IJ4LdAMxuwj)8iSrrX9g_LiVi?A7-`d_)==ArIoI}&AEEq@yD|MK!fljLx&%DFBj zF~Nk{pPwFaLH_4+jVBm`?4eF_3d6O?%ad1YlLFSQZ)myj zMR|$%GC`3rSaopQm}QjxVRJL=8CP#?X<5);j+S$$a4v%yhdxWwtB3pg((x;zeIW!rJw5Xt9{coD(=i6TS1;hBgvrAL3p?)Cty@iuk6&vA zr&`FeY*%+zm-dD_IJ$42P;T!Z)C-u5yfg6e#|z4~x3|}Ho@dy-0{%;4QQY3UZQFv0 z5BBemNx8RtUoSx9mEp5z!{Ffjg50uYi`LdwmN-mS;Lf}#TDEWBKJVellP4WMb0*}x zJo~J^L^_fXzTUoLN482^D&11YO xkFhliVQ($QzQr7`#IGBL{X_`ZG!y?kegwK)Tj9hj67T>3002ovPDHLkV1k2*Q&Io` literal 0 HcmV?d00001 diff --git a/graphics/snap_white.png b/graphics/snap_white.png new file mode 100644 index 0000000000000000000000000000000000000000..801e9c599db93179689328159a033b6d3f98c20d GIT binary patch literal 1246 zcmV<41R?v0P)pF8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H11Zzn| zK~z|Ut(VQUewJMrvsHSrebd#vrQxF26bYqwn-CBP2-xJ&o0ta(>zI=)E#)>_xzso zeL3g(o##2nXaNmql=OzAm6EcO{*e?h#$*@5SE=Z`z%{H*Q@U9o0sIW?s+8AMAiQ7F zmy(uBlE%lSJ9nhPLFw`1e5ci`rS^8IwN+ZQ$U*N)`oI`-v8s_42rmO70A#b!+Y2o% zAkBU4-VJ?yV6B^(^FU3t;+wEG1;F*|uwuph!o^p6JKVqTOxy>8m5MiG?IZw)4_7Z- ze4RPtOvI*(cTRB+7zNp1$h(o>#Hx)FRc#|*v)WXa`V*DgQLzI~3Pw-^|}TFc1DeAD;! zobNEtwFj^ylci^JeB1(Apso<~Y1yjZvBQb~J)d|1-?so9J?iH>a>Vg{R0#MJfMv`4 zfWAHlsQB{=cv$<4blUp(R;_Y;e-r|qkVyE&JuhEW@UT+x0?yL_baa$@4FD-g@_-t_ zV%@##XW6qys;QBrU#c}ADPJ%9_xqm=4M|cHQ0Gb7AY<}BnBul~uZw=FR^1qLO<=Ws zyZ_+_=$2zgBBt+C@?;SNii09=IsvNqV`gfjrn6W6}#UAU#$? z1HSCTnUZSuB>gK%s;%|I>*^%%6I9+Z@;v{Z!_1_tCn+vTTC(H?bjr5U=7TeT=5bHb zs3d9ma(~B(3CS4m1q?JPm-Cx=t`+kn1>ZrqUi`=x;aY5jUh${Ax~ zk|bcP_}3nL^oU3#;%*13RR%%;$z+m|d-t%<_lR!4n2;p5S?rhe_SLIbb>hSc4Gj$` zl}afP2gnmxv17;7*x0DHwl;NlcWdj`t&((0l3aoPAW6YsPy+)4 zN~Kbgq)aBGSS%*b^BRDcsx;6kN$1X;lO(0nY4!K_EBJi1oi8+SN|M^z+I%dLNW_J2 zRcT;NCX> literal 0 HcmV?d00001 diff --git a/graphics/src/timeline.svg b/graphics/src/timeline_black.svg similarity index 100% rename from graphics/src/timeline.svg rename to graphics/src/timeline_black.svg diff --git a/graphics/src/timeline_white.svg b/graphics/src/timeline_white.svg new file mode 100644 index 000000000..14dd8ccce --- /dev/null +++ b/graphics/src/timeline_white.svg @@ -0,0 +1,189 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/graphics/update b/graphics/update index 755b73fc0..f42c3182b 100755 --- a/graphics/update +++ b/graphics/update @@ -95,8 +95,10 @@ else $INKSCAPE_EXPORT --export-filename=splash.png src/splash.svg -w 400 -h 300 # Timeline toolbar icons (all platforms) - for i in select zoom zoom_all snap sequence; do - inkbatch --inkscape $INKSCAPE -i timeline-$i -o $i.png --width 32 --height 32 src/timeline.svg + for c in black white; do + for i in select zoom zoom_all snap sequence; do + inkbatch --inkscape $INKSCAPE -i timeline-$i -o ${i}_${c}.png --width 32 --height 32 src/timeline_$c.svg + done done # Playlist editor tick/no-tick diff --git a/graphics/wscript b/graphics/wscript index c87904683..c67d0695b 100644 --- a/graphics/wscript +++ b/graphics/wscript @@ -39,11 +39,16 @@ def build(bld): if not bld.env.TARGET_WINDOWS_64 and not bld.env.TARGET_WINDOWS_32 and not bld.env.DISABLE_GUI: bld.install_as('${PREFIX}/share/dcpomatic2/dcpomatic2_server_small.png', 'linux/16/dcpomatic2.png') bld.install_files('${PREFIX}/share/dcpomatic2', 'splash.png') - bld.install_files('${PREFIX}/share/dcpomatic2', 'zoom.png') - bld.install_files('${PREFIX}/share/dcpomatic2', 'zoom_all.png') - bld.install_files('${PREFIX}/share/dcpomatic2', 'select.png') - bld.install_files('${PREFIX}/share/dcpomatic2', 'snap.png') - bld.install_files('${PREFIX}/share/dcpomatic2', 'sequence.png') + bld.install_files('${PREFIX}/share/dcpomatic2', 'zoom_white.png') + bld.install_files('${PREFIX}/share/dcpomatic2', 'zoom_black.png') + bld.install_files('${PREFIX}/share/dcpomatic2', 'select_white.png') + bld.install_files('${PREFIX}/share/dcpomatic2', 'select_black.png') + bld.install_files('${PREFIX}/share/dcpomatic2', 'snap_white.png') + bld.install_files('${PREFIX}/share/dcpomatic2', 'snap_black.png') + bld.install_files('${PREFIX}/share/dcpomatic2', 'sequence_white.png') + bld.install_files('${PREFIX}/share/dcpomatic2', 'sequence_black.png') + bld.install_files('${PREFIX}/share/dcpomatic2', 'zoom_all_white.png') + bld.install_files('${PREFIX}/share/dcpomatic2', 'zoom_all_black.png') bld.install_files('${PREFIX}/share/dcpomatic2', 'me.jpg') bld.install_files('${PREFIX}/share/dcpomatic2', 'tick.png') bld.install_files('${PREFIX}/share/dcpomatic2', 'no_tick.png') diff --git a/graphics/zoom_all_black.png b/graphics/zoom_all_black.png new file mode 100644 index 0000000000000000000000000000000000000000..19ccb71481e841fd001dc9f1caa76fcdfc48e107 GIT binary patch literal 957 zcmV;u148_XP)pF8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H114>Cm zK~z|U#g9KZ#+2GY;5D<7T%d2!f!3yR=#n`~%+FOD#ogkRJL+4`orjBq)fU z_Pl#p1lNPB7hzdEN)FnCY^iZ8ltP6nbZuS#RW~6qIGfF{2OSA+bj<8D{lYLmhBx#1 z@ZOvEo{Q_n1Kb7zKqU|dUIM?K)&E(VfXBc;faJMOfCbR%^%i-anOioTp zFc{43k#F7wUdQQ}N?Ti-Y;SMp1z$`$otB}Yq1>VQ-VWRcYyi^T-7P04C)a}KW@2I@ zwU8c=$Bdr2mf^!4@G7Klcp)Ya9Q0^eE*nE&qQ0HILGHaIseEiGu8 z2Ji`|i`SI`3ecb^3LPCCjtD4z`?mPuRc+0c&=33p=!1iU93LOshP&Nv z78e&;Utb6K0(g4ecSixKs;ZLx{e9beK`0b5_k!nKe%{ENQs8Gm+S}XZ=;){*a5kHj zNF*YFc)eaJEiHYC#VVLDw}8I@si~=vSS)re_|DFbbaizJARdoL=H}*Pe0Mt*y!M@UWDXmC0HAY$OuNCK3rrBoZ<zQeA zTEdJEs0TWMM&Krw&+-OURbS1_%v_ZC^IathNrS4Y@u{h)bBWQ>(V|P-zStAtaM;jw zeG_=Um=f_^iT?h6L)Z1GVhOw@F+V>q6%`fFizxu7bKpF8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H11M5jd zK~z|Uy_Zc$V`mhGpRe&RqQOR5jdm8Dg`iz%wbbgS2ri@==|~WZP=%2~(Nf$BDg&Yz zi$XUol!{X7&qfqPELjZ&tqkg*pgW;OCw53oGD?!0pPnvaB(}!HOvZO}e>mrRpYPnm zx%VoPkceaeRe%X70z7~n*jGwlaU$=G%j1_o z*4o+{EiEmywzl4R_fZWF4svjCKv!26z+>R&+v1~-;B$cW_4SmEW3{)phtKB&s1*^@ ztpFmD1ylxuLAJNI(*h6-2HD-+g~$d!x)p%PcvTLEBc;ZRr_JcSYoth=|MOdhJQ* zcDtjOj}m!j04SwiipY1s6R+2c#bUwjcBi!ak&zLanwlW;eXyJ;KK5la0X!=yDZy&B zlAoV{Cu5})eSLj2H8l|k1kg0i1QaI?pp^0fkARcv>S|_YW+*Q&Ps-eAG-9<{>F(|( z91b%+KF-3zLZRR9-%2!!Z~7v7K%{ilB7)6kV|jU*ot+&*q0qJ1va&K78yo59=pZ*Y z7ZH)g#YN`k<`jU%VhOglx1Z+Z`4J!LgWI2z_)-N!0Yv5x7%?#o#f@^QCwUc zJ8S@!fN4$Bex010G;D5eCJhl+BJ!SyJQ0!Sahm=_M1ByF+L)Y5zu)g39UcA0Y&MJ8 zY?j&C*?`aI`|GC1abpGIz!-rNBL4-ifD^#3l#&}_D>Y4fIyE(A*x1;Jt%N-%C+Cwp zS0WW%LU<-7CjMKAKNB@(Iw7hwO>>Wpja@;^&(8>9Zq`l8UH||907*qoM6N<$f+WlU-~a#s literal 0 HcmV?d00001 diff --git a/graphics/zoom_black.png b/graphics/zoom_black.png new file mode 100644 index 0000000000000000000000000000000000000000..4633c8cb31c0893c5e0737e0be7e5f579d449f7f GIT binary patch literal 924 zcmV;N17rM&P)pF8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H111U*F zK~z|U#gm z5k*i?!b{Xi_GI8iG73B-ZlturE=2BXtGVmE9k$P;*8S(84-9-W%zVG+dxx3twU8Y* zfEJ(v@Bk5D7kCeR$a0RHu>ntkPk^L3z5>qyS3V(@bFQ}l)4(l&;^Jc3+uNzBslns% z5Q#+C-rmOV_Y({T)iYt>8L*I#$XT8MzW}MLtCOXrB{@DmmQ)yqAuB5@(%Ra3wjwWp zf_%dt0|p>{eSH#-$5RHUVsdg)>~_177|kdAE)WA`e0)6X;Ik|*FN@7)lRt}il&ioy zKzu%5Ug3&~i3wGOU7#r2@CSgDm6gf<{{Dpo48xG7rY0pZkgdQgK*q+#E)=ft`~6Db zb2j0HK-6Nf$j;7=DFTT^LP|?Zl|)^-@B-i_;Hs^yrK+kb+lr;dYPHhV)}~JHWfCX{ zsIIOyC0uc4zVb{0I)JY0rV6;-?$co=fiOTg95z)T6bhXVGYJF%0)YS`Vw%9#)|MIu z)7=Nj4QU6E_4RdAzJh~;193PU0-OM4>B0+0ekyMOW@l$Fu;#xkE-rF(bOf+UhF74d z2NHI>T>^o?g;pPn#iX*bQvCyR+7D&`X>4qiSS*&eKu=GP3jfIY{YFYWz!yNey1L}> z@Gz%f!!TrEU_byVEG!g zWMm}abUK41o7tQw0bT-e{oKELAGHlakOGM`9=T9Yidwb(#M;`L=(@gpnF5fk#E*`S yj%a;-{l3fPnt~kv)h6Hq9s)msw!hmy literal 0 HcmV?d00001 diff --git a/graphics/zoom_white.png b/graphics/zoom_white.png new file mode 100644 index 0000000000000000000000000000000000000000..50890f120b6b046f2fe6c14349ce810b50108c9d GIT binary patch literal 1094 zcmV-M1iAZ(P)pF8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H11Jg-F zK~z|UwUT0bdRDwP(rA_^*Q1nHsy(Nz#;(Jn+6;>IEaLP3ft zDkWM_5EmB3HYjLYcj6+ng@~n$=&tDK#6btDMorWhbGp!197avl_+Q=oxaa3s#*Y41G&JvKmd3J{3RlP$1}&BrK)CCZBf-_yZColoX`1m-3gM*x(pU1V5hK2?@Iyx|$%>X?j z^6X9ks`?r52Vm>(?`LxIPMHLtqM`z~+f7nZk^)W<`8igM=}LP5uuV@--^(1p=kw9m z*9R91`(9O3;sQ|BFM#UZ-Cf*n_r1&wO;1m=yu1vM4YbDv06Ya48yh1O3OxuwRT&;0 zHo8w^0;sAL_*_+)pPzq_xuK<{C3bgr0SZ;M=vDyWBOq;KV}qTYorC~HqfwTYmW*!c zZDUP94#4*Ic0$YzU70T@7C<^cFc?fIz|ql>(R>mM;5C5VZcivcMn;Cwymenqz!pGW zULGRXUJdtBety2u+=>OT2E5G7%%rfeFd^nPn~k!vGJq%-U)P%fL_~pK0UQoTLICRO z>abWW0Dp=|%q@V6+wZ)wv60-|+y|LktyY?wn~m-dvBsMKL}Uf{(QG#3a=EZtt@j4# z=;$zNgk``J7r>>y2G)y;iskZnx9f*-33}EzxL{o}M1Eva-&bnwtJiPEM{6kr#0RTta*T%mN=q zA`xb1XPKLuV`XK9X!Ok@r=XyKy1F`?PA4fTDX6M?JRT+{CIq0qzW&_lbne(}wsH}< z_Bh^D6J`M40$%}10D(XNzu(W^-X7`c>11VPU9ATJegQ_p;qb)3z(AVU>x~=YMycw@ zs@kur|J+a!@2Kj?Wf5z{6rY}+26}sYqYj5d9S(<%j*dn`q0pA9zIDXn{`9G84v+`D z2kZlW;N^A2r>Yi*!(ng2GI1Zpn+elxlRQKs^4wyv)U>s=9aL6UD!|Ol%sU>B=l$d3 zW8Y;)A783kd~$LUaJgLnXJTq<>g@3F@F#f03>XrT=T@t=roFxWpsK1$0Tvb(l1wI3 z&0~ANq04t-Z*g()U~O&fFc=Juz#UFOf*{fW2M`2)6Os6SyB<^j0l~cJvPP!B00000 M07*qoM6N<$f{l*z`2YX_ literal 0 HcmV?d00001 diff --git a/platform/osx/make_dmg.sh b/platform/osx/make_dmg.sh index 3285f7d1d..40eabef1f 100644 --- a/platform/osx/make_dmg.sh +++ b/platform/osx/make_dmg.sh @@ -242,11 +242,11 @@ function copy_resources { cp $prefix/src/dcpomatic/fonts/LiberationSans-Bold.ttf "$dest" cp $prefix/src/dcpomatic/fonts/fonts.conf.osx "$dest"/fonts.conf cp $prefix/src/dcpomatic/graphics/splash.png "$dest" - cp $prefix/src/dcpomatic/graphics/zoom.png "$dest" - cp $prefix/src/dcpomatic/graphics/zoom_all.png "$dest" - cp $prefix/src/dcpomatic/graphics/select.png "$dest" - cp $prefix/src/dcpomatic/graphics/snap.png "$dest" - cp $prefix/src/dcpomatic/graphics/sequence.png "$dest" + cp $prefix/src/dcpomatic/graphics/zoom*.png "$dest" + cp $prefix/src/dcpomatic/graphics/zoom_all*.png "$dest" + cp $prefix/src/dcpomatic/graphics/select*.png "$dest" + cp $prefix/src/dcpomatic/graphics/snap*.png "$dest" + cp $prefix/src/dcpomatic/graphics/sequence*.png "$dest" cp $prefix/src/dcpomatic/graphics/me.jpg "$dest" cp $prefix/src/dcpomatic/graphics/link.png "$dest" cp $prefix/src/dcpomatic/graphics/tick.png "$dest" diff --git a/platform/windows/wscript b/platform/windows/wscript index 84291b3ca..94b7fc3d3 100644 --- a/platform/windows/wscript +++ b/platform/windows/wscript @@ -306,11 +306,16 @@ File "%resources%/../../fonts/LiberationSans-Italic.ttf" File "%resources%/../../fonts/LiberationSans-Bold.ttf" File /oname=fonts.conf "%resources%/../../fonts/fonts.conf.windows" File "%graphics%/splash.png" -File "%graphics%/zoom.png" -File "%graphics%/zoom_all.png" -File "%graphics%/select.png" -File "%graphics%/snap.png" -File "%graphics%/sequence.png" +File "%graphics%/zoom_white.png" +File "%graphics%/zoom_black.png" +File "%graphics%/zoom_all_white.png" +File "%graphics%/zoom_all_black.png" +File "%graphics%/select_white.png" +File "%graphics%/select_black.png" +File "%graphics%/snap_white.png" +File "%graphics%/snap_black.png" +File "%graphics%/sequence_white.png" +File "%graphics%/sequence_black.png" File "%graphics%/me.jpg" File "%graphics%/tick.png" File "%graphics%/no_tick.png" diff --git a/src/wx/full_config_dialog.cc b/src/wx/full_config_dialog.cc index 6b0be4603..1aeacd3ca 100644 --- a/src/wx/full_config_dialog.cc +++ b/src/wx/full_config_dialog.cc @@ -84,16 +84,6 @@ using namespace boost::placeholders; using dcp::locale_convert; -#ifdef DCPOMATIC_OSX -static -wxString -icon_path(string name) -{ - return gui_is_dark() ? bitmap_path(String::compose("%1_white.png", name)) : bitmap_path(String::compose("%1_black.png", name)); -} -#endif - - class FullGeneralPage : public GeneralPage { public: diff --git a/src/wx/timeline_dialog.cc b/src/wx/timeline_dialog.cc index 91737f204..0d05e66d6 100644 --- a/src/wx/timeline_dialog.cc +++ b/src/wx/timeline_dialog.cc @@ -63,11 +63,11 @@ TimelineDialog::TimelineDialog(ContentPanel* cp, shared_ptr film, FilmView { auto sizer = new wxBoxSizer (wxVERTICAL); - wxBitmap select (bitmap_path("select.png"), wxBITMAP_TYPE_PNG); - wxBitmap zoom (bitmap_path("zoom.png"), wxBITMAP_TYPE_PNG); - wxBitmap zoom_all (bitmap_path("zoom_all.png"), wxBITMAP_TYPE_PNG); - wxBitmap snap (bitmap_path("snap.png"), wxBITMAP_TYPE_PNG); - wxBitmap sequence (bitmap_path("sequence.png"), wxBITMAP_TYPE_PNG); + wxBitmap select(icon_path("select"), wxBITMAP_TYPE_PNG); + wxBitmap zoom(icon_path("zoom"), wxBITMAP_TYPE_PNG); + wxBitmap zoom_all(icon_path("zoom_all"), wxBITMAP_TYPE_PNG); + wxBitmap snap(icon_path("snap"), wxBITMAP_TYPE_PNG); + wxBitmap sequence(icon_path("sequence"), wxBITMAP_TYPE_PNG); _toolbar = new wxToolBar (this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTB_HORIZONTAL); _toolbar->SetMargins (4, 4); diff --git a/src/wx/wx_util.cc b/src/wx/wx_util.cc index 9d9d4c599..074f47d61 100644 --- a/src/wx/wx_util.cc +++ b/src/wx/wx_util.cc @@ -651,6 +651,13 @@ bitmap_path (string name) } +wxString +icon_path(string name) +{ + return gui_is_dark() ? bitmap_path(String::compose("%1_white.png", name)) : bitmap_path(String::compose("%1_black.png", name)); +} + + wxSize small_button_size (wxWindow* parent, wxString text) { diff --git a/src/wx/wx_util.h b/src/wx/wx_util.h index fb1a3a001..50fb7268f 100644 --- a/src/wx/wx_util.h +++ b/src/wx/wx_util.h @@ -119,6 +119,7 @@ extern double calculate_mark_interval (double start); extern bool display_progress (wxString title, wxString task); extern bool report_errors_from_last_job (wxWindow* parent); extern wxString bitmap_path (std::string name); +extern wxString icon_path(std::string name); extern wxSize small_button_size (wxWindow* parent, wxString text); extern bool gui_is_dark (); extern double dpi_scale_factor (wxWindow* window); -- 2.30.2