From 36d697d60822ba27274cedbd3ef72aec98f369ba Mon Sep 17 00:00:00 2001 From: ShikiSuen Date: Wed, 10 Aug 2022 15:15:47 +0800 Subject: [PATCH] PrefWindow // Unify toolbar icons, conforming what PrefUI uses. --- .../icon_32x32.png | Bin 0 -> 572 bytes .../icon_32x32@2x.png | Bin 0 -> 879 bytes .../icon_32x32.png | Bin 0 -> 749 bytes .../icon_32x32@2x.png | Bin 0 -> 1176 bytes .../PrefToolbar-General.iconset/icon_32x32.png | Bin 0 -> 1164 bytes .../icon_32x32@2x.png | Bin 0 -> 2022 bytes .../PrefToolbar-Keyboard.iconset/icon_32x32.png | Bin 0 -> 942 bytes .../icon_32x32@2x.png | Bin 0 -> 1383 bytes Source/WindowControllers/ctlPrefWindow.swift | 8 ++++---- 9 files changed, 4 insertions(+), 4 deletions(-) create mode 100644 Source/Resources/Images/Images.xcassets/PrefToolbar-Dictionary.iconset/icon_32x32.png create mode 100644 Source/Resources/Images/Images.xcassets/PrefToolbar-Dictionary.iconset/icon_32x32@2x.png create mode 100644 Source/Resources/Images/Images.xcassets/PrefToolbar-Experiences.iconset/icon_32x32.png create mode 100644 Source/Resources/Images/Images.xcassets/PrefToolbar-Experiences.iconset/icon_32x32@2x.png create mode 100644 Source/Resources/Images/Images.xcassets/PrefToolbar-General.iconset/icon_32x32.png create mode 100644 Source/Resources/Images/Images.xcassets/PrefToolbar-General.iconset/icon_32x32@2x.png create mode 100644 Source/Resources/Images/Images.xcassets/PrefToolbar-Keyboard.iconset/icon_32x32.png create mode 100644 Source/Resources/Images/Images.xcassets/PrefToolbar-Keyboard.iconset/icon_32x32@2x.png diff --git a/Source/Resources/Images/Images.xcassets/PrefToolbar-Dictionary.iconset/icon_32x32.png b/Source/Resources/Images/Images.xcassets/PrefToolbar-Dictionary.iconset/icon_32x32.png new file mode 100644 index 0000000000000000000000000000000000000000..b7cb8877a5d534aa7a5c7d7b0c381e1ee31d1b19 GIT binary patch literal 572 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyEa{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaNN1^9%xx)=EL^z=-bGNrMxap}^feSLkCCr@r|Z3T+-_V)Jo_jh!3Oq@7z z!h{L`|NpP9u3o%&F;J?#y}i4;d;a|Sot>R+ZEfY{68B?cD z1sbwx(h-{H4zG#)0GI>%Z5(n!A3FFwyf6VKx^m+!Lte68AJYZ{tVq&c|QYUHSPc_?M=J zTJcT2eW~w?mjVqt?&;zfVsZNDzoboFyt=akR{0HARMq5uE@ literal 0 HcmV?d00001 diff --git a/Source/Resources/Images/Images.xcassets/PrefToolbar-Dictionary.iconset/icon_32x32@2x.png b/Source/Resources/Images/Images.xcassets/PrefToolbar-Dictionary.iconset/icon_32x32@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..edee48a6f3507cdc50735d8e3ad7d74def8a9fbd GIT binary patch literal 879 zcmX9*4KR~&7=M{en;LGVIwdZlautbnUCrWHYDw;rE{Z5QBE&wj51+4Ln~m7!R+;U{ z9LvoVit3^d$|)|TRpes6t4qmxx}LlD`TzdU^Lu{J^FDtxgci68w*iMB$SP`(e<+;f zf1ecwd{qnA2#3W5zoUK#(j>qyom&BSv((T)3ewQ)@D;FU$dRysz~m#PrKMahx1^*b zGc&WexR}r9i$o$0hXX(;6qc2hK{g{JgTY{EwOSw)6%{F!N*<4=P$<-DHAKW>G0?yy z63KsGQ&R&Nlb8~ac%gez-90Y;c+S&>oRVoz}f)y4P zYBU-c05E9g<>j&2Y?(~PVzD3sB_Im}NTt&J{CtRHXJfB+cu;Roq-I+TE+C<HjsP1eR?nb{^vJtWXy5iYU5!=xt{eb#g_fVt`Xxo_hZk(%7&OeVa`yPG7}kDW3dtK~xv z{#ecva=~@o_~>FlZ5kP+U5?w?IQEw0okM!cowWC{t_*W^I@>1;IPUaVL z2*%S>K2A~2PMz2|jaDq=SPhL~sPUU0VsZVPF6`Z92ODD&O4*3~A;?AgZ3IcH*EzbO z!lvI6;x#X;^) z4C~IxyackP0(?ST-3xrCPMzA)(lTk%q^72(`Sa%kxznai`~UxcMMcHp#fvv>+O%QA zhJ_0ku3ELKt*s5HpuWDowzhWe+__VxOsT4>>hA9D?Cb=}0>y!PfuN(KW8%b#K-rly zX9A7t@9zh)fn;xQ@3LjffEEF{%a<<)inO-2E?BStsCV+@$w2YO#zvr2U0oee*MtcZ zfZ{+B2zq*YfU-dCKsH1r#C#wZXkAxV7f=^aWXX~xKoOuLf#jk^i-2|kO#nI=A`5g( zO-&6@3g~j6y+AYD+uMQ00tJC)R##U8mF?WQ6DYoP>C*D@@|E9I*?>V7TN30K%y9Zc z@<)yt*^K|xxp>tiUTZM@P~!Rh{23cd`>Yq&>vawNYV96K70;1%e=jW>fAn+VH{+X} zHn$&}c?I?yzuoDo_iA0Pe8k(kisEt#XVZ*+-Ozvc^p)+;4Zmu*9||5ke|{A(IygLC z978NlCnrd3acIz0ak?{|IW!tzc&5Wn^S_ zP1tjutr*h`m4-PN3Iy5M9^Sa&pu*}Cz`D^bfRXc9grZ~19zGwtFis@_Wijbz?I{gR zF^zIA3KnK3xNmmenPb4ZE5R;4XN~zP^`i+~I}XHz)wyk1VAv{^c&1VN! z*FAf;$}TQ;Yj^4DJdNX~X4Ay;Q$B34oGeuzGws?ookxCW#MB~|ww`^!n7X3#C4X3H zg+XIO55q2|V-X<=OB%KG#k={oR7`kUnQYi-vWbaVhbv-&=!%3ufz@409C&AQo`@5j klAh+yd`hWVOPGm4Gd1pE*J7FNz`$qlboFyt=akR{01Adt{Qv*} literal 0 HcmV?d00001 diff --git a/Source/Resources/Images/Images.xcassets/PrefToolbar-Experiences.iconset/icon_32x32@2x.png b/Source/Resources/Images/Images.xcassets/PrefToolbar-Experiences.iconset/icon_32x32@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..06c51e4a659d78316115ba8d5882395245663b82 GIT binary patch literal 1176 zcmX9+3ox5m6#f&h)}z(#AmUYQF{@~I7>d?olZIA3f@znkY8CCUeZ*9}BFRd;UrDH> zUJ3EYOh~nql9cN0EpGf24iX{5@c1Xix;6a5HFR zWQ4_HwY0R9l#~<~7pv9k?CfkZnOsm%z~OM1OlCzz1&v1Ia=CES+uNI;pP!YLC6P#g z!{_tA(12N9UQVG7$LLBmf797AI2+#$cPKO8p7|?E{rXkuJX*oyI3(g?e*7!YwW9HXF#w{Ym&@=I6`SnU#t{T56Om zoueIE9G~xQsWy(tltWY$`jYj*WjvP`s098xE*?T>k_GYAMf`YpIX)?b_LI53uijcd#Uhoo zFhHmc(6ORs7;ZX~&?m!?@8=>NP0Q!B`wnSfdr&*^Kksv=ZkWxm=SRZt5>rSN+|;Ba ie>UddC&b@gFCARIXB;%xhP1-Jiv;3>aqa$>=>GxL3P(o( literal 0 HcmV?d00001 diff --git a/Source/Resources/Images/Images.xcassets/PrefToolbar-General.iconset/icon_32x32.png b/Source/Resources/Images/Images.xcassets/PrefToolbar-General.iconset/icon_32x32.png new file mode 100644 index 0000000000000000000000000000000000000000..ae3e418639c06ed4fb3970b25557f4ce7c1cf0ed GIT binary patch literal 1164 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 literal 0 HcmV?d00001 diff --git a/Source/Resources/Images/Images.xcassets/PrefToolbar-Keyboard.iconset/icon_32x32@2x.png b/Source/Resources/Images/Images.xcassets/PrefToolbar-Keyboard.iconset/icon_32x32@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..0306e75eced015dc2d6346a3a5321c6426814fc8 GIT binary patch literal 1383 zcmX|A2~d+)5dH&%fL!G)1w<^+YFoJjL_rb=AjMD#FluRw$Tf-*tU{1G+~FobxI(#- z0Kp^>lqy513QT37LM=g3h&Z*V+=nPP>2{duoB8+c+uiT`cHf(ye$K~J?U2DC1VPli z&JfA4AAE1?w-+SYieqk zOy=#|x0{=ri;9X$N=g_EMnORVm&;8{OG{2pPEAdXi;F8OD=RNAPfSd#uC6XFE`}N^ zm70>0Qd?V_l$7+~!2_901`I$2DOfxnud1pFcnS*(^*v5`)vH#IfEEIBzj z5X{KPfKCz;5}+%9AFu%sW&{b4gBnPI5I{H_4m1pR1@{9Hs22)_kUfw96fCHREYyIL zo}La7xG|UrBw$kL3Kpae9tD8l!}vfBig20WfG9Ni{}fOl5C|YUJUk4qlk>R#v>-!FsTUJiadvcbWD)NUNPYr0;yzt*SzKwdPu*B4V7BD)e zV%7 zTe}t8-EiY`g08QR;e(zNf7A3f`r;qmkH*qe!)T8_{jz5@?MZ33FfJ4{3nxnwUQ!T&G*g(eWP*3JBvnNANF`u&N zvmCRXHZ9>=v~ApVTjhpeI+q(`jy}v;QyvZevrSZo8tB##wjxhd^?w1Qe@o70P4M!AGHQ%;R&pzTm%{}UK{298DwolmtE{fIZYDX$(&#v(pErW_~K z5HX*9k5`k}D6UwgdTXzg@hl%&Nj|@nx?mfqMB1Z~_*1wxEGj+N!c{{*C;HVbAyN9> zH1%a$b`3kv^!iL$m75XOr7lEOMN6g_H{!kPxH4g>Z2j_HP<4Ie+^fLj<%(SM*1h;b zYi5Ujq~5^WZK`!)dutHG851uV8+q~r;ugA>ul-Cx!MlG#$4XcGcdz;caw2gH?J+R9 zesR5a!aeq)PTm^MW5dlGvsf`n8EhHTt(RPG&E2<0=dKoxn;ZS18R8LEu&Nl)*GZXF zZ47DY=?KK4%9U@X6!#3Vd}GZ?om;M4(!y@3PM5Flb2UdRnPEgH*?3&Vk$nrx<9HsQ zFWugz?z9eS`OnwRsc$Uc`eyE!if?e5gR^4C-%d(xJ-sX)J>d%f4C3YPLln4PO8Xa5Hnc?m literal 0 HcmV?d00001 diff --git a/Source/WindowControllers/ctlPrefWindow.swift b/Source/WindowControllers/ctlPrefWindow.swift index 9d08bd8f..fe1d8d14 100644 --- a/Source/WindowControllers/ctlPrefWindow.swift +++ b/Source/WindowControllers/ctlPrefWindow.swift @@ -375,7 +375,7 @@ extension ctlPrefWindow: NSToolbarDelegate { systemSymbolName: "wrench.and.screwdriver.fill", accessibilityDescription: "General Preferences" ) } else { - item.image = NSImage(named: NSImage.homeTemplateName) + item.image = NSImage(named: "PrefToolbar-General") } item.action = #selector(showGeneralView(_:)) @@ -387,7 +387,7 @@ extension ctlPrefWindow: NSToolbarDelegate { systemSymbolName: "person.fill.questionmark", accessibilityDescription: "Experiences Preferences" ) } else { - item.image = NSImage(named: NSImage.flowViewTemplateName) + item.image = NSImage(named: "PrefToolbar-Experiences") } item.action = #selector(showExperienceView(_:)) @@ -399,7 +399,7 @@ extension ctlPrefWindow: NSToolbarDelegate { systemSymbolName: "character.book.closed.fill", accessibilityDescription: "Dictionary Preferences" ) } else { - item.image = NSImage(named: NSImage.bookmarksTemplateName) + item.image = NSImage(named: "PrefToolbar-Dictionary") } item.action = #selector(showDictionaryView(_:)) @@ -409,7 +409,7 @@ extension ctlPrefWindow: NSToolbarDelegate { if #available(macOS 11.0, *) { item.image = NSImage(systemSymbolName: "keyboard.macwindow", accessibilityDescription: "Keyboard Preferences") } else { - item.image = NSImage(named: NSImage.slideshowTemplateName) + item.image = NSImage(named: "PrefToolbar-Keyboard") } item.action = #selector(showKeyboardView(_:))