【综合】系统菜单栏，OCR入口补充

PDF Office/PDF Master.xcodeproj/xcuserdata/kdanmobile.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -318,8 +318,8 @@
             filePath = "PDF Master/Class/PDFWindowController/ViewController/KMMainViewController+MenuAction.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "993"
-            endingLineNumber = "993"
+            startingLineNumber = "997"
+            endingLineNumber = "997"
             landmarkName = "rotateAllRight(_:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -334,8 +334,8 @@
             filePath = "PDF Master/Class/ChromiumTabs/KMBrowserWindowController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "2164"
-            endingLineNumber = "2164"
+            startingLineNumber = "2173"
+            endingLineNumber = "2173"
             landmarkName = "autoSelectContent(_:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -350,8 +350,8 @@
             filePath = "PDF Master/Class/ChromiumTabs/KMBrowserWindowController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1893"
-            endingLineNumber = "1893"
+            startingLineNumber = "1902"
+            endingLineNumber = "1902"
             landmarkName = "editWatermark(_:)"
             landmarkType = "7">
          </BreakpointContent>

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

@@ -883,9 +883,6 @@ extension KMBrowserWindowController {
     @IBAction func pageEdit(_ sender: Any?) {
         KMPrint("pageEdit ...")
     }
-    @IBAction func ocr(_ sender: Any?) {
-        KMPrint("ocr ...")
-    }
     @IBAction func insertPage(_ sender: Any?) {
         KMPrint("insertPage ...")
     }
@@ -1715,6 +1712,18 @@ extension KMBrowserWindowController: KMSystemToolMenuProtocol {
         }
     }
     
+    @IBAction func ocr(_ sender: Any?) {
+        if (self.canResponseDocumentAction() == false) {
+            return
+        }
+        if let document = self.browser.activeTabContents() as? KMMainDocument {
+            if (document.isHome) {
+            } else {
+                document.mainViewController?.ocr(sender)
+            }
+        }
+    }
+    
     @IBAction func extractImage(_ sender: Any?) {
         if (self.canResponseDocumentAction() == false) {
             return

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

@@ -250,7 +250,6 @@ class KMToolbarController: NSViewController {
             if (identifier == KMDocumentAnnotationToolbarItemIdentifier ||
                 identifier == KMDocumentPageToolbarItemIdentifier ||
                 identifier == KMDocumentConversonToolbarItemIdentifier ||
-                identifier == KMDocumentScanOCRToolbarItemIdentifier ||
                 identifier == KMDocumentEditToolbarItemIdentifier ||
                 identifier == KMDocumentFormToolbarItemIdentifier ||
                 identifier == KMDocumentFillSginToolbarItemIdentifier ||
@@ -262,6 +261,8 @@ class KMToolbarController: NSViewController {
                 self.mainToolBarView?.itemAction(item!)
             } else if identifier == KMDocumentRedactToolbarItemIdentifier {
                 self.mainToolBarView?.itemAction(item!)
+            } else if identifier == KMDocumentScanOCRToolbarItemIdentifier {
+                self.mainToolBarView?.itemAction(item!)
             }
             
             return

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

@@ -689,6 +689,10 @@ extension KMMainViewController: KMSystemToolMenuProtocol {
         KMApp.ShowImageToPDFWindow()
     }
     
+    func ocr(_ sender: Any?) {
+        self.toolbarController.clickItem(KMDocumentScanOCRToolbarItemIdentifier)
+    }
+    
     func extractImage(_ sender: Any?) {
         self.extractImageAction(num: 1)
     }

PDF Office/PDF Master/Class/SystemMenu/KMSystemToolMenu.swift

@@ -27,6 +27,9 @@ import Foundation
     @objc optional func convert(_ sender: Any?)
     @objc optional func imageToPDF(_ sender: Any?)
     
+    // ocr
+    @objc optional func ocr(_ sender: Any?)
+    
     // Editor
     @objc optional func compression(_ sender: Any?)
     @objc optional func merge(_ sender: Any?)
@@ -105,6 +108,9 @@ extension KMSystemMenu.Tool {
     public static let convertSelector       = NSSelectorFromString("convert:")
     public static let imageToPDFSelector       = NSSelectorFromString("imageToPDF:")
     
+    // ocr
+    public static let ocrSelector       = NSSelectorFromString("ocr:")
+    
     // Editor
     public static let compressSelector       = NSSelectorFromString("compression:")
     public static let mergeSelector       = NSSelectorFromString("merge:")