Revision: 7050
          http://skim-app.svn.sourceforge.net/skim-app/?rev=7050&view=rev
Author:   hofman
Date:     2011-01-05 23:04:06 +0000 (Wed, 05 Jan 2011)

Log Message:
-----------
disable some actions for locked documents.

Modified Paths:
--------------
    trunk/SKMainToolbarController.m
    trunk/SKMainWindowController_UI.m
    trunk/SKPDFView.m

Modified: trunk/SKMainToolbarController.m
===================================================================
--- trunk/SKMainToolbarController.m     2011-01-05 19:41:44 UTC (rev 7049)
+++ trunk/SKMainToolbarController.m     2011-01-05 23:04:06 UTC (rev 7050)
@@ -768,11 +768,11 @@
     if ([[toolbarItem toolbar] customizationPaletteIsRunning]) {
         return NO;
     } else if ([identifier 
isEqualToString:SKDocumentToolbarZoomActualItemIdentifier]) {
-        return fabs([mainController.pdfView scaleFactor] - 1.0 ) > 0.01;
+        return [mainController.pdfView.document isLocked] == NO && 
fabs([mainController.pdfView scaleFactor] - 1.0 ) > 0.01;
     } else if ([identifier 
isEqualToString:SKDocumentToolbarZoomToFitItemIdentifier]) {
-        return [mainController.pdfView autoScales] == NO;
+        return [mainController.pdfView.document isLocked] == NO && 
[mainController.pdfView autoScales] == NO;
     } else if ([identifier 
isEqualToString:SKDocumentToolbarZoomToSelectionItemIdentifier]) {
-        return NSIsEmptyRect([mainController.pdfView currentSelectionRect]) == 
NO;
+        return [mainController.pdfView.document isLocked] == NO && 
NSIsEmptyRect([mainController.pdfView currentSelectionRect]) == NO;
     } else if ([identifier 
isEqualToString:SKDocumentToolbarNewTextNoteItemIdentifier] || [identifier 
isEqualToString:SKDocumentToolbarNewCircleNoteItemIdentifier] || [identifier 
isEqualToString:SKDocumentToolbarNewLineItemIdentifier]) {
         return ([mainController.pdfView toolMode] == SKTextToolMode || 
[mainController.pdfView toolMode] == SKNoteToolMode) && [mainController.pdfView 
hideNotes] == NO;
     } else if ([identifier 
isEqualToString:SKDocumentToolbarNewMarkupItemIdentifier]) {
@@ -783,6 +783,8 @@
         [noteButton setEnabled:enabled forSegment:SKUnderlineNote];
         [noteButton setEnabled:enabled forSegment:SKStrikeOutNote];
         return ([mainController.pdfView toolMode] == SKTextToolMode || 
[mainController.pdfView toolMode] == SKNoteToolMode) && [mainController.pdfView 
hideNotes] == NO;
+    } else if ([identifier 
isEqualToString:SKDocumentToolbarFullScreenItemIdentifier] || [identifier 
isEqualToString:SKDocumentToolbarPresentationItemIdentifier]) {
+        return [mainController.pdfView.document isLocked] == NO;
     }
     return YES;
 }
