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

PDF Office/PDF Master/Class/PDFTools/AddHeaderFooter/VC/KMBatchOperateAddHeaderFooterViewController.swift

@@ -183,7 +183,7 @@ class KMBatchOperateAddHeaderFooterViewController: KMBatchOperateBaseViewControl
         } else {
             baseWindowController.showWindow(nil)
         }
-        var arr = NSMutableArray()
+        let arr = NSMutableArray()
         let file = KMBatchOperateFile(filePath: self.pdfView!.document!.documentURL!.path, type: self.isBates ? .AddBates : .AddHeaderFooter)
         arr.add(file)
         baseWindowController.checkNeedPasswordSwitchToOperateType(operateType: self.isBates ? .AddBates : .AddHeaderFooter, files: arr as! [KMBatchOperateFile])
@@ -355,7 +355,7 @@ class KMBatchOperateAddHeaderFooterViewController: KMBatchOperateBaseViewControl
                             self.hiddenWindowCloseButtonIfNeeded()
                             self.successFilePathURLArray?.removeAll()
                             if (self.isBates) {
-                                let file = KMBatchOperateFile(filePath: self.pdfView?.document.documentURL.path ?? "")
+                                let file = KMBatchOperateFile(filePath: self.pdfView?.document.documentURL.path ?? "", type: .AddBates)
                                 if file.fileType == .PDF {
                                     file.addBatesInfo.pageChoice = KMBatchOperatePageChoice(rawValue: headFooter?.pageRangeType.rawValue ?? 0) ?? .All
                                     file.addBatesInfo.pageRangeString = headFooter?.pageRangeString
@@ -368,7 +368,7 @@ class KMBatchOperateAddHeaderFooterViewController: KMBatchOperateBaseViewControl
                                 }
                             } else {
                                 self.successFilePathURLArray?.removeAll()
-                                let file = KMBatchOperateFile(filePath: self.pdfView?.document.documentURL.path ?? "")
+                                let file = KMBatchOperateFile(filePath: self.pdfView?.document.documentURL.path ?? "", type: .AddHeaderFooter)
                                 if file.fileType == .PDF {
                                     file.addHeaderFooterInfo.pageChoice = KMBatchOperatePageChoice(rawValue: headFooter?.pageRangeType.rawValue ?? 0) ?? .All
                                     file.addHeaderFooterInfo.pageRangeString = headFooter?.pageRangeString

PDF Office/PDF Master/Class/PDFTools/Watermark/Controller/KMBatchOperateAddWatermarkViewController.swift

@@ -261,14 +261,21 @@ class KMBatchOperateAddWatermarkViewController: KMBatchOperateBaseViewController
                             self.hiddenWindowCloseButtonIfNeeded()
                             self.successFilePathURLArray?.removeAll()
                             if (!self.isBackground) {
-                                let file = KMBatchOperateFile(filePath: self.pdfView?.document.documentURL.path ?? "")
+                                let file = KMBatchOperateFile(filePath: self.pdfView?.document.documentURL.path ?? "", type: .AddWatermark)
                                 file.addWatermarkInfo.savePath = fileURL.path
                                 file.addWatermarkInfo.pageChoice = KMBatchOperatePageChoice(rawValue: watermark?.pageRangeType.rawValue ?? 0) ?? .All
                                 file.addWatermarkInfo.pageRangeString = watermark?.pagesString ?? ""
+                                let op = KMBatchAddWatermarkOperation(file: file, waterMarkM: watermark!)
+                                op.delegate = self
+                                self.queue?.addOperation(op)
                             } else {
-                                let file = KMBatchOperateFile(filePath: self.pdfView?.document.documentURL.path ?? "")
+                                let file = KMBatchOperateFile(filePath: self.pdfView?.document.documentURL.path ?? "", type: .AddBackground)
                                 file.addBackgroundInfo.savePath = fileURL.path
+                                file.addWatermarkInfo.pageChoice = KMBatchOperatePageChoice(rawValue: watermark?.pageRangeType.rawValue ?? 0) ?? .All
                                 file.addBackgroundInfo.pageRangeString = background?.pagesString ?? ""
+                                let op = KMBatchAddBackgroundOperation(file: file, backgroundM: background!)
+                                op.delegate = self
+                                self.queue?.addOperation(op)
                             }
                             if let cnt = self.queue?.operations.count, cnt > 0 {
                                 self.interfaceStatus = .Processing
@@ -625,12 +632,13 @@ extension KMBatchOperateAddWatermarkViewController {
     
     @objc private func _buttonItemClick_addBatch(_ sender: Any?) {
         let baseWindowController = KMBatchOperateBaseWindowController(windowNibName: "KMBatchOperateBaseWindowController")
-        baseWindowController.window?.makeKeyAndOrderFront(nil)
+       
 //        NSMutableArray *arr = [NSMutableArray array];
         
-//        KMBatchOperateFile *file = [[KMBatchOperateFile alloc] initWithFilePath:self.pdfView.document.documentURL.path type:self.isBackground ? KMBatchOperationTypeAddBackground : KMBatchOperationTypeAddWatermark];
-//        [arr addObject:file];
-    //    [baseWindowController checkNeedPasswordSwitchToOperateType:self.isBackground ? KMBatchOperationTypeAddBackground : KMBatchOperationTypeAddWatermark files:arr];
+        let file = KMBatchOperateFile(filePath: self.pdfView!.document.documentURL.path, type: self.isBackground ? .AddBackground : .AddWatermark)
+        
+        baseWindowController.window?.makeKeyAndOrderFront(nil)
+        baseWindowController.checkNeedPasswordSwitchToOperateType(operateType: self.isBackground ? .AddBackground : .AddWatermark, files: [file])
     }
     
     @objc private func _buttonItemClick_CleanAll(_ sender: Any?) {

PDF Office/PDF Master/Class/PDFTools/Watermark/Model/KMWatermarkModel.swift

@@ -8,7 +8,7 @@
 import Cocoa
 
 @objcMembers class KMWatermarkModel: KMWatermarkAdjectiveBaseModel {
-    var text: String = ""
+    var text: String = "Watermark"
     var image: NSImage!
     var imagePath: String = ""
     

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

@@ -3536,6 +3536,12 @@ extension KMMainViewController : KMMainToolbarControllerDelegate {
                         self.view.window?.endSheet((self.currentWindowController.window)!)
                         self.currentWindowController = nil
                     }
+                    
+                    controller.operateCallBack = { [unowned self] controller, watermark, countType in
+                        let file = KMFileAttribute()
+                        file.filePath = (self.document?.documentURL.path)!
+                        self.showBatchWindow(type: .AddWatermark, files: [file])
+                    }
                     await NSWindow.currentWindow().beginSheet(controller.window!)
                 } else if index == 2 {
                     let watermarks = self.listView.document.watermarks()