From fecfda4c913da3f60ab4329d1f4f412bc27d19a7 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 16 Oct 2022 22:21:34 +0200 Subject: [PATCH] Use slightly better icons for macOS prefs in dark mode. --- ...{advanced@2x.png => advanced@2x_black.png} | Bin .../osx/preferences/advanced@2x_white.png | Bin 0 -> 3267 bytes .../{advanced.png => advanced_black.png} | Bin graphics/osx/preferences/advanced_white.png | Bin 0 -> 1619 bytes ..._sheet@2x.png => cover_sheet@2x_black.png} | Bin .../osx/preferences/cover_sheet@2x_white.png | Bin 0 -> 356 bytes ...{cover_sheet.png => cover_sheet_black.png} | Bin .../osx/preferences/cover_sheet_white.png | Bin 0 -> 232 bytes ...{defaults@2x.png => defaults@2x_black.png} | Bin .../osx/preferences/defaults@2x_white.png | Bin 0 -> 1221 bytes .../{defaults.png => defaults_black.png} | Bin graphics/osx/preferences/defaults_white.png | Bin 0 -> 626 bytes .../{email@2x.png => email@2x_black.png} | Bin graphics/osx/preferences/email@2x_white.png | Bin 0 -> 1945 bytes .../{email.png => email_black.png} | Bin graphics/osx/preferences/email_white.png | Bin 0 -> 879 bytes .../{general@2x.png => general@2x_black.png} | Bin graphics/osx/preferences/general@2x_white.png | Bin 0 -> 497 bytes .../{general.png => general_black.png} | Bin graphics/osx/preferences/general_white.png | Bin 0 -> 340 bytes ...ifiers@2x.png => identifiers@2x_black.png} | Bin .../osx/preferences/identifiers@2x_white.png | Bin 0 -> 1660 bytes ...{identifiers.png => identifiers_black.png} | Bin .../osx/preferences/identifiers_white.png | Bin 0 -> 847 bytes ...dm_email@2x.png => kdm_email@2x_black.png} | Bin .../osx/preferences/kdm_email@2x_white.png | Bin 0 -> 2514 bytes .../{kdm_email.png => kdm_email_black.png} | Bin graphics/osx/preferences/kdm_email_white.png | Bin 0 -> 1156 bytes .../{keys@2x.png => keys@2x_black.png} | Bin graphics/osx/preferences/keys@2x_white.png | Bin 0 -> 758 bytes .../preferences/{keys.png => keys_black.png} | Bin graphics/osx/preferences/keys_white.png | Bin 0 -> 424 bytes ...ocations@2x.png => locations@2x_black.png} | Bin .../osx/preferences/locations@2x_white.png | Bin 0 -> 2593 bytes .../{locations.png => locations_black.png} | Bin graphics/osx/preferences/locations_white.png | Bin 0 -> 1302 bytes ...ions@2x.png => notifications@2x_black.png} | Bin .../preferences/notifications@2x_white.png | Bin 0 -> 2252 bytes ...ifications.png => notifications_black.png} | Bin .../osx/preferences/notifications_white.png | Bin 0 -> 1271 bytes .../{servers@2x.png => servers@2x_black.png} | Bin graphics/osx/preferences/servers@2x_white.png | Bin 0 -> 390 bytes .../{servers.png => servers_black.png} | Bin graphics/osx/preferences/servers_white.png | Bin 0 -> 283 bytes .../{sound@2x.png => sound@2x_black.png} | Bin graphics/osx/preferences/sound@2x_white.png | Bin 0 -> 1465 bytes .../{sound.png => sound_black.png} | Bin graphics/osx/preferences/sound_white.png | Bin 0 -> 769 bytes .../{tms@2x.png => tms@2x_black.png} | Bin graphics/osx/preferences/tms@2x_white.png | Bin 0 -> 1027 bytes .../preferences/{tms.png => tms_black.png} | Bin graphics/osx/preferences/tms_white.png | Bin 0 -> 536 bytes ...{preferences.svg => preferences_black.svg} | 0 graphics/src/preferences_white.svg | 1066 +++++++++++++++++ graphics/update | 8 +- platform/osx/make_dmg.sh | 39 +- src/wx/config_dialog.cc | 2 +- src/wx/config_dialog.h | 6 +- src/wx/full_config_dialog.cc | 28 +- 59 files changed, 1107 insertions(+), 42 deletions(-) rename graphics/osx/preferences/{advanced@2x.png => advanced@2x_black.png} (100%) create mode 100644 graphics/osx/preferences/advanced@2x_white.png rename graphics/osx/preferences/{advanced.png => advanced_black.png} (100%) create mode 100644 graphics/osx/preferences/advanced_white.png rename graphics/osx/preferences/{cover_sheet@2x.png => cover_sheet@2x_black.png} (100%) create mode 100644 graphics/osx/preferences/cover_sheet@2x_white.png rename graphics/osx/preferences/{cover_sheet.png => cover_sheet_black.png} (100%) create mode 100644 graphics/osx/preferences/cover_sheet_white.png rename graphics/osx/preferences/{defaults@2x.png => defaults@2x_black.png} (100%) create mode 100644 graphics/osx/preferences/defaults@2x_white.png rename graphics/osx/preferences/{defaults.png => defaults_black.png} (100%) create mode 100644 graphics/osx/preferences/defaults_white.png rename graphics/osx/preferences/{email@2x.png => email@2x_black.png} (100%) create mode 100644 graphics/osx/preferences/email@2x_white.png rename graphics/osx/preferences/{email.png => email_black.png} (100%) create mode 100644 graphics/osx/preferences/email_white.png rename graphics/osx/preferences/{general@2x.png => general@2x_black.png} (100%) create mode 100644 graphics/osx/preferences/general@2x_white.png rename graphics/osx/preferences/{general.png => general_black.png} (100%) create mode 100644 graphics/osx/preferences/general_white.png rename graphics/osx/preferences/{identifiers@2x.png => identifiers@2x_black.png} (100%) create mode 100644 graphics/osx/preferences/identifiers@2x_white.png rename graphics/osx/preferences/{identifiers.png => identifiers_black.png} (100%) create mode 100644 graphics/osx/preferences/identifiers_white.png rename graphics/osx/preferences/{kdm_email@2x.png => kdm_email@2x_black.png} (100%) create mode 100644 graphics/osx/preferences/kdm_email@2x_white.png rename graphics/osx/preferences/{kdm_email.png => kdm_email_black.png} (100%) create mode 100644 graphics/osx/preferences/kdm_email_white.png rename graphics/osx/preferences/{keys@2x.png => keys@2x_black.png} (100%) create mode 100644 graphics/osx/preferences/keys@2x_white.png rename graphics/osx/preferences/{keys.png => keys_black.png} (100%) create mode 100644 graphics/osx/preferences/keys_white.png rename graphics/osx/preferences/{locations@2x.png => locations@2x_black.png} (100%) create mode 100644 graphics/osx/preferences/locations@2x_white.png rename graphics/osx/preferences/{locations.png => locations_black.png} (100%) create mode 100644 graphics/osx/preferences/locations_white.png rename graphics/osx/preferences/{notifications@2x.png => notifications@2x_black.png} (100%) create mode 100644 graphics/osx/preferences/notifications@2x_white.png rename graphics/osx/preferences/{notifications.png => notifications_black.png} (100%) create mode 100644 graphics/osx/preferences/notifications_white.png rename graphics/osx/preferences/{servers@2x.png => servers@2x_black.png} (100%) create mode 100644 graphics/osx/preferences/servers@2x_white.png rename graphics/osx/preferences/{servers.png => servers_black.png} (100%) create mode 100644 graphics/osx/preferences/servers_white.png rename graphics/osx/preferences/{sound@2x.png => sound@2x_black.png} (100%) create mode 100644 graphics/osx/preferences/sound@2x_white.png rename graphics/osx/preferences/{sound.png => sound_black.png} (100%) create mode 100644 graphics/osx/preferences/sound_white.png rename graphics/osx/preferences/{tms@2x.png => tms@2x_black.png} (100%) create mode 100644 graphics/osx/preferences/tms@2x_white.png rename graphics/osx/preferences/{tms.png => tms_black.png} (100%) create mode 100644 graphics/osx/preferences/tms_white.png rename graphics/src/{preferences.svg => preferences_black.svg} (100%) create mode 100644 graphics/src/preferences_white.svg diff --git a/graphics/osx/preferences/advanced@2x.png b/graphics/osx/preferences/advanced@2x_black.png similarity index 100% rename from graphics/osx/preferences/advanced@2x.png rename to graphics/osx/preferences/advanced@2x_black.png diff --git a/graphics/osx/preferences/advanced@2x_white.png b/graphics/osx/preferences/advanced@2x_white.png new file mode 100644 index 0000000000000000000000000000000000000000..71f97b3cad32ac6fad9d150c3aaa387053d305d9 GIT binary patch literal 3267 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 Rz;plr002ovPDHLkV1k-P3c3IQ literal 0 HcmV?d00001 diff --git a/graphics/osx/preferences/cover_sheet@2x.png b/graphics/osx/preferences/cover_sheet@2x_black.png similarity index 100% rename from graphics/osx/preferences/cover_sheet@2x.png rename to graphics/osx/preferences/cover_sheet@2x_black.png diff --git a/graphics/osx/preferences/cover_sheet@2x_white.png b/graphics/osx/preferences/cover_sheet@2x_white.png new file mode 100644 index 0000000000000000000000000000000000000000..3e1bade6f2b7e341c99c5e2215afd7926ea3e83a GIT binary patch literal 356 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9Fx?I6t9|MX)jP*AeO zHKHUqKdq!Zu_%?Hyu4g5GcUV1Ik6yBFTW^#_B$IXprVhSE{-7;bKcGlUbADww#Mdxs_V!uPts|!)td#kM{6`u>g9>3ak(MLJk0I$f0AI-DY z#=n=}&&cM$eL;dj*CCl<3&YtB>^%~D)58n5uiwGAnYk>#>v(6Pe$s8inr1s+Upk*o`FVp@`Ss6&6s1cub}A6Hoe=|s-WcNVm;WUwEIDXBTn Zf9tz!;z}R+<3I;6c)I$ztaD0e0svljR^b2u literal 0 HcmV?d00001 diff --git a/graphics/osx/preferences/defaults@2x.png b/graphics/osx/preferences/defaults@2x_black.png similarity index 100% rename from graphics/osx/preferences/defaults@2x.png rename to graphics/osx/preferences/defaults@2x_black.png diff --git a/graphics/osx/preferences/defaults@2x_white.png b/graphics/osx/preferences/defaults@2x_white.png new file mode 100644 index 0000000000000000000000000000000000000000..e86c023502a79c54f710d4890697c7918972bf8c GIT binary patch literal 1221 zcmV;$1UmbPP)qBfK7Q~8**auss1@jW6@f$SZM49xRLi?djRf z{QNgSGcbYYwF+qcp+!UeYry>c0fOXzV`-^7PRT=^Q$RDBKA;ykkK^QIY;1PfZ&f2H zjEJmgRIhppXfC%K-~S%C3V1?1?@-0><5mD|Z@&r0xmAkAFRyrK%r(G|z|Fv*c-}KB z4RpOwb`8+h)<#@+0+GqmFu(L}V88(m6C^(cybyYnAyR%3Ja%jjkr5z;$dG0-Z z>FIu;1^5To?GVpfj4av^s5oELm|kEINTFH)jv(Rzit2;qrbpbUx?q$#JP){Zz)^i! zip4j>3@j>YS}`@9-i6~#5X}3dc-|v%+wYg7rbb9cMy6?KxU1CeKE6?sPe@3xkG8aI z(tJL()^XH|T}KF@vGD*iGhb;($Mx2=L%@n5asf4_8`VDGJgV0Lf7{d#1J{<2=5o7H z9V6%(^Wu4vwzR{<$`sJf&L(_+l;CJQD8=IYHguz)?gCu2!r>O+1aosQ)*n`M)IS1F zpMI6V3O|GE=45hmp>E9xsmm0Ns}+7ZtKJ1xYK5;?OKjOGplxkiHJ7`s?7NS-aGXpfD?AP??+SyE&Gw_(A3V@^P(6g>d`FE|cpRw35_<~OcL^5E1z-~~ zx56){Y9Anl!Vtke|1UxEQ*mo{Dp8vy=6Rpv`+I?(aNUl$H9OW&i}wi<5)w8hn#2&j2$5AVGugMv+1>YaValX||=3blHVPUNRr5)luU*FhU;*F1TSi7sR{TD8 zo}e-JYc{*T+yO|9xdRv~{qebK$**V1R!h6Ou4ZxZcLLM%1EBB1Z7?-v3-AN51J#34 zEcQkgZ3vVd0Wv&%7S%4`EYJ;nt;TFCjfR5+&Cbt=JR4o8;ZW_G+#X;8*be*(90#5U z&H&Bgd4Gf+VaQbX1dZ8FP=r0DM}FLzok~>q1U>IB;2z-P;DNlpQIdz+J;6EPVMLy0 j=g!zQI|&I13Cr<6w9tV^te!)900000NkvXXu0mjf`L8Zt literal 0 HcmV?d00001 diff --git a/graphics/osx/preferences/defaults.png b/graphics/osx/preferences/defaults_black.png similarity index 100% rename from graphics/osx/preferences/defaults.png rename to graphics/osx/preferences/defaults_black.png diff --git a/graphics/osx/preferences/defaults_white.png b/graphics/osx/preferences/defaults_white.png new file mode 100644 index 0000000000000000000000000000000000000000..3dbbac3841b563b5597b3960f89929c50f393b18 GIT binary patch literal 626 zcmV-&0*(ENP)pF8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H10sl!v zK~z|U?Uuc36hRoqfA8K0K|}D6G*)7f(g=Qmh+b?hOvsKKFB}{wh?qY>5G5c8A^`=f zl!7F%w-*}`Y%Q)4Y!bCm?392eAg7Sz=CzT7y<9GvFnf*ntA?4K_jz___L+e`3DHVr zAdR|SBJruIqcj>HbzZOuuo_DzjB3B1PI3lc@2_9~c^))GhqZ&Jcj4J0#<;tz-bA??>kL)L2L;mioTG` zodbq|YiW!3NsJbYSv6)($Hx!3uAL|e86JKJ94D9i<=VimC!YHL72qn_>?v7TXu3Ag zHHtL|MzHoR)?StUKSU>rfs0lU(zKK5R+bfi~s-t M07*qoM6N<$f;avNAOHXW literal 0 HcmV?d00001 diff --git a/graphics/osx/preferences/email@2x.png b/graphics/osx/preferences/email@2x_black.png similarity index 100% rename from graphics/osx/preferences/email@2x.png rename to graphics/osx/preferences/email@2x_black.png diff --git a/graphics/osx/preferences/email@2x_white.png b/graphics/osx/preferences/email@2x_white.png new file mode 100644 index 0000000000000000000000000000000000000000..68408a6e4227ca1987251e5bc6c9a48037c7975e GIT binary patch literal 1945 zcmV;K2WI$*P)=B7=$$Boe_)B%~bCOiO2)k0qMnLNk?e z4s{wKgi#@6MHD@el}SiXL`oE?|CAApFvW+t`~9Qxr)jl^YrpEd7YMR@&S&rQ;@s_= zdj<|1IB?*=fddB){+kG2|B)o=6W|I+U;h4P1_eQw2H-sEMOVN{k|fM#Gm`Z8IS@q= zQ546#Hd=sLk|ZZV5HK2zBqk>E>eZ`Xn{blw_4P%s*W=^kgV}5zBVmk=;o)IgT3Yb- z_NJz$hQPqUUmjL&=Fgvx!C=70$A{<7pJO(g$6Ob`?U0(9%8eU0m_B_vdcB_D;NV{t zR&EwAUW~zDVCKx3w6?aAkdQF0%{T!=LqqJ}zn{j&My5`kN?BPMAt52ZB(R*UT)C2} zswzA^J-L1RHp$7!^!4?PYd1~+fZ1$DtJQMq)G1tCTqrCoBqAbW(nHI|`t|E6FE7W< z&5g^KFO!*>$>8ANgl#7j03b;c$BrFCr_&*dA~`uZY~Q|p(n8BcSXdav#l0uy^lXJUu