@@ -1040,9 +1042,9 @@
     [zoomInOutButton setEnabled:[mainController.pdfView canZoomOut] 
forSegment:0];
     [zoomInOutButton setEnabled:[mainController.pdfView canZoomIn] 
forSegment:1];
     [zoomInActualOutButton setEnabled:[mainController.pdfView canZoomOut] 
forSegment:0];
-    [zoomInActualOutButton setEnabled:fabs([mainController.pdfView 
scaleFactor] - 1.0 ) > 0.01 forSegment:1];
+    [zoomInActualOutButton setEnabled:[mainController.pdfView.document 
isLocked] == NO && fabs([mainController.pdfView scaleFactor] - 1.0 ) > 0.01 
forSegment:1];
     [zoomInActualOutButton setEnabled:[mainController.pdfView canZoomIn] 
forSegment:2];
-    [zoomActualButton setEnabled:fabs([mainController.pdfView scaleFactor] - 
1.0 ) > 0.01];
+    [zoomActualButton setEnabled:[mainController.pdfView.document isLocked] == 
NO && fabs([mainController.pdfView scaleFactor] - 1.0 ) > 0.01];
 }
 
 - (void)handleToolModeChangedNotification:(NSNotification *)notification {

Modified: trunk/SKMainWindowController_UI.m
===================================================================
--- trunk/SKMainWindowController_UI.m   2011-01-05 19:41:44 UTC (rev 7049)
+++ trunk/SKMainWindowController_UI.m   2011-01-05 23:04:06 UTC (rev 7050)
@@ -1437,13 +1437,13 @@
     } else if (action == @selector(doZoomOut:)) {
         return [self interactionMode] != SKPresentationMode && [pdfView 
canZoomOut];
     } else if (action == @selector(doZoomToActualSize:)) {
-        return fabs([pdfView scaleFactor] - 1.0 ) > 0.01;
+        return [[self pdfDocument] isLocked] == NO && fabs([pdfView 
scaleFactor] - 1.0 ) > 0.01;
     } else if (action == @selector(doZoomToPhysicalSize:)) {
         return [self interactionMode] != SKPresentationMode;
     } else if (action == @selector(doZoomToSelection:)) {
-        return [self interactionMode] != SKPresentationMode && 
NSIsEmptyRect([pdfView currentSelectionRect]) == NO;
+        return [self interactionMode] != SKPresentationMode && [[self 
pdfDocument] isLocked] == NO && NSIsEmptyRect([pdfView currentSelectionRect]) 
== NO;
     } else if (action == @selector(doZoomToFit:)) {
-        return [self interactionMode] != SKPresentationMode && [pdfView 
autoScales] == NO;
+        return [self interactionMode] != SKPresentationMode && [[self 
pdfDocument] isLocked] == NO && [pdfView autoScales] == NO;
     } else if (action == @selector(alternateZoomToFit:)) {
         PDFDisplayMode displayMode = [pdfView displayMode];
         if (displayMode == kPDFDisplaySinglePage || displayMode == 
kPDFDisplayTwoUp) {
@@ -1453,14 +1453,14 @@
         }
         return [self interactionMode] != SKPresentationMode;
     } else if (action == @selector(doAutoScale:)) {
-        return [pdfView autoScales] == NO;
+        return [[self pdfDocument] isLocked] == NO && [pdfView autoScales] == 
NO;
     } else if (action == @selector(toggleAutoScale:)) {
         [menuItem setState:[pdfView autoScales] ? NSOnState : NSOffState];
-        return YES;
+        return [[self pdfDocument] isLocked] == NO;
     } else if (action == @selector(cropAll:) || action == @selector(crop:) || 
action == @selector(autoCropAll:) || action == @selector(smartAutoCropAll:)) {
-        return [self interactionMode] != SKPresentationMode;
+        return [self interactionMode] != SKPresentationMode && [[self 
pdfDocument] isLocked] == NO;
     } else if (action == @selector(autoSelectContent:)) {
-        return [self interactionMode] != SKPresentationMode && [pdfView 
toolMode] == SKSelectToolMode;
+        return [self interactionMode] != SKPresentationMode && [[self 
pdfDocument] isLocked] == NO && [pdfView toolMode] == SKSelectToolMode;
     } else if (action == @selector(toggleLeftSidePane:)) {
         if ([self leftSidePaneIsOpen])
             [menuItem setTitle:NSLocalizedString(@"Hide Contents Pane", @"Menu 
item title")];

Modified: trunk/SKPDFView.m
===================================================================
--- trunk/SKPDFView.m   2011-01-05 19:41:44 UTC (rev 7049)
+++ trunk/SKPDFView.m   2011-01-05 23:04:06 UTC (rev 7050)
@@ -948,6 +948,30 @@
     return aSelector != @selector(printDocument:) && [super 
respondsToSelector:aSelector];
 }
 
+- (BOOL)canZoomIn {
+    return [[self document] isLocked] == NO && [super canZoomIn];
+}
+
+- (BOOL)canZoomOut {
+    return [[self document] isLocked] == NO && [super canZoomOut];
+}
+
+- (BOOL)canGoToNextPage {
+    return [[self document] isLocked] == NO && [super canGoToNextPage];
+}
+
+- (BOOL)canGoToPreviousPage {
+    return [[self document] isLocked] == NO && [super canGoToPreviousPage];
+}
+
+- (BOOL)canGoBack {
+    return [[self document] isLocked] == NO && [super canGoBack];
+}
+
+- (BOOL)canGoForward {
+    return [[self document] isLocked] == NO && [super canGoForward];
+}
+
 #pragma mark Event Handling
 
 // PDFView has duplicated key equivalents for Cmd-+/- as well as Opt-Cmd-+/-, 
which is totoally unnecessary and harmful


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

------------------------------------------------------------------------------
Learn how Oracle Real Application Clusters (RAC) One Node allows customers
to consolidate database storage, standardize their database environment, and, 
should the need arise, upgrade to a full multi-node Oracle RAC database 
without downtime or disruption
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit

Reply via email to