Revision: 4762
          http://skim-app.svn.sourceforge.net/skim-app/?rev=4762&view=rev
Author:   hofman
Date:     2008-10-08 14:47:54 +0000 (Wed, 08 Oct 2008)

Log Message:
-----------
remember snapshots in document setup, used for last open files and setup and 
session bookmarks

Modified Paths:
--------------
    trunk/SKMainWindowController.m

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m      2008-10-08 11:38:19 UTC (rev 4761)
+++ trunk/SKMainWindowController.m      2008-10-08 14:47:54 UTC (rev 4762)
@@ -508,7 +508,9 @@
         [self performFit:self];
     
     // Open snapshots?
-    if ([sud boolForKey:SKRememberSnapshotsKey])
+    if (hasWindowSetup && [savedNormalSetup 
objectForKey:SKMainWindowSnapshotsKey])
+        [self showSnapshotWithSetups:[savedNormalSetup 
objectForKey:SKMainWindowSnapshotsKey]];
+    else if ([sud boolForKey:SKRememberSnapshotsKey])
         [self showSnapshotWithSetups:[[SKBookmarkController 
sharedBookmarkController] snapshotsAtPath:[[[self document] fileURL] path]]];
     
     // typeSelectHelpers
@@ -563,6 +565,7 @@
     [setup setObject:[NSNumber numberWithFloat:[self leftSidePaneIsOpen] ? 
NSWidth([leftSideContentView frame]) : 0.0] 
forKey:SKMainWindowLeftSidePaneWidthKey];
     [setup setObject:[NSNumber numberWithFloat:[self rightSidePaneIsOpen] ? 
NSWidth([rightSideContentView frame]) : 0.0] 
forKey:SKMainWindowRightSidePaneWidthKey];
     [setup setObject:[NSNumber numberWithUnsignedInt:[[pdfView currentPage] 
pageIndex]] forKey:SKMainWindowPageIndexKey];
+    [setup setObject:[NSNumber numberWithUnsignedInt:[snapshots 
valueForKey:SKSnapshotCurrentSetupKey] forKey:SKMainWindowSnapshotsKey];
     if ([self isFullScreen] || [self isPresentation]) {
         [setup addEntriesFromDictionary:savedNormalSetup];
         [setup removeObjectsForKeys:[NSArray 
arrayWithObjects:SKMainWindowHasHorizontalScrollerKey, 
SKMainWindowHasVerticalScrollerKey, SKMainWindowAutoHidesScrollersKey, nil]];


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

-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit

Reply via email to