【综合】属性面板UI

PDF Office/PDF Master/Class/Appearance/Color.xcassets/NewColor/KMColor_Layout_H0.colorset/Contents.json

@@ -5,9 +5,9 @@
         "color-space" : "srgb",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "20",
-          "green" : "17",
-          "red" : "14"
+          "blue" : "0x13",
+          "green" : "0x10",
+          "red" : "0x0D"
         }
       },
       "idiom" : "universal"

PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/EditPDF/KMEditImagePropertyViewController.swift

@@ -136,9 +136,10 @@ class KMEditImagePropertyViewController: NSViewController {
         self.titleLabel.font = NSFont.SFProTextSemiboldFont(14.0)
         self.titleLabel.textColor = KMAppearance.Layout.h0Color()
         
-        self.opacityTitleLabel.font = NSFont.SFProTextSemiboldFont(12.0)
-        self.opacityTitleLabel.textColor = KMAppearance.Layout.h0Color()
+        self.opacityTitleLabel.font = NSFont.SFProTextRegularFont(12.0)
+//        self.opacityTitleLabel.textColor = KMAppearance.Layout.h0Color()
         
+        self.whTitleLabel.font = NSFont.SFProTextRegularFont(12)
         self.whTitleLabel.stringValue = NSLocalizedString("Size", comment: "")
         self.wTextFieldItemView.backgroundView.wantsLayer = true
         self.wTextFieldItemView.backgroundView.layer?.backgroundColor = .white
@@ -205,7 +206,9 @@ class KMEditImagePropertyViewController: NSViewController {
         self.whVC?.state = .Norm
         self._setWHButtonState(whState)
         
+        
         self.rotateTitleLabel.stringValue = NSLocalizedString("Rotate", comment: "")
+        self.rotateTitleLabel.font = NSFont.SFProTextRegularFont(12)
         self.rotateTextFieldItemView.delegate = self
         self.rotateTextFieldItemView.enterKeyEndEdit = true
         self.rotateTextFieldItemView.useToken = false
@@ -274,6 +277,7 @@ class KMEditImagePropertyViewController: NSViewController {
         self.reverseYVC?.pagination()
         
         self.toolsTitleLabel.stringValue = NSLocalizedString("Tools", comment: "")
+        self.toolsTitleLabel.font = NSFont.SFProTextRegularFont(12)
         
         cropVC = KMDesignButton.init(withType: .Text)
         cropBox.contentView = cropVC?.view
@@ -404,6 +408,12 @@ class KMEditImagePropertyViewController: NSViewController {
             self.backgroundView.backgroundColor(NSColor.km_init(hex: "#252526"))
             self.noBackgroundView.backgroundColor(NSColor.km_init(hex: "#252526"))
             
+            self.whTitleLabel.textColor = NSColor(hex: "#C8C9CC")
+            self.rotateTitleLabel.textColor = NSColor(hex: "#C8C9CC")
+            self.opacityTitleLabel.textColor = NSColor(hex: "#C8C9CC")
+            self.toolsTitleLabel.textColor = NSColor(hex: "#C8C9CC")
+            self.alignmentView.alignmentLabel.textColor = NSColor(hex: "#C8C9CC")
+            
             whVC?.background_hov = NSColor(red: 71/255, green: 72/255, blue: 75/255, alpha: 1)
 //            whVC?.background_focus = KMAppearance.Layout.l1Color()
             whVC?.background_disabled = KMAppearance.buttonDisabledColor()
@@ -484,6 +494,12 @@ class KMEditImagePropertyViewController: NSViewController {
             self.backgroundView.backgroundColor(NSColor.km_init(hex: "#FAFAFA"))
             self.noBackgroundView.backgroundColor(NSColor.km_init(hex: "#F7F8FA"))
             
+            self.whTitleLabel.textColor = NSColor(hex: "#616469")
+            self.rotateTitleLabel.textColor = NSColor(hex: "#616469")
+            self.opacityTitleLabel.textColor = NSColor(hex: "#616469")
+            self.toolsTitleLabel.textColor = NSColor(hex: "#616469")
+            self.alignmentView.alignmentLabel.textColor = NSColor(hex: "#616469")
+            
             leftRotateVC?.borderColor = KMAppearance.Interactive.s0Color()
             leftRotateVC?.background = KMAppearance.Layout.l1Color()
             leftRotateVC?.background_hov = KMAppearance.view_bg_dis_color()
@@ -546,11 +562,11 @@ class KMEditImagePropertyViewController: NSViewController {
             }
         }
         
-        for label in [self.whTitleLabel, self.opacityTitleLabel,
-                      self.turnOverTitleLabel] {
-            label?.font = NSFont.SFProTextSemiboldFont(12.0)
-            label?.textColor = NSColor.km_init(hex: "#616469")
-        }
+//        for label in [self.whTitleLabel, self.opacityTitleLabel,
+//                      self.turnOverTitleLabel] {
+//            label?.font = NSFont.SFProTextSemiboldFont(12.0)
+//            label?.textColor = NSColor.km_init(hex: "#616469")
+//        }
     }
     
     func updateLanguage() {

PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/EditPDF/KMEditPDFTextPropertyViewController.swift

@@ -167,6 +167,7 @@ class KMEditPDFTextPropertyViewController: NSViewController {
 
     @IBOutlet weak var opacityBox: NSBox!
     var opacitVC: KMDesignSelect?
+    var sliderItemView: KMSliderItemView?
     
     var textsAreas : [CPDFEditTextArea] = []
     
@@ -259,7 +260,7 @@ class KMEditPDFTextPropertyViewController: NSViewController {
         self.propertyTitle.font = NSFont.SFProTextSemiboldFont(14.0)
         self.propertyTitle.textColor = KMAppearance.Layout.h0Color()
 
-        self.fontTitleLabel.font = NSFont.SFProTextSemiboldFont(12.0)
+        self.fontTitleLabel.font = NSFont.SFProTextRegularFont(12.0)
         self.fontTitleLabel.textColor = KMAppearance.Layout.h0Color()
 
         self.headerBox.borderWidth = 1
@@ -447,8 +448,10 @@ class KMEditPDFTextPropertyViewController: NSViewController {
         self.colorBox.borderColor = KMAppearance.Interactive.s0Color()
         
         let sliderItemView = KMSliderItemView()
+        self.sliderItemView = sliderItemView
         self.opacityBox.contentView = sliderItemView
         self.opacityBox.borderWidth = 0
+        sliderItemView.titleLabel.font = NSFont.SFProTextRegularFont(12)
         sliderItemView.titleLabel.stringValue = NSLocalizedString("Opacity", comment: "")
         sliderItemView.minValue = 0.0001
         sliderItemView.maxValue = 1
@@ -539,6 +542,10 @@ class KMEditPDFTextPropertyViewController: NSViewController {
         if isDarkModel {
             self.backgroundView.backgroundColor(NSColor.km_init(hex: "#252526"))
             
+            self.fontTitleLabel.textColor = NSColor(hex: "#C8C9CC")
+            self.sliderItemView?.titleLabel.textColor = NSColor(hex: "#C8C9CC")
+            self.alignmentView.alignmentLabel.textColor = NSColor(hex: "#C8C9CC")
+            
             self.textPresuppositionResetVC?.background_disabled = NSColor(red: 71/255, green: 72/255, blue: 75/255, alpha: 1)
             self.textPresuppositionResetVC?.borderColor = KMAppearance.Layout.w15Color()
             self.textPresuppositionResetVC?.borderColor_hov = KMAppearance.Interactive.a0Color()
@@ -583,7 +590,10 @@ class KMEditPDFTextPropertyViewController: NSViewController {
             self.backgroundView.backgroundColor(NSColor.km_init(hex: "#FAFAFA"))
 
             self.propertyTitle.textColor = KMAppearance.Layout.h0Color()
-            self.fontTitleLabel.textColor = KMAppearance.Layout.h0Color()
+//            self.fontTitleLabel.textColor = KMAppearance.Layout.h0Color()
+            self.fontTitleLabel.textColor = NSColor(hex: "#616469")
+            self.sliderItemView?.titleLabel.textColor = NSColor(hex: "#616469")
+            self.alignmentView.alignmentLabel.textColor = NSColor(hex: "#616469")
             self.headerBox.borderColor = KMAppearance.Interactive.s0Color()
             self.headerBox.fillColor = KMAppearance.Layout.l1Color()
             

PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/EditPDF/View/AlignmentView/KMEditPropertyAlignmentView.swift

@@ -49,7 +49,7 @@ class KMEditPropertyAlignmentView: KMBaseXibView {
     
     override func setup() {
         self.alignmentLabel.stringValue = NSLocalizedString("Align", comment: "")
-        alignmentLabel.font = NSFont.SFProTextSemiboldFont(12.0)
+        alignmentLabel.font = NSFont.SFProTextRegularFont(12.0)
         alignmentLabel.textColor = NSColor.km_init(hex: "#616469")
         
         alignmentLine1.backgroundColor(NSColor.km_init(hex: "#000000", alpha: 0.1))