Revision: 3170
http://skim-app.svn.sourceforge.net/skim-app/?rev=3170&view=rev
Author: hofman
Date: 2007-11-07 03:02:20 -0800 (Wed, 07 Nov 2007)
Log Message:
-----------
Move utility panel actions to app delegate.
Modified Paths:
--------------
trunk/SKApplication.h
trunk/SKApplication.m
trunk/SKApplicationController.h
trunk/SKApplicationController.m
Modified: trunk/SKApplication.h
===================================================================
--- trunk/SKApplication.h 2007-11-07 10:54:08 UTC (rev 3169)
+++ trunk/SKApplication.h 2007-11-07 11:02:20 UTC (rev 3170)
@@ -41,8 +41,6 @@
extern NSString *SKApplicationStartsTerminatingNotification;
@interface SKApplication : NSApplication
-- (IBAction)orderFrontLineInspector:(id)sender;
-- (IBAction)orderFrontNotesPanel:(id)sender;
@end
Modified: trunk/SKApplication.m
===================================================================
--- trunk/SKApplication.m 2007-11-07 10:54:08 UTC (rev 3169)
+++ trunk/SKApplication.m 2007-11-07 11:02:20 UTC (rev 3170)
@@ -40,8 +40,6 @@
#import "SKDocument.h"
#import "SKPDFSynchronizer.h"
#import "SKPDFView.h"
-#import "SKLineInspector.h"
-#import "SKNotesPanelController.h"
#import "NSString_SKExtensions.h"
NSString *SKApplicationStartsTerminatingNotification =
@"SKApplicationStartsTerminatingNotification";
@@ -53,40 +51,6 @@
@implementation SKApplication
-- (IBAction)orderFrontLineInspector:(id)sender {
- if ([SKLineInspector sharedLineInspectorExists] && [[[SKLineInspector
sharedLineInspector] window] isVisible])
- [[[SKLineInspector sharedLineInspector] window] orderOut:sender];
- else
- [[[SKLineInspector sharedLineInspector] window] orderFront:sender];
-}
-
-- (IBAction)orderFrontNotesPanel:(id)sender {
- if ([SKNotesPanelController sharedControllerExists] &&
[[[SKNotesPanelController sharedController] window] isVisible])
- [[[SKNotesPanelController sharedController] window] orderOut:sender];
- else
- [[[SKNotesPanelController sharedController] window] orderFront:sender];
-}
-
-- (BOOL)validateMenuItem:(NSMenuItem *)menuItem {
- SEL action = [menuItem action];
- if (action == @selector(orderFrontLineInspector:)) {
- if ([SKLineInspector sharedLineInspectorExists] && [[[SKLineInspector
sharedLineInspector] window] isVisible])
- [menuItem setTitle:NSLocalizedString(@"Hide Lines", @"Menu item
title")];
- else
- [menuItem setTitle:NSLocalizedString(@"Show Lines", @"Menu item
title")];
- return YES;
- } else if (action == @selector(orderFrontNotesPanel:)) {
- if ([SKNotesPanelController sharedControllerExists] &&
[[[SKNotesPanelController sharedController] window] isVisible])
- [menuItem setTitle:NSLocalizedString(@"Hide Notes", @"Menu item
title")];
- else
- [menuItem setTitle:NSLocalizedString(@"Show Notes", @"Menu item
title")];
- return YES;
- } else if ([[SKApplication superclass] respondsToSelector:_cmd]) {
- return [super validateMenuItem:menuItem];
- }
- return YES;
-}
-
- (void)sendEvent:(NSEvent *)anEvent {
if ([anEvent type] == NSScrollWheel && [anEvent modifierFlags] &
NSAlternateKeyMask) {
id target = [self targetForAction:@selector(magnifyWheel:)];
Modified: trunk/SKApplicationController.h
===================================================================
--- trunk/SKApplicationController.h 2007-11-07 10:54:08 UTC (rev 3169)
+++ trunk/SKApplicationController.h 2007-11-07 11:02:20 UTC (rev 3170)
@@ -53,6 +53,9 @@
- (IBAction)visitWebSite:(id)sender;
- (IBAction)visitWiki:(id)sender;
+- (IBAction)orderFrontLineInspector:(id)sender;
+- (IBAction)orderFrontNotesPanel:(id)sender;
+
- (IBAction)showPreferencePanel:(id)sender;
- (IBAction)showReleaseNotes:(id)sender;
- (IBAction)showDownloads:(id)sender;
Modified: trunk/SKApplicationController.m
===================================================================
--- trunk/SKApplicationController.m 2007-11-07 10:54:08 UTC (rev 3169)
+++ trunk/SKApplicationController.m 2007-11-07 11:02:20 UTC (rev 3170)
@@ -37,6 +37,8 @@
*/
#import "SKApplicationController.h"
+#import "SKLineInspector.h"
+#import "SKNotesPanelController.h"
#import "SKPreferenceController.h"
#import "SKReleaseNotesController.h"
#import "SKStringConstants.h"
@@ -226,6 +228,20 @@
NSBeep();
}
+- (IBAction)orderFrontLineInspector:(id)sender {
+ if ([SKLineInspector sharedLineInspectorExists] && [[[SKLineInspector
sharedLineInspector] window] isVisible])
+ [[[SKLineInspector sharedLineInspector] window] orderOut:sender];
+ else
+ [[[SKLineInspector sharedLineInspector] window] orderFront:sender];
+}
+
+- (IBAction)orderFrontNotesPanel:(id)sender {
+ if ([SKNotesPanelController sharedControllerExists] &&
[[[SKNotesPanelController sharedController] window] isVisible])
+ [[[SKNotesPanelController sharedController] window] orderOut:sender];
+ else
+ [[[SKNotesPanelController sharedController] window] orderFront:sender];
+}
+
- (IBAction)showPreferencePanel:(id)sender{
[[SKPreferenceController sharedPrefenceController] showWindow:self];
}
@@ -247,6 +263,24 @@
[[SKBookmarkController sharedBookmarkController] openBookmarks:[NSArray
arrayWithObjects:bookmark, nil]];
}
+- (BOOL)validateMenuItem:(NSMenuItem *)menuItem {
+ SEL action = [menuItem action];
+ if (action == @selector(orderFrontLineInspector:)) {
+ if ([SKLineInspector sharedLineInspectorExists] && [[[SKLineInspector
sharedLineInspector] window] isVisible])
+ [menuItem setTitle:NSLocalizedString(@"Hide Lines", @"Menu item
title")];
+ else
+ [menuItem setTitle:NSLocalizedString(@"Show Lines", @"Menu item
title")];
+ return YES;
+ } else if (action == @selector(orderFrontNotesPanel:)) {
+ if ([SKNotesPanelController sharedControllerExists] &&
[[[SKNotesPanelController sharedController] window] isVisible])
+ [menuItem setTitle:NSLocalizedString(@"Hide Notes", @"Menu item
title")];
+ else
+ [menuItem setTitle:NSLocalizedString(@"Show Notes", @"Menu item
title")];
+ return YES;
+ }
+ return YES;
+}
+
#pragma mark Support
- (void)addMenuItemsForBookmarks:(NSArray *)bookmarks toMenu:(NSMenu *)menu {
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
Skim-app-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
