From eddb2d4f82ad7a97c2cbb213e25e432ac0470e95 Mon Sep 17 00:00:00 2001 From: qinyuhang Date: Tue, 23 Aug 2016 10:41:04 +0800 Subject: [PATCH] Update duplicate icons Update duplicate icons Fix up force quite app ss-local still running background --- ShadowsocksX-NG/AppDelegate.swift | 2 ++ .../copyV1.imageset/Contents.json | 21 +++++++++++++++++ .../copyV1.imageset/copyV1.png | Bin 0 -> 14667 bytes .../copyV2.imageset/Contents.json | 21 +++++++++++++++++ .../copyV2.imageset/copyV2.png | Bin 0 -> 14685 bytes .../copyV3.imageset/Contents.json | 21 +++++++++++++++++ .../copyV3.imageset/copyV3.png | Bin 0 -> 14817 bytes .../PreferencesWindowController.xib | 22 +++++++++++++----- 8 files changed, 81 insertions(+), 6 deletions(-) create mode 100644 ShadowsocksX-NG/Assets.xcassets/copyV1.imageset/Contents.json create mode 100644 ShadowsocksX-NG/Assets.xcassets/copyV1.imageset/copyV1.png create mode 100644 ShadowsocksX-NG/Assets.xcassets/copyV2.imageset/Contents.json create mode 100644 ShadowsocksX-NG/Assets.xcassets/copyV2.imageset/copyV2.png create mode 100644 ShadowsocksX-NG/Assets.xcassets/copyV3.imageset/Contents.json create mode 100644 ShadowsocksX-NG/Assets.xcassets/copyV3.imageset/copyV3.png diff --git a/ShadowsocksX-NG/AppDelegate.swift b/ShadowsocksX-NG/AppDelegate.swift index 4f6abc1..d42321b 100644 --- a/ShadowsocksX-NG/AppDelegate.swift +++ b/ShadowsocksX-NG/AppDelegate.swift @@ -151,6 +151,8 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserNotificationCenterDele // Insert code here to tear down your application StopSSLocal() ProxyConfHelper.disableProxy() + let defaults = NSUserDefaults.standardUserDefaults() + defaults.setBool(false, forKey: "ShadowsocksOn") } func applyConfig() { diff --git a/ShadowsocksX-NG/Assets.xcassets/copyV1.imageset/Contents.json b/ShadowsocksX-NG/Assets.xcassets/copyV1.imageset/Contents.json new file mode 100644 index 0000000..6a32a15 --- /dev/null +++ b/ShadowsocksX-NG/Assets.xcassets/copyV1.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "copyV1.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/ShadowsocksX-NG/Assets.xcassets/copyV1.imageset/copyV1.png b/ShadowsocksX-NG/Assets.xcassets/copyV1.imageset/copyV1.png new file mode 100644 index 0000000000000000000000000000000000000000..49ab36cd8faa27896435004f168cee131e46e198 GIT binary patch literal 14667 zcmeI3TZkJ~7{|}rRov)OFNhZqhiR2no6IEHWRqc%x+Yt9scF~U6t^JS*_o5Aem@*WK*> z4WZYM-iAvK)5_dVn zPkIHpg~BYCGi}TzBFV5CjmNl&bR?Qc$5P|lxR@AC3gWmBO^2g#iM+=}uKD7#Ari^9 zR+8rOJDTOle;IzsbuCE{>h*f09*>xInb^~5L5vBpSePin&WhnGjj-Wt36gB&$zw;g zb<5RFgY)t#i)PKu@Vr;3^=e*M)oK+ooF+R$QD`WZ5RHgJKa-}mJXX!F_(RiF0atJp z8?Hlq(Y`)w$#hL;$sAC!)jhBrd?IstX@^hSg?$;EVLVevbD0L zoLMn#GAx{p%R;|q;PO|SG-EifVyJi~pCt_uUDu?vqG_dMS`4R@aV0!1rqu8v7S(XH zluW94B9>0#k`J*^fcBo$c~h-EB6DYk>XU6U}n?u)Ev3 z_u^LA-ED0<_ZYgHjWw%vH3OG-0tZLKJh@rG*<>OSPsl=dbGKtwZ{W&8UMG9l@m6L$ z+4OXG^fm4sWCR^eV=z_VXWgI4pq1P-koy&(b;Hs*$*s+Bg@g7LUE#zq9V-H9P-BLR ziU8Ps4>Gu zMFa&57oj3(}y*3>Os<6fj(n1~q25sED9|;es@%F~dbg1O*Hiq(O}tE-E4@V7MR+YRqs^ z5kUdN1!+)YhKq^_3K%X(gBmkjR76m~a6uZ>nBk%#f&zvM(xAo{#T9Bl0*DRr++UqM z;5T~VlNZUuft)%$S3qd>ZiLpJLFnIg^8Fh^H4&k6`w)`I1BbVoFFo<;4x)W+CO=th zoc-hbouM`H`r$K&8|Bj}s$-#|Y8te;u9aM#Dr9=@u4>g%t5az>t-SlXP}gwXo> bCiL0S6UW|o@A+@ZAkoa!uKZgM?tA(_FXHGy literal 0 HcmV?d00001 diff --git a/ShadowsocksX-NG/Assets.xcassets/copyV2.imageset/Contents.json b/ShadowsocksX-NG/Assets.xcassets/copyV2.imageset/Contents.json new file mode 100644 index 0000000..7ec6238 --- /dev/null +++ b/ShadowsocksX-NG/Assets.xcassets/copyV2.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "copyV2.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/ShadowsocksX-NG/Assets.xcassets/copyV2.imageset/copyV2.png b/ShadowsocksX-NG/Assets.xcassets/copyV2.imageset/copyV2.png new file mode 100644 index 0000000000000000000000000000000000000000..eb255afeb05a37366451132d7b0928ad2bff2cbb GIT binary patch literal 14685 zcmeI3PmB{)9LFE=4^aLEF^ZU&$sop!v@@OVEbZ8qKP}6y(si@cxadJWvomDw#|<;XU;q3Io-_0e z|B_q~3w91q7y~m7-ZwK;)Mh5Nl+JI@M$$EfB&c9d^BQM7f8Ix z48PMa$c+|;xt!%-PLB0OwRl3}wxwcmIVB}~w{nsg?-RscA)boH6AJn36}kG0&qhd; zcJz`mlJBpVBi}Oogy-3cAXKZ>STzx|oN;1Lr36tDBq>T1QFq$()LPVZH-||U^W?Fs zIfm^SmdW{f)iG_SH*4=GTk~mLQ$xxwh)hrLMM~1H9Yo|Qx1lvYXUCg z3N}5L_~IRX_JrkG?u6B)WTU%lVKOI$LZf!a@m4AwOS|6gg9JexX-B79oVKwrf?aFM z(eUnrFHl^m0~rwgiPm_FH_w9syA&UrH<&Z{2I`fD;OCZkfKD2j^It0WT7h)G2hL6T6} zmZMn9q`im|^HjDb?4P(&J-MSuUy3-c+&_RTIfn zR8NWGSTbIcR7naT77Eb5Bz4}>ru-dKPp#i&YG7ZI`US@zr=3~`8h`Y6TcSgnC8Y)o zm#ooguy)A`4$iZE__fy7#g4KOoJ+RqxY*xy8GdowH4d`IIpuqT-K(gYf1+hIe^X#R zEwr>Yht+V_ZN~qdz%W0scdt>Mz~=2XRG2DIbx-12C9kSFc;`4-6L-4b!_2ML_7Z8q z{}m`3t&R zcDGyi-`)zl+pSIKi>Bda$zBWw+SUwQ{s|l&4g1K=0?ziyazaiE?al3uVWWo2qj`hu zVb@=oiN3n0y`!UXe>WrOs2jtn0zd1)OopxGrh(kA2#p(-)=6$`hIj3(}y*3>Os<6fj(n1~q25sED9|;es@%F~dbg1O*Hi zq(O}tE-E4@V7MR+YRqs^5kUdN1!+)YhKq^_3K%X(gBmkjR76m~a6uZ>nBk%#f&zvM z(xAo+7Zni{FkFxZHDIYL5&$MDk3OgxF8K`%y3Z=K>@=B zX;5Q^i;4&e7%oVI8Z%r}L{PwRK^oMU;i4jf0)`9HpvDXr6%iCLT#yDezAdgu^ASL7 zlIQ-a*Dd`dS z)K}k}b>5SUtH1qjV`QQK=z6oZZrQJ=4?VH!{ZB4E^x=)`4<9~q=ICWno<;X_XxWM# z{X_q5y7|GEbGx2hU)d7*v|k*%ko#Et{@P#fuC!_khyLvO=*o%Ne6)W#_x14;7kA86 zj_u+K&&_?d`R!8&FYT}{u6vmuBICSu>ppbu+>Ku@A3L*`d_{x1hw^849eDjeey{Gz literal 0 HcmV?d00001 diff --git a/ShadowsocksX-NG/Assets.xcassets/copyV3.imageset/Contents.json b/ShadowsocksX-NG/Assets.xcassets/copyV3.imageset/Contents.json new file mode 100644 index 0000000..34d4c2e --- /dev/null +++ b/ShadowsocksX-NG/Assets.xcassets/copyV3.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "copyV3.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/ShadowsocksX-NG/Assets.xcassets/copyV3.imageset/copyV3.png b/ShadowsocksX-NG/Assets.xcassets/copyV3.imageset/copyV3.png new file mode 100644 index 0000000000000000000000000000000000000000..a7a99dbbd073cf6683fe29ce918290e2b1e4c99e GIT binary patch literal 14817 zcmeI3eQXnD9LJxHZ0L}HAVP>Sr9d2k_O9)^wMW}+wv08==3Apd47rUf z>;X2Qcwt0r?u*0rzLucS*CRMX#(GbcE5)G%F{tr|R4gi~T*_@s=jBkWH#0^gMH6Mopy%bgun8udcCSN6JMO0JNkX4xT%Oo~?+iOG%#+ku_P3$YYeub&pvX%}F4Tt6g%uu~^B{s2pM?INU z);faF;PvXO%5JtBssp?rN;=tjE~eO)pYwc1=;Jl$(buGjb(pNSAj@*r8qQ{$&pJ4k z#gb%{ML7a;NDTKD=diGx&B@v7@En-3I0xE8AztGjDhsZ~@`MB~EXQNK<`H9jH)Is4 z+r{J?F=cLLab7tp$I-B$$L3;6HDj*yYUBKps_~Kl{XP$BFpFY{gHD#`twOEI&RguJ z8oP}(IRxl1)j2{AG$n!%=0jZgHD(``dRbgVryU=~H2UZt zwM2?Wn`dm`@xC-@M=QfUPyWByRJEwF{diQd? zpr2?SLEjV*0WN6G4=d-)+Qk1mftmc6ee4>^2$UYQp)#q`s5FU~w^{+VYh%`VM_wqlvV> z&dQ<}W6?jeR=m5|+WBBB-d$|XJC{qM=CNk06*Xfn{RGY&4ejV=0eWifcAMSB6gL+; zTE!HMcKAfJhgE%L+G?|&;*OHW&asSGN7k5`D(q)HJ(HPMbkl(DSD4%lOW`EvHp62M z@>lej6XWS<5u64wrnrcRZ~?`I(;&ta7ZDLIptx`v#F*kDBEkg}7fyp1Q(QzuxPaoq zX%J(Ii--spP+T|-VoY%n5#a)g3#UPhDJ~)+TtIQ*G>9?9MMQ)PC@!1^F{ZePh;RYL zh0`F$6c-T@E}*z@8pN35A|k>C6cGgM4yVhz*L>duKpErrH3m}`ZuAFQ${Qy)t-13loVQ`pm9t>~p0Dmq`JrOfvE^Tb z@jDkD**0VA{AFvqs_QNuoVDfW_PI6w6>TS%o?d!)$?)~ykmKoDFI?ZbACBMl#*Mp` z=f1OAGtftj!W`kwvbtlQil z-+8BtAG{TNl`%?}-aNi<`;x2G4HX}PX@f%NkB&8a&i*wh*3UV*@t@_9?uPU4UswrD zn>K&(+UMoNz-;PUH(_wu{1O~HdVu?^;qP<8&dNxorj`vmUvh%jJJmgdi7VS~ vSM0d2?mawZ@w+Q;D%Va;I;4&pejY4*R@rs?(A)L;Lzw - - - + + + + + + + @@ -459,5 +468,6 @@ DQ +