【批量】水印批量弹窗中，有四个问题，请看截图 -- 修复

PDF Office/PDF Master/Class/PDFTools/Watermark/Base/KMWatermarkAdjectiveBaseModel.swift

@@ -66,7 +66,7 @@ enum KMWatermarkAdjectiveText {
         }
         
         if (color == nil) {
-            color = NSColor.black
+            color = NSColor.red
         }
         
         return color

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

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

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

@@ -48,13 +48,13 @@ class KMAngleIndicateView: NSView {
             layer?.shadowRadius = 0
         } else {
             wantsLayer = true
-            layer?.backgroundColor = NSColor.white.cgColor
+            layer?.backgroundColor = KMAppearance.KM_FFFFFF_Color35().cgColor
             layer?.cornerRadius = 1
             layer?.borderWidth = 0.5
-            layer?.borderColor = NSColor.black.withAlphaComponent(0.15).cgColor
+            layer?.borderColor = KMAppearance.KM_000000_Color15Chang35().cgColor
 
             shadow = NSShadow()
-            layer?.shadowColor = NSColor.black.withAlphaComponent(0.2).cgColor
+            layer?.shadowColor = KMAppearance.KM_000000_Color20().cgColor
             layer?.shadowOffset = CGSize(width: 0, height: -1)
             layer?.shadowRadius = 0.5
         }
@@ -67,18 +67,18 @@ class KMAngleIndicateView: NSView {
                 context.translateBy(x: bounds.width / 2, y: bounds.height / 2)
                 context.rotate(by: CGFloat.pi / 4)
                 context.addRect(CGRect(x: -4, y: -6, width: 8, height: 12))
-                context.setFillColor(NSColor(calibratedRed: 117/255, green: 119/255, blue: 128/255, alpha: 1.0).cgColor)
+                context.setFillColor(KMAppearance.KM_757780_Color().cgColor)
                 context.fillPath()
             } else if style == .horizontal {
                 context.translateBy(x: bounds.width / 2, y: bounds.height / 2)
                 context.addRect(CGRect(x: -4, y: -6, width: 8, height: 12))
-                context.setFillColor(NSColor(calibratedRed: 117/255, green: 119/255, blue: 128/255, alpha: 1.0).cgColor)
+                context.setFillColor(KMAppearance.KM_757780_Color().cgColor)
                 context.fillPath()
             } else if style == .right45 {
                 context.translateBy(x: bounds.width / 2, y: bounds.height / 2)
                 context.rotate(by: -CGFloat.pi / 4)
                 context.addRect(CGRect(x: -4, y: -6, width: 8, height: 12))
-                context.setFillColor(NSColor(calibratedRed: 117/255, green: 119/255, blue: 128/255, alpha: 1.0).cgColor)
+                context.setFillColor(KMAppearance.KM_757780_Color().cgColor)
                 context.fillPath()
             }
 
@@ -88,8 +88,8 @@ class KMAngleIndicateView: NSView {
 
     override func awakeFromNib() {
         super.awakeFromNib()
-        gradient = NSGradient(starting: NSColor(calibratedRed: 237/255, green: 236/255, blue: 237/255, alpha: 1.0),
-                              ending: NSColor(calibratedRed: 210/255, green: 209/255, blue: 210/255, alpha: 1.0))
+        gradient = NSGradient(starting: KMAppearance.KM_EDECED_Color(),
+                              ending: KMAppearance.KM_D2D1D2_Color())
     }
 
     override func mouseUp(with event: NSEvent) {

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

@@ -36,9 +36,9 @@ class KMPostionIndicateView: NSView {
                 context.addRect(CGRect(x: 0, y: 0, width: 24, height: 24))
                 
                 if style == KMPositionIndicateViewStyle(rawValue: j + 3 * i) {
-                    context.setFillColor(NSColor(calibratedRed: 160/255, green: 160/255, blue: 160/255, alpha: 1.0).cgColor)
+                    context.setFillColor(KMAppearance.Interactive.a0Color().cgColor)
                 } else {
-                    context.setFillColor(NSColor(calibratedRed: 219/255, green: 219/255, blue: 219/255, alpha: 1.0).cgColor)
+                    context.setFillColor(KMAppearance.KM_DBDBDB_Color().cgColor)
                 }
                 
                 context.fillPath()

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

@@ -304,7 +304,7 @@ class KMWatermarkView: KMBaseXibView, NSTextFieldDelegate, NSComboBoxDelegate, N
         
         totalPageCountLabel.stringValue = "/ \(pdfDocument.pageCount)"
         
-        fontSizeCombobox.stringValue = "\(watermark.getTextFontSize())"
+        fontSizeCombobox.stringValue = "\(Int(watermark.getTextFontSize()))"
         angleStepper.doubleValue = Double(watermark.rotation)
         angleTextF.stringValue = "\(angleStepper.doubleValue)"
         
@@ -501,7 +501,7 @@ class KMWatermarkView: KMBaseXibView, NSTextFieldDelegate, NSComboBoxDelegate, N
                 }
             }
             self.watermark.textFont = KMWatermarkAdjectiveText.font(name: "Helvetica", size: textSize)
-            self.fontSizeCombobox.stringValue = "\(textSize)"
+            self.fontSizeCombobox.stringValue = "\(Int(textSize))"
             self.updatePDFView()
         } else if obj.object as? NSTextField == self.ratioTextField {
             let formatter = self.ratioTextField.formatter as? NumberFormatter
@@ -953,11 +953,11 @@ extension KMWatermarkView {
             if self.watermark.isTilePage {
                 let textSize = self.watermark.getTextFontSize() == 48 ? 18 : self.watermark.getTextFontSize()
                 self.isTileWater.state = .on
-                self.fontSizeCombobox.stringValue = "\(textSize)"
+                self.fontSizeCombobox.stringValue = "\(Int(textSize))"
                 self.watermark.textFont = KMWatermarkAdjectiveText.font(name: "Helvetica", size: textSize)
             } else {
                 let textSize = self.watermark.getTextFontSize() == 18 ? 48 : self.watermark.getTextFontSize()
-                self.fontSizeCombobox.stringValue = "\(textSize)"
+                self.fontSizeCombobox.stringValue = "\(Int(textSize))"
                 self.watermark.textFont = KMWatermarkAdjectiveText.font(name: "Helvetica", size: textSize)
             }
         }