Bundle the uninstaller with the preference pane. Suggested by ScienceGuy, thanks!

This commit is contained in:
Frank Denis
2012-09-21 23:06:39 +02:00
parent 4112c0c19a
commit c381885f6a
10 changed files with 293 additions and 15 deletions
@@ -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
@@ -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
@@ -2,13 +2,13 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
<data>
<int key="IBDocument.SystemTarget">1070</int>
<string key="IBDocument.SystemVersion">12A269</string>
<string key="IBDocument.InterfaceBuilderVersion">2829</string>
<string key="IBDocument.AppKitVersion">1187</string>
<string key="IBDocument.HIToolboxVersion">624.00</string>
<string key="IBDocument.SystemVersion">12C54</string>
<string key="IBDocument.InterfaceBuilderVersion">2840</string>
<string key="IBDocument.AppKitVersion">1187.34</string>
<string key="IBDocument.HIToolboxVersion">625.00</string>
<dictionary class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="com.apple.InterfaceBuilder.CocoaPlugin">2829</string>
<string key="com.apple.WebKitIBPlugin">1809</string>
<string key="com.apple.InterfaceBuilder.CocoaPlugin">2840</string>
<string key="com.apple.WebKitIBPlugin">1810</string>
</dictionary>
<array key="IBDocument.IntegratedClassDependencies">
<string>NSBox</string>
@@ -64,13 +64,14 @@
<int key="NSvFlags">274</int>
<string key="NSFrame">{{13, 10}, {563, 359}}</string>
<reference key="NSSuperview" ref="1037298196"/>
<reference key="NSNextKeyView" ref="1025762247"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="521420514"/>
<string key="NSReuseIdentifierKey">_NS:461</string>
<array class="NSMutableArray" key="NSTabViewItems">
<object class="NSTabViewItem" id="19707695">
<string key="NSIdentifier">1</string>
<object class="NSView" key="NSView" id="1025762247">
<reference key="NSNextResponder" ref="821865429"/>
<nil key="NSNextResponder"/>
<int key="NSvFlags">256</int>
<array class="NSMutableArray" key="NSSubviews">
<object class="NSButton" id="894789954">
@@ -500,7 +501,6 @@
</object>
</array>
<string key="NSFrame">{{10, 33}, {543, 313}}</string>
<reference key="NSSuperview" ref="821865429"/>
<reference key="NSNextKeyView" ref="423755939"/>
<string key="NSReuseIdentifierKey">_NS:463</string>
</object>
@@ -511,7 +511,7 @@
<object class="NSTabViewItem" id="820989392">
<string key="NSIdentifier">2</string>
<object class="NSView" key="NSView" id="521420514">
<nil key="NSNextResponder"/>
<reference key="NSNextResponder" ref="821865429"/>
<int key="NSvFlags">256</int>
<array class="NSMutableArray" key="NSSubviews">
<object class="WebView" id="1000382251">
@@ -534,8 +534,9 @@
<string>public.url</string>
<string>public.url-name</string>
</set>
<string key="NSFrame">{{17, 17}, {509, 293}}</string>
<string key="NSFrame">{{17, 23}, {509, 287}}</string>
<reference key="NSSuperview" ref="521420514"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView"/>
<string key="NSReuseIdentifierKey">_NS:51</string>
<string key="FrameName"/>
@@ -544,8 +545,34 @@
<bool key="UseBackForwardList">YES</bool>
<bool key="AllowsUndo">YES</bool>
</object>
<object class="NSButton" id="231106999">
<reference key="NSNextResponder" ref="521420514"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{437, -10}, {95, 32}}</string>
<reference key="NSSuperview" ref="521420514"/>
<reference key="NSWindow"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="132642450">
<int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">134217728</int>
<string key="NSContents">Uninstall</string>
<reference key="NSSupport" ref="858841166"/>
<string key="NSCellIdentifier">_NS:9</string>
<reference key="NSControlView" ref="231106999"/>
<int key="NSButtonFlags">-2038284288</int>
<int key="NSButtonFlags2">129</int>
<string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/>
<int key="NSPeriodicDelay">200</int>
<int key="NSPeriodicInterval">25</int>
</object>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
</array>
<string key="NSFrame">{{10, 33}, {543, 313}}</string>
<reference key="NSSuperview" ref="821865429"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="1000382251"/>
<string key="NSReuseIdentifierKey">_NS:620</string>
</object>
@@ -644,7 +671,7 @@
<reference key="NSTabView" ref="821865429"/>
</object>
</array>
<reference key="NSSelectedTabViewItem" ref="19707695"/>
<reference key="NSSelectedTabViewItem" ref="820989392"/>
<object class="NSFont" key="NSFont">
<string key="NSName">LucidaGrande</string>
<double key="NSSize">13</double>
@@ -654,12 +681,13 @@
<bool key="NSAllowTruncatedLabels">YES</bool>
<bool key="NSDrawsBackground">YES</bool>
<array class="NSMutableArray" key="NSSubviews">
<reference ref="1025762247"/>
<reference ref="521420514"/>
</array>
</object>
</array>
<string key="NSFrameSize">{589, 375}</string>
<reference key="NSSuperview"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="821865429"/>
</object>
<string key="NSScreenRect">{{0, 0}, {1366, 746}}</string>
@@ -833,6 +861,14 @@
</object>
<int key="connectionID">384</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">uninstallPushed:</string>
<reference key="source" ref="294453543"/>
<reference key="destination" ref="231106999"/>
</object>
<int key="connectionID">387</int>
</object>
</array>
<object class="IBMutableOrderedSet" key="objectRecords">
<array key="orderedObjects">
@@ -1135,6 +1171,7 @@
<reference key="object" ref="521420514"/>
<array class="NSMutableArray" key="children">
<reference ref="1000382251"/>
<reference ref="231106999"/>
</array>
<reference key="parent" ref="820989392"/>
</object>
@@ -1143,6 +1180,19 @@
<reference key="object" ref="1000382251"/>
<reference key="parent" ref="521420514"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">385</int>
<reference key="object" ref="231106999"/>
<array class="NSMutableArray" key="children">
<reference ref="132642450"/>
</array>
<reference key="parent" ref="521420514"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">386</int>
<reference key="object" ref="132642450"/>
<reference key="parent" ref="231106999"/>
</object>
</array>
</object>
<dictionary class="NSMutableDictionary" key="flattenedProperties">
@@ -1228,6 +1278,8 @@
<string key="356.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="357.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="358.IBPluginDependency">com.apple.WebKitIBPlugin</string>
<string key="385.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="386.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="6.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSMutableDictionary" key="99.IBAttributePlaceholdersKey">
<string key="NS.key.0">InitialTabViewItem</string>
@@ -1243,9 +1295,178 @@
<nil key="activeLocalization"/>
<dictionary class="NSMutableDictionary" key="localizations"/>
<nil key="sourceID"/>
<int key="maxID">384</int>
<int key="maxID">387</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<array class="NSMutableArray" key="referencedPartialClassDescriptions">
<object class="IBPartialClassDescription">
<string key="className">DNSCrypt</string>
<string key="superclassName">NSPreferencePane</string>
<dictionary class="NSMutableDictionary" key="actions">
<string key="dnscryptButtonPressed:">NSButton</string>
<string key="fallbackButtonPressed:">NSButton</string>
<string key="familyShieldButtonPressed:">NSButton</string>
<string key="openDNSLinkPushed:">NSButton</string>
<string key="opendnsButtonPressed:">NSButton</string>
<string key="uninstallPushed:">NSButton</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="actionInfosByName">
<object class="IBActionInfo" key="dnscryptButtonPressed:">
<string key="name">dnscryptButtonPressed:</string>
<string key="candidateClassName">NSButton</string>
</object>
<object class="IBActionInfo" key="fallbackButtonPressed:">
<string key="name">fallbackButtonPressed:</string>
<string key="candidateClassName">NSButton</string>
</object>
<object class="IBActionInfo" key="familyShieldButtonPressed:">
<string key="name">familyShieldButtonPressed:</string>
<string key="candidateClassName">NSButton</string>
</object>
<object class="IBActionInfo" key="openDNSLinkPushed:">
<string key="name">openDNSLinkPushed:</string>
<string key="candidateClassName">NSButton</string>
</object>
<object class="IBActionInfo" key="opendnsButtonPressed:">
<string key="name">opendnsButtonPressed:</string>
<string key="candidateClassName">NSButton</string>
</object>
<object class="IBActionInfo" key="uninstallPushed:">
<string key="name">uninstallPushed:</string>
<string key="candidateClassName">NSButton</string>
</object>
</dictionary>
<dictionary class="NSMutableDictionary" key="outlets">
<string key="aboutTabViewItem">NSTabViewItem</string>
<string key="aboutWebView">WebView</string>
<string key="currentResolverTextField">NSTextField</string>
<string key="dnscryptButton">NSButton</string>
<string key="fallbackButton">NSButton</string>
<string key="familyShieldButton">NSButton</string>
<string key="feedbackWebView">WebView</string>
<string key="opendnsButton">NSButton</string>
<string key="previewNotesWebView">WebView</string>
<string key="releaseNotesTabViewItem">NSTabViewItem</string>
<string key="releaseNotesWebView">WebView</string>
<string key="statusImageView">NSImageView</string>
<string key="statusText">NSTextField</string>
<string key="tabView">NSTabView</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
<object class="IBToOneOutletInfo" key="aboutTabViewItem">
<string key="name">aboutTabViewItem</string>
<string key="candidateClassName">NSTabViewItem</string>
</object>
<object class="IBToOneOutletInfo" key="aboutWebView">
<string key="name">aboutWebView</string>
<string key="candidateClassName">WebView</string>
</object>
<object class="IBToOneOutletInfo" key="currentResolverTextField">
<string key="name">currentResolverTextField</string>
<string key="candidateClassName">NSTextField</string>
</object>
<object class="IBToOneOutletInfo" key="dnscryptButton">
<string key="name">dnscryptButton</string>
<string key="candidateClassName">NSButton</string>
</object>
<object class="IBToOneOutletInfo" key="fallbackButton">
<string key="name">fallbackButton</string>
<string key="candidateClassName">NSButton</string>
</object>
<object class="IBToOneOutletInfo" key="familyShieldButton">
<string key="name">familyShieldButton</string>
<string key="candidateClassName">NSButton</string>
</object>
<object class="IBToOneOutletInfo" key="feedbackWebView">
<string key="name">feedbackWebView</string>
<string key="candidateClassName">WebView</string>
</object>
<object class="IBToOneOutletInfo" key="opendnsButton">
<string key="name">opendnsButton</string>
<string key="candidateClassName">NSButton</string>
</object>
<object class="IBToOneOutletInfo" key="previewNotesWebView">
<string key="name">previewNotesWebView</string>
<string key="candidateClassName">WebView</string>
</object>
<object class="IBToOneOutletInfo" key="releaseNotesTabViewItem">
<string key="name">releaseNotesTabViewItem</string>
<string key="candidateClassName">NSTabViewItem</string>
</object>
<object class="IBToOneOutletInfo" key="releaseNotesWebView">
<string key="name">releaseNotesWebView</string>
<string key="candidateClassName">WebView</string>
</object>
<object class="IBToOneOutletInfo" key="statusImageView">
<string key="name">statusImageView</string>
<string key="candidateClassName">NSImageView</string>
</object>
<object class="IBToOneOutletInfo" key="statusText">
<string key="name">statusText</string>
<string key="candidateClassName">NSTextField</string>
</object>
<object class="IBToOneOutletInfo" key="tabView">
<string key="name">tabView</string>
<string key="candidateClassName">NSTabView</string>
</object>
</dictionary>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/DNSCrypt.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSPreferencePane</string>
<string key="superclassName">NSObject</string>
<dictionary class="NSMutableDictionary" key="outlets">
<string key="_firstKeyView">NSView</string>
<string key="_initialKeyView">NSView</string>
<string key="_lastKeyView">NSView</string>
<string key="_window">NSWindow</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
<object class="IBToOneOutletInfo" key="_firstKeyView">
<string key="name">_firstKeyView</string>
<string key="candidateClassName">NSView</string>
</object>
<object class="IBToOneOutletInfo" key="_initialKeyView">
<string key="name">_initialKeyView</string>
<string key="candidateClassName">NSView</string>
</object>
<object class="IBToOneOutletInfo" key="_lastKeyView">
<string key="name">_lastKeyView</string>
<string key="candidateClassName">NSView</string>
</object>
<object class="IBToOneOutletInfo" key="_window">
<string key="name">_window</string>
<string key="candidateClassName">NSWindow</string>
</object>
</dictionary>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/NSPreferencePane.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">WebView</string>
<object class="NSMutableDictionary" key="actions">
<string key="NS.key.0">reloadFromOrigin:</string>
<string key="NS.object.0">id</string>
</object>
<object class="NSMutableDictionary" key="actionInfosByName">
<string key="NS.key.0">reloadFromOrigin:</string>
<object class="IBActionInfo" key="NS.object.0">
<string key="name">reloadFromOrigin:</string>
<string key="candidateClassName">id</string>
</object>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/WebView.h</string>
</object>
</object>
</array>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes"/>
<int key="IBDocument.localizationMode">0</int>
<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
@@ -0,0 +1,46 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleAllowMixedLocalizations</key>
<true/>
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleExecutable</key>
<string>applet</string>
<key>CFBundleIconFile</key>
<string>applet</string>
<key>CFBundleIdentifier</key>
<string>com.apple.ScriptEditor.id.Uninstall</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>Uninstall</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleSignature</key>
<string>aplt</string>
<key>LSMinimumSystemVersionByArchitecture</key>
<dict>
<key>x86_64</key>
<string>10.6</string>
</dict>
<key>LSRequiresCarbon</key>
<true/>
<key>WindowState</key>
<dict>
<key>dividerCollapsed</key>
<false/>
<key>eventLogLevel</key>
<integer>-1</integer>
<key>name</key>
<string>ScriptWindowState</string>
<key>positionOfDivider</key>
<real>334</real>
<key>savedFrame</key>
<string>82 147 1193 599 0 0 1366 746 </string>
<key>selectedTabView</key>
<string>result</string>
</dict>
</dict>
</plist>
Binary file not shown.

After

Width:  |  Height:  |  Size: 362 B

@@ -0,0 +1,4 @@
{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf200
{\fonttbl}
{\colortbl;\red255\green255\blue255;}
}