【综合】整理代码

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

@@ -951,18 +951,7 @@ extension KMBrowserWindowController {
     @IBAction func split(_ sender: Any?) {
         KMPrint("split ...")
     }
-    @IBAction func compression(_ sender: Any?) {
-        if (self.canResponseDocumentAction() == false) {
-            return
-        }
-        if let document = self.browser.activeTabContents() as? KMMainDocument {
-            if (document.isHome) {
-                document.homeViewController?.menuItemClick_Compress(sender)
-            } else {
-                document.mainViewController?.menuItemClick_Compress(sender)
-            }
-        }
-    }
+
     @IBAction func comparison(_ sender: Any?) {
         KMPrint("comparison ...")
     }
@@ -1803,6 +1792,18 @@ extension KMBrowserWindowController: KMSystemToolMenuProtocol {
             document.mainViewController?.menuItemAction_selectTool(sender)
         }
     }
+    
+    @IBAction func compression(_ sender: Any?) {
+        if (self.canResponseDocumentAction() == false) {
+            return
+        }
+        if let document = self.browser.activeTabContents() as? KMMainDocument {
+            if (document.isHome) {
+            } else {
+                document.mainViewController?.compression(sender)
+            }
+        }
+    }
 }
 
 // MARK: - KMSystemWindowMenuRrotocol

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

@@ -625,7 +625,7 @@ extension KMMainViewController {
 
 // MARK: tool Menu
 
-extension KMMainViewController {
+extension KMMainViewController: KMSystemToolMenuProtocol {
     @IBAction func menuItemAction_textTool(_ sender: Any) {
         self.toolbarController.selectItem(KMToolbarZoomToSelectionItemIdentifier)
     }
@@ -665,6 +665,10 @@ extension KMMainViewController {
     @IBAction func menuItemAction_batch(_ sender: Any) {
 //        KMBatchWindowController.openFile(self.listView.document?.documentURL, .Batch)
     }
+    
+    func compression(_ sender: Any?) {
+        self.toolbarController.delegate?.clickChildTool?(type: .compress, index: 0)
+    }
 }
 
 // MARK: window Menu

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

@@ -7,27 +7,19 @@
 
 import Foundation
 
-protocol KMSystemToolMenuProtocol {
-    func menuItemAction_textTool(_ sender: Any)
-    func menuItemAction_scrolTool(_ sender: Any)
-    func menuItemAction_zoomOutTool(_ sender: Any)
-    func menuItemAction_selectTool(_ sender: Any)
-    func menuItemAction_redact(_ sender: Any)
-    func menuItemAction_warkmark(_ sender: Any)
-    func menuItemAction_background(_ sender: Any)
-    func menuItemAction_headerfooter(_ sender: Any)
-    func menuItemAction_bates(_ sender: Any)
-    func menuItemAction_batch(_ sender: Any)
-}
-extension KMSystemToolMenuProtocol {
-    func menuItemAction_textTool(_ sender: Any) {}
+@objc protocol KMSystemToolMenuProtocol: NSObjectProtocol {
+    @objc optional func menuItemAction_textTool(_ sender: Any)
+    @objc func menuItemAction_scrolTool(_ sender: Any)
+    @objc func menuItemAction_zoomOutTool(_ sender: Any)
+    @objc func menuItemAction_selectTool(_ sender: Any)
+    @objc optional func menuItemAction_redact(_ sender: Any)
+    @objc optional func menuItemAction_warkmark(_ sender: Any)
+    @objc optional func menuItemAction_background(_ sender: Any)
+    @objc optional func menuItemAction_headerfooter(_ sender: Any)
+    @objc optional func menuItemAction_bates(_ sender: Any)
+    @objc optional func menuItemAction_batch(_ sender: Any)
     
-    func menuItemAction_redact(_ sender: Any) {}
-    func menuItemAction_warkmark(_ sender: Any) {}
-    func menuItemAction_background(_ sender: Any) {}
-    func menuItemAction_headerfooter(_ sender: Any) {}
-    func menuItemAction_bates(_ sender: Any) {}
-    func menuItemAction_batch(_ sender: Any) {}
+    @objc optional func compression(_ sender: Any?)
 }
 
 extension KMSystemMenu.Tool {