Merge branch 'develop_PDFReaderProNew' of git.kdan.cc:Mac_PDF/PDF_Office into develop_PDFReaderProNew

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

@@ -1875,7 +1875,7 @@ extension KMMainViewController {
         } else {
             url = self.listView.document.documentURL
         }
-        self.showConvertWindow(convertT: convertT)
+        self.showAllConvertWindow(convertT: convertT)
         
 //        let model = KMDocumentModel(url: url!)
 //        if (self.listView.document.password != nil) {
@@ -1900,7 +1900,7 @@ extension KMMainViewController {
 //        self.currentWindowController = windowController
     }
     
-    func showConvertWindow(convertT: KMConvertType) {
+    func showAllConvertWindow(convertT: KMConvertType) {
         let convertWC = KMConvertWindowController(documemtV: self.document!, currentPage: self.listView.currentPage(), convertT: convertT) {
             DispatchQueue.main.asyncAfter(deadline: DispatchTime.now() + 0.25) { [self] in
                 var type: KMConvertWithPDFType = .WordAdvance
@@ -3110,7 +3110,7 @@ extension KMMainViewController : KMMainToolbarControllerDelegate {
         default:
             convertT = .JPEG
         }
-        showConvertWindow(convertT: convertT)
+        showAllConvertWindow(convertT: convertT)
     }
     
     func toolbarViewController(_ viewController: KMToolbarViewController, searchAction searchString: String) {