Revision: 7056
http://skim-app.svn.sourceforge.net/skim-app/?rev=7056&view=rev
Author: hofman
Date: 2011-01-07 18:44:58 +0000 (Fri, 07 Jan 2011)
Log Message:
-----------
some more disabling on locked documents
Modified Paths:
--------------
trunk/SKMainToolbarController.m
Modified: trunk/SKMainToolbarController.m
===================================================================
--- trunk/SKMainToolbarController.m 2011-01-07 18:38:38 UTC (rev 7055)
+++ trunk/SKMainToolbarController.m 2011-01-07 18:44:58 UTC (rev 7056)
@@ -778,6 +778,10 @@
return [mainController.pdfView.document isLocked] == NO &&
[mainController.pdfView autoScales] == NO;
} else if ([identifier
isEqualToString:SKDocumentToolbarZoomToSelectionItemIdentifier]) {
return [mainController.pdfView.document isLocked] == NO &&
NSIsEmptyRect([mainController.pdfView currentSelectionRect]) == NO;
+ } else if ([identifier
isEqualToString:SKDocumentToolbarScaleItemIdentifier]) {
+ return [mainController.pdfView.document isLocked] == NO;
+ } else if ([identifier
isEqualToString:SKDocumentToolbarPageNumberItemIdentifier]) {
+ return [mainController.pdfView.document isLocked] == NO;
} else if ([identifier
isEqualToString:SKDocumentToolbarDisplayBoxItemIdentifier] || [identifier
isEqualToString:SKDocumentToolbarDisplayModeItemIdentifier] || [identifier
isEqualToString:SKDocumentToolbarSingleTwoUpItemIdentifier] || [identifier
isEqualToString:SKDocumentToolbarContinuousItemIdentifier]) {
return [mainController.pdfView.document isLocked] == NO;
} else if ([identifier
isEqualToString:SKDocumentToolbarNewTextNoteItemIdentifier] || [identifier
isEqualToString:SKDocumentToolbarNewCircleNoteItemIdentifier] || [identifier
isEqualToString:SKDocumentToolbarNewLineItemIdentifier]) {
@@ -802,15 +806,17 @@
- (BOOL)validateMenuItem:(NSMenuItem *)menuItem {
SEL action = [menuItem action];
- if (action == @selector(createNewTextNote:)) {
+ if (action == @selector(chooseScale:)) {
+ return [mainController.pdfView.document isLocked] == NO;
+ } else if (action == @selector(createNewTextNote:)) {
[menuItem setState:[textNoteButton tagForSegment:0] == [menuItem tag]
? NSOnState : NSOffState];
- return [mainController interactionMode] != SKPresentationMode &&
([mainController.pdfView toolMode] == SKTextToolMode || [mainController.pdfView
toolMode] == SKNoteToolMode) && [mainController.pdfView hideNotes] == NO;
+ return [mainController interactionMode] != SKPresentationMode &&
[mainController.pdfView.document isLocked] == NO && ([mainController.pdfView
toolMode] == SKTextToolMode || [mainController.pdfView toolMode] ==
SKNoteToolMode) && [mainController.pdfView hideNotes] == NO;
} else if (action == @selector(createNewCircleNote:)) {
[menuItem setState:[circleNoteButton tagForSegment:0] == [menuItem
tag] ? NSOnState : NSOffState];
- return [mainController interactionMode] != SKPresentationMode &&
([mainController.pdfView toolMode] == SKTextToolMode || [mainController.pdfView
toolMode] == SKNoteToolMode) && [mainController.pdfView hideNotes] == NO;
+ return [mainController interactionMode] != SKPresentationMode &&
[mainController.pdfView.document isLocked] == NO && ([mainController.pdfView
toolMode] == SKTextToolMode || [mainController.pdfView toolMode] ==
SKNoteToolMode) && [mainController.pdfView hideNotes] == NO;
} else if (action == @selector(createNewMarkupNote:)) {
[menuItem setState:[markupNoteButton tagForSegment:0] == [menuItem
tag] ? NSOnState : NSOffState];
- return [mainController interactionMode] != SKPresentationMode &&
([mainController.pdfView toolMode] == SKTextToolMode || [mainController.pdfView
toolMode] == SKNoteToolMode) && [mainController.pdfView hideNotes] == NO &&
[[mainController.pdfView currentSelection] hasCharacters];
+ return [mainController interactionMode] != SKPresentationMode &&
[mainController.pdfView.document isLocked] == NO && ([mainController.pdfView
toolMode] == SKTextToolMode || [mainController.pdfView toolMode] ==
SKNoteToolMode) && [mainController.pdfView hideNotes] == NO &&
[[mainController.pdfView currentSelection] hasCharacters];
}
return YES;
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Gaining the trust of online customers is vital for the success of any company
that requires sensitive data to be transmitted over the Web. Learn how to
best implement a security strategy that keeps consumers' information secure
and instills the confidence they need to proceed with transactions.
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit