Revision: 5250
          http://skim-app.svn.sourceforge.net/skim-app/?rev=5250&view=rev
Author:   hofman
Date:     2009-03-04 15:20:02 +0000 (Wed, 04 Mar 2009)

Log Message:
-----------
Let Sparkle ask for update permission, unless the user has used Skim+Sparkle 
with an older version before.

Modified Paths:
--------------
    trunk/English.lproj/MainMenu.nib/classes.nib
    trunk/English.lproj/MainMenu.nib/info.nib
    trunk/English.lproj/MainMenu.nib/keyedobjects.nib
    trunk/Info.plist
    trunk/SKApplicationController.m

Modified: trunk/English.lproj/MainMenu.nib/classes.nib
===================================================================
--- trunk/English.lproj/MainMenu.nib/classes.nib        2009-03-04 10:42:08 UTC 
(rev 5249)
+++ trunk/English.lproj/MainMenu.nib/classes.nib        2009-03-04 15:20:02 UTC 
(rev 5250)
@@ -7,6 +7,36 @@
                <dict>
                        <key>ACTIONS</key>
                        <dict>
+                               <key>openPDF</key>
+                               <string>id</string>
+                               <key>searchNotes</key>
+                               <string>id</string>
+                               <key>toggleCaseInsensitiveSearch</key>
+                               <string>id</string>
+                               <key>toggleStatusBar</key>
+                               <string>id</string>
+                       </dict>
+                       <key>CLASS</key>
+                       <string>SKNotesDocument</string>
+                       <key>LANGUAGE</key>
+                       <string>ObjC</string>
+                       <key>OUTLETS</key>
+                       <dict>
+                               <key>arrayController</key>
+                               <string>NSArrayController</string>
+                               <key>outlineView</key>
+                               <string>SKNoteOutlineView</string>
+                               <key>searchField</key>
+                               <string>NSSearchField</string>
+                               <key>statusBar</key>
+                               <string>SKStatusBar</string>
+                       </dict>
+                       <key>SUPERCLASS</key>
+                       <string>NSDocument</string>
+               </dict>
+               <dict>
+                       <key>ACTIONS</key>
+                       <dict>
                                <key>dismissNoteTypeSheet</key>
                                <string>id</string>
                                <key>displayAllNoteTypes</key>
@@ -69,6 +99,14 @@
                        <string>NSWindowController</string>
                </dict>
                <dict>
+                       <key>CLASS</key>
+                       <string>NSApplication</string>
+                       <key>LANGUAGE</key>
+                       <string>ObjC</string>
+                       <key>SUPERCLASS</key>
+                       <string>NSResponder</string>
+               </dict>
+               <dict>
                        <key>ACTIONS</key>
                        <dict>
                                <key>deleteBookmark</key>
@@ -114,11 +152,11 @@
                </dict>
                <dict>
                        <key>CLASS</key>
-                       <string>NSMenu</string>
+                       <string>NSWindowController</string>
                        <key>LANGUAGE</key>
                        <string>ObjC</string>
                        <key>SUPERCLASS</key>
-                       <string>NSObject</string>
+                       <string>NSResponder</string>
                </dict>
                <dict>
                        <key>ACTIONS</key>
@@ -269,6 +307,8 @@
                                <string>id</string>
                                <key>toggleAutoScale</key>
                                <string>id</string>
+                               <key>toggleCaseInsensitiveNoteSearch</key>
+                               <string>id</string>
                                <key>toggleCaseInsensitiveSearch</key>
                                <string>id</string>
                                <key>toggleDisplayAsBook</key>
@@ -429,7 +469,7 @@
                                <key>snapshotArrayController</key>
                                <string>NSArrayController</string>
                                <key>snapshotTableView</key>
-                               <string>SKSnapshotTableView</string>
+                               <string>SKThumbnailTableView</string>
                                <key>snapshotView</key>
                                <string>NSView</string>
                                <key>splitView</key>
@@ -462,11 +502,11 @@
                </dict>
                <dict>
                        <key>CLASS</key>
-                       <string>NSWindowController</string>
+                       <string>NSMenu</string>
                        <key>LANGUAGE</key>
                        <string>ObjC</string>
                        <key>SUPERCLASS</key>
-                       <string>NSResponder</string>
+                       <string>NSObject</string>
                </dict>
                <dict>
                        <key>ACTIONS</key>
@@ -489,14 +529,6 @@
                </dict>
                <dict>
                        <key>CLASS</key>
