Revision: 3874
http://skim-app.svn.sourceforge.net/skim-app/?rev=3874&view=rev
Author: hofman
Date: 2008-05-13 09:49:18 -0700 (Tue, 13 May 2008)
Log Message:
-----------
Make main controller next responder for side window rather than forwarding
specific actions. Simplify keydown.
Modified Paths:
--------------
trunk/SKMainWindowController.h
trunk/SKMainWindowController.m
trunk/SKSideWindow.m
Modified: trunk/SKMainWindowController.h
===================================================================
--- trunk/SKMainWindowController.h 2008-05-13 16:22:08 UTC (rev 3873)
+++ trunk/SKMainWindowController.h 2008-05-13 16:49:18 UTC (rev 3874)
@@ -391,8 +391,7 @@
- (BOOL)leftSidePaneIsOpen;
- (BOOL)rightSidePaneIsOpen;
-- (NSWindow *)leftSideWindow;
-- (NSWindow *)rightSideWindow;
+- (void)closeSideWindow:(SKSideWindow *)sideWindow;
- (void)displayOutlineView;
- (void)fadeInOutlineView;
Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m 2008-05-13 16:22:08 UTC (rev 3873)
+++ trunk/SKMainWindowController.m 2008-05-13 16:49:18 UTC (rev 3874)
@@ -995,14 +995,16 @@
return state == NSDrawerOpenState || state == NSDrawerOpeningState;
}
-- (NSWindow *)leftSideWindow {
- return leftSideWindow;
+- (void)closeSideWindow:(SKSideWindow *)sideWindow {
+ if ([sideWindow state] == NSDrawerOpenState || [sideWindow state] ==
NSDrawerOpeningState) {
+ if (sideWindow == leftSideWindow) {
+ [self toggleLeftSidePane:self];
+ } else if (sideWindow == rightSideWindow) {
+ [self toggleRightSidePane:self];
+ }
+ }
}
-- (NSWindow *)rightSideWindow {
- return rightSideWindow;
-}
-
- (NSArray *)notes {
return notes;
}
Modified: trunk/SKSideWindow.m
===================================================================
--- trunk/SKSideWindow.m 2008-05-13 16:22:08 UTC (rev 3873)
+++ trunk/SKSideWindow.m 2008-05-13 16:49:18 UTC (rev 3874)
@@ -176,54 +176,21 @@
unsigned modifierFlags = [theEvent modifierFlags] &
NSDeviceIndependentModifierFlagsMask;
if (ch == 0x1B && modifierFlags == 0) {
- if (self == [controller leftSideWindow] && [controller
leftSidePaneIsOpen])
- [controller toggleLeftSidePane:self];
- else if (self == [controller rightSideWindow] && [controller
rightSidePaneIsOpen])
- [controller toggleRightSidePane:self];
+ if (state == NSDrawerOpenState || state == NSDrawerOpeningState)
+ [controller closeSideWindow:self];
else
[controller exitFullScreen:self];
} else if (ch == 'p' && modifierFlags == 0 && [controller isPresentation])
{
- [controller toggleLeftSidePane:self];
+ [controller closeSideWindow:self];
} else {
[super keyDown:theEvent];
}
}
-- (IBAction)toggleLeftSidePane:(id)sender {
- [controller toggleLeftSidePane:sender];
+- (NSResponder *)nextResponder {
+ return controller;
}
-- (IBAction)toggleRightSidePane:(id)sender {
- [controller toggleRightSidePane:sender];
-}
-
-- (IBAction)changeLeftSidePaneState:(id)sender {
- [controller changeLeftSidePaneState:sender];
-}
-
-- (IBAction)changeRightSidePaneState:(id)sender {
- [controller changeRightSidePaneState:sender];
-}
-
-- (IBAction)toggleFullScreen:(id)sender {
- [controller toggleFullScreen:sender];
-}
-
-- (IBAction)togglePresentation:(id)sender {
- [controller togglePresentation:sender];
-}
-
-- (BOOL)validateMenuItem:(NSMenuItem *)menuItem {
- SEL action = [menuItem action];
- if (action == @selector(toggleLeftSidePane:) || action ==
@selector(toggleRightSidePane:) ||
- action == @selector(changeLeftSidePaneState:) || action ==
@selector(changeRightSidePaneState:) ||
- action == @selector(toggleFullScreen:) || action ==
@selector(togglePresentation:)) {
- return [controller validateMenuItem:menuItem];
- } else {
- return [super validateMenuItem:menuItem];
- }
-}
-
@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 2008.
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
