【2025】【菜单栏】菜单栏自测处理

PDF Office/PDF Master/AppDelegate+MenuAction.swift

@@ -382,7 +382,11 @@ extension AppDelegate {
     }
     
     @IBAction func menuItemAction_MergePDFFiles(_ sender: NSMenuItem) -> Void {
-        
+        if let homeVC = self.homeViewController() {
+            homeVC.fastTool_MergePDF()
+        } else if let mainVC = self.mainViewController() {
+            mainVC.showMergeWindow(mainVC.listView.document.password)
+        }
     }
     
     @IBAction func menuItemAction_closeDocument(_ sender: Any) {
@@ -448,24 +452,22 @@ extension AppDelegate {
                 convertType = .excel
             } else if sender.tag == 2 {
                 convertType = .ppt
-            } else if sender.tag == 3 {
-                if sender.tag == 30 {
-                    convertType = .jpeg
-                } else if sender.tag == 31 {
-                    convertType = .jpg
-                } else if sender.tag == 32 {
-                    convertType = .png
-                } else if sender.tag == 33 {
-                    convertType = .gif
-                } else if sender.tag == 34 {
-                    convertType = .tiff
-                } else if sender.tag == 35 {
-                    convertType = .tga
-                } else if sender.tag == 36 {
-                    convertType = .bmp
-                } else if sender.tag == 37 {
-                    convertType = .jp2
-                }
+            } else if sender.tag == 30 {
+                convertType = .jpeg
+            } else if sender.tag == 31 {
+                convertType = .jpg
+            } else if sender.tag == 32 {
+                convertType = .png
+            } else if sender.tag == 33 {
+                convertType = .gif
+            } else if sender.tag == 34 {
+                convertType = .tiff
+            } else if sender.tag == 35 {
+                convertType = .tga
+            } else if sender.tag == 36 {
+                convertType = .bmp
+            } else if sender.tag == 37 {
+                convertType = .jp2
             } else if sender.tag == 4 {
                 convertType = .rtf
             } else if sender.tag == 5 {

PDF Office/PDF Master/KMClass/Convert/View/KMConvertImageSettingView.swift

@@ -137,6 +137,27 @@ class KMConvertImageSettingView: KMConvertSettingView {
         formatSelect_.properties.isDisabled = self.isDisable
         dpiSelect_.properties.isDisabled = self.isDisable
     }
+    
+    func selectConvertType(convertType: KMPDFConvertType) {
+        if convertType == .jpeg {
+            self.selectedFormatIndex = 0
+        } else if convertType == .jpg {
+            self.selectedFormatIndex = 1
+        } else if convertType == .png {
+            self.selectedFormatIndex = 2
+        } else if convertType == .gif {
+            self.selectedFormatIndex = 3
+        } else if convertType == .tiff {
+            self.selectedFormatIndex = 4
+        } else if convertType == .tga {
+            self.selectedFormatIndex = 5
+        } else if convertType == .bmp {
+            self.selectedFormatIndex = 6
+        } else if convertType == .jp2 {
+            self.selectedFormatIndex = 7
+        }
+        formatSelect_.selectItemAtIndex(self.selectedFormatIndex)
+    }
 }
 
 extension KMConvertImageSettingView: ComponentSelectDelegate {

PDF Office/PDF Master/KMClass/KMPDFViewController/KMMainViewController.swift

@@ -3169,6 +3169,9 @@ struct KMNMWCFlags {
             let model = KMDocumentModel(url: listView.document.documentURL)
             winC.documentModel = model
             winC.own_beginSheetModal(for: view.window, completionHandler: nil)
+            if let settingView = winC.settingView as? KMConvertImageSettingView {
+                settingView.selectConvertType(convertType: convertType)
+            }
         }
     }