2$J&mW!=hx005Yh9C&k)zw*) z^QQs;&Ye3)Pfri|`T3|+D%{=ODK0J^_lf%dM5R)p(P)q)iPF+iPM|v}xq$=VLONYz{34q9~G`olRt9B*VkQ6ciM2>Cz?3`&;v7ckbLl zqtVdY+snp{8##LPC{w0Pu{yL|xVX5W)oO{1jHJK6pVZV;s|F8N3IKTc@F58a2^ft= z)~;QPPN&1&-QC(UcH`>mN@-~+p`oGl^z@LFltgoLv(`>R4Q#LWfLAA9#m9Rux8B~K79Bgr}$u2=Q0f~u;#Ky)lG&DqJW+ttztpGGMG?1H{i^*g{rBacdojvZ!EPS3l z`}XZaqtReCn<*$LpuWByqtVFj-Mc4Ef-C~!;^Nq`V+SUaiL9(F?%lgL=K9sES4mG# zXJBA}EnBvr)oO8e{@+Ga6h-p#@`#CvVQ_Ge?CfkVT(~fDeKIB3Eg&W)hWPk+%w{ur zd3iK7HBH#=?%lg2B_;9c(XOZ9v)75dO83_ zMMV}39-zIwePkKCeED*Mf`WMa_AP3)`lo{j`DcPn0zyJU$j!|~6h+F*%V}t6u&RGY zN5{xcva_=jwOUPQXQ##e<&8IR*fn_gypyzNQzOSruvoyVRjVj1Ek&VFP+wnoPgQ0XQS8a@%HxS!Gi~+rKNrMX!&=>QVHW0 zLfzfn`1ttn^yyQQl9DF;QNf?Yw~HlTU*9ncp)mp^NpcYcfoIR2v1iYoKYs9E87)DQ zBm_a2P=JXqKa=~D?ssc&a&r3mL~2+N1ZNm~Jl+qu3W8uB{jlOMMC9{W9XN2{z<~n? f4jede@E_)1&kH$3h!r6_00000NkvXXu0mjf7xbhJ literal 0 HcmV?d00001 diff --git a/graphics/osx/preferences/email.png b/graphics/osx/preferences/email_black.png similarity index 100% rename from graphics/osx/preferences/email.png rename to graphics/osx/preferences/email_black.png diff --git a/graphics/osx/preferences/email_white.png b/graphics/osx/preferences/email_white.png new file mode 100644 index 0000000000000000000000000000000000000000..ed821598e8964508a7e9200cb986b23829197448 GIT binary patch literal 879 zcmV-#1CacQP)pF8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H10{lrt zK~z|U?Uv0;GHV#de>3(05g`;r6u4*+w2B~cB|)38AX>C2!WKGHj2cW*^r0(>EP@sl zNVAAqRl7DVg8Bn&6GXHLX(6^KLL@LsXU^h1%IT;nyuO{Y=vocWea-#5cQxnObYAk>%zsw#UF*+?RElz0A{lp01?123}$9# zn46npbaeEO!3PHi2?PT8{r>!#n0tuDVn~vN)9J+NbXFZcHa5oW>@13+aC3807yuxV zNFYfP4u=Du&sR10)YKG{lat7@%>DiSr<(Y0^YimFvMkfv+so3@5~5gOsaS#_psFek zhXc3UO*|ei@D%NyN~KT~g^rF6LZJ{fH8sU-UrH23g25o&-QBocE}ovAiu+16NT<`N zs!DBbEt{L0)YsQn46m!JBODIX+}w=M=i~MDwRF(08oj^2v$(j(%gYNpJ3BNsHkO4q zG&HcawZ+HB2Y$bwx3{-1{bdKN>pG!Oh`YNxj*pLNYild%ZE9*l(=_7oIKg0$OeRw{ za78D~Fbp!842EH_ySqzkYioh0rKN@a{e3JJ3+LzO=(=7>>&gNsih|8%V`5^0qoX4< zO~YcbJ2?P!|D>FFt6ua~v8HTwGcsuRHFa$&dIQ51z#D#gjk36V&INF+j6R~Ma~ zo$T%Had2?J;o%|I*Vim8EU>z|T2Y8EzpwG}afXJ5kY$-? z=JN6~U(bcu*w|oYWreG&tC9=>Ae+r*tyb%&-541e!R>Y<%QBCTk40a$TCD&?qtT-E zo}QkPA)?W!ZZernMMp3^Jd7ksOixdjgy+De;6O#=C`V literal 0 HcmV?d00001 diff --git a/graphics/osx/preferences/general@2x.png b/graphics/osx/preferences/general@2x_black.png similarity index 100% rename from graphics/osx/preferences/general@2x.png rename to graphics/osx/preferences/general@2x_black.png diff --git a/graphics/osx/preferences/general@2x_white.png b/graphics/osx/preferences/general@2x_white.png new file mode 100644 index 0000000000000000000000000000000000000000..72820d0fd5b8a766d6060dc9de9f0e2d88290da4 GIT binary patch literal 497 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9Fx?I6t9|MX)jP*AeO zHKHUqKdq!Zu_%?Hyu4g5GcUV1Ik6yBFTW^#_B$IX1_s7DPZ!6KiaBp*8}=PC5OI0F zew(MtE03LQF&f`_uX{{x;#zuO()LYLQe`hVy>a}u=bRDW`~H2(1tJa{fyUcRAMX8b z=^B)rb}?#yQFo2h{quGOR&$FgRFY+mw|~A`-oTW=y&;exhtZ6yLHB?g;|A6nHh)!r z@YUXbUoHRWdHqHbMK^z-`8jdkSdk^>^6taJlN}Qu{vUYhb z5KCChaDypl6~DsijXw-{EcZQAy~3!eKkw7ZcX1*28L=oYZ!7BNP;3#Hf0*Anw65ao Tj=Yt?=wk46^>bP0l+XkK7yi(8 literal 0 HcmV?d00001 diff --git a/graphics/osx/preferences/general.png b/graphics/osx/preferences/general_black.png similarity index 100% rename from graphics/osx/preferences/general.png rename to graphics/osx/preferences/general_black.png diff --git a/graphics/osx/preferences/general_white.png b/graphics/osx/preferences/general_white.png new file mode 100644 index 0000000000000000000000000000000000000000..20d41c7d437c30b0bbe56043df86e80143a21926 GIT binary patch literal 340 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 Zj-SPQ*zE=+9{>OV002ovPDHLkV1mxQe0u-@ literal 0 HcmV?d00001 diff --git a/graphics/osx/preferences/kdm_email@2x.png b/graphics/osx/preferences/kdm_email@2x_black.png similarity index 100% rename from graphics/osx/preferences/kdm_email@2x.png rename to graphics/osx/preferences/kdm_email@2x_black.png diff --git a/graphics/osx/preferences/kdm_email@2x_white.png b/graphics/osx/preferences/kdm_email@2x_white.png new file mode 100644 index 0000000000000000000000000000000000000000..c6b547f9c4fffdbb5d690ce28cd24542749f3b48 GIT binary patch literal 2514 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 literal 0 HcmV?d00001 diff --git a/graphics/osx/preferences/keys.png b/graphics/osx/preferences/keys_black.png similarity index 100% rename from graphics/osx/preferences/keys.png rename to graphics/osx/preferences/keys_black.png diff --git a/graphics/osx/preferences/keys_white.png b/graphics/osx/preferences/keys_white.png new file mode 100644 index 0000000000000000000000000000000000000000..000b46eb682ca6cf3b1d9075d69db80945ce2936 GIT binary patch literal 424 zcmV;Z0ayNsP)pF8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H10X0cP zK~z|U?a@C=!$24Y@Vk;YbaJ|(NJBq?gIVOVm2NKi0Dc6AB4ky%xVPUyGG!9C><$IN zS)oP9a!W5X|9S_Ho5X6xlqe4Oo9?)~_jzBA5W_GG-$2n>02x|(!{HE|bBxDh2qD&GSzi1`Car~AS(ZIdCX;>~$FzQ_*Xxlm46|;xdrT>P zX|sV&ZG9?)INS~=gpedjNEAf}TI=&R!?znaS}vEJT^ARNg{_pjLJR73t=jt4aU75x z27|%Iw(T2A>2;F{0l;Fbu;me&7v?%jO#^ S5nQ$a0000! literal 0 HcmV?d00001 diff --git a/graphics/osx/preferences/locations@2x.png b/graphics/osx/preferences/locations@2x_black.png similarity index 100% rename from graphics/osx/preferences/locations@2x.png rename to graphics/osx/preferences/locations@2x_black.png diff --git a/graphics/osx/preferences/locations@2x_white.png b/graphics/osx/preferences/locations@2x_white.png new file mode 100644 index 0000000000000000000000000000000000000000..939056a18699807eee5a7eacf0a71fec82e7ffc8 GIT binary patch literal 2593 zcmV++3f}dJP)tbutC7rd>xGL-XLC8uGCDhThh(VFo2nDT*+-HB>dl;?Od(Qnq zw{@St&gH)E^E~gD=bZDr&piiz;>d70Qq|EwI*4 zeT0RD5f&CkOiT=uCQTwGC55P{sG;Wm4!j^De+@>g0Tn=1?LZ;$TOiEka#34b%lq%Y zPhDLdH*VZ8WhXf~nc1^vla-Z)!{IRgd;rK5k#m8JIbZ^)Y7DRsNLN*AYHFyes^a|l z^FG_W`|i70v}h44R;)0D=myq^$iBct9UuWzbqa70h`o66A|)jyeDcXBfiMj~WMm{x zr;`~oW&kMgI}v#y5VrjmKvfffkAdihh6V}>3i#%mZ~Tw!Haz*{lWg3$5u42hP$42t ze{K3DfU1rG{sBxpe*8EE1qG(hb6oaBZ%$YMBI&_FRbLNBsn~b=u zU^xR+^_Rebwzf7FEm~wsfYj7f%FD|KOWdxmE7SPW28Q)6oJ85tRrm6c()+i7fU04%e?=x8$V1zn{H(-KX-* znKMnzX>Dya4wJ0-vMRvO06IH6y$(!CNde&4v11lpxH)?C=y&XRW5_=x(TX3d0*nUt zt?EvQ2>0E09{?R49Tr`<>Fn%eU|@jA$Vfs%LrsnMFwTk}s{)JwET^=uSgA0FY{4U~ z_^>K~9WZq@|N85%0T?&V(m!O7=;&zdb~`;iJ*KwUSFT(!4jp$I_kFAia2a6Ks8L=A zo;r03fb{fqi!S)iyr!lmQ{zXD9BCZ(TJd95fU^K`adBP;e)Q2t04!d-*wi^Zl#q}R zva_=RIDGi9sX6!Gf4_0qWyP0O0Zsr+o94Y;Ut3#CYildx$B!pBH`kJroSYmUc;Err z+uNzBsWCMtDQWQT*J#C;RRKN*t|lcVc|EsXE*BLQ74-M_vvlcFR<2x$i1)o$c6K(a zR;^-SV1SB>3U1!K>2;3XZs(zg9x^`G-D&Liu_S1+>+qP|E3{E_4A*|Rh^H`CqS&As>DOJZW;;B}?1uaDBwQd65PgO^@< z$!M8xvDz;8wIkFBq*PW`4wkIma5x++TeghM%uGg)9(~LA-QC@M@WBVX@x~io3$39{ zm@t8N-+h;mkdS_0qKI5DJsIBx$OQg!`SN8JELbq~9_$sH%|>EkBC)ZtL_|c;+uKWf zdpj*HEne%3+fiO#&g|K<0jfo0rPcZVw8f7AKi{=$7dv+ztnVZ#Qa z!+Zkxqd&I%%>aN`fRp3KjUy)~CjjQ|%)<{q%;S$g4sZ=vAtKgq9YgS20M8GU&j7Bc zpMIM7_;`O!{vcstVQk*K*|_kPS*`kRM<6l)5vc=q*zI4-coLq{PUi zVi7qVm?-~EFfsrU*$ccE9v+U<>HC9R&pr2?(d#<_Yzt6$-ytXhc*p~~r%#`5G%GAI zefo6f&6@{s6<97J0|AZ?2%-QYavsl)v9PevR4d)U;c!q?RAhWC5|MufK0-Ia%m9F$ zz_F;PC`+B;wQJWhX3Q9HH(~z}q}YHU3*f2K*8u%bJn_U2HbjS#oSe*p1q;Ak@I2#h zt?!LsX8eM^7)1P|kDI-hT z@jQnZY=%Vu5$VPK9s&9J`9wrS+%hIADvH&sR~sMKdP?h{Gh7(}@F(DJ5fKrrTD9ty zFZ1*B2@ekkcuz#UKOPn!hD`twQD7b5TDWi_6DCX;{4PE|p1E`9g1g*ZKU^{WD5&ag zRn-qa{7_R8J)LY(v1gbhwRj;{RE?vHSx#r~L7>mE^dF|$ZA60!t zRkgmpUK<-54FP;^ZU5Jys$*2OXUKbk-JTaKe>$jY$q)gGf9!aM9aRli)lOCIQdRRi zr2ym0)8YX^MEX><3>e`llzw`sYN)CX&(BH!=l1*yxiX(dmH2Cj00000NkvXXu0mjf D1hCcG literal 0 HcmV?d00001 diff --git a/graphics/osx/preferences/locations.png b/graphics/osx/preferences/locations_black.png similarity index 100% rename from graphics/osx/preferences/locations.png rename to graphics/osx/preferences/locations_black.png diff --git a/graphics/osx/preferences/locations_white.png b/graphics/osx/preferences/locations_white.png new file mode 100644 index 0000000000000000000000000000000000000000..ba7594c6b7bd4c026b684413b9671dac75804b14 GIT binary patch literal 1302 zcmV+x1?l>UP)pF8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H11fxkr zK~z|Uy_a8TQ&$|vzrWs_yWITiTiT%kL7= zgJ(9t%ypWk-3o<5*1LD_mSX4Vz<~qVU@-W=YPD`BqC~N{ign!eH+8W!v)X9 z)vH%EtJV4r5&c|`#kq6mez)0dP9qg~D;|%hSHl4y5D1{NvojA40Nvf)u-R~X8;`|eX#lSqG4Sfr(o)g$QB2GXqWoQr z#bN;9GGbssQIxz2M59sE*Vh+ZKt!mougCQCbl#lZZf5`myJ9f|QMcP|Hk-{kgXhnm zM>rftb#?xB9zJ{+nx#&vJwpq4Nw#X;cyshKU<&Ahn1C;2SoI+Agkc-2f)k?^YioH z?%liBwzk34)YPD)RZbdSg#Msyvu3fu^OeT|;r>mD<&6{!P z(4l3!-R>_HThag#C1hFt;N;1Zsw~ST;esIG)TvV`K@g4+(cE(zcw*vvS(b-Gp-{nt zv|52cAmem8r%fi)mu2NHCkOzT`88eFe+>qMmBk(?TefV$#fuk{X0!S2Qctm`D!bnk z(H|z0DSYC@iIgA+dGn$u;>?*dDU-?cQMqtK2A)8A6-Ak9ZEel2o%8$s8AVZk5=HSV zBRLH>7-oJ$)3nK!mKJ$oVF3WJY11ZLzI<6To6Xya=oh0o4NFzk&xVGEQXY?oJsuB_ zj*ccZP5bnJ2R{`v+jL$3)9?3lAP`_xRTr4qTzcgTR5qJEIyE(wh(@DJnM|hbrNV)K z{wu1g`kSh%51F~(wO)>%c_9%!X66Wh3L?tChhK)6nV8w|+i|u21{8$l@1dRurT_o{ M07*qoM6N<$g3uRlfdBvi literal 0 HcmV?d00001 diff --git a/graphics/osx/preferences/notifications@2x.png b/graphics/osx/preferences/notifications@2x_black.png similarity index 100% rename from graphics/osx/preferences/notifications@2x.png rename to graphics/osx/preferences/notifications@2x_black.png diff --git a/graphics/osx/preferences/notifications@2x_white.png b/graphics/osx/preferences/notifications@2x_white.png new file mode 100644 index 0000000000000000000000000000000000000000..32ae1ff762576d3a759c5dc8badb12af6da61ab5 GIT binary patch literal 2252 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 literal 0 HcmV?d00001 diff --git a/graphics/osx/preferences/servers@2x.png b/graphics/osx/preferences/servers@2x_black.png similarity index 100% rename from graphics/osx/preferences/servers@2x.png rename to graphics/osx/preferences/servers@2x_black.png diff --git a/graphics/osx/preferences/servers@2x_white.png b/graphics/osx/preferences/servers@2x_white.png new file mode 100644 index 0000000000000000000000000000000000000000..d796f3f9b50312e33a6ea1fabfd426613b2d2594 GIT binary patch literal 390 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9Fx?I6t9|MX)jP*AeO zHKHUqKdq!Zu_%?Hyu4g5GcUV1Ik6yBFTW^#_B$IX1_nl9PZ!6KiaBp*JMuLdh_FT{ zUpi4~!T9k;n{a`gPxy|)#fBb}@B5vs-z>WSaKKhWp(cTKo$ma1w!IAtULt0A?D@OL z?rnSg>r4%^&TkNZcMG*zsJ`PwWb7_p`XA=+ z!W)<_Fqyn#7OCf0HYKZKM$n@byN^Z9`qJ@RTD`U49QS>5oy}GUjBJ2m$l&Sf=d#Wz Gp$PzO9+@8i literal 0 HcmV?d00001 diff --git a/graphics/osx/preferences/servers.png b/graphics/osx/preferences/servers_black.png similarity index 100% rename from graphics/osx/preferences/servers.png rename to graphics/osx/preferences/servers_black.png diff --git a/graphics/osx/preferences/servers_white.png b/graphics/osx/preferences/servers_white.png new file mode 100644 index 0000000000000000000000000000000000000000..3a798a6521a23f6886f08aa6b22304beb7078510 GIT binary patch literal 283 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4j!ywFfJby(BP*AeO zHKHUqKdq!Zu_%?Hyu4g5GcUV1Ik6yBFTW^#_B$IXprRF?E{-7)t#7AquhokD^|=k!Yj8)jaN3TB>ABK5AIgu$>WeQMCYJh|j6%r`E-5ufRv z!1us7L9WrV;e10S3*Q39+17=r;L+B$M>6q+Urne*Ad)7$9kcq)#NNr>93XH8mB99U|zE20y99;65tdtwxOYcHEY&z{rdI6)m2;Dd4#Ql3oGM0#9DLbcxlgSJTqc;z=xv#X5oaoYM{3 zym`R>d1`>9Wk4P9Sbcpx8#ivGt*y<=kO2FD7T_r^UVLdF@qh+6DQdFYC`r44J(41| zwY8L&m($tVISl=ak8>65aZZ;Gq>pQWq!B>JAhz4U+g)8UkfF8`| zskk^hp3t*fpslTq_3PJj`t)h9Lb&402&aHd;I(+#gr5cS^YiKM?vAU8L?YDJ*8{L} z&`@NtW&*(1#%} zu|tP016P1C6cy#U=~C7JhwlIgho5s3q_zRld1pV(O_JIMm|b@Elieh#Z9pj0XMi-x zRpMJ?g5fV`@0tvywgH`;|2RjFyGc^pfJo%Fb2Q3LlG+Azbo3{Bt|@G48<3fq;T)x@ z0lmFroTI8i3y3U)&@q zYkkw_c*PE?ji8DH`MGy55s z34EWElf#Z3JD5Iw`tS$3b!#P%3;e*rgNG9-;#(qQW>4i zM~(ns9wiciJ`9=JS^6@z#z~VVQC?n7UY_fBOiu{>Y0%7?faifT+1c4_-MW<-GiC(c zEdL4Wcliej=QrAoX}MtHZqjzi%-u+unYN3j`bq0$bN!_C!pVM=&P!(>;xYdL?GBl0 TpxO;300000NkvXXu0mjfP6)g` literal 0 HcmV?d00001 diff --git a/graphics/osx/preferences/sound.png b/graphics/osx/preferences/sound_black.png similarity index 100% rename from graphics/osx/preferences/sound.png rename to graphics/osx/preferences/sound_black.png diff --git a/graphics/osx/preferences/sound_white.png b/graphics/osx/preferences/sound_white.png new file mode 100644 index 0000000000000000000000000000000000000000..4ef33ab07588b12039a310e7509b0a66ae00f53e GIT binary patch literal 769 zcmV+c1OEJpP)pF8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H10**;U zK~z|U-Iq^j({L2WzrQ3)TiYrq9;$fhMR7NsP{D(U$L_GPP%pjou!}7+SXo6@h9GQ5 zZBabvWr(sK24lx5+hq_e;Du!?~vr>_x&XK@$w$< zzln%$dS-4})`V@_HBZb9!+5MHibh2APmPI4&@}B$rBYE-sTB1Jzzt{~)->&-EX#?R znVI0h!GU|8BwZgm01-uXUH`hhy&apMpAXh*?w_6}CN2QjBuTnDGyo#HZ5YPh^78WK zLZKkqw%sNe*nkLHSvX;;1gNmZG^;lb5 z17ob^uSb#;0`LvMHC8GeHx5m2fH7v{PkC+$Q4~iak;wC6v8YF*(aulmt^|P1M)MYc zBZxL(1pl0L+51SASpYc@qkP@WJo*-=CYCQ{wS>`%a`$ zhldXV$ZTb0V_*OPV2pkC`FuB$$z(Z`$(THUN?*cpb#UBlKVBV0L}67`xAyn<)kGpe zQw8$ilL`-yHVhADx zfy}}|neY#yFbmt+M7hj?QjloTLMHBQq0*E>Ek_8Jagvv zKIh+iI0r1tvMkH8teZ*BD^S&Z;2uzt`#4$kGjLl({!CZoWU!)lxqgEOxCP9qYT7ZT z-2+thIp9aYGcYi~;^JZ!^Igp9>M8*B_4Vi0mXwq*J3C8JQ4zqfhzy=pduDf3^=aU1 zz_YZpWOVQswXv~5e}6v*2L}M3sA}6;wWl^fRb9YWzzgwsoWa2}8+c`{tgJ9HG6Jc+ zJglnkpH}xs0}i+RB5-GObCa&FE|SS)PQ&KP{QNw@U=UK{{9IK(JX!Nl15~vV_#SvE zkx0pQ`Hdx$n3Es@hCy@VD01)@W&IVSRnwK;-O; zL?R3i53|3&571BQ>hL6hqpB`d4Fgf&nOH1Fdwct}-|{CdEG*F7-ObL<4!}FWH>&!S zL+Ud3!QS4UjE;`d+uO_T?yk|Wxw5>xOj}zUTU%QIuL3bqRRstH0>tBSqXE;o$UNXY zKA(?hGzvU$4!FvL&$dJ&alD+#RQP}G#y8-JObd^W!EDRMG5ufIJs{IU(_1Q6Zu}l# z8(=zsX|@5T1DIwTU^;+lwgILCm}c(P)OioTxRaIpua`u#!l`%0ff#2_k)U(eQMdXL0?;pAfh{&(N zE5H|pg@uGdAxcY2FEMU*dA(jjp%8Aj8{kXeH4*v!!J0=dgCg=5sfUMAkH^FK_&8p# z_fi69lgs5I6bj+<`2b?T+ahxRWZkLr01?>(-U7b$dc6z{4dFP~Ys%2q*GEM~1;9_h z>!%GK(oBR7fAA*oTSG$wO-)TX37QLyjg2%nHv=SrH$>!*$6lGLzNgn$&w1m^^hL?L xz_X9tMKgW@o)?k7O$V_o%d#xXvMlTB`4`~z$q$g1_RatR002ovPDHLkV1jz&@A?1$ literal 0 HcmV?d00001 diff --git a/graphics/osx/preferences/tms.png b/graphics/osx/preferences/tms_black.png similarity index 100% rename from graphics/osx/preferences/tms.png rename to graphics/osx/preferences/tms_black.png diff --git a/graphics/osx/preferences/tms_white.png b/graphics/osx/preferences/tms_white.png new file mode 100644 index 0000000000000000000000000000000000000000..09248cb282bb24367c10c0698cf1c8f34949b30e GIT binary patch literal 536 zcmV+z0_XjSP)pF8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H10i{Vq zK~z|U?UpfX!ax+q--TkXNgTwlAuhU9s33Nzn?r|!4pQ9Q1Zfus$sjm(5QmOh=prc{ zx^&hhV4)wtT?h!t-FYHhhZ0axv^9~ouJ^Em*lO@WJP zntLC#tJ7U<3~=b7-$B}45(N0?0fH%z002}~J(|$PbxMq}UccX`u~_VA@_0NBhG9^~ zSWi+Er5KGyuREQNlg(y@-||c*Biik@6NyBw6h$dY000P~7mRVL(P-GIRLVDbB9Q=H z*By-UIYQ_aU}+2yLLV68%Vx7l!{M;!a!u2q)oM|UaULP`zO|4s*7NI6NGa`l-dRAv apXU>-W>?)fIU()<0000 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/graphics/update b/graphics/update index f518b5b5b..0195c3695 100755 --- a/graphics/update +++ b/graphics/update @@ -80,9 +80,11 @@ else # OS X preferences icons mkdir -p osx/preferences - for i in defaults email kdm_email cover_sheet keys tms notifications locations sound identifiers servers general advanced; do - inkbatch --inkscape $INKSCAPE -i bounds-$i -o osx/preferences/$i.png --width 32 --height 32 src/preferences.svg - inkbatch --inkscape $INKSCAPE -i bounds-$i -o osx/preferences/$i@2x.png --width 64 --height 64 src/preferences.svg + for c in black white; do + for i in defaults email kdm_email cover_sheet keys tms notifications locations sound identifiers servers general advanced; do + inkbatch --inkscape $INKSCAPE -i bounds-$i -o osx/preferences/${i}_${c}.png --width 32 --height 32 src/preferences_$c.svg + inkbatch --inkscape $INKSCAPE -i bounds-$i -o osx/preferences/${i}@2x_${c}.png --width 64 --height 64 src/preferences_$c.svg + done done # OS X menu bar icon for the server (in dark and light mode) diff --git a/platform/osx/make_dmg.sh b/platform/osx/make_dmg.sh index 3ae60143f..3285f7d1d 100644 --- a/platform/osx/make_dmg.sh +++ b/platform/osx/make_dmg.sh @@ -224,32 +224,19 @@ function copy_resources { cp $prefix/src/dcpomatic/graphics/osx/dcpomatic2_disk.icns "$dest" cp $prefix/src/dcpomatic/graphics/osx/dcpomatic2_combiner.icns "$dest" cp $prefix/src/dcpomatic/graphics/osx/dcpomatic2_editor.icns "$dest" - cp $prefix/src/dcpomatic/graphics/osx/preferences/defaults.png "$dest" - cp $prefix/src/dcpomatic/graphics/osx/preferences/defaults@2x.png "$dest" - cp $prefix/src/dcpomatic/graphics/osx/preferences/kdm_email.png "$dest" - cp $prefix/src/dcpomatic/graphics/osx/preferences/kdm_email@2x.png "$dest" - cp $prefix/src/dcpomatic/graphics/osx/preferences/email.png "$dest" - cp $prefix/src/dcpomatic/graphics/osx/preferences/email@2x.png "$dest" - cp $prefix/src/dcpomatic/graphics/osx/preferences/servers.png "$dest" - cp $prefix/src/dcpomatic/graphics/osx/preferences/servers@2x.png "$dest" - cp $prefix/src/dcpomatic/graphics/osx/preferences/tms.png "$dest" - cp $prefix/src/dcpomatic/graphics/osx/preferences/tms@2x.png "$dest" - cp $prefix/src/dcpomatic/graphics/osx/preferences/keys.png "$dest" - cp $prefix/src/dcpomatic/graphics/osx/preferences/keys@2x.png "$dest" - cp $prefix/src/dcpomatic/graphics/osx/preferences/cover_sheet.png "$dest" - cp $prefix/src/dcpomatic/graphics/osx/preferences/cover_sheet@2x.png "$dest" - cp $prefix/src/dcpomatic/graphics/osx/preferences/notifications.png "$dest" - cp $prefix/src/dcpomatic/graphics/osx/preferences/notifications@2x.png "$dest" - cp $prefix/src/dcpomatic/graphics/osx/preferences/sound.png "$dest" - cp $prefix/src/dcpomatic/graphics/osx/preferences/sound@2x.png "$dest" - cp $prefix/src/dcpomatic/graphics/osx/preferences/identifiers.png "$dest" - cp $prefix/src/dcpomatic/graphics/osx/preferences/identifiers@2x.png "$dest" - cp $prefix/src/dcpomatic/graphics/osx/preferences/general.png "$dest" - cp $prefix/src/dcpomatic/graphics/osx/preferences/general@2x.png "$dest" - cp $prefix/src/dcpomatic/graphics/osx/preferences/advanced.png "$dest" - cp $prefix/src/dcpomatic/graphics/osx/preferences/advanced@2x.png "$dest" - cp $prefix/src/dcpomatic/graphics/osx/preferences/locations.png "$dest" - cp $prefix/src/dcpomatic/graphics/osx/preferences/locations@2x.png "$dest" + cp $prefix/src/dcpomatic/graphics/osx/preferences/defaults*.png "$dest" + cp $prefix/src/dcpomatic/graphics/osx/preferences/kdm_email*.png "$dest" + cp $prefix/src/dcpomatic/graphics/osx/preferences/email*.png "$dest" + cp $prefix/src/dcpomatic/graphics/osx/preferences/servers*.png "$dest" + cp $prefix/src/dcpomatic/graphics/osx/preferences/tms*.png "$dest" + cp $prefix/src/dcpomatic/graphics/osx/preferences/keys*.png "$dest" + cp $prefix/src/dcpomatic/graphics/osx/preferences/cover_sheet*.png "$dest" + cp $prefix/src/dcpomatic/graphics/osx/preferences/notifications*.png "$dest" + cp $prefix/src/dcpomatic/graphics/osx/preferences/sound*.png "$dest" + cp $prefix/src/dcpomatic/graphics/osx/preferences/identifiers*.png "$dest" + cp $prefix/src/dcpomatic/graphics/osx/preferences/general*.png "$dest" + cp $prefix/src/dcpomatic/graphics/osx/preferences/advanced*.png "$dest" + cp $prefix/src/dcpomatic/graphics/osx/preferences/locations*.png "$dest" cp $prefix/src/dcpomatic/fonts/LiberationSans-Regular.ttf "$dest" cp $prefix/src/dcpomatic/fonts/LiberationSans-Italic.ttf "$dest" cp $prefix/src/dcpomatic/fonts/LiberationSans-Bold.ttf "$dest" diff --git a/src/wx/config_dialog.cc b/src/wx/config_dialog.cc index 7148fd173..07ab2d8aa 100644 --- a/src/wx/config_dialog.cc +++ b/src/wx/config_dialog.cc @@ -1054,7 +1054,7 @@ LocationsPage::GetName () const wxBitmap LocationsPage::GetLargeIcon () const { - return wxBitmap(bitmap_path("locations.png"), wxBITMAP_TYPE_PNG); + return wxBitmap(icon_path("locations"), wxBITMAP_TYPE_PNG); } #endif diff --git a/src/wx/config_dialog.h b/src/wx/config_dialog.h index c767929f7..a258e1fe2 100644 --- a/src/wx/config_dialog.h +++ b/src/wx/config_dialog.h @@ -88,7 +88,7 @@ public: #ifdef DCPOMATIC_OSX wxBitmap GetLargeIcon () const override { - return wxBitmap(bitmap_path("general.png"), wxBITMAP_TYPE_PNG); + return wxBitmap(icon_path("general"), wxBITMAP_TYPE_PNG); } #endif @@ -166,7 +166,7 @@ public: #ifdef DCPOMATIC_OSX wxBitmap GetLargeIcon () const override { - return wxBitmap(bitmap_path("keys.png"), wxBITMAP_TYPE_PNG); + return wxBitmap(icon_path("keys"), wxBITMAP_TYPE_PNG); } #endif @@ -197,7 +197,7 @@ public: #ifdef DCPOMATIC_OSX wxBitmap GetLargeIcon () const override { - return wxBitmap(bitmap_path("sound.png"), wxBITMAP_TYPE_PNG); + return wxBitmap(icon_path("sound"), wxBITMAP_TYPE_PNG); } #endif diff --git a/src/wx/full_config_dialog.cc b/src/wx/full_config_dialog.cc index 40cb0c285..6b0be4603 100644 --- a/src/wx/full_config_dialog.cc +++ b/src/wx/full_config_dialog.cc @@ -84,6 +84,16 @@ 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: @@ -257,7 +267,7 @@ public: #ifdef DCPOMATIC_OSX wxBitmap GetLargeIcon () const override { - return wxBitmap(bitmap_path("defaults.png"), wxBITMAP_TYPE_PNG); + return wxBitmap(icon_path("defaults"), wxBITMAP_TYPE_PNG); } #endif @@ -615,7 +625,7 @@ public: #ifdef DCPOMATIC_OSX wxBitmap GetLargeIcon () const override { - return wxBitmap(bitmap_path("servers.png"), wxBITMAP_TYPE_PNG); + return wxBitmap(icon_path("servers"), wxBITMAP_TYPE_PNG); } #endif @@ -678,7 +688,7 @@ public: #ifdef DCPOMATIC_OSX wxBitmap GetLargeIcon () const override { - return wxBitmap(bitmap_path("tms.png"), wxBITMAP_TYPE_PNG); + return wxBitmap(icon_path("tms"), wxBITMAP_TYPE_PNG); } #endif @@ -789,7 +799,7 @@ public: #ifdef DCPOMATIC_OSX wxBitmap GetLargeIcon () const override { - return wxBitmap(bitmap_path("email.png"), wxBITMAP_TYPE_PNG); + return wxBitmap(icon_path("email"), wxBITMAP_TYPE_PNG); } #endif @@ -961,7 +971,7 @@ public: #ifdef DCPOMATIC_OSX wxBitmap GetLargeIcon () const override { - return wxBitmap(bitmap_path("kdm_email.png"), wxBITMAP_TYPE_PNG); + return wxBitmap(icon_path("kdm_email"), wxBITMAP_TYPE_PNG); } #endif @@ -1086,7 +1096,7 @@ public: #ifdef DCPOMATIC_OSX wxBitmap GetLargeIcon () const override { - return wxBitmap(bitmap_path("notifications.png"), wxBITMAP_TYPE_PNG); + return wxBitmap(icon_path("notifications"), wxBITMAP_TYPE_PNG); } #endif @@ -1262,7 +1272,7 @@ public: #ifdef DCPOMATIC_OSX wxBitmap GetLargeIcon () const override { - return wxBitmap(bitmap_path("cover_sheet.png"), wxBITMAP_TYPE_PNG); + return wxBitmap(icon_path("cover_sheet"), wxBITMAP_TYPE_PNG); } #endif @@ -1321,7 +1331,7 @@ public: #ifdef DCPOMATIC_OSX wxBitmap GetLargeIcon () const override { - return wxBitmap(bitmap_path("identifiers.png"), wxBITMAP_TYPE_PNG); + return wxBitmap(icon_path("identifiers"), wxBITMAP_TYPE_PNG); } #endif @@ -1439,7 +1449,7 @@ public: #ifdef DCPOMATIC_OSX wxBitmap GetLargeIcon () const override { - return wxBitmap(bitmap_path("advanced.png"), wxBITMAP_TYPE_PNG); + return wxBitmap(icon_path("advanced"), wxBITMAP_TYPE_PNG); } #endif -- 2.30.2