【UI替换】编辑工具 回调补充

PDF Office/PDF Master/Class/PDFTools/AddHeaderFooter/New/KMHeaderFooterWindowController.swift

@@ -7,9 +7,14 @@
 
 import Cocoa
 
+typealias KMHeaderFooterWindowControllerOperateCallBack = (_ controller: NSWindowController, _ headerFooter: KMHeaderFooterModel) -> ()
+
 class KMHeaderFooterWindowController: KMBaseWindowController {
     @IBOutlet weak var headerFooterView: KMHeaderFooterView!
 
+    var type: KMBatchModifyTemplateType = .Use
+    var operateCallBack: KMHeaderFooterWindowControllerOperateCallBack?
+    
     override func windowDidLoad() {
         super.windowDidLoad()
 
@@ -17,8 +22,13 @@ class KMHeaderFooterWindowController: KMBaseWindowController {
         headerFooterView.isHiddenBatchBtn = isBatch
         headerFooterView.isBates = isBates
         headerFooterView.pdfDocument = pdfDocument
+        headerFooterView.type = type
         headerFooterView.cancelAction = { [unowned self] view in
-            self.cancelAction?(self)
+            cancelAction?(self)
+        }
+        
+        headerFooterView.operateCallBack = { [unowned self] model in
+            operateCallBack?(self, model)
         }
     }
 }

PDF Office/PDF Master/Class/PDFTools/AddHeaderFooter/New/View/KMHeaderFooterView.swift

@@ -256,11 +256,7 @@ class KMHeaderFooterView: KMBaseXibView, NSTextViewDelegate, NSComboBoxDelegate
         self.bottomCenterLabel.allowsExpansionToolTips = true
         self.bottomRightLabel.allowsExpansionToolTips = true
 
-        
-        if !self.onlyManagerTemplate {
-            self.saveToTemplateButton.isEnabled = false
-        }
-        
+        self.saveToTemplateButton.isEnabled = onlyManagerTemplate
 
         self.pageRangeCombobox.removeAllItems()
         self.pageRangeCombobox.addItems(withObjectValues: [

PDF Office/PDF Master/Class/PDFTools/Background/Model/KMBackgroundModel.swift

@@ -11,6 +11,7 @@ import Cocoa
     case color = 0
     case file = 1
 }
+
 @objcMembers class KMBackgroundModel: KMWatermarkAdjectiveBaseModel {
     var type: KMBackgroundType = .color
     var color: NSColor? = NSColor.red

PDF Office/PDF Master/Class/PDFTools/Background/New/KMBackgroundWindowController.swift

@@ -7,21 +7,28 @@
 
 import Cocoa
 
+typealias KMBackgroundWindowControllerOperateCallBack = (_ controller: NSWindowController, _ background: KMBackgroundModel, _ countType: Int) -> ()
 class KMBackgroundWindowController: KMBaseWindowController {
-
+    
     @IBOutlet weak var addBackgroundView: KMAddBackgroundView!
+    
+    var type: KMBackgroundManagerType = .use
+    
+    var operateCallBack: KMBackgroundWindowControllerOperateCallBack?
+    
     override func windowDidLoad() {
         super.windowDidLoad()
         
         // Implement this method to handle any initialization after your window controller's window has been loaded from its nib file.
         addBackgroundView.isHiddenBatchBtn = isBatch
         addBackgroundView.pdfDocument = self.pdfDocument
+        addBackgroundView.type = type
         addBackgroundView.cancelAction = { [unowned self] view in
             cancelAction?(self)
         }
         
         addBackgroundView.operateCallBack = { [unowned self] background, countType in
-            
+            operateCallBack?(self, background, countType)
         }
     }
 }

PDF Office/PDF Master/Class/PDFTools/Background/New/View/KMAddBackgroundView.swift

@@ -78,9 +78,8 @@ class KMAddBackgroundView: KMBaseXibView, NSComboBoxDelegate {
             self.reloadData()
         }
     }
-    var backgroundType: KMBackgroundType!
-    
-    
+    var backgroundType: KMBackgroundType = .color
+        
     var initialID: String!
     var currentType: Int = 0
     
@@ -88,7 +87,7 @@ class KMAddBackgroundView: KMBaseXibView, NSComboBoxDelegate {
     var batchAction: KMAddBackgroundViewCancelAction?
     var operateCallBack: KMAddBackgroundViewOperateCallBack?
 
-    var onlyManagerTemplate: Bool = false
+    var onlyManagerTemplate: Bool = true
 
     // MARK: - Dealloc
 
@@ -195,17 +194,15 @@ class KMAddBackgroundView: KMBaseXibView, NSComboBoxDelegate {
 
         appearanceBox.titleFont = NSFont.systemFont(ofSize: 13)
 
-        if !onlyManagerTemplate {
-            saveToTemplateButton.isEnabled = false
-        }
+        saveToTemplateButton.isEnabled = onlyManagerTemplate
 
-        if type == .use {
-            saveToTemplateButton.isHidden = true
-            saveToTemplateButton.state = .off
-        } else {
-            saveToTemplateButton.isHidden = false
-            saveToTemplateButton.state = .on
-        }
+//        if type == .use {
+//            saveToTemplateButton.isHidden = true
+//            saveToTemplateButton.state = .off
+//        } else {
+//            saveToTemplateButton.isHidden = false
+//            saveToTemplateButton.state = .on
+//        }
 
         pageRangeComboBox.removeAllItems()
         pageRangeComboBox.addItems(withObjectValues: [

PDF Office/PDF Master/Class/PDFTools/Watermark/New/KMWatermarkWindowController.swift

@@ -7,19 +7,31 @@
 
 import Cocoa
 
+
+typealias KMWatermarkWindowControllerOperateCallBack = (_ controller: NSWindowController, _ watermark: KMWatermarkModel, _ countType: Int) -> ()
+
 class KMWatermarkWindowController: KMBaseWindowController {
 
     @IBOutlet weak var watermarkView: KMWatermarkView!
     
+    var operateCallBack:KMWatermarkWindowControllerOperateCallBack?
+    
+    var type: KMWatermarkManagerType = .use
+    
     override func windowDidLoad() {
         super.windowDidLoad()
 
         // Implement this method to handle any initialization after your window controller's window has been loaded from its nib file.
         watermarkView.isHiddenBatchBtn = isBatch
         watermarkView.pdfDocument = self.pdfDocument
+        watermarkView.type = type
         watermarkView.cancelAction = { [unowned self] view in
             cancelAction?(self)
         }
+        
+        watermarkView.operateCallBack = { [unowned self] watermark, countType in
+            operateCallBack?(self, watermark, countType)
+        }
     }
     
 }

PDF Office/PDF Master/Class/PDFTools/Watermark/New/View/KMWatermarkView.swift

@@ -102,7 +102,7 @@ class KMWatermarkView: KMBaseXibView, NSTextFieldDelegate, NSComboBoxDelegate, N
         }
     }
     
-    var onlyManagerTemplate: Bool = false
+    var onlyManagerTemplate: Bool = true
     var isHiddenBatchBtn: Bool = false
 
     var cancelAction: KMWatermarkViewCancelAction?
@@ -181,19 +181,16 @@ class KMWatermarkView: KMBaseXibView, NSTextFieldDelegate, NSComboBoxDelegate, N
             self.pdfView.needsDisplay = true
         }
         
-        if !onlyManagerTemplate {
-            saveToTemplateButton.isEnabled = false
-        }
+        saveToTemplateButton.isEnabled = onlyManagerTemplate
         
-        if type == .use {
-            saveToTemplateButton.isHidden = true
-            saveToTemplateButton.state = .off
-        } else {
-            saveToTemplateButton.isHidden = false
-            saveToTemplateButton.state = .on
-        }
+//        if type == .use {
+//            saveToTemplateButton.isHidden = true
+//            saveToTemplateButton.state = .off
+//        } else {
+//            saveToTemplateButton.isHidden = false
+//            saveToTemplateButton.state = .on
+//        }
     
-        
         if type == .add {
             applyButton.title = NSLocalizedString("Apply", comment: "")
             batchButton.isHidden = true