[Skim-app-commit] SF.net SVN: skim-app:[12648] trunk/SKMainToolbarController.m

[hofman--- via Skim-app-commit]

Revision: 12648
          http://sourceforge.net/p/skim-app/code/12648
Author:   hofman
Date:     2021-12-27 23:55:05 +0000 (Mon, 27 Dec 2021)
Log Message:
-----------
Use add note toolbar icons for temporary tool modes

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

Modified: trunk/SKMainToolbarController.m
===================================================================
--- trunk/SKMainToolbarController.m     2021-12-27 17:21:23 UTC (rev 12647)
+++ trunk/SKMainToolbarController.m     2021-12-27 23:55:05 UTC (rev 12648)
@@ -1348,21 +1348,22 @@
 }
 
 - (void)handleTemporaryToolModeChangedNotification:(NSNotification 
*)notification {
-    SKTemporaryToolMode mode = [mainController.pdfView temporaryToolMode];
     SKToolMode toolMode = [mainController.pdfView toolMode];
     NSString *name = nil;
-    if (mode == SKNoToolMode) {
-        switch (toolMode) {
-            case SKTextToolMode : name = SKImageNameToolbarTextTool; break;
-            case SKMoveToolMode : name = SKImageNameToolbarMoveTool; break;
-            case SKMagnifyToolMode : name = SKImageNameToolbarMagnifyTool; 
break;
-            case SKSelectToolMode : name = SKImageNameToolbarSelectTool; break;
-            case SKNoteToolMode : name = 
noteToolImageNames[mainController.pdfView.annotationMode]; break;
-        }
-    } else if (mode == SKZoomToolMode) {
-        name = SKImageNameToolbarZoomIn;
-    } else {
-        name = noteToolImageNames[mode];
+    switch ([mainController.pdfView temporaryToolMode]) {
+        case SKZoomToolMode :      name = SKImageNameToolbarZoomIn;           
break;
+        case SKHighlightToolMode : name = SKImageNameToolbarAddHighlightNote; 
break;
+        case SKUnderlineToolMode : name = SKImageNameToolbarAddUnderlineNote; 
break;
+        case SKStrikeOutToolMode : name = SKImageNameToolbarAddStrikeOutNote; 
break;
+        case SKNoToolMode:
+            switch (toolMode) {
+                case SKTextToolMode :    name = SKImageNameToolbarTextTool;    
break;
+                case SKMoveToolMode :    name = SKImageNameToolbarMoveTool;    
break;
+                case SKMagnifyToolMode : name = SKImageNameToolbarMagnifyTool; 
break;
+                case SKSelectToolMode :  name = SKImageNameToolbarSelectTool;  
break;
+                case SKNoteToolMode :    name = 
noteToolImageNames[mainController.pdfView.annotationMode]; break;
+            }
+            break;
     }
     [toolModeButton setImage:[NSImage imageNamed:name] forSegment:toolMode];
 }

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