【综合】KMStampCreaterWindowController属性、接口private补充

PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/StampList/CreateStamp/Controller/KMStampCreaterWindowController.swift

@@ -10,43 +10,43 @@ import Cocoa
 typealias closeStampCreaterWindowCallBack = (_ result: Int) -> ()
 
 class KMStampCreaterWindowController: NSWindowController, NSTextViewDelegate{
-    var stamp: KMAnnotationStamp?
-    var closeCallBack: closeStampCreaterWindowCallBack?
-    @IBOutlet var preView: NSImageView!
+    private var stamp: KMAnnotationStamp?
+    private var closeCallBack: closeStampCreaterWindowCallBack?
+    @IBOutlet private var preView: NSImageView!
     
-    @IBOutlet var cancelButton: NSButton!
-    @IBOutlet var addButton: NSButton!
+    @IBOutlet private var cancelButton: NSButton!
+    @IBOutlet private var addButton: NSButton!
     
-    @IBOutlet var textView: NSTextView!
-    @IBOutlet var dateButton: NSButton!
-    @IBOutlet var timeButton: NSButton!
+    @IBOutlet private var textView: NSTextView!
+    @IBOutlet private var dateButton: NSButton!
+    @IBOutlet private var timeButton: NSButton!
     
-    @IBOutlet var color0Button: NSButton!
-    @IBOutlet var color1Button: NSButton!
-    @IBOutlet var color2Button: NSButton!
-    @IBOutlet var color3Button: NSButton!
-    @IBOutlet var color4Button: NSButton!
+    @IBOutlet private var color0Button: NSButton!
+    @IBOutlet private var color1Button: NSButton!
+    @IBOutlet private var color2Button: NSButton!
+    @IBOutlet private var color3Button: NSButton!
+    @IBOutlet private var color4Button: NSButton!
     
-    @IBOutlet var color1LeftButton: NSButton!
-    @IBOutlet var color2LeftButton: NSButton!
-    @IBOutlet var color3LeftButton: NSButton!
+    @IBOutlet private var color1LeftButton: NSButton!
+    @IBOutlet private var color2LeftButton: NSButton!
+    @IBOutlet private var color3LeftButton: NSButton!
     
-    @IBOutlet var color1RightButton: NSButton!
-    @IBOutlet var color2RightButton: NSButton!
-    @IBOutlet var color3RightButton: NSButton!
+    @IBOutlet private var color1RightButton: NSButton!
+    @IBOutlet private var color2RightButton: NSButton!
+    @IBOutlet private var color3RightButton: NSButton!
     
-    @IBOutlet var boardView: NSView!
+    @IBOutlet private var boardView: NSView!
     
-    @IBOutlet var previewLabel: NSTextField!
-    @IBOutlet var textLabel: NSTextField!
-    @IBOutlet var colorLabel: NSTextField!
-    @IBOutlet var dateLabel: NSTextField!
-    @IBOutlet var timeLabel: NSTextField!
+    @IBOutlet private var previewLabel: NSTextField!
+    @IBOutlet private var textLabel: NSTextField!
+    @IBOutlet private var colorLabel: NSTextField!
+    @IBOutlet private var dateLabel: NSTextField!
+    @IBOutlet private var timeLabel: NSTextField!
     
     convenience init(){
         self.init(windowNibName: "KMStampCreaterWindowController")
     }
-    func changeBoardViewWithBounds(_ frame: CGRect) {
+    private func changeBoardViewWithBounds(_ frame: CGRect) {
         if boardView == nil {
             boardView = NSView()
             boardView.wantsLayer = true
@@ -102,7 +102,7 @@ class KMStampCreaterWindowController: NSWindowController, NSTextViewDelegate{
         self.timeButton.state = .off
     }
     
-    func changeBoardView(bounds: CGRect) {
+    private func changeBoardView(bounds: CGRect) {
         if boardView == nil {
             boardView = NSView()
             boardView.wantsLayer = true
@@ -126,7 +126,7 @@ class KMStampCreaterWindowController: NSWindowController, NSTextViewDelegate{
         NSApp.beginSheet(self.window!, modalFor: window, modalDelegate: self, didEnd: #selector(dismissSheet(_:)), contextInfo: contextPointer)
     }
     
-    @IBAction func colorButton_Click(_ sender: NSButton) {
+    @IBAction private func colorButton_Click(_ sender: NSButton) {
         changeBoardView(bounds: sender.frame)
         self.stamp?.bounds = self.preView.bounds
         switch sender.tag {
@@ -145,7 +145,8 @@ class KMStampCreaterWindowController: NSWindowController, NSTextViewDelegate{
         }
         self.preView.image = self.stamp?.stampPreviewImage()
     }
-    @IBAction func colorLeftButton_Click(_ sender: NSButton) {
+    
+    @IBAction private func colorLeftButton_Click(_ sender: NSButton) {
         self.stamp?.bounds = self.preView.bounds
         changeBoardView(bounds: sender.frame)
         switch sender.tag {
@@ -160,7 +161,8 @@ class KMStampCreaterWindowController: NSWindowController, NSTextViewDelegate{
         }
         self.preView.image = self.stamp?.stampPreviewImage()
     }
-    @IBAction func colorRightButton_Click(_ sender: NSButton) {
+    
+    @IBAction private func colorRightButton_Click(_ sender: NSButton) {
         self.stamp?.bounds = self.preView.bounds
         changeBoardView(bounds: sender.frame)
         switch sender.tag {
@@ -175,7 +177,8 @@ class KMStampCreaterWindowController: NSWindowController, NSTextViewDelegate{
         }
         self.preView.image = self.stamp?.stampPreviewImage()
     }
-    @IBAction func dateButton_Click(_ sender: NSButton) {
+    
+    @IBAction private func dateButton_Click(_ sender: NSButton) {
         var dateString: String = ""
         if dateButton.state == .on {
             if timeButton.state == .on {
@@ -192,7 +195,8 @@ class KMStampCreaterWindowController: NSWindowController, NSTextViewDelegate{
         self.stamp?.setCustomStampString(self.stamp?.contentStr ?? "", dateString: dateString)
         self.preView.image = self.stamp?.stampPreviewImage()
     }
-    @IBAction func timeButton_Click(_ sender: NSButton) {
+    
+    @IBAction private func timeButton_Click(_ sender: NSButton) {
         var dateString: String = ""
         if dateButton.state == .on {
             if timeButton.state == .on {
@@ -209,6 +213,7 @@ class KMStampCreaterWindowController: NSWindowController, NSTextViewDelegate{
         self.stamp?.setCustomStampString(self.stamp?.contentStr ?? "", dateString: dateString)
         self.preView.image = self.stamp?.stampPreviewImage()
     }
+    
     func textViewDidChangeSelection(_ notification: Notification) {
         let textView = notification.object as! NSTextView
         if textView == self.textView {
@@ -219,7 +224,7 @@ class KMStampCreaterWindowController: NSWindowController, NSTextViewDelegate{
         }
     }
  
-    @IBAction func dismissSheet(_ sender: NSButton) {
+    @IBAction private func dismissSheet(_ sender: NSButton) {
         if sender == self.addButton {
             if self.stamp?.contentStr.count ?? 0 < 1 && self.stamp?.dateString.count ?? 0 < 1 {
                 return
@@ -235,14 +240,6 @@ class KMStampCreaterWindowController: NSWindowController, NSTextViewDelegate{
                 closeCallBack!(0)
             }
         }
-//        if #available(macOS 10.13, *) {
-//            self.window?.endSheet(sender.window!)
-//        } else {
-//            NSApp.endSheet(self.window!)
-//        }
-//        self.window?.orderOut(self)
-//        NSWindow.currentWindow().endSheet(self.window!)
-//        self.window?.orderOut(self)
         self.km_quick_endSheet()
     }
 }