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 3271ff2..0000000 Binary files a/DNSCrypt-Menubar/DNSCrypt-Menubar/led_green.png and /dev/null differ diff --git a/DNSCrypt-Menubar/DNSCrypt-Menubar/led_red.png b/DNSCrypt-Menubar/DNSCrypt-Menubar/led_red.png deleted file mode 100644 index 870fe5b..0000000 Binary files a/DNSCrypt-Menubar/DNSCrypt-Menubar/led_red.png and /dev/null differ diff --git a/DNSCrypt-Menubar/DNSCrypt-Menubar/led_yellow.png b/DNSCrypt-Menubar/DNSCrypt-Menubar/led_yellow.png deleted file mode 100644 index 69187ed..0000000 Binary files a/DNSCrypt-Menubar/DNSCrypt-Menubar/led_yellow.png and /dev/null differ diff --git a/DNSCrypt-Menubar/DNSCrypt-Menubar/no-network.png b/DNSCrypt-Menubar/DNSCrypt-Menubar/no-network.png new file mode 100644 index 0000000..c8d5605 Binary files /dev/null and b/DNSCrypt-Menubar/DNSCrypt-Menubar/no-network.png differ diff --git a/DNSCrypt-Menubar/DNSCrypt-Menubar/no-opendns.png b/DNSCrypt-Menubar/DNSCrypt-Menubar/no-opendns.png new file mode 100644 index 0000000..f483ce1 Binary files /dev/null and b/DNSCrypt-Menubar/DNSCrypt-Menubar/no-opendns.png differ 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 0000000..619862a Binary files /dev/null and b/DNSCrypt-Menubar/DNSCrypt-Menubar/yes-opendns-no-crypt.png differ 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 0000000..0fdf7fa Binary files /dev/null and b/DNSCrypt-Menubar/DNSCrypt-Menubar/yes-opendns-yes-crypt.png differ