aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrowanbeentje <rowan@beent.je>2010-04-02 15:22:26 +0000
committerrowanbeentje <rowan@beent.je>2010-04-02 15:22:26 +0000
commitd8373245efdb63f4f8a27bdc646053f7b939f2f2 (patch)
tree8f925fd763e3d431d99d44653cdf07492cbd0e84
parent65105b5a7cf72913ef0dbd6da41df7a19609d44a (diff)
downloadsequelpro-d8373245efdb63f4f8a27bdc646053f7b939f2f2.tar.gz
sequelpro-d8373245efdb63f4f8a27bdc646053f7b939f2f2.tar.bz2
sequelpro-d8373245efdb63f4f8a27bdc646053f7b939f2f2.zip
- Initialise prefs controller before setting Sparkle delegate
- Move sparkle prefs reset from 2056 to 2057 - Tweak prefs key binding to the user preference stats enabled key rather than the overall Sparkle stats enabled key
-rw-r--r--Interfaces/English.lproj/Preferences.xib23
-rw-r--r--Source/SPAppController.m10
-rw-r--r--Source/SPPreferenceController.m4
3 files changed, 20 insertions, 17 deletions
diff --git a/Interfaces/English.lproj/Preferences.xib b/Interfaces/English.lproj/Preferences.xib
index 4c1f5013..93d00394 100644
--- a/Interfaces/English.lproj/Preferences.xib
+++ b/Interfaces/English.lproj/Preferences.xib
@@ -16,7 +16,7 @@
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>740</string>
- <string>1.2.2</string>
+ <string>1.2.5</string>
</object>
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
@@ -25,8 +25,8 @@
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
- <string>com.brandonwalkin.BWToolkit</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.brandonwalkin.BWToolkit</string>
</object>
<object class="NSMutableDictionary" key="IBDocument.Metadata">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -56,7 +56,7 @@
<string key="NSWindowTitle">Preferences</string>
<string key="NSWindowClass">NSWindow</string>
<nil key="NSViewClass"/>
- <string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
+ <string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
<string key="NSWindowContentMinSize">{500, 0}</string>
<object class="NSView" key="NSWindowView" id="1006">
<nil key="NSNextResponder"/>
@@ -65,7 +65,7 @@
</object>
<string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string>
<string key="NSMinSize">{500, 22}</string>
- <string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string>
+ <string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
</object>
<object class="NSCustomView" id="594324362">
<nil key="NSNextResponder"/>
@@ -454,7 +454,7 @@
<string key="NSColorName">controlColor</string>
<object class="NSColor" key="NSColor" id="432854223">
<int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MC42NjY2NjY2ODY1AA</bytes>
+ <bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
</object>
</object>
<object class="NSColor" key="NSTextColor" id="1035618107">
@@ -4204,6 +4204,7 @@ AQAAAAA</bytes>
<object class="NSUserDefaultsController" id="151174232">
<object class="NSMutableArray" key="NSDeclaredKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
+ <string>SUSendProfileInfo</string>
<string>SUEnableAutomaticChecks</string>
</object>
<bool key="NSSharedInstance">YES</bool>
@@ -6550,19 +6551,19 @@ AQAAAAA</bytes>
</object>
<object class="IBConnectionRecord">
<object class="IBBindingConnection" key="connection">
- <string key="label">value: values.SUEnableSystemProfiling</string>
+ <string key="label">value: values.SUSendProfileInfo</string>
<reference key="source" ref="467474047"/>
<reference key="destination" ref="151174232"/>
<object class="NSNibBindingConnector" key="connector">
<reference key="NSSource" ref="467474047"/>
<reference key="NSDestination" ref="151174232"/>
- <string key="NSLabel">value: values.SUEnableSystemProfiling</string>
+ <string key="NSLabel">value: values.SUSendProfileInfo</string>
<string key="NSBinding">value</string>
- <string key="NSKeyPath">values.SUEnableSystemProfiling</string>
+ <string key="NSKeyPath">values.SUSendProfileInfo</string>
<int key="NSNibBindingConnectorVersion">2</int>
</object>
</object>
- <int key="connectionID">1619</int>
+ <int key="connectionID">1624</int>
</object>
<object class="IBConnectionRecord">
<object class="IBBindingConnection" key="connection">
@@ -6578,7 +6579,7 @@ AQAAAAA</bytes>
<int key="NSNibBindingConnectorVersion">2</int>
</object>
</object>
- <int key="connectionID">1622</int>
+ <int key="connectionID">1625</int>
</object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
@@ -10476,7 +10477,7 @@ AQAAAAA</bytes>
</object>
</object>
<nil key="sourceID"/>
- <int key="maxID">1622</int>
+ <int key="maxID">1625</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
diff --git a/Source/SPAppController.m b/Source/SPAppController.m
index 9fc4b7b1..f0d4c9bf 100644
--- a/Source/SPAppController.m
+++ b/Source/SPAppController.m
@@ -62,12 +62,14 @@
*/
- (void)awakeFromNib
{
- // Set Sparkle delegate
- [[SUUpdater sharedUpdater] setDelegate:self];
-
+
+ // Set up the prefs controller
prefsController = [[SPPreferenceController alloc] init];
aboutController = nil;
-
+
+ // Set Sparkle delegate
+ [[SUUpdater sharedUpdater] setDelegate:self];
+
// Register SPAppController as services provider
[NSApp setServicesProvider:self];
diff --git a/Source/SPPreferenceController.m b/Source/SPPreferenceController.m
index 3bbc42a2..20173b32 100644
--- a/Source/SPPreferenceController.m
+++ b/Source/SPPreferenceController.m
@@ -303,8 +303,8 @@
[prefs removeObjectForKey:@"FetchCorrectRowCount"];
}
- // For versions prior to r2056 (~0.9.8), reset the Sparkle prefs so the user is prompted about submitting information
- if (recordedVersionNumber < 2056 && [prefs objectForKey:@"SUEnableAutomaticChecks"]) {
+ // For versions prior to r2057 (~0.9.8), reset the Sparkle prefs so the user is prompted about submitting information
+ if (recordedVersionNumber < 2057 && [prefs objectForKey:@"SUEnableAutomaticChecks"]) {
[prefs removeObjectForKey:@"SUEnableAutomaticChecks"];
[prefs removeObjectForKey:@"SUSendProfileInfo"];
}