diff --git a/DNSCrypt-Preference-Pane/DNSCrypt/DNSCrypt.h b/DNSCrypt-Preference-Pane/DNSCrypt/DNSCrypt.h index 8fbbfb2..c82d993 100644 --- a/DNSCrypt-Preference-Pane/DNSCrypt/DNSCrypt.h +++ b/DNSCrypt-Preference-Pane/DNSCrypt/DNSCrypt.h @@ -13,6 +13,7 @@ #define kDNSCRYPT_PREFPANE_APP_PATH @"/Library/PreferencePanes/DNSCrypt.prefPane" #define kDNSCRYPT_USR_BASE_DIR kDNSCRYPT_PREFPANE_APP_PATH @"/Contents/Resources/usr" +#define kDNSCRIPT_BIN_BASE_DIR kDNSCRYPT_USR_BASE_DIR @"/bin" #define kDNSCRIPT_SCRIPTS_BASE_DIR kDNSCRYPT_USR_BASE_DIR @"/scripts" #define kDNSCRYPT_VAR_BASE_DIR @"/Library/Application Support/DNSCrypt" #define kDNSCRYPT_CONTROL_DIR kDNSCRYPT_VAR_BASE_DIR @"/control" @@ -57,5 +58,6 @@ typedef enum { - (IBAction)fallbackButtonPressed:(NSButton *)sender; - (IBAction)openDNSLinkPushed:(NSButton *)sender; +- (IBAction)uninstallPushed:(NSButton *)sender; @end diff --git a/DNSCrypt-Preference-Pane/DNSCrypt/DNSCrypt.m b/DNSCrypt-Preference-Pane/DNSCrypt/DNSCrypt.m index 68a6110..249e286 100644 --- a/DNSCrypt-Preference-Pane/DNSCrypt/DNSCrypt.m +++ b/DNSCrypt-Preference-Pane/DNSCrypt/DNSCrypt.m @@ -342,5 +342,9 @@ DNSConfigurationState currentState = kDNS_CONFIGURATION_UNKNOWN; [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString: kOPENDNS_URL]]; } +- (IBAction)uninstallPushed:(NSButton *)sender { + [self fromCommand: @"/bin/ksh" withArguments: [NSArray arrayWithObjects: @"-c", @"cd '" kDNSCRIPT_BIN_BASE_DIR @"' && /usr/bin/open ./Uninstall.app", nil]]; +} + @end diff --git a/DNSCrypt-Preference-Pane/DNSCrypt/en.lproj/DNSCrypt.xib b/DNSCrypt-Preference-Pane/DNSCrypt/en.lproj/DNSCrypt.xib index 222503a..11c04ea 100644 --- a/DNSCrypt-Preference-Pane/DNSCrypt/en.lproj/DNSCrypt.xib +++ b/DNSCrypt-Preference-Pane/DNSCrypt/en.lproj/DNSCrypt.xib @@ -2,13 +2,13 @@ 1070 - 12A269 - 2829 - 1187 - 624.00 + 12C54 + 2840 + 1187.34 + 625.00 - 2829 - 1809 + 2840 + 1810 NSBox @@ -64,13 +64,14 @@ 274 {{13, 10}, {563, 359}} - + + _NS:461 1 - + 256 @@ -500,7 +501,6 @@ {{10, 33}, {543, 313}} - _NS:463 @@ -511,7 +511,7 @@ 2 - + 256 @@ -534,8 +534,9 @@ public.url public.url-name - {{17, 17}, {509, 293}} + {{17, 23}, {509, 287}} + _NS:51 @@ -544,8 +545,34 @@ YES YES + + + 268 + {{437, -10}, {95, 32}} + + + _NS:9 + YES + + 67108864 + 134217728 + Uninstall + + _NS:9 + + -2038284288 + 129 + + + 200 + 25 + + NO + {{10, 33}, {543, 313}} + + _NS:620 @@ -644,7 +671,7 @@ - + LucidaGrande 13 @@ -654,12 +681,13 @@ YES YES - + {589, 375} + {{0, 0}, {1366, 746}} @@ -833,6 +861,14 @@ 384 + + + uninstallPushed: + + + + 387 + @@ -1135,6 +1171,7 @@ + @@ -1143,6 +1180,19 @@ + + 385 + + + + + + + + 386 + + + @@ -1228,6 +1278,8 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.WebKitIBPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin InitialTabViewItem @@ -1243,9 +1295,178 @@ - 384 + 387 + + + + + DNSCrypt + NSPreferencePane + + NSButton + NSButton + NSButton + NSButton + NSButton + NSButton + + + + dnscryptButtonPressed: + NSButton + + + fallbackButtonPressed: + NSButton + + + familyShieldButtonPressed: + NSButton + + + openDNSLinkPushed: + NSButton + + + opendnsButtonPressed: + NSButton + + + uninstallPushed: + NSButton + + + + NSTabViewItem + WebView + NSTextField + NSButton + NSButton + NSButton + WebView + NSButton + WebView + NSTabViewItem + WebView + NSImageView + NSTextField + NSTabView + + + + aboutTabViewItem + NSTabViewItem + + + aboutWebView + WebView + + + currentResolverTextField + NSTextField + + + dnscryptButton + NSButton + + + fallbackButton + NSButton + + + familyShieldButton + NSButton + + + feedbackWebView + WebView + + + opendnsButton + NSButton + + + previewNotesWebView + WebView + + + releaseNotesTabViewItem + NSTabViewItem + + + releaseNotesWebView + WebView + + + statusImageView + NSImageView + + + statusText + NSTextField + + + tabView + NSTabView + + + + IBProjectSource + ./Classes/DNSCrypt.h + + + + NSPreferencePane + NSObject + + NSView + NSView + NSView + NSWindow + + + + _firstKeyView + NSView + + + _initialKeyView + NSView + + + _lastKeyView + NSView + + + _window + NSWindow + + + + IBProjectSource + ./Classes/NSPreferencePane.h + + + + WebView + + reloadFromOrigin: + id + + + reloadFromOrigin: + + reloadFromOrigin: + id + + + + IBProjectSource + ./Classes/WebView.h + + + - 0 IBCocoaFramework diff --git a/DNSCrypt-Preference-Pane/DNSCrypt/extra/usr/bin/Uninstall.app/Contents/Info.plist b/DNSCrypt-Preference-Pane/DNSCrypt/extra/usr/bin/Uninstall.app/Contents/Info.plist new file mode 100644 index 0000000..6c80d4c --- /dev/null +++ b/DNSCrypt-Preference-Pane/DNSCrypt/extra/usr/bin/Uninstall.app/Contents/Info.plist @@ -0,0 +1,46 @@ + + + + + CFBundleAllowMixedLocalizations + + CFBundleDevelopmentRegion + English + CFBundleExecutable + applet + CFBundleIconFile + applet + CFBundleIdentifier + com.apple.ScriptEditor.id.Uninstall + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + Uninstall + CFBundlePackageType + APPL + CFBundleSignature + aplt + LSMinimumSystemVersionByArchitecture + + x86_64 + 10.6 + + LSRequiresCarbon + + WindowState + + dividerCollapsed + + eventLogLevel + -1 + name + ScriptWindowState + positionOfDivider + 334 + savedFrame + 82 147 1193 599 0 0 1366 746 + selectedTabView + result + + + diff --git a/DNSCrypt-Preference-Pane/DNSCrypt/extra/usr/bin/Uninstall.app/Contents/MacOS/applet b/DNSCrypt-Preference-Pane/DNSCrypt/extra/usr/bin/Uninstall.app/Contents/MacOS/applet new file mode 100755 index 0000000..9656b90 Binary files /dev/null and b/DNSCrypt-Preference-Pane/DNSCrypt/extra/usr/bin/Uninstall.app/Contents/MacOS/applet differ diff --git a/DNSCrypt-Preference-Pane/DNSCrypt/extra/usr/bin/Uninstall.app/Contents/PkgInfo b/DNSCrypt-Preference-Pane/DNSCrypt/extra/usr/bin/Uninstall.app/Contents/PkgInfo new file mode 100644 index 0000000..3253614 --- /dev/null +++ b/DNSCrypt-Preference-Pane/DNSCrypt/extra/usr/bin/Uninstall.app/Contents/PkgInfo @@ -0,0 +1 @@ +APPLaplt \ No newline at end of file diff --git a/DNSCrypt-Preference-Pane/DNSCrypt/extra/usr/bin/Uninstall.app/Contents/Resources/Scripts/main.scpt b/DNSCrypt-Preference-Pane/DNSCrypt/extra/usr/bin/Uninstall.app/Contents/Resources/Scripts/main.scpt new file mode 100644 index 0000000..a834a09 Binary files /dev/null and b/DNSCrypt-Preference-Pane/DNSCrypt/extra/usr/bin/Uninstall.app/Contents/Resources/Scripts/main.scpt differ diff --git a/DNSCrypt-Preference-Pane/DNSCrypt/extra/usr/bin/Uninstall.app/Contents/Resources/applet.icns b/DNSCrypt-Preference-Pane/DNSCrypt/extra/usr/bin/Uninstall.app/Contents/Resources/applet.icns new file mode 100644 index 0000000..0cdd170 Binary files /dev/null and b/DNSCrypt-Preference-Pane/DNSCrypt/extra/usr/bin/Uninstall.app/Contents/Resources/applet.icns differ diff --git a/DNSCrypt-Preference-Pane/DNSCrypt/extra/usr/bin/Uninstall.app/Contents/Resources/applet.rsrc b/DNSCrypt-Preference-Pane/DNSCrypt/extra/usr/bin/Uninstall.app/Contents/Resources/applet.rsrc new file mode 100644 index 0000000..0a29761 Binary files /dev/null and b/DNSCrypt-Preference-Pane/DNSCrypt/extra/usr/bin/Uninstall.app/Contents/Resources/applet.rsrc differ diff --git a/DNSCrypt-Preference-Pane/DNSCrypt/extra/usr/bin/Uninstall.app/Contents/Resources/description.rtfd/TXT.rtf b/DNSCrypt-Preference-Pane/DNSCrypt/extra/usr/bin/Uninstall.app/Contents/Resources/description.rtfd/TXT.rtf new file mode 100644 index 0000000..3ff69d2 --- /dev/null +++ b/DNSCrypt-Preference-Pane/DNSCrypt/extra/usr/bin/Uninstall.app/Contents/Resources/description.rtfd/TXT.rtf @@ -0,0 +1,4 @@ +{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf200 +{\fonttbl} +{\colortbl;\red255\green255\blue255;} +} \ No newline at end of file