【综合】toolbar搜索菜单事件补充

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

@@ -653,6 +653,16 @@ private let KMToolbarItemSpace = 8.0
                 self._invisibleItems.append(item)
             }
         }
+        
+        if self._invisibleItems.isEmpty {
+            KMPrint("无更多菜单")
+        } else {
+            for item in self._invisibleItems {
+                KMPrint(item.itemIdentifier)
+            }
+        }
+
+//        KMPrint(self._visibleItems)
     }
     
     func reloadData() {

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

@@ -223,6 +223,14 @@ class KMToolbarViewController: NSViewController, NSTextFieldDelegate {
         }
     }
     
+    @objc private func _menuItemAction(_ item: NSMenuItem) {
+        guard let itemId = item.representedObject as? String else {
+            NSSound.beep()
+            return
+        }
+        self.delegate?.toolbarViewController?(self, menuItemDidClick: self.toolbarItemFindItemIdentifiers(value: itemId), index: 0, info: nil)
+    }
+    
     @objc private func _comparisonAction(sender: NSMenuItem) {
         if let data = self._currentItemView {
             self.delegate?.toolbarViewController?(self, menuItemDidClick: data, index: sender.tag, info: nil)
@@ -1200,6 +1208,10 @@ extension KMToolbarViewController {
             titleLabel.font = KMToolbarMainItemView.textFont
             
             item?.customizeView = view
+            
+            let menuItem = NSMenuItem.init(title: NSLocalizedString("Search", comment: ""), action: #selector(_menuItemAction), target: self)
+            menuItem.representedObject = identifier
+            item?.menuFormRepresentation = menuItem
         } else if identifier == KMRightControlToolbarItemIdentifier {
             item?.image = NSImage(named: "KMImageNameUXIconBtnTriRightNor")
             item?.titleName = NSLocalizedString("Properties", comment: "")

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

@@ -4223,23 +4223,17 @@ extension KMMainViewController : KMMainToolbarControllerDelegate {
     
     func toolbarViewController(_ viewController: KMToolbarViewController, menuItemDidClick toolbarItem: KMToolbarItemView, index: Int, info: Any?) {
         if (toolbarItem.itemIdentifier == KMToolbarToolWatermarkItemIdentifier) {
-            KMPrint("KMToolbarToolWatermarkItemIdentifier \(index)")
             self.clickChildTool(type: .watermark, index: index)
         } else if (toolbarItem.itemIdentifier == KMToolbarToolBackgroundItemIdentifier) {
             self.clickChildTool(type: .background, index: index)
         } else if (toolbarItem.itemIdentifier == KMToolbarToolHeaderFooterItemIdentifier) {
-            KMPrint("KMToolbarToolHeaderFooterItemIdentifier \(index)")
             self.clickChildTool(type: .headerAndFooter, index: index)
         } else if (toolbarItem.itemIdentifier == KMToolbarToolBatesItemIdentifier) {
-            KMPrint("KMToolbarToolBatesItemIdentifier \(index)")
             self.clickChildTool(type: .bates, index: index)
         } else if (toolbarItem.itemIdentifier == KMToolbarComparisonItemIdentifier) {
-            KMPrint("KMToolbarComparisonItemIdentifier \(index)")
             self.clickChildTool(type: .comparison, index: index)
         } else if (toolbarItem.itemIdentifier == KMToolbarToolFormAlignIdentifier) {
-            KMPrint("KMToolbarToolFormAlignIdentifier \(index)")
         } else if (toolbarItem.itemIdentifier == KMToolbarConversionImageItemIdentifier) {
-            KMPrint("KMToolbarConversionImageItemIdentifier \(index)")
             convertToImg(index: index)
         } else if (toolbarItem.itemIdentifier == KMToolbarConversionExportImageItemIdentifier) {
             extractImageAction(num: index)
@@ -4256,8 +4250,9 @@ extension KMMainViewController : KMMainToolbarControllerDelegate {
                 self.toolbarController.clickItem(KMToolbarSelectToolModeItemIdentifier)
             }
         } else if (toolbarItem.itemIdentifier == KMToolbarToolSecureItemIdentifier) {
-            KMPrint("KMToolbarToolSecureItemIdentifier \(index)")
             self.clickChildTool(type: .secure, index: index)
+        } else if toolbarItem.itemIdentifier == KMDocumentSearchToolbarItemIdentifier {
+            KMPrint("KMDocumentSearchToolbarItemIdentifier ...")
         }
     }
     

PDF Office/PDF Reader Pro.xcodeproj/xcuserdata/kdanmobile.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -78,8 +78,8 @@
             filePath = "PDF Master/Class/PDFWindowController/Toolbar/KMToolbarView.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "679"
-            endingLineNumber = "679"
+            startingLineNumber = "689"
+            endingLineNumber = "689"
             landmarkName = "toolbarCustomChangeNotification()"
             landmarkType = "7">
          </BreakpointContent>