Revision: 2973
http://skim-app.svn.sourceforge.net/skim-app/?rev=2973&view=rev
Author: hofman
Date: 2007-09-22 04:32:50 -0700 (Sat, 22 Sep 2007)
Log Message:
-----------
Make transition controller a subclass of NSWindwController to manage the setup
sheet.
Modified Paths:
--------------
trunk/Dutch.lproj/TransitionSheet.nib/classes.nib
trunk/Dutch.lproj/TransitionSheet.nib/keyedobjects.nib
trunk/English.lproj/TransitionSheet.nib/classes.nib
trunk/English.lproj/TransitionSheet.nib/keyedobjects.nib
trunk/French.lproj/TransitionSheet.nib/classes.nib
trunk/French.lproj/TransitionSheet.nib/keyedobjects.nib
trunk/Italian.lproj/TransitionSheet.nib/classes.nib
trunk/Italian.lproj/TransitionSheet.nib/keyedobjects.nib
trunk/SKMainWindowController.m
trunk/SKSheetController.m
trunk/SKTransitionController.h
trunk/SKTransitionController.m
Modified: trunk/Dutch.lproj/TransitionSheet.nib/classes.nib
===================================================================
--- trunk/Dutch.lproj/TransitionSheet.nib/classes.nib 2007-09-22 11:08:18 UTC
(rev 2972)
+++ trunk/Dutch.lproj/TransitionSheet.nib/classes.nib 2007-09-22 11:32:50 UTC
(rev 2973)
@@ -9,10 +9,9 @@
transitionDurationField = NSTextField;
transitionDurationSlider = NSSlider;
transitionExtentMatrix = NSMatrix;
- transitionSheet = NSWindow;
transitionStylePopUpButton = NSPopUpButton;
};
- SUPERCLASS = NSObject;
+ SUPERCLASS = NSWindowController;
}
);
IBVersion = 1;
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-09-22 11:08:18 UTC
(rev 2972)
+++ trunk/English.lproj/TransitionSheet.nib/classes.nib 2007-09-22 11:32:50 UTC
(rev 2973)
@@ -9,10 +9,9 @@
transitionDurationField = NSTextField;
transitionDurationSlider = NSSlider;
transitionExtentMatrix = NSMatrix;
- transitionSheet = NSWindow;
transitionStylePopUpButton = NSPopUpButton;
};
- SUPERCLASS = NSObject;
+ SUPERCLASS = NSWindowController;
}
);
IBVersion = 1;
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-09-22 11:08:18 UTC
(rev 2972)
+++ trunk/French.lproj/TransitionSheet.nib/classes.nib 2007-09-22 11:32:50 UTC
(rev 2973)
@@ -9,10 +9,9 @@
transitionDurationField = NSTextField;
transitionDurationSlider = NSSlider;
transitionExtentMatrix = NSMatrix;
- transitionSheet = NSWindow;
transitionStylePopUpButton = NSPopUpButton;
};
- SUPERCLASS = NSObject;
+ SUPERCLASS = NSWindowController;
}
);
IBVersion = 1;
Modified: trunk/French.lproj/TransitionSheet.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/Italian.lproj/TransitionSheet.nib/classes.nib
===================================================================
--- trunk/Italian.lproj/TransitionSheet.nib/classes.nib 2007-09-22 11:08:18 UTC
(rev 2972)
+++ trunk/Italian.lproj/TransitionSheet.nib/classes.nib 2007-09-22 11:32:50 UTC
(rev 2973)
@@ -9,10 +9,9 @@
transitionDurationField = NSTextField;
transitionDurationSlider = NSSlider;
transitionExtentMatrix = NSMatrix;
- transitionSheet = NSWindow;
transitionStylePopUpButton = NSPopUpButton;
};
- SUPERCLASS = NSObject;
+ SUPERCLASS = NSWindowController;
}
);
IBVersion = 1;
Modified: trunk/Italian.lproj/TransitionSheet.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m 2007-09-22 11:08:18 UTC (rev 2972)
+++ trunk/SKMainWindowController.m 2007-09-22 11:32:50 UTC (rev 2973)
@@ -1401,6 +1401,7 @@
if (pageSheetController == nil)
pageSheetController = [[SKPageSheetController alloc] init];
+ [pageSheetController setObjectValues:pageLabels];
[pageSheetController setStringValue:[self pageLabel]];
[pageSheetController beginSheetModalForWindow: [self window]
Modified: trunk/SKSheetController.m
===================================================================
--- trunk/SKSheetController.m 2007-09-22 11:08:18 UTC (rev 2972)
+++ trunk/SKSheetController.m 2007-09-22 11:32:50 UTC (rev 2973)
@@ -92,13 +92,11 @@
}
- (NSString *)stringValue {
- [self window];
- return [textField stringValue];
+ return [[self textField] stringValue];
}
- (void)setStringValue:(NSString *)string {
- [self window];
- [textField setStringValue:string];
+ [[self textField] setStringValue:string];
}
@end
@@ -110,12 +108,12 @@
- (NSString *)windowNibName { return @"PageSheet"; }
- (NSArray *)objectValues {
- return [(NSComboBox *)textField objectValues];
+ return [(NSComboBox *)[self textField] objectValues];
}
- (void)setObjectValues:(NSArray *)objects {
- [(NSComboBox *)textField removeAllItems];
- [(NSComboBox *)textField addItemsWithObjectValues:objects];
+ [(NSComboBox *)[self textField] removeAllItems];
+ [(NSComboBox *)[self textField] addItemsWithObjectValues:objects];
}
@end
Modified: trunk/SKTransitionController.h
===================================================================
--- trunk/SKTransitionController.h 2007-09-22 11:08:18 UTC (rev 2972)
+++ trunk/SKTransitionController.h 2007-09-22 11:32:50 UTC (rev 2973)
@@ -114,12 +114,11 @@
@class CIImage, SKTransitionView;
[EMAIL PROTECTED] SKTransitionController : NSObject {
- IBOutlet NSWindow *transitionSheet;
- IBOutlet NSPopUpButton *transitionStylePopUpButton;
- IBOutlet NSTextField *transitionDurationField;
- IBOutlet NSSlider *transitionDurationSlider;
- IBOutlet NSMatrix *transitionExtentMatrix;
[EMAIL PROTECTED] SKTransitionController : NSWindowController {
+ IBOutlet NSPopUpButton *transitionStylePopUpButton;
+ IBOutlet NSTextField *transitionDurationField;
+ IBOutlet NSSlider *transitionDurationSlider;
+ IBOutlet NSMatrix *transitionExtentMatrix;
NSWindow *transitionWindow;
SKTransitionView *transitionView;
Modified: trunk/SKTransitionController.m
===================================================================
--- trunk/SKTransitionController.m 2007-09-22 11:08:18 UTC (rev 2972)
+++ trunk/SKTransitionController.m 2007-09-22 11:32:50 UTC (rev 2973)
@@ -112,11 +112,23 @@
}
- (void)dealloc {
- [transitionWindow release];
[initialImage release];
[super dealloc];
}
+- (NSString *)windowNibName { return @"TransitionSheet"; }
+
+- (void)windowDidLoad {
+ NSArray *filterNames = [[self class] 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];
+ }
+}
+
- (NSView *)view {
return view;
}
@@ -416,6 +428,8 @@
}
}
+#pragma mark Setup sheet
+
- (void)transitionSheetDidEnd:(NSWindow *)sheet returnCode:(int)returnCode
contextInfo:(void *)contextInfo {
if (returnCode == NSOKButton) {
[self setTransitionStyle:[[transitionStylePopUpButton selectedItem]
tag]];
@@ -425,25 +439,12 @@
}
- (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];
- }
- }
+ [self window];
[transitionStylePopUpButton selectItemWithTag:[self transitionStyle]];
[transitionDurationField setFloatValue:[self duration]];
[transitionDurationSlider setFloatValue:[self duration]];
[transitionExtentMatrix selectCellWithTag:(int)[self shouldRestrict]];
- [NSApp beginSheet:transitionSheet
+ [NSApp beginSheet:[self window]
modalForWindow:window
modalDelegate:self
didEndSelector:@selector(transitionSheetDidEnd:returnCode:contextInfo:)
@@ -451,8 +452,8 @@
}
- (IBAction)dismissTransitionSheet:(id)sender {
- [NSApp endSheet:transitionSheet returnCode:[sender tag]];
- [transitionSheet orderOut:self];
+ [NSApp endSheet:[self window] returnCode:[sender tag]];
+ [[self window] orderOut:self];
}
@end
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
