Browse Source

【转档】- 从图片创建PDF

liujiajie 1 year ago
parent
commit
3a307888aa

+ 2 - 1
PDF Office/PDF Master/Class/Home/ViewController/KMHomeViewController+Action.swift

@@ -892,7 +892,8 @@ extension KMHomeViewController {
 //        openPanel.canChooseFiles = false
 //        openPanel.canChooseDirectories = true
 //        openPanel.canCreateDirectories = true
-        openPanel.beginSheetModal(for: self.view.window!) { [self] (result) in
+        
+        openPanel.beginSheetModal(for: NSWindow.currentWindow()) { [self] (result) in
             if result == NSApplication.ModalResponse.OK {
                 openImageToPdfWindow(urls: openPanel.urls)
             }

+ 11 - 10
PDF Office/PDF Master/Class/Home/ViewController/KMHomeViewController.swift

@@ -691,18 +691,19 @@ extension KMHomeViewController {
     }
     
     func newFromImages() {
-        let openPanel = NSOpenPanel()
-        openPanel.allowedFileTypes = KMImageAccessoryController.supportedImageTypes()
+        fastTool_ImageToPDF()
+//        let openPanel = NSOpenPanel()
+//        openPanel.allowedFileTypes = KMImageAccessoryController.supportedImageTypes()
 //        if IAPProductsManager.defaultManager().isAvailableAllFunction {
 //            openPanel.allowsMultipleSelection = true
 //        } else {
 //            openPanel.allowsMultipleSelection = false
 //        }
-        openPanel.message = NSLocalizedString("Select images to create a new document. To select multiple files press cmd ⌘ button on the keyboard and click on the target files one by one.", comment: "")
-        openPanel.beginSheetModal(for: NSApp.mainWindow!) { result in
-            if result == .OK {
-                DispatchQueue.main.asyncAfter(deadline: .now() + 0.25) {
-                    debugPrint("缺少图片转PDF")
+//        openPanel.message = NSLocalizedString("Select images to create a new document. To select multiple files press cmd ⌘ button on the keyboard and click on the target files one by one.", comment: "")
+//        openPanel.beginSheetModal(for: NSApp.mainWindow!) { result in
+//            if result == .OK {
+//                DispatchQueue.main.asyncAfter(deadline: .now() + 0.25) {
+//                    debugPrint("缺少图片转PDF")
 //                    let baseWindowController = KMBatchOperateBaseWindowController(windowNibName: "KMBatchOperateBaseWindowController")
 //                    var arr: [KMBatchOperateFile] = []
 //                    for url in openPanel.urls {
@@ -719,8 +720,8 @@ extension KMHomeViewController {
 //                    if #available(macOS 10.13, *) {
 //                        baseWindowController.release()
 //                    }
-                }
-            }
-        }
+//                }
+//            }
+//        }
     }
 }