【工具】查找 快捷键接入

PDF Office/PDF Master/Base.lproj/Main.storyboard

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="21507" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="22505" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21507"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22505"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>

PDF Office/PDF Master/Class/ChromiumTabs/KMBrowserWindowController.swift

@@ -787,12 +787,39 @@ extension KMBrowserWindowController {
     @IBAction func toggleCaseInsensitiveNoteSearch(_ sender: Any?) {
         KMPrint("toggleCaseInsensitiveNoteSearch ...")
     }
-    @IBAction func performFindPanelAction(_ sender: Any?) {
+    @IBAction func performFindPanelAction(_ sender: NSMenuItem) {
         KMPrint("performFindPanelAction ...")
-        if let document = self.browser.activeTabContents() as? KMMainDocument {
-            if document.isHome == false {
-                document.mainViewController?.toolbarController.showFindBar()
+        
+        var forward = true
+        var findString: String?
+
+        switch sender.tag {
+        case 1:
+            if let document = self.browser.activeTabContents() as? KMMainDocument {
+                if document.isHome == false {
+                    document.mainViewController?.toolbarController.showFindBar()
+                }
+            }
+        case 3:
+            if let document = self.browser.activeTabContents() as? KMMainDocument {
+                if document.isHome == false {
+                    document.mainViewController?.toolbarController.showFindString(forward: false)
+                }
+            }
+        case 2:
+            if let document = self.browser.activeTabContents() as? KMMainDocument {
+                if document.isHome == false {
+                    document.mainViewController?.toolbarController.showFindString(forward: true)
+                }
             }
+        case 7:
+            if let document = self.browser.activeTabContents() as? KMMainDocument {
+                if document.isHome == false {
+                    document.mainViewController?.toolbarController.showAllAction()
+                }
+            }
+        default: break
+            
         }
     }
     @IBAction func scrollUp(_ sender: Any?) {

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

@@ -534,6 +534,14 @@ extension KMToolbarController {
         }
     }
     
+    func showFindString(forward: Bool) {
+        self.toolbarViewController(self.mainToolBarView!, searchAction: self.findSearchView.findString ?? "", forward: forward)
+    }
+    
+    func showAllAction() {
+        self.toolbarViewController(self.mainToolBarView!, searchAllAction: self.findSearchView.findString ?? "", forward: true)
+    }
+    
     func exitFindBar() {
         print("exitFindBar")
         var height: Float = self.fetchHeight(type: _toolbarType, isShow: false)