Revision: 3027
http://skim-app.svn.sourceforge.net/skim-app/?rev=3027&view=rev
Author: hofman
Date: 2007-10-07 06:10:40 -0700 (Sun, 07 Oct 2007)
Log Message:
-----------
Show all snapshots in one method.
Modified Paths:
--------------
trunk/SKMainWindowController.h
trunk/SKMainWindowController.m
Modified: trunk/SKMainWindowController.h
===================================================================
--- trunk/SKMainWindowController.h 2007-10-07 13:05:51 UTC (rev 3026)
+++ trunk/SKMainWindowController.h 2007-10-07 13:10:40 UTC (rev 3027)
@@ -255,7 +255,7 @@
- (IBAction)chooseTransition:(id)sender;
- (void)showSnapshotAtPageNumber:(int)pageNum forRect:(NSRect)rect
scaleFactor:(int)scaleFactor autoFits:(BOOL)autoFits;
-- (void)showSnapshotWithSetup:(NSDictionary *)setup;
+- (void)showSnapshotWithSetups:(NSArray *)setups;
- (void)toggleSnapshots:(NSArray *)snapshotArray;
- (void)showNote:(PDFAnnotation *)annotation;
Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m 2007-10-07 13:05:51 UTC (rev 3026)
+++ trunk/SKMainWindowController.m 2007-10-07 13:10:40 UTC (rev 3027)
@@ -436,12 +436,8 @@
[self performFit:self];
// Open snapshots?
- if ([sud boolForKey:SKRememberSnapshotsKey]) {
- NSEnumerator *setupEnum = [[[SKBookmarkController
sharedBookmarkController] snapshotsAtPath:[[[self document] fileURL] path]]
objectEnumerator];
- NSDictionary *setup;
- while (setup = [setupEnum nextObject])
- [self showSnapshotWithSetup:setup];
- }
+ if ([sud boolForKey:SKRememberSnapshotsKey])
+ [self showSnapshotWithSetups:[[SKBookmarkController
sharedBookmarkController] snapshotsAtPath:[[[self document] fileURL] path]]];
// typeSelectHelpers
SKTypeSelectHelper *typeSelectHelper = [[[SKTypeSelectHelper alloc] init]
autorelease];
@@ -946,10 +942,7 @@
[self updatePageLabelsAndOutline];
[self updateNoteSelection];
- NSEnumerator *setupEnum = [snapshotDicts objectEnumerator];
- NSDictionary *setup;
- while (setup = [setupEnum nextObject])
- [self showSnapshotWithSetup:setup];
+ [self showSnapshotWithSetups:snapshotDicts];
if (pageIndex != NSNotFound && [document pageCount]) {
PDFPage *page = [document pageAtIndex:MIN(pageIndex, [document
pageCount] - 1)];
@@ -2712,19 +2705,24 @@
[swc showWindow:self];
}
-- (void)showSnapshotWithSetup:(NSDictionary *)setup {
- SKSnapshotWindowController *swc = [[SKSnapshotWindowController alloc]
init];
+- (void)showSnapshotWithSetups:(NSArray *)setups {
BOOL snapshotsOnTop = [[NSUserDefaults standardUserDefaults]
boolForKey:SKSnapshotsOnTopKey];
+ NSEnumerator *setupEnum = [setups objectEnumerator];
+ NSDictionary *setup;
- [swc setDelegate:self];
-
- [swc setPdfDocument:[pdfView document] setup:setup];
-
- [swc setForceOnTop:[self isFullScreen] || [self isPresentation]];
- [[swc window] setHidesOnDeactivate:snapshotsOnTop];
-
- [[self document] addWindowController:swc];
- [swc release];
+ while (setup = [setupEnum nextObject]) {
+ SKSnapshotWindowController *swc = [[SKSnapshotWindowController alloc]
init];
+
+ [swc setDelegate:self];
+
+ [swc setPdfDocument:[pdfView document] setup:setup];
+
+ [swc setForceOnTop:[self isFullScreen] || [self isPresentation]];
+ [[swc window] setHidesOnDeactivate:snapshotsOnTop];
+
+ [[self document] addWindowController:swc];
+ [swc release];
+ }
}
- (void)toggleSnapshots:(NSArray *)snapshotArray {
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: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
