Revision: 2965
http://skim-app.svn.sourceforge.net/skim-app/?rev=2965&view=rev
Author: hofman
Date: 2007-09-21 10:50:08 -0700 (Fri, 21 Sep 2007)
Log Message:
-----------
Move transition sheet to a separate nib and let the transition controller
manage it.
Modified Paths:
--------------
trunk/Dutch.lproj/MainWindow.nib/classes.nib
trunk/Dutch.lproj/MainWindow.nib/keyedobjects.nib
trunk/English.lproj/MainWindow.nib/classes.nib
trunk/English.lproj/MainWindow.nib/info.nib
trunk/English.lproj/MainWindow.nib/keyedobjects.nib
trunk/French.lproj/MainWindow.nib/classes.nib
trunk/French.lproj/MainWindow.nib/info.nib
trunk/French.lproj/MainWindow.nib/keyedobjects.nib
trunk/Italian.lproj/MainWindow.nib/classes.nib
trunk/Italian.lproj/MainWindow.nib/info.nib
trunk/Italian.lproj/MainWindow.nib/keyedobjects.nib
trunk/SKMainWindowController.h
trunk/SKMainWindowController.m
trunk/SKPDFView.h
trunk/SKPDFView.m
trunk/SKTransitionController.h
trunk/SKTransitionController.m
trunk/Skim.xcodeproj/project.pbxproj
Added Paths:
-----------
trunk/Dutch.lproj/TransitionSheet.nib/
trunk/Dutch.lproj/TransitionSheet.nib/classes.nib
trunk/Dutch.lproj/TransitionSheet.nib/info.nib
trunk/Dutch.lproj/TransitionSheet.nib/keyedobjects.nib
trunk/English.lproj/TransitionSheet.nib/
trunk/English.lproj/TransitionSheet.nib/classes.nib
trunk/English.lproj/TransitionSheet.nib/info.nib
trunk/English.lproj/TransitionSheet.nib/keyedobjects.nib
trunk/French.lproj/TransitionSheet.nib/
trunk/French.lproj/TransitionSheet.nib/classes.nib
trunk/French.lproj/TransitionSheet.nib/info.nib
trunk/French.lproj/TransitionSheet.nib/keyedobjects.nib
trunk/Italian.lproj/TransitionSheet.nib/
trunk/Italian.lproj/TransitionSheet.nib/classes.nib
trunk/Italian.lproj/TransitionSheet.nib/info.nib
trunk/Italian.lproj/TransitionSheet.nib/keyedobjects.nib
Modified: trunk/Dutch.lproj/MainWindow.nib/classes.nib
===================================================================
--- trunk/Dutch.lproj/MainWindow.nib/classes.nib 2007-09-21 17:22:32 UTC
(rev 2964)
+++ trunk/Dutch.lproj/MainWindow.nib/classes.nib 2007-09-21 17:50:08 UTC
(rev 2965)
@@ -63,7 +63,6 @@
dismissChoosePageSheet = id;
dismissChooseScaleSheet = id;
dismissPasswordSheet = id;
- dismissTransitionSheet = id;
displayFacingPages = id;
displaySinglePages = id;
doAutoScale = id;
@@ -168,11 +167,6 @@
thumbnailView = NSView;
tocView = NSView;
toolModeButton = NSSegmentedControl;
- transitionDurationField = NSTextField;
- transitionDurationSlider = NSSlider;
- transitionExtentMatrix = NSMatrix;
- transitionSheet = NSWindow;
- transitionStylePopUpButton = NSPopUpButton;
};
SUPERCLASS = NSWindowController;
},
Modified: trunk/Dutch.lproj/MainWindow.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Added: trunk/Dutch.lproj/TransitionSheet.nib/classes.nib
===================================================================
--- trunk/Dutch.lproj/TransitionSheet.nib/classes.nib
(rev 0)
+++ trunk/Dutch.lproj/TransitionSheet.nib/classes.nib 2007-09-21 17:50:08 UTC
(rev 2965)
@@ -0,0 +1,19 @@
+{
+ IBClasses = (
+ {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; },
+ {
+ ACTIONS = {dismissTransitionSheet = id; };
+ CLASS = SKTransitionController;
+ LANGUAGE = ObjC;
+ OUTLETS = {
+ transitionDurationField = NSTextField;
+ transitionDurationSlider = NSSlider;
+ transitionExtentMatrix = NSMatrix;
+ transitionSheet = NSWindow;
+ transitionStylePopUpButton = NSPopUpButton;
+ };
+ SUPERCLASS = NSObject;
+ }
+ );
+ IBVersion = 1;
+}
\ No newline at end of file
Added: trunk/Dutch.lproj/TransitionSheet.nib/info.nib
===================================================================
--- trunk/Dutch.lproj/TransitionSheet.nib/info.nib
(rev 0)
+++ trunk/Dutch.lproj/TransitionSheet.nib/info.nib 2007-09-21 17:50:08 UTC
(rev 2965)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN"
"http://www.apple.com/DTDs/PropertyList-1.0.dtd";>
+<plist version="1.0">
+<dict>
+ <key>IBDocumentLocation</key>
+ <string>69 58 356 240 0 0 1440 938 </string>
+ <key>IBFramework Version</key>
+ <string>446.1</string>
+ <key>IBOpenObjects</key>
+ <array>
+ <integer>41</integer>
+ </array>
+ <key>IBSystem Version</key>
+ <string>8R218</string>
+</dict>
+</plist>
Added: trunk/Dutch.lproj/TransitionSheet.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Property changes on: trunk/Dutch.lproj/TransitionSheet.nib/keyedobjects.nib
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/English.lproj/MainWindow.nib/classes.nib
===================================================================
--- trunk/English.lproj/MainWindow.nib/classes.nib 2007-09-21 17:22:32 UTC
(rev 2964)
+++ trunk/English.lproj/MainWindow.nib/classes.nib 2007-09-21 17:50:08 UTC
(rev 2965)
@@ -63,7 +63,6 @@
dismissChoosePageSheet = id;
dismissChooseScaleSheet = id;
dismissPasswordSheet = id;
- dismissTransitionSheet = id;
displayFacingPages = id;
displaySinglePages = id;
doAutoScale = id;
@@ -168,11 +167,6 @@
thumbnailView = NSView;
tocView = NSView;
toolModeButton = NSSegmentedControl;
- transitionDurationField = NSTextField;
- transitionDurationSlider = NSSlider;
- transitionExtentMatrix = NSMatrix;
- transitionSheet = NSWindow;
- transitionStylePopUpButton = NSPopUpButton;
};
SUPERCLASS = NSWindowController;
},
Modified: trunk/English.lproj/MainWindow.nib/info.nib
===================================================================
--- trunk/English.lproj/MainWindow.nib/info.nib 2007-09-21 17:22:32 UTC (rev
2964)
+++ trunk/English.lproj/MainWindow.nib/info.nib 2007-09-21 17:50:08 UTC (rev
2965)
@@ -33,21 +33,20 @@
</array>
<key>IBOpenObjects</key>
<array>
+ <integer>208</integer>
+ <integer>5</integer>
+ <integer>502</integer>
<integer>539</integer>
- <integer>760</integer>
+ <integer>511</integer>
+ <integer>694</integer>
<integer>553</integer>
- <integer>208</integer>
- <integer>168</integer>
<integer>224</integer>
- <integer>694</integer>
+ <integer>687</integer>
<integer>256</integer>
+ <integer>760</integer>
<integer>585</integer>
- <integer>511</integer>
- <integer>687</integer>
- <integer>502</integer>
+ <integer>168</integer>
<integer>314</integer>
- <integer>633</integer>
- <integer>5</integer>
</array>
<key>IBSystem Version</key>
<string>8R218</string>
Modified: trunk/English.lproj/MainWindow.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Added: trunk/English.lproj/TransitionSheet.nib/classes.nib
===================================================================
--- trunk/English.lproj/TransitionSheet.nib/classes.nib
(rev 0)
+++ trunk/English.lproj/TransitionSheet.nib/classes.nib 2007-09-21 17:50:08 UTC
(rev 2965)
@@ -0,0 +1,19 @@
+{
+ IBClasses = (
+ {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; },
+ {
+ ACTIONS = {dismissTransitionSheet = id; };
+ CLASS = SKTransitionController;
+ LANGUAGE = ObjC;
+ OUTLETS = {
+ transitionDurationField = NSTextField;
+ transitionDurationSlider = NSSlider;
+ transitionExtentMatrix = NSMatrix;
+ transitionSheet = NSWindow;
+ transitionStylePopUpButton = NSPopUpButton;
+ };
+ SUPERCLASS = NSObject;
+ }
+ );
+ IBVersion = 1;
+}
\ No newline at end of file
Added: trunk/English.lproj/TransitionSheet.nib/info.nib
===================================================================
--- trunk/English.lproj/TransitionSheet.nib/info.nib
(rev 0)
+++ trunk/English.lproj/TransitionSheet.nib/info.nib 2007-09-21 17:50:08 UTC
(rev 2965)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN"
"http://www.apple.com/DTDs/PropertyList-1.0.dtd";>
+<plist version="1.0">
+<dict>
+ <key>IBDocumentLocation</key>
+ <string>69 58 356 240 0 0 1440 938 </string>
+ <key>IBFramework Version</key>
+ <string>446.1</string>
+ <key>IBOpenObjects</key>
+ <array>
+ <integer>7</integer>
+ </array>
+ <key>IBSystem Version</key>
+ <string>8R218</string>
+</dict>
+</plist>
Added: trunk/English.lproj/TransitionSheet.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Property changes on: trunk/English.lproj/TransitionSheet.nib/keyedobjects.nib
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/French.lproj/MainWindow.nib/classes.nib
===================================================================
--- trunk/French.lproj/MainWindow.nib/classes.nib 2007-09-21 17:22:32 UTC
(rev 2964)
+++ trunk/French.lproj/MainWindow.nib/classes.nib 2007-09-21 17:50:08 UTC
(rev 2965)
@@ -63,7 +63,6 @@
dismissChoosePageSheet = id;
dismissChooseScaleSheet = id;
dismissPasswordSheet = id;
- dismissTransitionSheet = id;
displayFacingPages = id;
displaySinglePages = id;
doAutoScale = id;
@@ -168,11 +167,6 @@
thumbnailView = NSView;
tocView = NSView;
toolModeButton = NSSegmentedControl;
- transitionDurationField = NSTextField;
- transitionDurationSlider = NSSlider;
- transitionExtentMatrix = NSMatrix;
- transitionSheet = NSWindow;
- transitionStylePopUpButton = NSPopUpButton;
};
SUPERCLASS = NSWindowController;
},
Modified: trunk/French.lproj/MainWindow.nib/info.nib
===================================================================
--- trunk/French.lproj/MainWindow.nib/info.nib 2007-09-21 17:22:32 UTC (rev
2964)
+++ trunk/French.lproj/MainWindow.nib/info.nib 2007-09-21 17:50:08 UTC (rev
2965)
@@ -33,11 +33,11 @@
</array>
<key>IBOpenObjects</key>
<array>
+ <integer>314</integer>
<integer>5</integer>
+ <integer>760</integer>
<integer>502</integer>
<integer>256</integer>
- <integer>314</integer>
- <integer>760</integer>
</array>
<key>IBSystem Version</key>
<string>8R218</string>
Modified: trunk/French.lproj/MainWindow.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Added: trunk/French.lproj/TransitionSheet.nib/classes.nib
===================================================================
--- trunk/French.lproj/TransitionSheet.nib/classes.nib
(rev 0)
+++ trunk/French.lproj/TransitionSheet.nib/classes.nib 2007-09-21 17:50:08 UTC
(rev 2965)
@@ -0,0 +1,19 @@
+{
+ IBClasses = (
+ {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; },
+ {
+ ACTIONS = {dismissTransitionSheet = id; };
+ CLASS = SKTransitionController;
+ LANGUAGE = ObjC;
+ OUTLETS = {
+ transitionDurationField = NSTextField;
+ transitionDurationSlider = NSSlider;
+ transitionExtentMatrix = NSMatrix;
+ transitionSheet = NSWindow;
+ transitionStylePopUpButton = NSPopUpButton;
+ };
+ SUPERCLASS = NSObject;
+ }
+ );
+ IBVersion = 1;
+}
\ No newline at end of file
Added: trunk/French.lproj/TransitionSheet.nib/info.nib
===================================================================
--- trunk/French.lproj/TransitionSheet.nib/info.nib
(rev 0)
+++ trunk/French.lproj/TransitionSheet.nib/info.nib 2007-09-21 17:50:08 UTC
(rev 2965)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN"
"http://www.apple.com/DTDs/PropertyList-1.0.dtd";>
+<plist version="1.0">
+<dict>
+ <key>IBDocumentLocation</key>
+ <string>69 58 356 240 0 0 1440 938 </string>
+ <key>IBFramework Version</key>
+ <string>446.1</string>
+ <key>IBOpenObjects</key>
+ <array>
+ <integer>41</integer>
+ </array>
+ <key>IBSystem Version</key>
+ <string>8R218</string>
+</dict>
+</plist>
Added: trunk/French.lproj/TransitionSheet.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Property changes on: trunk/French.lproj/TransitionSheet.nib/keyedobjects.nib
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/Italian.lproj/MainWindow.nib/classes.nib
===================================================================
--- trunk/Italian.lproj/MainWindow.nib/classes.nib 2007-09-21 17:22:32 UTC
(rev 2964)
+++ trunk/Italian.lproj/MainWindow.nib/classes.nib 2007-09-21 17:50:08 UTC
(rev 2965)
@@ -63,7 +63,6 @@
dismissChoosePageSheet = id;
dismissChooseScaleSheet = id;
dismissPasswordSheet = id;
- dismissTransitionSheet = id;
displayFacingPages = id;
displaySinglePages = id;
doAutoScale = id;
@@ -168,11 +167,6 @@
thumbnailView = NSView;
tocView = NSView;
toolModeButton = NSSegmentedControl;
- transitionDurationField = NSTextField;
- transitionDurationSlider = NSSlider;
- transitionExtentMatrix = NSMatrix;
- transitionSheet = NSWindow;
- transitionStylePopUpButton = NSPopUpButton;
};
SUPERCLASS = NSWindowController;
},
Modified: trunk/Italian.lproj/MainWindow.nib/info.nib
===================================================================
--- trunk/Italian.lproj/MainWindow.nib/info.nib 2007-09-21 17:22:32 UTC (rev
2964)
+++ trunk/Italian.lproj/MainWindow.nib/info.nib 2007-09-21 17:50:08 UTC (rev
2965)
@@ -33,20 +33,19 @@
</array>
<key>IBOpenObjects</key>
<array>
- <integer>511</integer>
- <integer>539</integer>
- <integer>628</integer>
- <integer>743</integer>
- <integer>224</integer>
+ <integer>676</integer>
<integer>256</integer>
- <integer>5</integer>
- <integer>553</integer>
- <integer>502</integer>
- <integer>314</integer>
<integer>168</integer>
- <integer>676</integer>
+ <integer>553</integer>
<integer>208</integer>
+ <integer>224</integer>
+ <integer>511</integer>
+ <integer>5</integer>
<integer>677</integer>
+ <integer>314</integer>
+ <integer>502</integer>
+ <integer>539</integer>
+ <integer>743</integer>
</array>
<key>IBSystem Version</key>
<string>8R218</string>
Modified: trunk/Italian.lproj/MainWindow.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Added: trunk/Italian.lproj/TransitionSheet.nib/classes.nib
===================================================================
--- trunk/Italian.lproj/TransitionSheet.nib/classes.nib
(rev 0)
+++ trunk/Italian.lproj/TransitionSheet.nib/classes.nib 2007-09-21 17:50:08 UTC
(rev 2965)
@@ -0,0 +1,19 @@
+{
+ IBClasses = (
+ {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; },
+ {
+ ACTIONS = {dismissTransitionSheet = id; };
+ CLASS = SKTransitionController;
+ LANGUAGE = ObjC;
+ OUTLETS = {
+ transitionDurationField = NSTextField;
+ transitionDurationSlider = NSSlider;
+ transitionExtentMatrix = NSMatrix;
+ transitionSheet = NSWindow;
+ transitionStylePopUpButton = NSPopUpButton;
+ };
+ SUPERCLASS = NSObject;
+ }
+ );
+ IBVersion = 1;
+}
\ No newline at end of file
Added: trunk/Italian.lproj/TransitionSheet.nib/info.nib
===================================================================
--- trunk/Italian.lproj/TransitionSheet.nib/info.nib
(rev 0)
+++ trunk/Italian.lproj/TransitionSheet.nib/info.nib 2007-09-21 17:50:08 UTC
(rev 2965)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN"
"http://www.apple.com/DTDs/PropertyList-1.0.dtd";>
+<plist version="1.0">
+<dict>
+ <key>IBDocumentLocation</key>
+ <string>69 58 356 240 0 0 1440 938 </string>
+ <key>IBFramework Version</key>
+ <string>446.1</string>
+ <key>IBOpenObjects</key>
+ <array>
+ <integer>41</integer>
+ </array>
+ <key>IBSystem Version</key>
+ <string>8R218</string>
+</dict>
+</plist>
Added: trunk/Italian.lproj/TransitionSheet.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Property changes on: trunk/Italian.lproj/TransitionSheet.nib/keyedobjects.nib
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/SKMainWindowController.h
===================================================================
--- trunk/SKMainWindowController.h 2007-09-21 17:22:32 UTC (rev 2964)
+++ trunk/SKMainWindowController.h 2007-09-21 17:50:08 UTC (rev 2965)
@@ -170,12 +170,6 @@
IBOutlet NSWindow *passwordSheet;
IBOutlet NSTextField *passwordField;
- IBOutlet NSWindow *transitionSheet;
- IBOutlet NSPopUpButton *transitionStylePopUpButton;
- IBOutlet NSTextField *transitionDurationField;
- IBOutlet NSSlider *transitionDurationSlider;
- IBOutlet NSMatrix *transitionExtentMatrix;
-
SKProgressController *progressController;
NSButton *colorAccessoryView;
@@ -268,7 +262,6 @@
- (IBAction)dismissPasswordSheet:(id)sender;
- (IBAction)savePDFSettingToDefaults:(id)sender;
- (IBAction)chooseTransition:(id)sender;
-- (IBAction)dismissTransitionSheet:(id)sender;
- (void)showSnapshotAtPageNumber:(int)pageNum forRect:(NSRect)rect
factor:(int)factor autoFits:(BOOL)autoFits display:(BOOL)display;
- (void)toggleSnapshots:(NSArray *)snapshotArray;
Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m 2007-09-21 17:22:32 UTC (rev 2964)
+++ trunk/SKMainWindowController.m 2007-09-21 17:50:08 UTC (rev 2965)
@@ -1852,41 +1852,10 @@
[[NSUserDefaults standardUserDefaults] setObject:[self
currentPDFSettings] forKey:SKDefaultPDFDisplaySettingsKey];
}
-- (void)transitionSheetDidEnd:(NSWindow *)sheet returnCode:(int)returnCode
contextInfo:(void *)contextInfo {
- if (returnCode == NSOKButton) {
- [pdfView setTransitionStyle:[[transitionStylePopUpButton selectedItem]
tag]];
- [pdfView setTransitionDuration:fmaxf([transitionDurationField
floatValue], 0.0)];
- [pdfView setTransitionShouldRestrict:(BOOL)[[transitionExtentMatrix
selectedCell] tag]];
- }
-}
-
- (IBAction)chooseTransition:(id)sender {
- if ([transitionStylePopUpButton numberOfItems] == SKCoreImageTransition) {
- NSArray *filterNames = [SKTransitionController transitionFilterNames];
- int i, count = [filterNames count];
- for (i = 0; i < count; i++) {
- NSString *name = [filterNames objectAtIndex:i];
- [transitionStylePopUpButton addItemWithTitle:[CIFilter
localizedNameForFilterName:name]];
- NSMenuItem *item = [transitionStylePopUpButton lastItem];
- [item setTag:SKCoreImageTransition + i];
- }
- }
- [transitionStylePopUpButton selectItemWithTag:[pdfView transitionStyle]];
- [transitionDurationField setFloatValue:[pdfView transitionDuration]];
- [transitionDurationSlider setFloatValue:[pdfView transitionDuration]];
- [transitionExtentMatrix selectCellWithTag:(int)[pdfView
transitionShouldRestrict]];
- [NSApp beginSheet:transitionSheet
- modalForWindow:[self window]
- modalDelegate:self
- didEndSelector:@selector(transitionSheetDidEnd:returnCode:contextInfo:)
- contextInfo:NULL];
+ [[[self pdfView] transitionController]
chooseTransitionModalForWindow:[self window]];
}
-- (IBAction)dismissTransitionSheet:(id)sender {
- [NSApp endSheet:transitionSheet returnCode:[sender tag]];
- [transitionSheet orderOut:self];
-}
-
- (IBAction)toggleLeftSidePane:(id)sender {
if ([self isFullScreen]) {
[[SKPDFHoverWindow sharedHoverWindow] hide];
Modified: trunk/SKPDFView.h
===================================================================
--- trunk/SKPDFView.h 2007-09-21 17:22:32 UTC (rev 2964)
+++ trunk/SKPDFView.h 2007-09-21 17:50:08 UTC (rev 2965)
@@ -142,15 +142,8 @@
- (void)toggleReadingBar;
-- (SKAnimationTransitionStyle)transitionStyle;
-- (void)setTransitionStyle:(SKAnimationTransitionStyle)style;
+- (SKTransitionController *)transitionController;
-- (float)transitionDuration;
-- (void)setTransitionDuration:(float)duration;
-
-- (BOOL)transitionShouldRestrict;
-- (void)setTransitionShouldRestrict:(BOOL)flag;
-
- (SKTypeSelectHelper *)typeSelectHelper;
- (void)setTypeSelectHelper:(SKTypeSelectHelper *)newTypeSelectHelper;
Modified: trunk/SKPDFView.m
===================================================================
--- trunk/SKPDFView.m 2007-09-21 17:22:32 UTC (rev 2964)
+++ trunk/SKPDFView.m 2007-09-21 17:50:08 UTC (rev 2965)
@@ -566,30 +566,6 @@
return transitionController;
}
-- (SKAnimationTransitionStyle)transitionStyle {
- return [[self transitionController] transitionStyle];
-}
-
-- (void)setTransitionStyle:(SKAnimationTransitionStyle)style {
- [[self transitionController] setTransitionStyle:style];
-}
-
-- (float)transitionDuration {
- return [[self transitionController] duration];
-}
-
-- (void)setTransitionDuration:(float)duration {
- [[self transitionController] setDuration:duration];
-}
-
-- (BOOL)transitionShouldRestrict {
- return [[self transitionController] shouldRestrict];
-}
-
-- (void)setTransitionShouldRestrict:(BOOL)flag {
- [[self transitionController] setShouldRestrict:flag];
-}
-
- (SKTypeSelectHelper *)typeSelectHelper {
return typeSelectHelper;
}
@@ -642,14 +618,14 @@
}
- (void)goToNextPage:(id)sender {
- if (hasNavigation && autohidesCursor && transitionController && [self
transitionStyle] != SKNoTransition && [self canGoToNextPage])
+ if (hasNavigation && autohidesCursor && transitionController &&
transitionController && [transitionController transitionStyle] !=
SKNoTransition && [self canGoToNextPage])
[self animateTransitionForNextPage:YES];
else
[super goToNextPage:sender];
}
- (void)goToPreviousPage:(id)sender {
- if (hasNavigation && autohidesCursor && transitionController && [self
transitionStyle] != SKNoTransition && [self canGoToPreviousPage])
+ if (hasNavigation && autohidesCursor && transitionController &&
transitionController && [transitionController transitionStyle] !=
SKNoTransition && [self canGoToPreviousPage])
[self animateTransitionForNextPage:NO];
else
[super goToPreviousPage:sender];
Modified: trunk/SKTransitionController.h
===================================================================
--- trunk/SKTransitionController.h 2007-09-21 17:22:32 UTC (rev 2964)
+++ trunk/SKTransitionController.h 2007-09-21 17:50:08 UTC (rev 2965)
@@ -115,6 +115,12 @@
@class CIImage, SKTransitionView;
@interface SKTransitionController : NSObject {
+ IBOutlet NSWindow *transitionSheet;
+ IBOutlet NSPopUpButton *transitionStylePopUpButton;
+ IBOutlet NSTextField *transitionDurationField;
+ IBOutlet NSSlider *transitionDurationSlider;
+ IBOutlet NSMatrix *transitionExtentMatrix;
+
NSWindow *transitionWindow;
SKTransitionView *transitionView;
NSView *view;
@@ -145,4 +151,7 @@
- (void)prepareAnimationForRect:(NSRect)rect;
- (void)animateForRect:(NSRect)rect forward:(BOOL)forward;
+- (void)chooseTransitionModalForWindow:(NSWindow *)window;
+- (IBAction)dismissTransitionSheet:(id)sender;
+
@end
Modified: trunk/SKTransitionController.m
===================================================================
--- trunk/SKTransitionController.m 2007-09-21 17:22:32 UTC (rev 2964)
+++ trunk/SKTransitionController.m 2007-09-21 17:50:08 UTC (rev 2965)
@@ -416,6 +416,45 @@
}
}
+- (void)transitionSheetDidEnd:(NSWindow *)sheet returnCode:(int)returnCode
contextInfo:(void *)contextInfo {
+ if (returnCode == NSOKButton) {
+ [self setTransitionStyle:[[transitionStylePopUpButton selectedItem]
tag]];
+ [self setDuration:fmaxf([transitionDurationField floatValue], 0.0)];
+ [self setShouldRestrict:(BOOL)[[transitionExtentMatrix selectedCell]
tag]];
+ }
+}
+
+- (void)chooseTransitionModalForWindow:(NSWindow *)window {
+ if (transitionSheet == nil) {
+ if (NO == [NSBundle loadNibNamed:@"TransitionSheet" owner:self]) {
+ NSLog(@"Failed to load TransitionSheet.nib");
+ return;
+ }
+ NSArray *filterNames = [SKTransitionController transitionFilterNames];
+ int i, count = [filterNames count];
+ for (i = 0; i < count; i++) {
+ NSString *name = [filterNames objectAtIndex:i];
+ [transitionStylePopUpButton addItemWithTitle:[CIFilter
localizedNameForFilterName:name]];
+ NSMenuItem *item = [transitionStylePopUpButton lastItem];
+ [item setTag:SKCoreImageTransition + i];
+ }
+ }
+ [transitionStylePopUpButton selectItemWithTag:[self transitionStyle]];
+ [transitionDurationField setFloatValue:[self duration]];
+ [transitionDurationSlider setFloatValue:[self duration]];
+ [transitionExtentMatrix selectCellWithTag:(int)[self shouldRestrict]];
+ [NSApp beginSheet:transitionSheet
+ modalForWindow:window
+ modalDelegate:self
+ didEndSelector:@selector(transitionSheetDidEnd:returnCode:contextInfo:)
+ contextInfo:NULL];
+}
+
+- (IBAction)dismissTransitionSheet:(id)sender {
+ [NSApp endSheet:transitionSheet returnCode:[sender tag]];
+ [transitionSheet orderOut:self];
+}
+
@end
#pragma mark -
Modified: trunk/Skim.xcodeproj/project.pbxproj
===================================================================
--- trunk/Skim.xcodeproj/project.pbxproj 2007-09-21 17:22:32 UTC (rev
2964)
+++ trunk/Skim.xcodeproj/project.pbxproj 2007-09-21 17:50:08 UTC (rev
2965)
@@ -168,6 +168,7 @@
CEAA67260C70A882006BD633 /* NSURL_SKExtensions.m in Sources */
= {isa = PBXBuildFile; fileRef = CEAA67240C70A882006BD633 /*
NSURL_SKExtensions.m */; };
CEAA68EB0C71242F006BD633 /* Resume.tiff in Resources */ = {isa
= PBXBuildFile; fileRef = CEAA68EA0C71242F006BD633 /* Resume.tiff */; };
CEAE1C480CA1877F00849B0F /* SKSecondaryPDFView.m in Sources */
= {isa = PBXBuildFile; fileRef = CEAE1C460CA1877F00849B0F /*
SKSecondaryPDFView.m */; };
+ CEAE38C40CA4399B00849B0F /* TransitionSheet.nib in Resources */
= {isa = PBXBuildFile; fileRef = CEAE38C20CA4399B00849B0F /*
TransitionSheet.nib */; };
CEAF079D0C4139EB00C3ECBB /* SKStatusBar.m in Sources */ = {isa
= PBXBuildFile; fileRef = CEAF079B0C4139EB00C3ECBB /* SKStatusBar.m */; };
CEAF2E5A0C45414100C3ECBB /* SKLine.m in Sources */ = {isa =
PBXBuildFile; fileRef = CEAF2E580C45414100C3ECBB /* SKLine.m */; };
CEAFFD7C0C40ED5400C3ECBB /* ToolbarColors.tiff in Resources */
= {isa = PBXBuildFile; fileRef = CEAFFD7A0C40ED5400C3ECBB /* ToolbarColors.tiff
*/; };
@@ -573,6 +574,10 @@
CEAA68EA0C71242F006BD633 /* Resume.tiff */ = {isa =
PBXFileReference; lastKnownFileType = image.tiff; name = Resume.tiff; path =
Images/Resume.tiff; sourceTree = "<group>"; };
CEAE1C450CA1877F00849B0F /* SKSecondaryPDFView.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
SKSecondaryPDFView.h; sourceTree = "<group>"; };
CEAE1C460CA1877F00849B0F /* SKSecondaryPDFView.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path
= SKSecondaryPDFView.m; sourceTree = "<group>"; };
+ CEAE38C30CA4399B00849B0F /* English */ = {isa =
PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path =
English.lproj/TransitionSheet.nib; sourceTree = "<group>"; };
+ CEAE38CA0CA439F600849B0F /* Dutch */ = {isa = PBXFileReference;
lastKnownFileType = wrapper.nib; name = Dutch; path =
Dutch.lproj/TransitionSheet.nib; sourceTree = "<group>"; };
+ CEAE38CB0CA439FD00849B0F /* French */ = {isa =
PBXFileReference; lastKnownFileType = wrapper.nib; name = French; path =
French.lproj/TransitionSheet.nib; sourceTree = "<group>"; };
+ CEAE38CC0CA43A0200849B0F /* Italian */ = {isa =
PBXFileReference; lastKnownFileType = wrapper.nib; name = Italian; path =
Italian.lproj/TransitionSheet.nib; sourceTree = "<group>"; };
CEAF079A0C4139EB00C3ECBB /* SKStatusBar.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
SKStatusBar.h; sourceTree = "<group>"; };
CEAF079B0C4139EB00C3ECBB /* SKStatusBar.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path
= SKStatusBar.m; sourceTree = "<group>"; };
CEAF2E570C45414100C3ECBB /* SKLine.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
SKLine.h; sourceTree = "<group>"; };
@@ -779,6 +784,7 @@
CE9A878D0C0C9E9A004F1F97 /* ProgressSheet.nib
*/,
CE4A65CA0BAB1E2E004AD07D /* BookmarksWindow.nib
*/,
CEAA55EF0C6DE5AE006BD633 /* DownloadsWindow.nib
*/,
+ CEAE38C20CA4399B00849B0F /* TransitionSheet.nib
*/,
2A37F4B9FDCFA73011CA2CEA /* Credits.rtf */,
CE54AA8E0BBC037400008750 /* ReleaseNotes.rtf */,
8D15AC360486D014006FF6A4 /* Info.plist */,
@@ -1339,6 +1345,7 @@
CEBD51D70C9BF68100FBF6A4 /*
ToolbarNewFolder.tiff in Resources */,
CEBD51D80C9BF68100FBF6A4 /*
ToolbarNewSeparator.tiff in Resources */,
CE20AC9C0C9EF2F9007C72F9 /* notesTemplate.rtfd
in Resources */,
+ CEAE38C40CA4399B00849B0F /* TransitionSheet.nib
in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -1785,6 +1792,17 @@
name = DownloadsWindow.nib;
sourceTree = "<group>";
};
+ CEAE38C20CA4399B00849B0F /* TransitionSheet.nib */ = {
+ isa = PBXVariantGroup;
+ children = (
+ CEAE38C30CA4399B00849B0F /* English */,
+ CEAE38CA0CA439F600849B0F /* Dutch */,
+ CEAE38CB0CA439FD00849B0F /* French */,
+ CEAE38CC0CA43A0200849B0F /* Italian */,
+ );
+ name = TransitionSheet.nib;
+ sourceTree = "<group>";
+ };
CEE106580BCBBE1200BF2D3E /* NotesDocument.nib */ = {
isa = PBXVariantGroup;
children = (
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: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