-                       <string>SKSnapshotTableView</string>
-                       <key>LANGUAGE</key>
-                       <string>ObjC</string>
-                       <key>SUPERCLASS</key>
-                       <string>SKThumbnailTableView</string>
-               </dict>
-               <dict>
-                       <key>CLASS</key>
                        <string>SKSplitView</string>
                        <key>LANGUAGE</key>
                        <string>ObjC</string>
@@ -543,6 +575,11 @@
                        <string>SUUpdater</string>
                        <key>LANGUAGE</key>
                        <string>ObjC</string>
+                       <key>OUTLETS</key>
+                       <dict>
+                               <key>delegate</key>
+                               <string>id</string>
+                       </dict>
                        <key>SUPERCLASS</key>
                        <string>NSObject</string>
                </dict>
@@ -614,6 +651,14 @@
                        <string>NSControl</string>
                </dict>
                <dict>
+                       <key>CLASS</key>
+                       <string>SKBookmarkOutlineView</string>
+                       <key>LANGUAGE</key>
+                       <string>ObjC</string>
+                       <key>SUPERCLASS</key>
+                       <string>SKOutlineView</string>
+               </dict>
+               <dict>
                        <key>ACTIONS</key>
                        <dict>
                                <key>editBookmarks</key>
@@ -654,14 +699,6 @@
                </dict>
                <dict>
                        <key>CLASS</key>
-                       <string>SKBookmarkOutlineView</string>
-                       <key>LANGUAGE</key>
-                       <string>ObjC</string>
-                       <key>SUPERCLASS</key>
-                       <string>SKOutlineView</string>
-               </dict>
-               <dict>
-                       <key>CLASS</key>
                        <string>NSView</string>
                        <key>LANGUAGE</key>
                        <string>ObjC</string>

Modified: trunk/English.lproj/MainMenu.nib/info.nib
===================================================================
--- trunk/English.lproj/MainMenu.nib/info.nib   2009-03-04 10:42:08 UTC (rev 
5249)
+++ trunk/English.lproj/MainMenu.nib/info.nib   2009-03-04 15:20:02 UTC (rev 
5250)
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
        <key>IBFramework Version</key>
-       <string>672</string>
+       <string>677</string>
        <key>IBLastKnownRelativeProjectPath</key>
        <string>../Skim.xcodeproj</string>
        <key>IBOldestOS</key>
@@ -13,7 +13,7 @@
                <integer>29</integer>
        </array>
        <key>IBSystem Version</key>
-       <string>9F33</string>
+       <string>9G55</string>
        <key>targetFramework</key>
        <string>IBCocoaFramework</string>
 </dict>

Modified: trunk/English.lproj/MainMenu.nib/keyedobjects.nib
===================================================================
(Binary files differ)

Modified: trunk/Info.plist
===================================================================
--- trunk/Info.plist    2009-03-04 10:42:08 UTC (rev 5249)
+++ trunk/Info.plist    2009-03-04 15:20:02 UTC (rev 5250)
@@ -487,8 +487,6 @@
        </array>
        <key>OSAScriptingDefinition</key>
        <string>Skim.sdef</string>
-       <key>SUEnableAutomaticChecks</key>
-       <true/>
        <key>SUFeedURL</key>
        <string>http://skim-app.sourceforge.net/skim.xml</string>
        <key>SUPublicDSAKeyFile</key>

Modified: trunk/SKApplicationController.m
===================================================================
--- trunk/SKApplicationController.m     2009-03-04 10:42:08 UTC (rev 5249)
+++ trunk/SKApplicationController.m     2009-03-04 15:20:02 UTC (rev 5250)
@@ -259,6 +259,17 @@
     }
 }
 
+#pragma mark Updater
+
+- (BOOL)updaterShouldPromptForPermissionToCheckForUpdates:(SUUpdater *)updater 
{
+    if ([[NSUserDefaults standardUserDefaults] 
objectForKey:@"SUScheduledCheckInterval"]) {
+        // the user already used an older version of Skim and Sparkle
+        [updater setAutomaticallyChecksForUpdates:[[NSUserDefaults 
standardUserDefaults] integerForKey:@"SUScheduledCheckInterval"] > 0];
+        return NO;
+    }
+    return YES;
+}
+
 #pragma mark Services Support
 
 - (void)openDocumentFromURLOnPboard:(NSPasteboard *)pboard userData:(NSString 
*)userData error:(NSString **)error {


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

------------------------------------------------------------------------------
Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA
-OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise
-Strategies to boost innovation and cut costs with open source participation
-Receive a $600 discount off the registration fee with the source code: SFAD
http://p.sf.net/sfu/XcvMzF8H
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit

Reply via email to