【综合】toolbar页面显示菜单补充

PDF Office/PDF Master/Class/PDFWindowController/Toolbar/KMToolbarViewController.swift

@@ -1059,7 +1059,7 @@ extension KMToolbarViewController {
             item?.selectBackgroundType = .imageBox
             item?.btnAction = #selector(_itemAction)
             
-            let menuItem = NSMenuItem.init(title: NSLocalizedString("OCR", comment: ""), action: #selector(_itemAction), target: self)
+            let menuItem = NSMenuItem.init(title: NSLocalizedString("OCR", comment: ""), action: #selector(_menuItemAction), target: self)
             menuItem.tag = item!.btnTag
             item?.menuFormRepresentation = menuItem
         } else if identifier == KMToolbarToolEnhancedScanIdentifier {
@@ -1161,8 +1161,8 @@ extension KMToolbarViewController {
             item?.boxImagePosition = .imageAbove
             item?.selectBackgroundType = .imageBox
             item?.btnAction = #selector(_itemAction)
-            let menuItem = NSMenuItem.init(title: NSLocalizedString("Page Display", comment: ""), action: #selector(_itemAction), target: self)
-            menuItem.tag = item!.btnTag
+            let menuItem = NSMenuItem.init(title: NSLocalizedString("Page Display", comment: ""), action: #selector(_menuItemAction), target: self)
+            menuItem.representedObject = identifier
             item?.menuFormRepresentation = menuItem
         } else if identifier == KMDocumentShareToolbarItemIdentifier {
             item?.image = NSImage(named: "KMImageNameUXIconToolbarShareNor")
@@ -1245,7 +1245,7 @@ extension KMToolbarViewController {
             item?.boxImagePosition = .imageAbove
             item?.btnAction = #selector(_itemAction)
             
-            let menuItem = NSMenuItem.init(title: NSLocalizedString("Digital Sign", comment: ""), action: #selector(_itemAction), target: self)
+            let menuItem = NSMenuItem.init(title: NSLocalizedString("Digital Sign", comment: ""), action: #selector(_menuItemAction), target: self)
             menuItem.tag = item!.btnTag
             item?.menuFormRepresentation = menuItem
         }
@@ -1560,7 +1560,7 @@ extension KMToolbarViewController {
             item?.toolTip = NSLocalizedString("Recognize text from Image-based or Scanned PDF with OCR", comment: "")
             item?.btnAction = #selector(_itemAction)
             
-            let menuItem = NSMenuItem.init(title: NSLocalizedString("OCR", comment: ""), action: #selector(_itemAction), target: self)
+            let menuItem = NSMenuItem.init(title: NSLocalizedString("OCR", comment: ""), action: #selector(_menuItemAction), target: self)
             menuItem.tag = item!.btnTag
             item?.menuFormRepresentation = menuItem
         } else if item?.itemIdentifier == KMToolbarConversionCreatePDFItemIdentifier {
@@ -1853,7 +1853,7 @@ extension KMToolbarViewController {
             item?.needExpandAction = true
 //            item?.btnAction = #selector(_itemAction)
             
-            let menuItem = NSMenuItem.init(title: "Bates Number", action: #selector(_itemAction), target: self)
+            let menuItem = NSMenuItem.init(title: "Bates Number", action: #selector(_menuItemAction), target: self)
             let subMenu = NSMenu()
             subMenu.addItem(title: NSLocalizedString("Side-by-Side View", comment: ""), action: #selector(_comparisonAction), target: self, tag: 1)
             subMenu.addItem(title: NSLocalizedString("Compare by File Overlay", comment: ""), action: #selector(_comparisonAction), target: self, tag: 2)

PDF Office/PDF Master/Class/PDFWindowController/ViewController/KMMainViewController+Action.swift

@@ -4124,7 +4124,10 @@ extension KMMainViewController : KMMainToolbarControllerDelegate {
                 } else if toolbarItem.itemIdentifier == KMDocumentNextPageToolbarItemIdentifier {
                     self.changePDFViewGotoNextPageAction()
                 } else if toolbarItem.itemIdentifier == KMDocumentViewDisplayToolbarItemIdentifier {
-                    Swift.debugPrint("KMDocumentViewDisplayToolbarItemIdentifier ...")
+//                    Swift.debugPrint("KMDocumentViewDisplayToolbarItemIdentifier ...")
+                    DispatchQueue.main.asyncAfter(deadline: .now() + 0.3) {
+                        self.toolbarController.clickItem(KMToolbarViewSettingIdentifier)
+                    }
                 } else if toolbarItem.itemIdentifier == KMLeftControlToolbarItemIdentifier {
                     toolbarItem.isSelected = !toolbarItem.isSelected
                     self.toggleLeftPane()
@@ -4255,6 +4258,8 @@ extension KMMainViewController : KMMainToolbarControllerDelegate {
         } else if toolbarItem.itemIdentifier == KMRightControlToolbarItemIdentifier {
             toolbarItem.isSelected = !toolbarItem.isSelected
             self.toggleRightPane()
+        } else if toolbarItem.itemIdentifier == KMDocumentViewDisplayToolbarItemIdentifier {
+            self.toolbarController.toolbarType = .viewSetting
         }
     }