Pārlūkot izejas kodu

【综合】系统菜单栏,开启文档补充图片类型

tangchao 1 gadu atpakaļ
vecāks
revīzija
339cfdd74e

+ 14 - 3
PDF Office/PDF Master/Class/ChromiumTabs/KMBrowserWindowController.swift

@@ -425,15 +425,26 @@ import Cocoa
     
     override func openDocument(_ sender: Any!) {
         guard let _window = self.window else {
+            KMPrint("openDocument error: window is nil.", beep: true)
             return
         }
         
-        NSOpenPanel.km_open_pdf_multi_success(_window, panel: nil) { urls in
+        NSOpenPanel.km_open_multi_success(_window) { panel in
+            panel.allowedFileTypes = KMTools.imageExtensions + KMTools.pdfExtensions
+        } completion: { urls in
+            var imageUrls: [URL] = []
             for url in urls {
-                NSDocumentController.shared.km_safe_openDocument(withContentsOf: url, display: true) { _, _, _ in
-                    
+                if KMTools.isPDFType(url.pathExtension.lowercased()) {
+                    NSDocumentController.shared.km_safe_openDocument(withContentsOf: url, display: true) { _, _, _ in
+                        
+                    }
+                } else {
+                    imageUrls.append(url)
                 }
             }
+            if imageUrls.isEmpty == false {
+                NSApplication.ShowImageToPDFWindow(urls: imageUrls)
+            }
         }
     }
 }

+ 2 - 2
PDF Office/PDF Reader Pro.xcodeproj/xcuserdata/kdanmobile.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -46,8 +46,8 @@
             filePath = "PDF Master/Class/ChromiumTabs/KMBrowserWindowController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1762"
-            endingLineNumber = "1762"
+            startingLineNumber = "1773"
+            endingLineNumber = "1773"
             landmarkName = "togglePresentation(_:)"
             landmarkType = "7">
          </BreakpointContent>