|
From: <de...@us...> - 2009-09-23 01:19:01
|
Revision: 1828
http://iterm.svn.sourceforge.net/iterm/?rev=1828&view=rev
Author: delx
Date: 2009-09-23 01:18:49 +0000 (Wed, 23 Sep 2009)
Log Message:
-----------
New sparkle - SUFeedURL and preferences fixes
Modified Paths:
--------------
branches/newsparkle/English.lproj/PreferencePanel.xib
branches/newsparkle/PreferencePanel.m
branches/newsparkle/iTerm.plist
branches/newsparkle/iTerm.xcodeproj/project.pbxproj
branches/newsparkle/iTermApplicationDelegate.m
Added Paths:
-----------
branches/newsparkle/dsa_pub.pem
Modified: branches/newsparkle/English.lproj/PreferencePanel.xib
===================================================================
--- branches/newsparkle/English.lproj/PreferencePanel.xib 2009-09-23 00:15:58 UTC (rev 1827)
+++ branches/newsparkle/English.lproj/PreferencePanel.xib 2009-09-23 01:18:49 UTC (rev 1828)
@@ -2,13 +2,13 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.03">
<data>
<int key="IBDocument.SystemTarget">1050</int>
- <string key="IBDocument.SystemVersion">9G2133</string>
+ <string key="IBDocument.SystemVersion">9L30</string>
<string key="IBDocument.InterfaceBuilderVersion">677</string>
- <string key="IBDocument.AppKitVersion">949.43</string>
+ <string key="IBDocument.AppKitVersion">949.54</string>
<string key="IBDocument.HIToolboxVersion">353.00</string>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
- <integer value="1680"/>
+ <integer value="323"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -60,7 +60,7 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSTabViewItem" id="163603654">
<object class="NSView" key="NSView" id="558013919">
- <nil key="NSNextResponder"/>
+ <reference key="NSNextResponder" ref="560294543"/>
<int key="NSvFlags">256</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -252,7 +252,7 @@
<object class="NSButtonCell" key="NSCell" id="852546834">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">0</int>
- <string key="NSContents">Check updates when iTerms starts</string>
+ <string key="NSContents">Check for updates automatically</string>
<reference key="NSSupport" ref="966507434"/>
<reference key="NSControlView" ref="790902597"/>
<int key="NSButtonFlags">1211912703</int>
@@ -289,6 +289,7 @@
</object>
</object>
<string key="NSFrame">{{10, 33}, {381, 185}}</string>
+ <reference key="NSSuperview" ref="560294543"/>
<reference key="NSNextKeyView" ref="12109862"/>
</object>
<string key="NSLabel">General</string>
@@ -297,7 +298,7 @@
</object>
<object class="NSTabViewItem" id="932824733">
<object class="NSView" key="NSView" id="938649533">
- <reference key="NSNextResponder" ref="560294543"/>
+ <nil key="NSNextResponder"/>
<int key="NSvFlags">256</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -578,7 +579,6 @@
</object>
</object>
<string key="NSFrame">{{10, 33}, {381, 185}}</string>
- <reference key="NSSuperview" ref="560294543"/>
</object>
<string key="NSLabel">Window</string>
<reference key="NSColor" ref="303715562"/>
@@ -1256,14 +1256,14 @@
<reference key="NSTabView" ref="560294543"/>
</object>
</object>
- <reference key="NSSelectedTabViewItem" ref="932824733"/>
+ <reference key="NSSelectedTabViewItem" ref="163603654"/>
<reference key="NSFont" ref="966507434"/>
<int key="NSTvFlags">0</int>
<bool key="NSAllowTruncatedLabels">YES</bool>
<bool key="NSDrawsBackground">YES</bool>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="938649533"/>
+ <reference ref="558013919"/>
</object>
</object>
<object class="NSButton" id="275916175">
@@ -2643,11 +2643,49 @@
<string>1831.ImportedFromIB2</string>
<string>1874.IBPluginDependency</string>
<string>1874.ImportedFromIB2</string>
+ <string>1881.IBPluginDependency</string>
+ <string>1882.IBPluginDependency</string>
+ <string>1883.IBPluginDependency</string>
+ <string>1884.IBPluginDependency</string>
+ <string>1885.IBPluginDependency</string>
+ <string>1886.IBPluginDependency</string>
+ <string>1887.IBPluginDependency</string>
+ <string>1888.IBPluginDependency</string>
+ <string>1889.IBPluginDependency</string>
+ <string>1890.IBPluginDependency</string>
+ <string>1891.IBPluginDependency</string>
+ <string>1892.IBPluginDependency</string>
+ <string>1893.IBPluginDependency</string>
+ <string>1894.IBPluginDependency</string>
+ <string>1895.IBPluginDependency</string>
+ <string>1896.IBPluginDependency</string>
+ <string>1897.IBPluginDependency</string>
+ <string>1898.IBPluginDependency</string>
+ <string>1899.IBPluginDependency</string>
+ <string>1900.IBPluginDependency</string>
+ <string>1901.IBPluginDependency</string>
+ <string>1902.IBPluginDependency</string>
+ <string>1903.IBPluginDependency</string>
+ <string>1904.IBPluginDependency</string>
+ <string>1905.IBPluginDependency</string>
+ <string>1906.IBPluginDependency</string>
+ <string>1907.IBPluginDependency</string>
+ <string>1908.IBPluginDependency</string>
+ <string>1909.IBPluginDependency</string>
+ <string>1910.IBPluginDependency</string>
+ <string>1911.IBPluginDependency</string>
+ <string>1912.IBPluginDependency</string>
+ <string>1913.IBPluginDependency</string>
<string>1913.IBShouldRemoveOnLegacySave</string>
+ <string>1914.IBPluginDependency</string>
<string>1914.IBShouldRemoveOnLegacySave</string>
+ <string>1915.IBPluginDependency</string>
<string>1915.IBShouldRemoveOnLegacySave</string>
+ <string>1916.IBPluginDependency</string>
<string>1916.IBShouldRemoveOnLegacySave</string>
+ <string>1917.IBPluginDependency</string>
<string>1917.IBShouldRemoveOnLegacySave</string>
+ <string>1918.IBPluginDependency</string>
<string>1918.IBShouldRemoveOnLegacySave</string>
<string>32.IBEditorWindowLastContentRect</string>
<string>32.IBWindowTemplateEditedContentRect</string>
@@ -2783,11 +2821,49 @@
<reference ref="5"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="5"/>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="5"/>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="5"/>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="5"/>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="5"/>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="5"/>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="5"/>
<string>{{208, 103}, {427, 247}}</string>
<string>{{208, 103}, {427, 247}}</string>
Modified: branches/newsparkle/PreferencePanel.m
===================================================================
--- branches/newsparkle/PreferencePanel.m 2009-09-23 00:15:58 UTC (rev 1827)
+++ branches/newsparkle/PreferencePanel.m 2009-09-23 01:18:49 UTC (rev 1828)
@@ -148,7 +148,7 @@
defaultOpenBookmark = [prefs objectForKey:@"OpenBookmark"]?[[prefs objectForKey:@"OpenBookmark"] boolValue]: NO;
defaultQuitWhenAllWindowsClosed = [prefs objectForKey:@"QuitWhenAllWindowsClosed"]?[[prefs objectForKey:@"QuitWhenAllWindowsClosed"] boolValue]: NO;
defaultCursorType=[prefs objectForKey:@"CursorType"]?[prefs integerForKey:@"CursorType"]:2;
- defaultCheckUpdate = [prefs objectForKey:@"SUCheckAtStartup"]?[[prefs objectForKey:@"SUCheckAtStartup"] boolValue]: YES;
+ defaultCheckUpdate = [prefs objectForKey:@"SUEnableAutomaticChecks"]?[[prefs objectForKey:@"SUEnableAutomaticChecks"] boolValue]: YES;
defaultUseBorder = [prefs objectForKey:@"UseBorder"]?[[prefs objectForKey:@"UseBorder"] boolValue]: NO;
defaultHideScrollbar = [prefs objectForKey:@"HideScrollbar"]?[[prefs objectForKey:@"HideScrollbar"] boolValue]: NO;
defaultCheckTestRelease = [prefs objectForKey:@"CheckTestRelease"]?[[prefs objectForKey:@"CheckTestRelease"] boolValue]: YES;
@@ -205,7 +205,7 @@
[prefs setObject: [[iTermTerminalProfileMgr singleInstance] profiles] forKey: @"Terminals"];
[prefs setObject: [[ITAddressBookMgr sharedInstance] bookmarks] forKey: @"Bookmarks"];
[prefs setBool:defaultQuitWhenAllWindowsClosed forKey:@"QuitWhenAllWindowsClosed"];
- [prefs setBool:defaultCheckUpdate forKey:@"SUCheckAtStartup"];
+ [prefs setBool:defaultCheckUpdate forKey:@"SUEnableAutomaticChecks"];
[prefs setInteger:defaultCursorType forKey:@"CursorType"];
[prefs setBool:defaultUseBorder forKey:@"UseBorder"];
[prefs setBool:defaultHideScrollbar forKey:@"HideScrollbar"];
@@ -253,7 +253,7 @@
[refreshRate setIntValue: defaultRefreshRate];
[wordChars setStringValue: ([defaultWordChars length] > 0)?defaultWordChars:@""];
[quitWhenAllWindowsClosed setState: defaultQuitWhenAllWindowsClosed?NSOnState:NSOffState];
- [checkUpdate setState: defaultCheckUpdate?NSOnState:NSOffState];
+ [checkUpdate setState: defaultCheckUpdate?NSOnState:NSOffState];
[cursorType selectCellWithTag:defaultCursorType];
[useBorder setState: defaultUseBorder?NSOnState:NSOffState];
[hideScrollbar setState: defaultHideScrollbar?NSOnState:NSOffState];
@@ -310,15 +310,10 @@
defaultCheckTestRelease = ([checkTestRelease state] == NSOnState);
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4
- NSString *appCast = defaultCheckTestRelease ?
- [[NSBundle mainBundle] objectForInfoDictionaryKey:@"SUFeedURL"] :
- [[NSBundle mainBundle] objectForInfoDictionaryKey:@"SUFeedURLForFinalRelease"];
+ NSString *appCast = defaultCheckTestRelease ?
+ [[NSBundle mainBundle] objectForInfoDictionaryKey:@"SUFeedURLForTesting"] :
+ [[NSBundle mainBundle] objectForInfoDictionaryKey:@"SUFeedURLForFinal"];
[[NSUserDefaults standardUserDefaults] setObject: appCast forKey:@"SUFeedURL"];
-#else
- NSString *appCast = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"SUFeedURLForPanther"];
- [[NSUserDefaults standardUserDefaults] setObject: appCast forKey:@"SUFeedURL"];
-#endif
}
}
}
Added: branches/newsparkle/dsa_pub.pem
===================================================================
--- branches/newsparkle/dsa_pub.pem (rev 0)
+++ branches/newsparkle/dsa_pub.pem 2009-09-23 01:18:49 UTC (rev 1828)
@@ -0,0 +1,20 @@
+-----BEGIN PUBLIC KEY-----
+MIIDOjCCAi0GByqGSM44BAEwggIgAoIBAQDCJaphqc+oMFjXq36dYoLA/3hEaCbh
+sIZlaScdtoS91BETnt6qPtcqGZfXx+W9nTAvdZfyJwMM0zsXG92e9V9xtr+fbixS
+OQeBmsfSu+LOdIwwjRliMU2XdcFi8Taarl6BznjUrsW+UDGrEgf/0ZABvPkT5vRu
+na8LSzhc37Zq/qEU22Ljw8jOA5eZVjY8sJXUsjrOoK2JTo/F6kM2J6/KxQBporTF
+/Bj1lewZyj5kTZ1NEtUOc0nbsqQfJow0Q3SOj2aC40JlHOQkYMmlJNzKCO2U4BvQ
+K8+U4xu7DFxrnicObmqkDhQ7J3CEvi1KAyIpYkdJ6mhb3he/rP3Y8SMtAhUAqsbN
+sNFg94wRGrm9AvXCLydtsdUCggEAYY+wBgfH6grXENP++Ik9ldSD9Ndy6KrXzdg6
+EXqfz3gfNvxRypIgsotNYo/XPz9jwS33I6kfkepDWwCUoCdiH73ssFM7ZAtXDQn6
+oG09q9+CilGom+rwUj50UVkJMOzRRTGcag+w6Hn0GAn61fNwtaj71T8HKzgWuROR
+5rb+E0PtHdiaUIzIy2jGZkw3dNogEKvn03eEbxHcKIh9LwxqL1jetRgfMUYpviWR
+gK8271MM4Pm2HA35rvY5ivBZsxU4DQPJ8HNjSQZxg7AaX6g+Tc6hHnPU1OWZtJiz
+m5vWzNyPsO/aRz0Y3zO1rew3CM3TEQePfnPXbTI+3Xw0/ZH2hQOCAQUAAoIBAFmb
+ROBReUveKovsmU80clAyKD1APmmAQ891p7Fen+A0/2mw6VTnjdwcg55nOfd7tvIw
+gWiMMvu+qjbT1OKKMRtockh5AijkzmzsE9gsmdfFiElvI6X/QTpFsMC85fB5uBfy
+21PwNwGCzv3NffovqYvg4DYSEHJfh8mFtFC27td1byk1HcxphcPEp4Bh8ZBXQ02v
+vBfikGuHEm7Ci9IcCaqSmKOZeOeM1kMXI6IriXARiiSlT9h5+MFQGtXOBM49VM/9
+4XWgadSdV/pyBotKB1hEzWZ4sM2EQ0JSBIl3FwLWEDMtio10aPHIyVHg7j3TX00E
+Mf7gbAyWRMlMpam2Xfk=
+-----END PUBLIC KEY-----
Modified: branches/newsparkle/iTerm.plist
===================================================================
--- branches/newsparkle/iTerm.plist 2009-09-23 00:15:58 UTC (rev 1827)
+++ branches/newsparkle/iTerm.plist 2009-09-23 01:18:49 UTC (rev 1828)
@@ -173,12 +173,12 @@
<string>MainMenu</string>
<key>NSPrincipalClass</key>
<string>iTermApplication</string>
- <key>SUFeedURL</key>
- <string>http://iterm.sourceforge.net/appcast.xml</string>
- <key>SUFeedURLForFinalRelease</key>
- <string>http://iterm.sourceforge.net/appcast_final.xml</string>
- <key>SUFeedURLForPanther</key>
- <string>http://iterm.sourceforge.net/appcast_panther.xml</string>
+ <key>SUPublicDSAKeyFile</key>
+ <string>dsa_pub.pem</string>
+ <key>SUFeedURLForTesting</key>
+ <string>http://iterm.sourceforge.net/appcasts/b/testing.xml</string>
+ <key>SUFeedURLForFinal</key>
+ <string>http://iterm.sourceforge.net/appcasts/b/final.xml</string>
<key>SmartCrashReports_CompanyName</key>
<string>iTerm</string>
<key>SmartCrashReports_EmailTicket</key>
Modified: branches/newsparkle/iTerm.xcodeproj/project.pbxproj
===================================================================
--- branches/newsparkle/iTerm.xcodeproj/project.pbxproj 2009-09-23 00:15:58 UTC (rev 1827)
+++ branches/newsparkle/iTerm.xcodeproj/project.pbxproj 2009-09-23 01:18:49 UTC (rev 1828)
@@ -75,6 +75,7 @@
9325FF4C0FB54DF1004EC67C /* FindPanel.xib in Resources */ = {isa = PBXBuildFile; fileRef = 9325FF440FB54DF1004EC67C /* FindPanel.xib */; };
9325FF4D0FB54DF1004EC67C /* Bookmarks.xib in Resources */ = {isa = PBXBuildFile; fileRef = 9325FF460FB54DF1004EC67C /* Bookmarks.xib */; };
9325FF500FB54E00004EC67C /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 9325FF4E0FB54E00004EC67C /* MainMenu.xib */; };
+ 93A6FEFA10685E9900A5F905 /* dsa_pub.pem in Resources */ = {isa = PBXBuildFile; fileRef = 93A6FEF910685E9900A5F905 /* dsa_pub.pem */; };
DD02573F09CB9399008F320C /* PSMAquaTabStyle.h in Headers */ = {isa = PBXBuildFile; fileRef = DD02572409CB9398008F320C /* PSMAquaTabStyle.h */; };
DD02574009CB9399008F320C /* PSMAquaTabStyle.m in Sources */ = {isa = PBXBuildFile; fileRef = DD02572509CB9398008F320C /* PSMAquaTabStyle.m */; };
DD02574109CB9399008F320C /* PSMMetalTabStyle.h in Headers */ = {isa = PBXBuildFile; fileRef = DD02572609CB9398008F320C /* PSMMetalTabStyle.h */; };
@@ -264,6 +265,7 @@
9325FF450FB54DF1004EC67C /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/FindPanel.xib; sourceTree = "<group>"; };
9325FF470FB54DF1004EC67C /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/Bookmarks.xib; sourceTree = "<group>"; };
9325FF4F0FB54E00004EC67C /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/MainMenu.xib; sourceTree = "<group>"; };
+ 93A6FEF910685E9900A5F905 /* dsa_pub.pem */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = dsa_pub.pem; sourceTree = "<group>"; };
DD02572409CB9398008F320C /* PSMAquaTabStyle.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PSMAquaTabStyle.h; sourceTree = "<group>"; };
DD02572509CB9398008F320C /* PSMAquaTabStyle.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = PSMAquaTabStyle.m; sourceTree = "<group>"; };
DD02572609CB9398008F320C /* PSMMetalTabStyle.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PSMMetalTabStyle.h; sourceTree = "<group>"; };
@@ -569,6 +571,7 @@
F500A65D0395269C01A8A066 /* Changelog */,
DD8CF2DD03CDD34B00A8A065 /* iTerm Help */,
DDB79A9A0612BBBF00EAE159 /* Profiles.plist */,
+ 93A6FEF910685E9900A5F905 /* dsa_pub.pem */,
);
name = "Supporting Files";
sourceTree = "<group>";
@@ -996,6 +999,7 @@
8742064D0564169600CFC3F1 /* iTerm.icns in Resources */,
F6CDC4E70AE6D3E2005E7D4F /* folder.png in Resources */,
9325FF500FB54E00004EC67C /* MainMenu.xib in Resources */,
+ 93A6FEFA10685E9900A5F905 /* dsa_pub.pem in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Modified: branches/newsparkle/iTermApplicationDelegate.m
===================================================================
--- branches/newsparkle/iTermApplicationDelegate.m 2009-09-23 00:15:58 UTC (rev 1827)
+++ branches/newsparkle/iTermApplicationDelegate.m 2009-09-23 01:18:49 UTC (rev 1828)
@@ -79,18 +79,6 @@
[iTermProfileWindowController sharedInstance];
[iTermBookmarkController sharedInstance];
[PreferencePanel sharedInstance];
-
-
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4
- NSString *appCast = [[PreferencePanel sharedInstance] checkTestRelease] ?
- [[NSBundle mainBundle] objectForInfoDictionaryKey:@"SUFeedURL"] :
- [[NSBundle mainBundle] objectForInfoDictionaryKey:@"SUFeedURLForFinalRelease"];
- [[NSUserDefaults standardUserDefaults] setObject: appCast forKey:@"SUFeedURL"];
-#else
- NSString *appCast = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"SUFeedURLForPanther"];
- [[NSUserDefaults standardUserDefaults] setObject: appCast forKey:@"SUFeedURL"];
-#endif
-
}
- (void)applicationDidFinishLaunching:(NSNotification *)aNotification
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|