From 757da97487dd53ef1487436384babc6c7955d6b9 Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Wed, 4 Jan 2012 11:20:18 -0800 Subject: [PATCH] Replace menu icons with a new set of black & white icons. --- .../project.pbxproj | 28 ++++++++++-------- .../DNSCrypt-Menubar/AppDelegate.m | 9 ++++-- .../DNSCrypt-Menubar/led_green.png | Bin 955 -> 0 bytes DNSCrypt-Menubar/DNSCrypt-Menubar/led_red.png | Bin 961 -> 0 bytes .../DNSCrypt-Menubar/led_yellow.png | Bin 962 -> 0 bytes .../DNSCrypt-Menubar/no-network.png | Bin 0 -> 502 bytes .../DNSCrypt-Menubar/no-opendns.png | Bin 0 -> 305 bytes .../DNSCrypt-Menubar/yes-opendns-no-crypt.png | Bin 0 -> 357 bytes .../yes-opendns-yes-crypt.png | Bin 0 -> 416 bytes 9 files changed, 22 insertions(+), 15 deletions(-) delete mode 100644 DNSCrypt-Menubar/DNSCrypt-Menubar/led_green.png delete mode 100644 DNSCrypt-Menubar/DNSCrypt-Menubar/led_red.png delete mode 100644 DNSCrypt-Menubar/DNSCrypt-Menubar/led_yellow.png create mode 100644 DNSCrypt-Menubar/DNSCrypt-Menubar/no-network.png create mode 100644 DNSCrypt-Menubar/DNSCrypt-Menubar/no-opendns.png create mode 100644 DNSCrypt-Menubar/DNSCrypt-Menubar/yes-opendns-no-crypt.png create mode 100644 DNSCrypt-Menubar/DNSCrypt-Menubar/yes-opendns-yes-crypt.png diff --git a/DNSCrypt-Menubar/DNSCrypt-Menubar.xcodeproj/project.pbxproj b/DNSCrypt-Menubar/DNSCrypt-Menubar.xcodeproj/project.pbxproj index 3a6ca1c..c238337 100644 --- a/DNSCrypt-Menubar/DNSCrypt-Menubar.xcodeproj/project.pbxproj +++ b/DNSCrypt-Menubar/DNSCrypt-Menubar.xcodeproj/project.pbxproj @@ -7,6 +7,10 @@ objects = { /* Begin PBXBuildFile section */ + 0906D82E14B4D9AC0093FA7D /* no-network.png in Resources */ = {isa = PBXBuildFile; fileRef = 0906D82A14B4D9AC0093FA7D /* no-network.png */; }; + 0906D82F14B4D9AC0093FA7D /* no-opendns.png in Resources */ = {isa = PBXBuildFile; fileRef = 0906D82B14B4D9AC0093FA7D /* no-opendns.png */; }; + 0906D83014B4D9AC0093FA7D /* yes-opendns-no-crypt.png in Resources */ = {isa = PBXBuildFile; fileRef = 0906D82C14B4D9AC0093FA7D /* yes-opendns-no-crypt.png */; }; + 0906D83114B4D9AC0093FA7D /* yes-opendns-yes-crypt.png in Resources */ = {isa = PBXBuildFile; fileRef = 0906D82D14B4D9AC0093FA7D /* yes-opendns-yes-crypt.png */; }; 09651148147D832D007FEE31 /* dnscrypt.icns in Resources */ = {isa = PBXBuildFile; fileRef = 09651147147D832D007FEE31 /* dnscrypt.icns */; }; 096AEEFA1468A11E009F2AA4 /* dsa_pub.pem in Resources */ = {isa = PBXBuildFile; fileRef = 096AEEF91468A11E009F2AA4 /* dsa_pub.pem */; }; 09972870147CCE41004E7017 /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0997286F147CCE41004E7017 /* Sparkle.framework */; }; @@ -17,9 +21,6 @@ 09A13AE2145F3B9000B227A4 /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 09A13AE0145F3B9000B227A4 /* Credits.rtf */; }; 09A13AE5145F3B9000B227A4 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 09A13AE4145F3B9000B227A4 /* AppDelegate.m */; }; 09A13AE8145F3B9000B227A4 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 09A13AE6145F3B9000B227A4 /* MainMenu.xib */; }; - 09A13AF1145F3C0300B227A4 /* led_green.png in Resources */ = {isa = PBXBuildFile; fileRef = 09A13AEE145F3C0300B227A4 /* led_green.png */; }; - 09A13AF2145F3C0300B227A4 /* led_red.png in Resources */ = {isa = PBXBuildFile; fileRef = 09A13AEF145F3C0300B227A4 /* led_red.png */; }; - 09A13AF3145F3C0300B227A4 /* led_yellow.png in Resources */ = {isa = PBXBuildFile; fileRef = 09A13AF0145F3C0300B227A4 /* led_yellow.png */; }; /* End PBXBuildFile section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -36,6 +37,10 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ + 0906D82A14B4D9AC0093FA7D /* no-network.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "no-network.png"; sourceTree = ""; }; + 0906D82B14B4D9AC0093FA7D /* no-opendns.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "no-opendns.png"; sourceTree = ""; }; + 0906D82C14B4D9AC0093FA7D /* yes-opendns-no-crypt.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "yes-opendns-no-crypt.png"; sourceTree = ""; }; + 0906D82D14B4D9AC0093FA7D /* yes-opendns-yes-crypt.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "yes-opendns-yes-crypt.png"; sourceTree = ""; }; 09651147147D832D007FEE31 /* dnscrypt.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = dnscrypt.icns; path = ../dnscrypt.icns; sourceTree = ""; }; 096AEEF91468A11E009F2AA4 /* dsa_pub.pem */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = dsa_pub.pem; sourceTree = ""; }; 0997286F147CCE41004E7017 /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Sparkle.framework; sourceTree = ""; }; @@ -52,9 +57,6 @@ 09A13AE3145F3B9000B227A4 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = ""; }; 09A13AE4145F3B9000B227A4 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = ""; }; 09A13AE7145F3B9000B227A4 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/MainMenu.xib; sourceTree = ""; }; - 09A13AEE145F3C0300B227A4 /* led_green.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = led_green.png; sourceTree = ""; }; - 09A13AEF145F3C0300B227A4 /* led_red.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = led_red.png; sourceTree = ""; }; - 09A13AF0145F3C0300B227A4 /* led_yellow.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = led_yellow.png; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -127,10 +129,11 @@ 09A13ADD145F3B9000B227A4 /* main.m */, 09A13ADF145F3B9000B227A4 /* DNSCrypt-Menubar-Prefix.pch */, 09A13AE0145F3B9000B227A4 /* Credits.rtf */, - 09A13AEE145F3C0300B227A4 /* led_green.png */, - 09A13AEF145F3C0300B227A4 /* led_red.png */, - 09A13AF0145F3C0300B227A4 /* led_yellow.png */, 096AEEF91468A11E009F2AA4 /* dsa_pub.pem */, + 0906D82A14B4D9AC0093FA7D /* no-network.png */, + 0906D82B14B4D9AC0093FA7D /* no-opendns.png */, + 0906D82C14B4D9AC0093FA7D /* yes-opendns-no-crypt.png */, + 0906D82D14B4D9AC0093FA7D /* yes-opendns-yes-crypt.png */, ); name = "Supporting Files"; sourceTree = ""; @@ -189,11 +192,12 @@ 09A13ADC145F3B9000B227A4 /* InfoPlist.strings in Resources */, 09A13AE2145F3B9000B227A4 /* Credits.rtf in Resources */, 09A13AE8145F3B9000B227A4 /* MainMenu.xib in Resources */, - 09A13AF1145F3C0300B227A4 /* led_green.png in Resources */, - 09A13AF2145F3C0300B227A4 /* led_red.png in Resources */, - 09A13AF3145F3C0300B227A4 /* led_yellow.png in Resources */, 096AEEFA1468A11E009F2AA4 /* dsa_pub.pem in Resources */, 09651148147D832D007FEE31 /* dnscrypt.icns in Resources */, + 0906D82E14B4D9AC0093FA7D /* no-network.png in Resources */, + 0906D82F14B4D9AC0093FA7D /* no-opendns.png in Resources */, + 0906D83014B4D9AC0093FA7D /* yes-opendns-no-crypt.png in Resources */, + 0906D83114B4D9AC0093FA7D /* yes-opendns-yes-crypt.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/DNSCrypt-Menubar/DNSCrypt-Menubar/AppDelegate.m b/DNSCrypt-Menubar/DNSCrypt-Menubar/AppDelegate.m index ec9f3c7..c52b62a 100644 --- a/DNSCrypt-Menubar/DNSCrypt-Menubar/AppDelegate.m +++ b/DNSCrypt-Menubar/DNSCrypt-Menubar/AppDelegate.m @@ -43,13 +43,16 @@ DNSConfigurationState currentState = kDNS_CONFIGURATION_UNKNOWN; switch (currentState) { case kDNS_CONFIGURATION_OPENDNS: - led = [[NSImage alloc] initWithContentsOfFile: [bundle pathForImageResource: @"led_yellow.png"]]; + led = [[NSImage alloc] initWithContentsOfFile: [bundle pathForImageResource: @"yes-opendns-no-crypt.png"]]; break; case kDNS_CONFIGURATION_LOCALHOST: - led = [[NSImage alloc] initWithContentsOfFile: [bundle pathForImageResource: @"led_green.png"]]; + led = [[NSImage alloc] initWithContentsOfFile: [bundle pathForImageResource: @"yes-opendns-yes-crypt.png"]]; + break; + case kDNS_CONFIGURATION_VANILLA: + led = [[NSImage alloc] initWithContentsOfFile: [bundle pathForImageResource: @"no-opendns.png"]]; break; default: - led = [[NSImage alloc] initWithContentsOfFile: [bundle pathForImageResource: @"led_red.png"]]; + led = [[NSImage alloc] initWithContentsOfFile: [bundle pathForImageResource: @"no-network.png"]]; } _statusItem.image = led; } diff --git a/DNSCrypt-Menubar/DNSCrypt-Menubar/led_green.png b/DNSCrypt-Menubar/DNSCrypt-Menubar/led_green.png deleted file mode 100644 index 3271ff2cb8a259afb4dae3f7faefc19771cfad21..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 955 zcmV;s14R6ZP)&!6vsd3y*F>B%upz$Olb;JkqDNEy09b~0W~qQF>ynTF(xMNG;t@!gGP&6CVu&1iU`{kbpH=leDAgcOU@$?nB`o{5hzj*fe$;btV zb(TLLEOF!Rb@J61Shy;YU^eQ9;_YboM~nbVzL2 zGuDceB=TcZjb!rF*!vQ zgE$sRnnI%!od%BX{3zMZdn~4z*F%iUX(bT>rE(S4Iec)$aZDTw$bUy7X#kT?f-2{% zE$R&84896z6q7~`LIC3|wR1Qh@Ig^kH1JsLfL!qEDqB&QlE`@iEgDI{x`MYDRgNNGg-IhY({wsAb#S~Fx@`5e##`UyZPP5aWxS4nLrEZx5w z{XMwHX1Pvf4Ne`-d#tlaosbr7hW$MJKD-~>+9g2zNVQwHZ{0q(cJ7tw?o47U4Nbd` ze$i(z+LW>=DNRXP8uFshK`|8TZ5-5-Wm$hmxddQwaq+9QwYBcT!or2=!_$qt&ahfz z#bP6i6-!NplUlr5*4G~vD=RDa?%cWaW4qm629O>3MPx5F3Is?R{Ko!ED|asHhz$6h*VtaGTd zWDg#)`RgJNHe7LSwY+?FxpzfX!){m%z!vxB=>u1$KKt-Ob!dWOv+v1s6G|(M@wVDy zhy2O=|1{cWXkoqD+Y*tlRMl_8%nu((1gdvL=9=^8E))kx@GFmkDf&?yHY5q_n4%|* zy-94^u|L#KI6Kn#VwC9ot{yP&zxcHR=-a11ZXO*YtSvheGLuM7W607RhDO6tk1Fcz zdPE}rg;p&-Kid9CM21mS5fQ`1i{X-papNN|d*hINRU#cwYbdo=LR>f0YJo=6P;Vwg zk;tA}#AFhm0*-7iI|i76rmM=j&(_g$fEf~uDxtJ!Wzpa;u_1~CBLV`kApu680j)ym zt+OG|2t`2%fk1>w64Zef4lNz(0|Z4C{8Qzhf<6Ve7`*dkiOq6M6^Ln&!~v}o9a!9E zh0Pq^20~DRF#vuWWVXDdA>GWp^^}>VTrDX&8O3r&)y*in1M+@>%^cPSyef8m#R2*5 zj`Y26zI*=NGxNuWdpFRHQe5RIOoa`AS3()^MZgsS4JsPfNoU{K&#ik?z>S^JUJL!J z$B!PK%76aJt286;1dkwI5wBd(G%YTw`J=OVJGs+}0%z|`Tf(Ib;Q z{Ns$&?_DRcYiRI9Ucdpt;6sc?!&IXO=}b+V$9ctIP(BAt1OJ1hF=UU=y~UutKXmW? zWi}q)M|(XeN`iAZ=g6F6-9&WiEgoe>NT2kh%J~?Gc1F8>^XBc|+}!IEQ-|Xc6P^r@ zvfSy=>-S|)

>Mo)_eKuH{B5YO6@RBi-EWY%3Q7EG#Ts>UO&mv$M1F2PP*Im!(9u zqV65RJJdOXt?;&z%2sq&Rt8H;OAqeez58RU)p`UV+wzOZ9$^Ex<}U1gtw zl(wYEJ+2IR4?zXM?^GnJs_F*AvIy9bXSCs1U$LzBaajfJ?goyg9nWCmHKh zxZD0S8m``CkoO7281;_QIc(t=jAK?t6STWF46|Nb6y5;wc5Byu|Lt1uxf9RK?_Ds3 zBaC&LZgH31`l<{^BdpEIbBoP$wRtA$ix_oe*+yq;a|U2}dHJJmw>x|M`0-Qob8|^q zWJDBHq7rW$8aaGa;H3~73RYHDM(uX{*7fVxzf9Bg9{|}}zlbz}Q-=;6dZE>7EjAjB zIaS@|y{}kn%Ph+VYinyO{eFL~-ERK@TuIaP$1Kb4Z2zO3e?>$RU>2AICV|T4Sr))L k(4Co?S?zQ>+0M)U53FDRO{_z~egFUf07*qoM6N<$g2HFWf&c&j diff --git a/DNSCrypt-Menubar/DNSCrypt-Menubar/no-network.png b/DNSCrypt-Menubar/DNSCrypt-Menubar/no-network.png new file mode 100644 index 0000000000000000000000000000000000000000..c8d5605d5c8aa7a8a1234306eec716f08a72046c GIT binary patch literal 502 zcmV=0x2RSoz8dhN?^CJfx~<=-#KT#`DVEK29*Pd0<26#Ny}+<`e)ks4@k?&i#eBz zB@!3xuR$E*%DSRKGMNldO;5{-J)j!k3aA8Dfe+#kx5NOWwztnN#XN6%wY9cw%LYwG zenhZXA1G(B+9Ym?0TBa%z~j>LinKQJrWedRfTzVQT+!al%q%-RI?53DM*}zyi}Co` z#^x4NsWl8IXJGWK(dzQ^?gbVM2CuT&tXt8bVA6bZdwV=KK2dB`S9ed|@AqFK=Kv}c z4P^LyyWI|_^IguNAD^h|0C5%Ne={I=0cD4EdPCmXKfnfuh8bPKELa}(hDHzaHHrpm zjdl{GJ6hw;xlkx{FN)&L+WJNgd(@LO8oIA&fRo-Rb}uZlSS)sq``Q6pByxV@^)5-g z29-LmWKc&leG~|y5DMQKYsM2taHS%*!~o@;rcx<}L1LRMmQkqYnmEKQ8nkzGQt&U3 smVRFv&s4UUG^C}{Mu8_*{&*to7v90r&Y4l(QUCw|07*qoM6N<$g8#bWCjbBd literal 0 HcmV?d00001 diff --git a/DNSCrypt-Menubar/DNSCrypt-Menubar/no-opendns.png b/DNSCrypt-Menubar/DNSCrypt-Menubar/no-opendns.png new file mode 100644 index 0000000000000000000000000000000000000000..f483ce1df8f8bc1f030a04ac5361c15928f064fc GIT binary patch literal 305 zcmV-10nYx3P)}07qHPA2?SHSoZj@XIwc<2i3jkafVh%0n6K7%ztte2SC{SObDEQAyG&L^KlnP4a%7LB+ z+7%eW%K`So;U|z~zVF`~&6ai;8Dz2Fn7DEMxgq-k{!RLZJj;2_00000NkvXXu0mjf DH%fx? literal 0 HcmV?d00001 diff --git a/DNSCrypt-Menubar/DNSCrypt-Menubar/yes-opendns-no-crypt.png b/DNSCrypt-Menubar/DNSCrypt-Menubar/yes-opendns-no-crypt.png new file mode 100644 index 0000000000000000000000000000000000000000..619862a484e10e530f42857e533c759b8607b5bb GIT binary patch literal 357 zcmV-r0h<1aP)L`ym;{qNG*l|&CM-; zfC_Y>irIj;1<8OGs2Io)gNDY&KNto8oi`t56VQe(ECJR9lRt3a;6kinKn|v!0k>}5 z`VRx`9UT}7TU*=U^4G6l$27p!&VCxqk6*uj?P_XnhARTGfnvQdd7#=^*rM?#kXC_) zG#e22BBg^~kQmee6{uRwFi=)ey$3S{TRMPhevCH|E~~qz9xIoW6nh`G3*@NRI~qa7(_@vz-i(00000NkvXXu0mjf DrcIQj literal 0 HcmV?d00001 diff --git a/DNSCrypt-Menubar/DNSCrypt-Menubar/yes-opendns-yes-crypt.png b/DNSCrypt-Menubar/DNSCrypt-Menubar/yes-opendns-yes-crypt.png new file mode 100644 index 0000000000000000000000000000000000000000..0fdf7faa6d27765ba4198fad8f163765800a077f GIT binary patch literal 416 zcmV;R0bl-!P)a5+g>LO0b--(w(lXWonLsv89n@+w9+hNtI0 z&O~?gVh(acFu>xFPn4zOjL;wu_x*__Abkn%>vj5gTa(;%o1!1S<^H}N5>giP_L_w z2%{G!UWpkHby!Fgt=XJQf^PTYomTfr$y8eR&x)Rqvreb;CJDylao!WqICH-MJt1&M zNgpcf0$qRF_XH=WxrJYl%NG`&0FZE9P$-s`Z_sFHmS3Q%55Fsdj5I>Ia<%*hmSt&= ztro{G1E|sS1a$9n|eWHH+{G2y|l39|py8T38EL~#`W0000< KMNUMnLSTYUqqf-q literal 0 HcmV?d00001