Revision: 3280
http://skim-app.svn.sourceforge.net/skim-app/?rev=3280&view=rev
Author: hofman
Date: 2007-11-29 09:08:00 -0800 (Thu, 29 Nov 2007)
Log Message:
-----------
Initialize transition window in nib. This also fixes leaking it. Keep filters
per transition controller (per pdfview) as it is not impossible to have more
than one presentations at the same time.
Modified Paths:
--------------
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/classes.nib
trunk/English.lproj/TransitionSheet.nib/info.nib
trunk/English.lproj/TransitionSheet.nib/keyedobjects.nib
trunk/French.lproj/TransitionSheet.nib/classes.nib
trunk/French.lproj/TransitionSheet.nib/info.nib
trunk/French.lproj/TransitionSheet.nib/keyedobjects.nib
trunk/German.lproj/TransitionSheet.nib/classes.nib
trunk/German.lproj/TransitionSheet.nib/info.nib
trunk/German.lproj/TransitionSheet.nib/keyedobjects.nib
trunk/Italian.lproj/TransitionSheet.nib/classes.nib
trunk/Italian.lproj/TransitionSheet.nib/info.nib
trunk/Italian.lproj/TransitionSheet.nib/keyedobjects.nib
trunk/SKTransitionController.h
trunk/SKTransitionController.m
trunk/Spanish.lproj/TransitionSheet.nib/classes.nib
trunk/Spanish.lproj/TransitionSheet.nib/info.nib
trunk/Spanish.lproj/TransitionSheet.nib/keyedobjects.nib
trunk/ru.lproj/TransitionSheet.nib/classes.nib
trunk/ru.lproj/TransitionSheet.nib/info.nib
trunk/ru.lproj/TransitionSheet.nib/keyedobjects.nib
Modified: trunk/Dutch.lproj/TransitionSheet.nib/classes.nib
===================================================================
--- trunk/Dutch.lproj/TransitionSheet.nib/classes.nib 2007-11-29 11:59:27 UTC
(rev 3279)
+++ trunk/Dutch.lproj/TransitionSheet.nib/classes.nib 2007-11-29 17:08:00 UTC
(rev 3280)
@@ -10,9 +10,13 @@
transitionDurationSlider = NSSlider;
transitionExtentMatrix = NSMatrix;
transitionStylePopUpButton = NSPopUpButton;
+ transitionView = SKTransitionView;
+ transitionWindow = SKTransitionWindow;
};
SUPERCLASS = NSWindowController;
- }
+ },
+ {CLASS = SKTransitionView; LANGUAGE = ObjC; SUPERCLASS = NSOpenGLView;
},
+ {CLASS = SKTransitionWindow; LANGUAGE = ObjC; SUPERCLASS = NSWindow; }
);
IBVersion = 1;
}
\ No newline at end of file
Modified: trunk/Dutch.lproj/TransitionSheet.nib/info.nib
===================================================================
--- trunk/Dutch.lproj/TransitionSheet.nib/info.nib 2007-11-29 11:59:27 UTC
(rev 3279)
+++ trunk/Dutch.lproj/TransitionSheet.nib/info.nib 2007-11-29 17:08:00 UTC
(rev 3280)
@@ -5,12 +5,13 @@
<key>IBDocumentLocation</key>
<string>69 58 356 240 0 0 1440 938 </string>
<key>IBFramework Version</key>
- <string>446.1</string>
+ <string>489.0</string>
<key>IBOpenObjects</key>
<array>
+ <integer>42</integer>
<integer>7</integer>
</array>
<key>IBSystem Version</key>
- <string>8R218</string>
+ <string>8S165</string>
</dict>
</plist>
Modified: trunk/Dutch.lproj/TransitionSheet.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/English.lproj/TransitionSheet.nib/classes.nib
===================================================================
--- trunk/English.lproj/TransitionSheet.nib/classes.nib 2007-11-29 11:59:27 UTC
(rev 3279)
+++ trunk/English.lproj/TransitionSheet.nib/classes.nib 2007-11-29 17:08:00 UTC
(rev 3280)
@@ -10,9 +10,13 @@
transitionDurationSlider = NSSlider;
transitionExtentMatrix = NSMatrix;
transitionStylePopUpButton = NSPopUpButton;
+ transitionView = SKTransitionView;
+ transitionWindow = SKTransitionWindow;
};
SUPERCLASS = NSWindowController;
- }
+ },
+ {CLASS = SKTransitionView; LANGUAGE = ObjC; SUPERCLASS = NSOpenGLView;
},
+ {CLASS = SKTransitionWindow; LANGUAGE = ObjC; SUPERCLASS = NSWindow; }
);
IBVersion = 1;
}
\ No newline at end of file
Modified: trunk/English.lproj/TransitionSheet.nib/info.nib
===================================================================
--- trunk/English.lproj/TransitionSheet.nib/info.nib 2007-11-29 11:59:27 UTC
(rev 3279)
+++ trunk/English.lproj/TransitionSheet.nib/info.nib 2007-11-29 17:08:00 UTC
(rev 3280)
@@ -5,12 +5,13 @@
<key>IBDocumentLocation</key>
<string>69 58 356 240 0 0 1440 938 </string>
<key>IBFramework Version</key>
- <string>446.1</string>
+ <string>489.0</string>
<key>IBOpenObjects</key>
<array>
+ <integer>42</integer>
<integer>7</integer>
</array>
<key>IBSystem Version</key>
- <string>8R218</string>
+ <string>8S165</string>
</dict>
</plist>
Modified: trunk/English.lproj/TransitionSheet.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/French.lproj/TransitionSheet.nib/classes.nib
===================================================================
--- trunk/French.lproj/TransitionSheet.nib/classes.nib 2007-11-29 11:59:27 UTC
(rev 3279)
+++ trunk/French.lproj/TransitionSheet.nib/classes.nib 2007-11-29 17:08:00 UTC
(rev 3280)
@@ -1,43 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN"
"http://www.apple.com/DTDs/PropertyList-1.0.dtd";>
-<plist version="1.0">
-<dict>
- <key>IBClasses</key>
- <array>
- <dict>
- <key>ACTIONS</key>
- <dict>
- <key>dismissTransitionSheet</key>
- <string>id</string>
- </dict>
- <key>CLASS</key>
- <string>SKTransitionController</string>
- <key>LANGUAGE</key>
- <string>ObjC</string>
- <key>OUTLETS</key>
- <dict>
- <key>transitionDurationField</key>
- <string>NSTextField</string>
- <key>transitionDurationSlider</key>
- <string>NSSlider</string>
- <key>transitionExtentMatrix</key>
- <string>NSMatrix</string>
- <key>transitionStylePopUpButton</key>
- <string>NSPopUpButton</string>
- </dict>
- <key>SUPERCLASS</key>
- <string>NSWindowController</string>
- </dict>
- <dict>
- <key>CLASS</key>
- <string>FirstResponder</string>
- <key>LANGUAGE</key>
- <string>ObjC</string>
- <key>SUPERCLASS</key>
- <string>NSObject</string>
- </dict>
- </array>
- <key>IBVersion</key>
- <string>1</string>
-</dict>
-</plist>
+{
+ IBClasses = (
+ {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; },
+ {
+ ACTIONS = {dismissTransitionSheet = id; };
+ CLASS = SKTransitionController;
+ LANGUAGE = ObjC;
+ OUTLETS = {
+ transitionDurationField = NSTextField;
+ transitionDurationSlider = NSSlider;
+ transitionExtentMatrix = NSMatrix;
+ transitionStylePopUpButton = NSPopUpButton;
+ transitionView = SKTransitionView;
+ transitionWindow = SKTransitionWindow;
+ };
+ SUPERCLASS = NSWindowController;
+ },
+ {CLASS = SKTransitionView; LANGUAGE = ObjC; SUPERCLASS = NSOpenGLView;
},
+ {CLASS = SKTransitionWindow; LANGUAGE = ObjC; SUPERCLASS = NSWindow; }
+ );
+ IBVersion = 1;
+}
\ No newline at end of file
Modified: trunk/French.lproj/TransitionSheet.nib/info.nib
===================================================================
--- trunk/French.lproj/TransitionSheet.nib/info.nib 2007-11-29 11:59:27 UTC
(rev 3279)
+++ trunk/French.lproj/TransitionSheet.nib/info.nib 2007-11-29 17:08:00 UTC
(rev 3280)
@@ -1,15 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN"
"http://www.apple.com/DTDs/PropertyList-1.0.dtd";>
+<!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>629</string>
+ <string>489.0</string>
<key>IBOldestOS</key>
<integer>5</integer>
<key>IBOpenObjects</key>
- <array/>
+ <array>
+ <integer>42</integer>
+ </array>
<key>IBSystem Version</key>
- <string>9B18</string>
+ <string>8S165</string>
<key>targetFramework</key>
<string>IBCocoaFramework</string>
</dict>
Modified: trunk/French.lproj/TransitionSheet.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/German.lproj/TransitionSheet.nib/classes.nib
===================================================================
--- trunk/German.lproj/TransitionSheet.nib/classes.nib 2007-11-29 11:59:27 UTC
(rev 3279)
+++ trunk/German.lproj/TransitionSheet.nib/classes.nib 2007-11-29 17:08:00 UTC
(rev 3280)
@@ -10,9 +10,13 @@
transitionDurationSlider = NSSlider;
transitionExtentMatrix = NSMatrix;
transitionStylePopUpButton = NSPopUpButton;
+ transitionView = SKTransitionView;
+ transitionWindow = SKTransitionWindow;
};
SUPERCLASS = NSWindowController;
- }
+ },
+ {CLASS = SKTransitionView; LANGUAGE = ObjC; SUPERCLASS = NSOpenGLView;
},
+ {CLASS = SKTransitionWindow; LANGUAGE = ObjC; SUPERCLASS = NSWindow; }
);
IBVersion = 1;
}
\ No newline at end of file
Modified: trunk/German.lproj/TransitionSheet.nib/info.nib
===================================================================
--- trunk/German.lproj/TransitionSheet.nib/info.nib 2007-11-29 11:59:27 UTC
(rev 3279)
+++ trunk/German.lproj/TransitionSheet.nib/info.nib 2007-11-29 17:08:00 UTC
(rev 3280)
@@ -3,12 +3,13 @@
<plist version="1.0">
<dict>
<key>IBDocumentLocation</key>
- <string>59 49 356 240 0 0 1280 832 </string>
+ <string>69 58 356 240 0 0 1440 938 </string>
<key>IBFramework Version</key>
- <string>446.1</string>
+ <string>489.0</string>
<key>IBOpenObjects</key>
<array>
<integer>7</integer>
+ <integer>42</integer>
</array>
<key>IBSystem Version</key>
<string>8S165</string>
Modified: trunk/German.lproj/TransitionSheet.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/Italian.lproj/TransitionSheet.nib/classes.nib
===================================================================
--- trunk/Italian.lproj/TransitionSheet.nib/classes.nib 2007-11-29 11:59:27 UTC
(rev 3279)
+++ trunk/Italian.lproj/TransitionSheet.nib/classes.nib 2007-11-29 17:08:00 UTC
(rev 3280)
@@ -10,9 +10,13 @@
transitionDurationSlider = NSSlider;
transitionExtentMatrix = NSMatrix;
transitionStylePopUpButton = NSPopUpButton;
+ transitionView = SKTransitionView;
+ transitionWindow = SKTransitionWindow;
};
SUPERCLASS = NSWindowController;
- }
+ },
+ {CLASS = SKTransitionView; LANGUAGE = ObjC; SUPERCLASS = NSOpenGLView;
},
+ {CLASS = SKTransitionWindow; LANGUAGE = ObjC; SUPERCLASS = NSWindow; }
);
IBVersion = 1;
}
\ No newline at end of file
Modified: trunk/Italian.lproj/TransitionSheet.nib/info.nib
===================================================================
--- trunk/Italian.lproj/TransitionSheet.nib/info.nib 2007-11-29 11:59:27 UTC
(rev 3279)
+++ trunk/Italian.lproj/TransitionSheet.nib/info.nib 2007-11-29 17:08:00 UTC
(rev 3280)
@@ -5,12 +5,13 @@
<key>IBDocumentLocation</key>
<string>69 58 356 240 0 0 1440 938 </string>
<key>IBFramework Version</key>
- <string>446.1</string>
+ <string>489.0</string>
<key>IBOpenObjects</key>
<array>
+ <integer>76</integer>
<integer>41</integer>
</array>
<key>IBSystem Version</key>
- <string>8R218</string>
+ <string>8S165</string>
</dict>
</plist>
Modified: trunk/Italian.lproj/TransitionSheet.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/SKTransitionController.h
===================================================================
--- trunk/SKTransitionController.h 2007-11-29 11:59:27 UTC (rev 3279)
+++ trunk/SKTransitionController.h 2007-11-29 17:08:00 UTC (rev 3280)
@@ -112,20 +112,22 @@
SKCoreImageTransition
} SKAnimationTransitionStyle;
[EMAIL PROTECTED] CIImage, SKTransitionView;
[EMAIL PROTECTED] CIImage, SKTransitionWindow, SKTransitionView;
@interface SKTransitionController : NSWindowController {
- IBOutlet NSPopUpButton *transitionStylePopUpButton;
- IBOutlet NSTextField *transitionDurationField;
- IBOutlet NSSlider *transitionDurationSlider;
- IBOutlet NSMatrix *transitionExtentMatrix;
+ IBOutlet NSPopUpButton *transitionStylePopUpButton;
+ IBOutlet NSTextField *transitionDurationField;
+ IBOutlet NSSlider *transitionDurationSlider;
+ IBOutlet NSMatrix *transitionExtentMatrix;
+ IBOutlet SKTransitionWindow *transitionWindow;
+ IBOutlet SKTransitionView *transitionView;
- NSWindow *transitionWindow;
- SKTransitionView *transitionView;
NSView *view;
CIImage *initialImage;
NSRect imageRect;
+ NSMutableDictionary *filters;
+
SKAnimationTransitionStyle transitionStyle;
float duration;
BOOL shouldRestrict;
@@ -154,3 +156,25 @@
- (IBAction)dismissTransitionSheet:(id)sender;
@end
+
+#pragma mark -
+
[EMAIL PROTECTED] SKTransitionAnimation, CIImage, CIContext;
+
[EMAIL PROTECTED] SKTransitionView : NSOpenGLView {
+ SKTransitionAnimation *animation;
+ CIImage *image;
+ CIContext *context;
+ BOOL needsReshape;
+}
+- (SKTransitionAnimation *)animation;
+- (void)setAnimation:(SKTransitionAnimation *)newAnimation;
+- (CIImage *)image;
+- (void)setImage:(CIImage *)newImage;
+- (CIImage *)currentImage;
[EMAIL PROTECTED]
+
+#pragma mark -
+
[EMAIL PROTECTED] SKTransitionWindow : NSWindow
[EMAIL PROTECTED]
Modified: trunk/SKTransitionController.m
===================================================================
--- trunk/SKTransitionController.m 2007-11-29 11:59:27 UTC (rev 3279)
+++ trunk/SKTransitionController.m 2007-11-29 17:08:00 UTC (rev 3280)
@@ -67,26 +67,6 @@
#pragma mark -
[EMAIL PROTECTED] SKTransitionView : NSOpenGLView {
- SKTransitionAnimation *animation;
- CIImage *image;
- CIContext *context;
- BOOL needsReshape;
-}
-- (SKTransitionAnimation *)animation;
-- (void)setAnimation:(SKTransitionAnimation *)newAnimation;
-- (CIImage *)image;
-- (void)setImage:(CIImage *)newImage;
-- (CIImage *)currentImage;
[EMAIL PROTECTED]
-
-#pragma mark -
-
[EMAIL PROTECTED] SKTransitionWindow : NSWindow
[EMAIL PROTECTED]
-
-#pragma mark -
-
@implementation SKTransitionController
+ (NSArray *)transitionFilterNames {
@@ -103,7 +83,7 @@
- (id)initWithView:(NSView *)aView {
if (self = [super init]) {
- view = aView;
+ view = aView; // don't retain as it may retain us
transitionStyle = SKNoTransition;
duration = 1.0;
shouldRestrict = YES;
@@ -113,6 +93,7 @@
- (void)dealloc {
[initialImage release];
+ [filters release];
[super dealloc];
}
@@ -164,7 +145,6 @@
}
- (CIFilter *)filterWithName:(NSString *)name {
- static NSMutableDictionary *filters = nil;
if (filters == nil)
filters = [[NSMutableDictionary alloc] init];
CIFilter *filter = [filters objectForKey:name];
@@ -273,21 +253,14 @@
}
- (NSWindow *)transitionWindow {
- if (transitionWindow == nil) {
- transitionWindow = [[SKTransitionWindow alloc]
initWithContentRect:NSZeroRect styleMask:NSBorderlessWindowMask
backing:NSBackingStoreBuffered defer:NO];
- [transitionWindow setReleasedWhenClosed:NO];
- [transitionWindow setIgnoresMouseEvents:YES];
-
- transitionView = [[SKTransitionView alloc] init];
- [transitionWindow setContentView:transitionView];
- [transitionView release];
- }
+ if (transitionWindow == nil)
+ [self window];
return transitionWindow;
}
- (SKTransitionView *)transitionView {
if (transitionView == nil)
- [self transitionWindow];
+ [self window];
return transitionView;
}
@@ -411,7 +384,7 @@
[[self transitionWindow] setFrame:frame display:NO];
[[self transitionWindow] orderBack:nil];
- [[view window] addChildWindow:transitionWindow ordered:NSWindowAbove];
+ [[view window] addChildWindow:[self transitionWindow]
ordered:NSWindowAbove];
[animation startAnimation];
@@ -421,7 +394,7 @@
[[view window] enableFlushWindow];
[[view window] flushWindow];
- [[view window] removeChildWindow:transitionWindow];
+ [[view window] removeChildWindow:[self transitionWindow]];
[[self transitionWindow] orderOut:nil];
[[self transitionView] setAnimation:nil];
@@ -435,8 +408,6 @@
[self setTransitionStyle:[[transitionStylePopUpButton selectedItem]
tag]];
[self setDuration:fmaxf([transitionDurationField floatValue], 0.0)];
[self setShouldRestrict:(BOOL)[[transitionExtentMatrix selectedCell]
tag]];
- // create the window to avoid delaying the first transition
- [self transitionWindow];
}
}
@@ -629,6 +600,16 @@
@implementation SKTransitionWindow
+
+- (id)initWithContentRect:(NSRect)contentRect styleMask:(unsigned
int)styleMask backing:(NSBackingStoreType)bufferingType
defer:(BOOL)deferCreation {
+ if (self = [super initWithContentRect:contentRect
styleMask:NSBorderlessWindowMask backing:bufferingType defer:deferCreation]) {
+ [self setReleasedWhenClosed:NO];
+ [self setIgnoresMouseEvents:YES];
+ }
+ return self;
+}
+
- (BOOL)canBecomeMainWindow { return NO; }
- (BOOL)canBecomeKeyWindow { return NO; }
+
@end
Modified: trunk/Spanish.lproj/TransitionSheet.nib/classes.nib
===================================================================
--- trunk/Spanish.lproj/TransitionSheet.nib/classes.nib 2007-11-29 11:59:27 UTC
(rev 3279)
+++ trunk/Spanish.lproj/TransitionSheet.nib/classes.nib 2007-11-29 17:08:00 UTC
(rev 3280)
@@ -10,9 +10,13 @@
transitionDurationSlider = NSSlider;
transitionExtentMatrix = NSMatrix;
transitionStylePopUpButton = NSPopUpButton;
+ transitionView = SKTransitionView;
+ transitionWindow = SKTransitionWindow;
};
SUPERCLASS = NSWindowController;
- }
+ },
+ {CLASS = SKTransitionView; LANGUAGE = ObjC; SUPERCLASS = NSOpenGLView;
},
+ {CLASS = SKTransitionWindow; LANGUAGE = ObjC; SUPERCLASS = NSWindow; }
);
IBVersion = 1;
}
\ No newline at end of file
Modified: trunk/Spanish.lproj/TransitionSheet.nib/info.nib
===================================================================
--- trunk/Spanish.lproj/TransitionSheet.nib/info.nib 2007-11-29 11:59:27 UTC
(rev 3279)
+++ trunk/Spanish.lproj/TransitionSheet.nib/info.nib 2007-11-29 17:08:00 UTC
(rev 3280)
@@ -6,6 +6,10 @@
<string>69 58 356 240 0 0 1440 938 </string>
<key>IBFramework Version</key>
<string>489.0</string>
+ <key>IBOpenObjects</key>
+ <array>
+ <integer>42</integer>
+ </array>
<key>IBSystem Version</key>
<string>8S165</string>
</dict>
Modified: trunk/Spanish.lproj/TransitionSheet.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/ru.lproj/TransitionSheet.nib/classes.nib
===================================================================
--- trunk/ru.lproj/TransitionSheet.nib/classes.nib 2007-11-29 11:59:27 UTC
(rev 3279)
+++ trunk/ru.lproj/TransitionSheet.nib/classes.nib 2007-11-29 17:08:00 UTC
(rev 3280)
@@ -10,9 +10,13 @@
transitionDurationSlider = NSSlider;
transitionExtentMatrix = NSMatrix;
transitionStylePopUpButton = NSPopUpButton;
+ transitionView = SKTransitionView;
+ transitionWindow = SKTransitionWindow;
};
SUPERCLASS = NSWindowController;
- }
+ },
+ {CLASS = SKTransitionView; LANGUAGE = ObjC; SUPERCLASS = NSOpenGLView;
},
+ {CLASS = SKTransitionWindow; LANGUAGE = ObjC; SUPERCLASS = NSWindow; }
);
IBVersion = 1;
}
\ No newline at end of file
Modified: trunk/ru.lproj/TransitionSheet.nib/info.nib
===================================================================
--- trunk/ru.lproj/TransitionSheet.nib/info.nib 2007-11-29 11:59:27 UTC (rev
3279)
+++ trunk/ru.lproj/TransitionSheet.nib/info.nib 2007-11-29 17:08:00 UTC (rev
3280)
@@ -3,11 +3,12 @@
<plist version="1.0">
<dict>
<key>IBDocumentLocation</key>
- <string>59 63 356 240 0 0 1280 1002 </string>
+ <string>69 58 356 240 0 0 1440 938 </string>
<key>IBFramework Version</key>
- <string>446.1</string>
+ <string>489.0</string>
<key>IBOpenObjects</key>
<array>
+ <integer>42</integer>
<integer>7</integer>
</array>
<key>IBSystem Version</key>
Modified: trunk/ru.lproj/TransitionSheet.nib/keyedobjects.nib
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
SF.Net email is sponsored by: The Future of Linux Business White Paper
from Novell. From the desktop to the data center, Linux is going
mainstream. Let it simplify your IT future.
http://altfarm.mediaplex.com/ad/ck/8857-50307-18918-4
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
