Revision: 15114
          http://sourceforge.net/p/skim-app/code/15114
Author:   hofman
Date:     2025-04-11 22:11:16 +0000 (Fri, 11 Apr 2025)
Log Message:
-----------
combine some cases

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

Modified: trunk/SKMainToolbarController.m
===================================================================
--- trunk/SKMainToolbarController.m     2025-04-11 14:41:33 UTC (rev 15113)
+++ trunk/SKMainToolbarController.m     2025-04-11 22:11:16 UTC (rev 15114)
@@ -969,7 +969,8 @@
         return [mainController.pdfView.document isLocked] == NO && 
[mainController hasOverview] == NO && [mainController.pdfView autoScales] == NO;
     } else if ([identifier 
isEqualToString:SKDocumentToolbarZoomToSelectionItemIdentifier]) {
         return [mainController.pdfView.document isLocked] == NO && 
[mainController hasOverview] == NO && (NSIsEmptyRect([mainController.pdfView 
currentSelectionRect]) == NO || [mainController.pdfView toolMode] != 
SKToolModeSelect);
-    } else if ([identifier 
isEqualToString:SKDocumentToolbarZoomInOutItemIdentifier] ||
+    } else if ([identifier 
isEqualToString:SKDocumentToolbarZoomActualItemIdentifier] ||
+               [identifier 
isEqualToString:SKDocumentToolbarZoomInOutItemIdentifier] ||
                [identifier 
isEqualToString:SKDocumentToolbarZoomInActualOutItemIdentifier] ||
                [identifier 
isEqualToString:SKDocumentToolbarAutoScalesItemIdentifier] ||
                [identifier 
isEqualToString:SKDocumentToolbarScaleItemIdentifier]) {
@@ -976,23 +977,33 @@
         return [mainController.pdfView.document isLocked] == NO && 
[mainController hasOverview] == 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] || [identifier 
isEqualToString:SKDocumentToolbarPageBreaksItemIdentifier]) {
+    } else if ([identifier 
isEqualToString:SKDocumentToolbarDisplayBoxItemIdentifier] ||
+               [identifier 
isEqualToString:SKDocumentToolbarDisplayModeItemIdentifier] ||
+               [identifier 
isEqualToString:SKDocumentToolbarSingleTwoUpItemIdentifier] ||
+               [identifier 
isEqualToString:SKDocumentToolbarContinuousItemIdentifier] ||
+               [identifier 
isEqualToString:SKDocumentToolbarPageBreaksItemIdentifier] ||
+               [identifier 
isEqualToString:SKDocumentToolbarDisplaysRTLItemIdentifier] ||
+               [identifier 
isEqualToString:SKDocumentToolbarBookModeItemIdentifier]) {
         return [mainController.pdfView.document isLocked] == NO && 
[mainController hasOverview] == NO;
     } else if ([identifier 
isEqualToString:SKDocumentToolbarDisplayDirectionItemIdentifier]) {
         return [mainController.pdfView.document isLocked] == NO && 
[mainController hasOverview] == NO && [mainController.pdfView displayMode] == 
kPDFDisplaySinglePageContinuous;
-    } else if ([identifier 
isEqualToString:SKDocumentToolbarDisplaysRTLItemIdentifier]) {
-        return [mainController.pdfView.document isLocked] == NO && 
[mainController hasOverview] == NO;
-    } else if ([identifier 
isEqualToString:SKDocumentToolbarBookModeItemIdentifier]) {
-        return [mainController.pdfView.document isLocked] == NO && 
[mainController hasOverview] == NO;
     } else if ([identifier 
isEqualToString:SKDocumentToolbarToolModeItemIdentifier]) {
         return [mainController hasOverview] == NO;
-    } else if ([identifier 
isEqualToString:SKDocumentToolbarNewTextNoteItemIdentifier] || [identifier 
isEqualToString:SKDocumentToolbarNewCircleNoteItemIdentifier] || [identifier 
isEqualToString:SKDocumentToolbarNewLineItemIdentifier] || [identifier 
isEqualToString:SKDocumentToolbarNewMarkupItemIdentifier] || [identifier 
isEqualToString:SKDocumentToolbarNewLineItemIdentifier] || [identifier 
isEqualToString:SKDocumentToolbarNewNoteItemIdentifier]) {
+    } else if ([identifier 
isEqualToString:SKDocumentToolbarNewTextNoteItemIdentifier] ||
+               [identifier 
isEqualToString:SKDocumentToolbarNewCircleNoteItemIdentifier] ||
+               [identifier 
isEqualToString:SKDocumentToolbarNewLineItemIdentifier] ||
+               [identifier 
isEqualToString:SKDocumentToolbarNewMarkupItemIdentifier] ||
+               [identifier 
isEqualToString:SKDocumentToolbarNewLineItemIdentifier] ||
+               [identifier 
isEqualToString:SKDocumentToolbarNewNoteItemIdentifier]) {
         return [mainController hasOverview] == NO && [mainController.pdfView 
canSelectNote];
     } else if ([identifier 
isEqualToString:SKDocumentToolbarFullScreenItemIdentifier]) {
         return [mainController canEnterFullscreen] || [mainController 
canExitFullscreen];
     } else if ([identifier 
isEqualToString:SKDocumentToolbarPresentationItemIdentifier]) {
         return [mainController canEnterPresentation] || [mainController 
canExitPresentation];
-    } else if ([identifier 
isEqualToString:SKDocumentToolbarRotateRightItemIdentifier] || [identifier 
isEqualToString:SKDocumentToolbarRotateLeftItemIdentifier] || [identifier 
isEqualToString:SKDocumentToolbarRotateLeftRightItemIdentifier] || [identifier 
isEqualToString:SKDocumentToolbarCropItemIdentifier]) {
+    } else if ([identifier 
isEqualToString:SKDocumentToolbarRotateRightItemIdentifier] ||
+               [identifier 
isEqualToString:SKDocumentToolbarRotateLeftItemIdentifier] ||
+               [identifier 
isEqualToString:SKDocumentToolbarRotateLeftRightItemIdentifier] ||
+               [identifier 
isEqualToString:SKDocumentToolbarCropItemIdentifier]) {
         return [mainController.pdfView.document isLocked] == NO;
     } else if ([identifier isEqualToString:NSToolbarPrintItemIdentifier]) {
         return [mainController.pdfView.document isLocked] == NO;

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



_______________________________________________
Skim-app-commit mailing list
Skim-app-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/skim-app-commit

Reply via email to