Revision: 4766
http://skim-app.svn.sourceforge.net/skim-app/?rev=4766&view=rev
Author: hofman
Date: 2008-10-08 20:15:32 +0000 (Wed, 08 Oct 2008)
Log Message:
-----------
Disable toolbar items while running palette
Modified Paths:
--------------
trunk/SKBookmarkController.m
trunk/SKMainWindowController_Toolbar.m
trunk/SKNotesDocument.m
Modified: trunk/SKBookmarkController.m
===================================================================
--- trunk/SKBookmarkController.m 2008-10-08 20:06:13 UTC (rev 4765)
+++ trunk/SKBookmarkController.m 2008-10-08 20:15:32 UTC (rev 4766)
@@ -859,17 +859,15 @@
}
- (BOOL)validateToolbarItem:(NSToolbarItem *)toolbarItem {
- NSString *identifier = [toolbarItem itemIdentifier];
- if ([identifier isEqualToString:SKBookmarksDeleteToolbarItemIdentifier]) {
+ if ([[[self window] toolbar] customizationPaletteIsRunning])
+ return NO;
+ else if ([[toolbarItem itemIdentifier]
isEqualToString:SKBookmarksDeleteToolbarItemIdentifier])
return [outlineView canDelete];
- } else {
- return YES;
- }
+ return YES;
}
- (BOOL)validateMenuItem:(NSMenuItem *)menuItem {
- SEL action = [menuItem action];
- if (action == @selector(toggleStatusBar:)) {
+ if ([menuItem action] == @selector(toggleStatusBar:)) {
if ([statusBar isVisible])
[menuItem setTitle:NSLocalizedString(@"Hide Status Bar", @"Menu
item title")];
else
Modified: trunk/SKMainWindowController_Toolbar.m
===================================================================
--- trunk/SKMainWindowController_Toolbar.m 2008-10-08 20:06:13 UTC (rev
4765)
+++ trunk/SKMainWindowController_Toolbar.m 2008-10-08 20:15:32 UTC (rev
4766)
@@ -683,26 +683,27 @@
- (BOOL)validateToolbarItem:(NSToolbarItem *)toolbarItem {
NSString *identifier = [toolbarItem itemIdentifier];
- BOOL noPalette = NO == [[mainWindow toolbar]
customizationPaletteIsRunning];
- if ([identifier
isEqualToString:SKDocumentToolbarZoomActualItemIdentifier]) {
- return noPalette && fabsf([pdfView scaleFactor] - 1.0 ) > 0.01;
+ if ([[mainWindow toolbar] customizationPaletteIsRunning]) {
+ return NO;
+ } else if ([identifier
isEqualToString:SKDocumentToolbarZoomActualItemIdentifier]) {
+ return fabsf([pdfView scaleFactor] - 1.0 ) > 0.01;
} else if ([identifier
isEqualToString:SKDocumentToolbarZoomToFitItemIdentifier]) {
- return noPalette && [pdfView autoScales] == NO;
+ return [pdfView autoScales] == NO;
} else if ([identifier
isEqualToString:SKDocumentToolbarZoomToSelectionItemIdentifier]) {
- return noPalette && NSIsEmptyRect([pdfView currentSelectionRect]) ==
NO;
+ return NSIsEmptyRect([pdfView currentSelectionRect]) == NO;
} else if ([identifier
isEqualToString:SKDocumentToolbarNewTextNoteItemIdentifier] || [identifier
isEqualToString:SKDocumentToolbarNewCircleNoteItemIdentifier] || [identifier
isEqualToString:SKDocumentToolbarNewLineItemIdentifier]) {
- return noPalette && ([pdfView toolMode] == SKTextToolMode || [pdfView
toolMode] == SKNoteToolMode) && [pdfView hideNotes] == NO;
+ return ([pdfView toolMode] == SKTextToolMode || [pdfView toolMode] ==
SKNoteToolMode) && [pdfView hideNotes] == NO;
} else if ([identifier
isEqualToString:SKDocumentToolbarNewMarkupItemIdentifier]) {
- return noPalette && ([pdfView toolMode] == SKTextToolMode || [pdfView
toolMode] == SKNoteToolMode) && [[[pdfView currentSelection] pages] count] &&
[pdfView hideNotes] == NO;
+ return ([pdfView toolMode] == SKTextToolMode || [pdfView toolMode] ==
SKNoteToolMode) && [[[pdfView currentSelection] pages] count] && [pdfView
hideNotes] == NO;
} else if ([identifier
isEqualToString:SKDocumentToolbarNewNoteItemIdentifier]) {
BOOL enabled = ([pdfView toolMode] == SKTextToolMode || [pdfView
toolMode] == SKNoteToolMode) && [[[pdfView currentSelection] pages] count] &&
[pdfView hideNotes] == NO;
[noteButton setEnabled:enabled forSegment:SKHighlightNote];
[noteButton setEnabled:enabled forSegment:SKUnderlineNote];
[noteButton setEnabled:enabled forSegment:SKStrikeOutNote];
- return noPalette && ([pdfView toolMode] == SKTextToolMode || [pdfView
toolMode] == SKNoteToolMode) && [pdfView hideNotes] == NO;
+ return ([pdfView toolMode] == SKTextToolMode || [pdfView toolMode] ==
SKNoteToolMode) && [pdfView hideNotes] == NO;
}
- return noPalette;
+ return YES;
}
- (void)handleColorSwatchColorsChangedNotification:(NSNotification
*)notification {
Modified: trunk/SKNotesDocument.m
===================================================================
--- trunk/SKNotesDocument.m 2008-10-08 20:06:13 UTC (rev 4765)
+++ trunk/SKNotesDocument.m 2008-10-08 20:15:32 UTC (rev 4766)
@@ -685,7 +685,9 @@
}
- (BOOL)validateToolbarItem:(NSToolbarItem *)toolbarItem {
- if ([[toolbarItem itemIdentifier]
isEqualToString:SKNotesDocumentOpenPDFToolbarItemIdentifier])
+ if (NO == [[[[[self windowControllers] objectAtIndex:0] window] toolbar]
customizationPaletteIsRunning])
+ return NO;
+ else if ([[toolbarItem itemIdentifier]
isEqualToString:SKNotesDocumentOpenPDFToolbarItemIdentifier])
return [[NSFileManager defaultManager] fileExistsAtPath:[[self
fileName] stringByReplacingPathExtension:@"pdf"]];
return YES;
}
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 the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
