【2025】【综合】暗黑模式切换优化

PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/Eraser/KMEraserController.swift

@@ -8,7 +8,7 @@
 import Cocoa
 import KMComponentLibrary
 
-class KMEraserController: NSViewController {
+class KMEraserController: KMNBaseViewController {
     
     @IBOutlet var eraserBGView: NSView!
     @IBOutlet var eraserLabel: NSTextField!
@@ -30,6 +30,18 @@ class KMEraserController: NSViewController {
         setupProperty()
     }
     
+    override func updateUILanguage() {
+        super.updateUILanguage()
+        setupProperty()
+        
+    }
+    
+    override func updateUIThemeColor() {
+        super.updateUIThemeColor()
+        setupProperty()
+        
+    }
+    
     func setupProperty() {
          
         eraserLabel.stringValue = KMLocalizedString("Line")

PDF Office/PDF Master/KMClass/KMPDFViewController/EditTool/Crop/Views/KMCropPropertyController.swift

@@ -17,7 +17,7 @@ import KMComponentLibrary
     @objc optional func kmCropControllerDidCropAuto(_ controller: KMCropPropertyController, _ view: KMPageRangeSelectView)
 }
 
-class KMCropPropertyController: NSViewController {
+class KMCropPropertyController: KMNBaseViewController {
     
     @IBOutlet var contendView: NSView!
     
@@ -78,6 +78,18 @@ class KMCropPropertyController: NSViewController {
         reloadData()
     }
     
+    override func updateUILanguage() {
+        super.updateUILanguage()
+        
+        refreshUI()
+    }
+    
+    override func updateUIThemeColor() {
+        super.updateUIThemeColor()
+        
+        refreshUI()
+    }
+    
     //MARK: - Setter and Getter
     
     public var syncChangeBounds : Bool {
@@ -112,34 +124,13 @@ class KMCropPropertyController: NSViewController {
     }
     
     func setupProperty() {
-        //White Margin
-        whiteMarginLabel.stringValue = KMLocalizedString("Crop White Margins")
-        whiteMarginLabel.textColor = ComponentLibrary.shared.getComponentColorFromKey("colorText/2")
-        whiteMarginLabel.font = ComponentLibrary.shared.getFontFromKey("mac/body-s-medium")
-        
-        separateLabel.stringValue = KMLocalizedString("Separate")
-        separateLabel.textColor = ComponentLibrary.shared.getComponentColorFromKey("comp-form/colorText-label")
-        separateLabel.font = ComponentLibrary.shared.getFontFromKey("mac/body-m-regular")
-        
         separateSwitch.properties = ComponentSwitchProperty(size: .s, open: false, isDisabled: false)
         separateSwitch.setTarget(self, action: #selector(switchAction(_:)))
         
-        autoLabel.stringValue = KMLocalizedString("Auto")
-        autoLabel.textColor = ComponentLibrary.shared.getComponentColorFromKey("comp-form/colorText-label")
-        autoLabel.font = ComponentLibrary.shared.getFontFromKey("mac/body-m-regular")
-        
-        separateTip.toolTip = KMLocalizedString("separateTip tooltips")
-        
-        autoTipsView.toolTip = KMLocalizedString("autoTipsView tooltips")
         
         autoSwitch.properties = ComponentSwitchProperty(size: .s, open: false, isDisabled: false)
         autoSwitch.setTarget(self, action: #selector(switchAction(_:)))
         
-        //PageSize
-        whiteMarginLabel.stringValue = KMLocalizedString("Crop Page Size")
-        whiteMarginLabel.textColor = ComponentLibrary.shared.getComponentColorFromKey("colorText/2")
-        whiteMarginLabel.font = ComponentLibrary.shared.getFontFromKey("mac/body-s-medium")
-        
         sizeSyncButton.properties = ComponentButtonProperty(type: .text_gray, size: .xxs, onlyIcon: true, icon: NSImage(named: "sync_Change_unlock"), keepPressState: true)
         sizeSyncButton.properties.propertyInfo.leftIcon_press = NSImage(named: "sync_Change_lock")
         sizeSyncButton.setTarget(self, action: #selector(sizeSyncButtonClicked(_:)))
@@ -165,11 +156,6 @@ class KMCropPropertyController: NSViewController {
                                                                   text:"100")
         sizeHeightInput.delegate = self
         
-        //PageMargin
-        whiteMarginLabel.stringValue = KMLocalizedString("Crop Page Margins")
-        whiteMarginLabel.textColor = ComponentLibrary.shared.getComponentColorFromKey("colorText/2")
-        whiteMarginLabel.font = ComponentLibrary.shared.getFontFromKey("mac/body-s-medium")
-        
         pageLeftInput.properties = ComponentInputNumberProperty(size: .s,
                                                                 state: .normal,
                                                                 minSize: 0,
@@ -198,14 +184,63 @@ class KMCropPropertyController: NSViewController {
         pageTopInput.delegate = self
         pageRightInput.delegate = self
         pageBottomInput.delegate = self
+         
+        cropButton.properties = ComponentButtonProperty(type: .primary, size: .m, buttonText: KMLocalizedString("Apply"), keepPressState: false)
+        cropButton.setTarget(self, action: #selector(cropButtonClicked(_:)))
+        
+        refreshUI()
+    }
+    
+    func refreshUI() {
+        //White Margin
+        whiteMarginLabel.stringValue = KMLocalizedString("Crop White Margins")
+        whiteMarginLabel.textColor = ComponentLibrary.shared.getComponentColorFromKey("colorText/2")
+        whiteMarginLabel.font = ComponentLibrary.shared.getFontFromKey("mac/body-s-medium")
+        
+        separateLabel.stringValue = KMLocalizedString("Separate")
+        separateLabel.textColor = ComponentLibrary.shared.getComponentColorFromKey("comp-form/colorText-label")
+        separateLabel.font = ComponentLibrary.shared.getFontFromKey("mac/body-m-regular")
+        
+        autoLabel.stringValue = KMLocalizedString("Auto")
+        autoLabel.textColor = ComponentLibrary.shared.getComponentColorFromKey("comp-form/colorText-label")
+        autoLabel.font = ComponentLibrary.shared.getFontFromKey("mac/body-m-regular")
+        
+        separateTip.toolTip = KMLocalizedString("separateTip tooltips")
+        
+        autoTipsView.toolTip = KMLocalizedString("autoTipsView tooltips")
+        
+        
+        //PageSize
+        whiteMarginLabel.stringValue = KMLocalizedString("Crop Page Size")
+        whiteMarginLabel.textColor = ComponentLibrary.shared.getComponentColorFromKey("colorText/2")
+        whiteMarginLabel.font = ComponentLibrary.shared.getFontFromKey("mac/body-s-medium")
+        
+        
+        //PageMargin
+        whiteMarginLabel.stringValue = KMLocalizedString("Crop Page Margins")
+        whiteMarginLabel.textColor = ComponentLibrary.shared.getComponentColorFromKey("colorText/2")
+        whiteMarginLabel.font = ComponentLibrary.shared.getFontFromKey("mac/body-s-medium")
         
         //PageRange
         pageRangeLabel.stringValue = KMLocalizedString("Page Range")
         pageRangeLabel.textColor = ComponentLibrary.shared.getComponentColorFromKey("colorText/2")
         pageRangeLabel.font = ComponentLibrary.shared.getFontFromKey("mac/body-s-medium")
         
-        cropButton.properties = ComponentButtonProperty(type: .primary, size: .m, buttonText: KMLocalizedString("Apply"), keepPressState: false)
-        cropButton.setTarget(self, action: #selector(cropButtonClicked(_:)))
+        sizeSyncButton.properties = sizeSyncButton.properties
+        
+        sizeWidthInput.properties = sizeWidthInput.properties
+        
+        sizeHeightInput.properties = sizeHeightInput.properties
+         
+        pageLeftInput.properties = pageLeftInput.properties
+        
+        pageTopInput.properties = pageTopInput.properties
+        
+        pageRightInput.properties = pageRightInput.properties
+        
+        pageBottomInput.properties = pageBottomInput.properties
+        
+        pangeRangeSelectView.refreshUI()
     }
     
     func reloadData() {

PDF Office/PDF Master/KMClass/KMPDFViewController/EditTool/KMLinkViewController/KMLinkViewController.swift

@@ -35,7 +35,7 @@ import KMComponentLibrary
 }
 
 //MARK: - KMLinkViewController
-@objcMembers class KMLinkViewController: NSViewController {
+@objcMembers class KMLinkViewController: KMNBaseViewController {
     
     @IBOutlet var contendBox: NSBox!
     @IBOutlet var infoContendView: NSView!
@@ -57,9 +57,9 @@ import KMComponentLibrary
     
     var multiController: KMNAlignmentController = KMNAlignmentController.init() //注释多选界面
     
-    let pageProperty = ComponentTabsProperty(tabsType: .underline_Fill, state: .normal, showIcon: false, title: NSLocalizedString("Page", comment: ""))
-    let webProperty = ComponentTabsProperty(tabsType: .underline_Fill, state: .normal, showIcon: false, title: NSLocalizedString("Web", comment: ""))
-    let emailProperty = ComponentTabsProperty(tabsType: .underline_Fill, state: .normal, showIcon: false, title: NSLocalizedString("Email", comment: ""))
+    let pageProperty = ComponentTabsProperty(tabsType: .underline_Fill, state: .normal, showIcon: false, title: KMLocalizedString("Page", comment: ""))
+    let webProperty = ComponentTabsProperty(tabsType: .underline_Fill, state: .normal, showIcon: false, title: KMLocalizedString("Web", comment: ""))
+    let emailProperty = ComponentTabsProperty(tabsType: .underline_Fill, state: .normal, showIcon: false, title: KMLocalizedString("Email", comment: ""))
     
     weak open var delegate: KMLinkViewControllerDelegate?
     
@@ -71,10 +71,19 @@ import KMComponentLibrary
         
     }
     
-    func setUpUI() {
+    override func updateUILanguage() {
+        super.updateUILanguage()
+        
+    }
+    
+    override func updateUIThemeColor() {
+        super.updateUIThemeColor()
         
         contendBox.fillColor = ComponentLibrary.shared.getComponentColorFromKey("colorBg/layout-middle")
         
+    }
+    
+    func setUpUI() {
         
         tabsView.updateItemProperty([pageProperty, webProperty, emailProperty])
         tabsView.delegate = self
@@ -309,13 +318,13 @@ extension KMLinkViewController: KMLinkWebViewDelegate {
             } else {
                 let alert = NSAlert()
                 alert.alertStyle = .critical
-                alert.messageText = NSLocalizedString("Invalid URL. Please try again.", comment: "")
+                alert.messageText = KMLocalizedString("Invalid URL. Please try again.", comment: "")
                 alert.runModal()
             }
         } else {
             let alert = NSAlert()
             alert.alertStyle = .critical
-            alert.messageText = NSLocalizedString("Invalid URL. Please try again.", comment: "")
+            alert.messageText = KMLocalizedString("Invalid URL. Please try again.", comment: "")
             alert.runModal()
         }
     }
@@ -332,7 +341,7 @@ extension KMLinkViewController: KMLinkEmailViewDelegate {
         if !KMNTools.isValidateEmail(emailString) {
             let alert = NSAlert()
             alert.alertStyle = .critical
-            alert.messageText = NSLocalizedString("Invalid Email. Please try again.", comment: "")
+            alert.messageText = KMLocalizedString("Invalid Email. Please try again.", comment: "")
             alert.runModal()
             return
         }

PDF Office/PDF Master/KMClass/KMPDFViewController/RightSideController/Views/Fill_Date/FillDateController.swift

@@ -8,7 +8,7 @@
 import Cocoa
 import KMComponentLibrary
 
-class FillDateController: NSViewController {
+class FillDateController: KMNBaseViewController {
     
     @IBOutlet var contendView: NSView!
     
@@ -62,6 +62,18 @@ class FillDateController: NSViewController {
         setupProperty()
     }
     
+    override func updateUILanguage() {
+        super.updateUILanguage()
+        
+        setupProperty()
+    }
+    
+    override func updateUIThemeColor() {
+        super.updateUIThemeColor()
+        
+        setupProperty()
+    }
+    
     func setupProperty() {
         //Type
         

PDF Office/PDF Master/KMClass/KMPDFViewController/RightSideController/Views/Fill_Tick/FillTickController.swift

@@ -21,7 +21,7 @@ enum KMRefreshType: UInt {
 }
 
 
-class FillTickController: NSViewController {
+class FillTickController: KMNBaseViewController {
     
     @IBOutlet var contendView: NSView!
     
@@ -66,12 +66,19 @@ class FillTickController: NSViewController {
         setupProperty()
     }
     
-    func setupProperty() {
+    override func updateUILanguage() {
+        super.updateUILanguage()
         
-        colorLabel.stringValue = KMLocalizedString("Color")
-        colorLabel.textColor = ComponentLibrary.shared.getComponentColorFromKey("colorText/2")
-        colorLabel.font = ComponentLibrary.shared.getFontFromKey("mac/body-s-medium")
+        updateUI()
+    }
+    
+    override func updateUIThemeColor() {
+        super.updateUIThemeColor()
         
+        updateUI()
+    }
+    
+    func setupProperty() {
         colorGroup.delegate = self
         
         colorSlider.properties = ComponentSliderProperty(size: .m, percent: 1)
@@ -92,12 +99,7 @@ class FillTickController: NSViewController {
             colorOpacitySelect.updateMenuItemsArr(opacityItems)
         }
         colorOpacitySelect.delegate = self
-        
-        
-        lineLabel.stringValue = KMLocalizedString("Line")
-        lineLabel.textColor = ComponentLibrary.shared.getComponentColorFromKey("colorText/2")
-        lineLabel.font = ComponentLibrary.shared.getFontFromKey("mac/body-s-medium")
-        
+          
         lineWidthSlider.properties = ComponentSliderProperty(size: .m, percent: 1)
         lineWidthSlider.delegate = self
         
@@ -117,10 +119,6 @@ class FillTickController: NSViewController {
         }
         lineWidthSelect.delegate = self
         
-        typeLabel.stringValue = KMLocalizedString("Type")
-        typeLabel.textColor = ComponentLibrary.shared.getComponentColorFromKey("colorText/2")
-        typeLabel.font = ComponentLibrary.shared.getFontFromKey("mac/body-s-medium")
-        
         typeItemA.properties = ComponentCSelectorProperty(size: .m, state: .normal, iconImage: NSImage(named: "fill_tick"), identifier: "")
         typeItemB.properties = ComponentCSelectorProperty(size: .m, state: .normal, iconImage: NSImage(named: "fill_fork"), identifier: "")
         typeItemC.properties = ComponentCSelectorProperty(size: .m, state: .normal, iconImage: NSImage(named: "fill_rectangle"), identifier: "")
@@ -130,6 +128,29 @@ class FillTickController: NSViewController {
         for item in [typeItemA, typeItemB, typeItemC, typeItemD, typeItemE] {
             item!.setTarget(self, action: #selector(selectItemClick(_:)))
         }
+        
+        self.updateUI()
+    }
+    
+    func updateUI() {
+        colorLabel.stringValue = KMLocalizedString("Color")
+        colorLabel.textColor = ComponentLibrary.shared.getComponentColorFromKey("colorText/2")
+        colorLabel.font = ComponentLibrary.shared.getFontFromKey("mac/body-s-medium")
+        
+        colorOpacitySelect.properties = colorOpacitySelect.properties
+        
+        lineLabel.stringValue = KMLocalizedString("Line")
+        lineLabel.textColor = ComponentLibrary.shared.getComponentColorFromKey("colorText/2")
+        lineLabel.font = ComponentLibrary.shared.getFontFromKey("mac/body-s-medium")
+        
+        lineWidthSlider.properties = lineWidthSlider.properties
+        
+        lineWidthSelect.properties = lineWidthSelect.properties
+        
+        typeLabel.stringValue = KMLocalizedString("Type")
+        typeLabel.textColor = ComponentLibrary.shared.getComponentColorFromKey("colorText/2")
+        typeLabel.font = ComponentLibrary.shared.getFontFromKey("mac/body-s-medium")
+         
     }
     
     func reloadData() {

PDF Office/PDF Master/KMClass/KMPDFViewController/RightSideController/Views/Forms/Forms_Button/FormsButtonController.swift

@@ -8,7 +8,7 @@
 import Cocoa
 import KMComponentLibrary
 
-class FormsButtonController: NSViewController {
+class FormsButtonController: KMNBaseViewController {
     
     @IBOutlet var typeTabs: ComponentTabs!
     
@@ -69,8 +69,19 @@ class FormsButtonController: NSViewController {
         // Do view setup here.
         
         setupProperty()
+         
+    }
+    
+    override func updateUILanguage() {
+        super.updateUILanguage()
         
-        reloadUI()
+        setupProperty()
+    }
+    
+    override func updateUIThemeColor() {
+        super.updateUIThemeColor()
+        
+        setupProperty()
     }
     
     func setupProperty() {
@@ -136,8 +147,7 @@ class FormsButtonController: NSViewController {
             fontSizeSelect.updateMenuItemsArr(sizeItemArr)
         }
         fontSizeSelect.delegate = self
-        
-        
+         
         //MARK: -Action
         selectActionSelect.properties = ComponentSelectProperties(size: .s,
                                                                   state: .normal,

PDF Office/PDF Master/KMClass/KMPDFViewController/RightSideController/Views/Forms/Forms_CheckBox/FormsCheckBoxController.swift

@@ -8,7 +8,7 @@
 import Cocoa
 import KMComponentLibrary
 
-class FormsCheckBoxController: NSViewController {
+class FormsCheckBoxController: KMNBaseViewController {
     
     @IBOutlet var typeTabs: ComponentTabs!
     
@@ -41,9 +41,7 @@ class FormsCheckBoxController: NSViewController {
     @IBOutlet var buttonStyleBGView: NSView!
     @IBOutlet var buttonStyleLabel: NSTextField!
     @IBOutlet var buttonStyleSelect: ComponentSelect!
-    
-    
-    
+     
     private var tabIndex: Int = 0
     private var generalTabProperty: ComponentTabsProperty = ComponentTabsProperty(tabsType: .underline_Fill, state: .normal, showIcon: false, title: KMLocalizedString("General"))
     private var appearanceTabProperty: ComponentTabsProperty = ComponentTabsProperty(tabsType: .underline_Fill, state: .normal, showIcon: false, title: KMLocalizedString("Appearance"))
@@ -63,6 +61,18 @@ class FormsCheckBoxController: NSViewController {
         reloadUI()
     }
     
+    override func updateUILanguage() {
+        super.updateUILanguage()
+        
+        setupProperty()
+    }
+    
+    override func updateUIThemeColor() {
+        super.updateUIThemeColor()
+        
+        setupProperty()
+    }
+    
     func setupProperty() {
         typeTabs.updateItemProperty([generalTabProperty, appearanceTabProperty])
         typeTabs.delegate = self

PDF Office/PDF Master/KMClass/KMPDFViewController/RightSideController/Views/Forms/Forms_DigitalSign/FormsDigitalSignController.swift

@@ -8,7 +8,7 @@
 import Cocoa
 import KMComponentLibrary
 
-class FormsDigitalSignController: NSViewController {
+class FormsDigitalSignController: KMNBaseViewController {
     
     //General
     @IBOutlet var generalBox: NSBox!
@@ -31,8 +31,19 @@ class FormsDigitalSignController: NSViewController {
         // Do view setup here.
         
         setupProperty()
+         
+    }
+    
+    override func updateUILanguage() {
+        super.updateUILanguage()
         
-        reloadUI()
+        setupProperty()
+    }
+    
+    override func updateUIThemeColor() {
+        super.updateUIThemeColor()
+        
+        setupProperty()
     }
     
     func setupProperty() {
@@ -53,6 +64,7 @@ class FormsDigitalSignController: NSViewController {
         formFieldSelect.updateMenuItemsArr(fieldItems)
         formFieldSelect.delegate = self
          
+        reloadUI()
     }
     
     func reloadUI() {

PDF Office/PDF Master/KMClass/KMPDFViewController/RightSideController/Views/Forms/Forms_List/FormsListController.swift

@@ -8,7 +8,7 @@
 import Cocoa
 import KMComponentLibrary
 
-class FormsListController: NSViewController {
+class FormsListController: KMNBaseViewController {
     
     @IBOutlet var typeTabs: ComponentTabs!
     
@@ -88,7 +88,18 @@ class FormsListController: NSViewController {
         
         setupProperty()
         
-        reloadUI()
+    }
+    
+    override func updateUILanguage() {
+        super.updateUILanguage()
+        
+        setupProperty()
+    }
+    
+    override func updateUIThemeColor() {
+        super.updateUIThemeColor()
+        
+        setupProperty()
     }
     
     func setupProperty() {
@@ -169,6 +180,8 @@ class FormsListController: NSViewController {
         fontSizeSelect.delegate = self
         
         itemListTooltip.toolTip = KMLocalizedString("Select an item in the list to make it the default option.")
+        
+        reloadUI()
     }
     
     func reloadUI() {

PDF Office/PDF Master/KMClass/KMPDFViewController/RightSideController/Views/Forms/Forms_Raido/FormsRadioController.swift

@@ -8,7 +8,7 @@
 import Cocoa
 import KMComponentLibrary
 
-class FormsRadioController: NSViewController {
+class FormsRadioController: KMNBaseViewController {
     
     @IBOutlet var typeTabs: ComponentTabs!
     
@@ -44,9 +44,7 @@ class FormsRadioController: NSViewController {
     @IBOutlet var buttonStyleBGView: NSView!
     @IBOutlet var buttonStyleLabel: NSTextField!
     @IBOutlet var buttonStyleSelect: ComponentSelect!
-    
-    
-    
+     
     private var tabIndex: Int = 0
     private var generalTabProperty: ComponentTabsProperty = ComponentTabsProperty(tabsType: .underline_Fill, state: .normal, showIcon: false, title: KMLocalizedString("General"))
     private var appearanceTabProperty: ComponentTabsProperty = ComponentTabsProperty(tabsType: .underline_Fill, state: .normal, showIcon: false, title: KMLocalizedString("Appearance"))
@@ -66,6 +64,18 @@ class FormsRadioController: NSViewController {
         reloadUI()
     }
     
+    override func updateUILanguage() {
+        super.updateUILanguage()
+        
+        setupProperty()
+    }
+    
+    override func updateUIThemeColor() {
+        super.updateUIThemeColor()
+        
+        setupProperty()
+    }
+    
     func setupProperty() {
         typeTabs.updateItemProperty([generalTabProperty, appearanceTabProperty])
         typeTabs.delegate = self

PDF Office/PDF Master/KMClass/KMPDFViewController/RightSideController/Views/Forms/Forms_TextField/FormsTextFieldController.swift

@@ -8,7 +8,7 @@
 import Cocoa
 import KMComponentLibrary
 
-class FormsTextFieldController: NSViewController {
+class FormsTextFieldController: KMNBaseViewController {
     
     @IBOutlet var infoContendView: NSView!
     @IBOutlet var typeTabs: ComponentTabs!
@@ -70,6 +70,18 @@ class FormsTextFieldController: NSViewController {
         reloadUI()
     }
     
+    override func updateUILanguage() {
+        super.updateUILanguage()
+        
+        setupProperty()
+    }
+    
+    override func updateUIThemeColor() {
+        super.updateUIThemeColor()
+        
+        setupProperty()
+    }
+    
     func setupProperty() {
         typeTabs.updateItemProperty([generalTabProperty, appearanceTabProperty])
         typeTabs.delegate = self

PDF Office/PDF Master/KMClass/KMPDFViewController/RightSideController/Views/Highlight/KMHighlightController.swift

@@ -8,7 +8,7 @@
 import Cocoa
 import KMComponentLibrary
 
-class KMHighlightController: NSViewController {
+class KMHighlightController: KMNBaseViewController {
     
     @IBOutlet var colorBGView: NSView!
     @IBOutlet var colorLabel: NSTextField!
@@ -43,16 +43,31 @@ class KMHighlightController: NSViewController {
         setupProperty()
     }
     
-    func getValidAnnotations() -> [CPDFMarkupAnnotation] {
-        return annotations
+    override func updateUILanguage() {
+        super.updateUILanguage()
+        
+        colorLabel.stringValue = KMLocalizedString("Color")
     }
     
-    func setupProperty() {
+    override func updateUIThemeColor() {
+        super.updateUIThemeColor()
         
-        colorLabel.stringValue = KMLocalizedString("Color")
         colorLabel.textColor = ComponentLibrary.shared.getComponentColorFromKey("colorText/2")
         colorLabel.font = ComponentLibrary.shared.getFontFromKey("mac/body-s-medium")
         
+        colorOpacitySelect.properties = colorOpacitySelect.properties
+        
+        colorSlider.properties = colorSlider.properties
+        
+        colorGroup.refreshUI()
+    }
+    
+    func getValidAnnotations() -> [CPDFMarkupAnnotation] {
+        return annotations
+    }
+    
+    func setupProperty() {
+        
         colorGroup.delegate = self
         
         colorSlider.properties = ComponentSliderProperty(size: .m, percent: 1)

PDF Office/PDF Master/KMClass/KMPDFViewController/RightSideController/Views/Line/KMLineController.swift

@@ -8,7 +8,7 @@
 import Cocoa
 import KMComponentLibrary
 
-class KMLineController: NSViewController {
+class KMLineController: KMNBaseViewController {
     //Color
     @IBOutlet var colorBGView: NSView!
     @IBOutlet var colorLabel: NSTextField!
@@ -81,6 +81,17 @@ class KMLineController: NSViewController {
         setupProperty()
     }
     
+    override func updateUILanguage() {
+        super.updateUILanguage()
+        
+        setupProperty()
+    }
+    
+    override func updateUIThemeColor() {
+        super.updateUIThemeColor()
+        
+        setupProperty()
+    }
     
     func getValidAnnotations() -> [CPDFLineAnnotation] {
         return annotations

PDF Office/PDF Master/KMClass/KMPDFViewController/RightSideController/Views/Measure/KMMeasureController.swift

@@ -8,7 +8,7 @@
 import Cocoa
 import KMComponentLibrary
 
-class KMMeasureController: NSViewController {
+class KMMeasureController: KMNBaseViewController {
     
     @IBOutlet var typeSegmented: ComponentSegmented!
     
@@ -97,6 +97,18 @@ class KMMeasureController: NSViewController {
         reloadData()
     }
     
+    override func updateUILanguage() {
+        super.updateUILanguage()
+        
+        setupProperty()
+    }
+    
+    override func updateUIThemeColor() {
+        super.updateUIThemeColor()
+        
+        setupProperty()
+    }
+    
     func setupProperty() {
         if true {
             var itemArr: [ComponentSegmentedProperty] = []

PDF Office/PDF Master/KMClass/KMPDFViewController/RightSideController/Views/Note/KMNoteController.swift

@@ -8,7 +8,7 @@
 import Cocoa
 import KMComponentLibrary
 
-class KMNoteController: NSViewController {
+class KMNoteController: KMNBaseViewController {
     @IBOutlet var colorBGView: NSView!
     @IBOutlet var colorLabel: NSTextField!
     @IBOutlet var colorGroup: ComponentCColorGroup!
@@ -33,6 +33,18 @@ class KMNoteController: NSViewController {
         setupProperty()
     }
     
+    override func updateUILanguage() {
+        super.updateUILanguage()
+        setupProperty()
+        
+    }
+    
+    override func updateUIThemeColor() {
+        super.updateUIThemeColor()
+        setupProperty()
+        
+    }
+    
     func setupProperty() {
         
         colorLabel.stringValue = KMLocalizedString("Color")

PDF Office/PDF Master/KMClass/KMPDFViewController/RightSideController/Views/Pen/KMPenController.swift

@@ -8,7 +8,7 @@
 import Cocoa
 import KMComponentLibrary
 
-class KMPenController: NSViewController {
+class KMPenController: KMNBaseViewController {
     //Color
     @IBOutlet var colorBGView: NSView!
     @IBOutlet var colorLabel: NSTextField!
@@ -52,6 +52,18 @@ class KMPenController: NSViewController {
         setupProperty()
     }
     
+    override func updateUILanguage() {
+        super.updateUILanguage()
+        
+        setupProperty()
+    }
+    
+    override func updateUIThemeColor() {
+        super.updateUIThemeColor()
+        
+        setupProperty()
+    }
+    
     func setupProperty() {
         
         //Color

PDF Office/PDF Master/KMClass/KMPDFViewController/RightSideController/Views/Rectangle/KMRectangleController.swift

@@ -8,7 +8,7 @@
 import Cocoa
 import KMComponentLibrary
 
-class KMRectangleController: NSViewController {
+class KMRectangleController: KMNBaseViewController {
     
     //Color
     @IBOutlet var colorBGView: NSView!
@@ -81,6 +81,18 @@ class KMRectangleController: NSViewController {
         setupProperty()
     }
     
+    override func updateUILanguage() {
+        super.updateUILanguage()
+        
+        setupProperty()
+    }
+    
+    override func updateUIThemeColor() {
+        super.updateUIThemeColor()
+        
+        setupProperty()
+    }
+    
     func setupProperty() {
         
         //Color

PDF Office/PDF Master/KMClass/KMPDFViewController/RightSideController/Views/Signature/KMSignatureController.swift

@@ -8,7 +8,7 @@
 import Cocoa
 import KMComponentLibrary
 
-class KMSignatureController: NSViewController {
+class KMSignatureController: KMNBaseViewController {
     @IBOutlet var rotateBGView: NSView!
     @IBOutlet var rotateLabel: NSTextField!
     @IBOutlet var rotateRightButton: ComponentButton!
@@ -31,6 +31,18 @@ class KMSignatureController: NSViewController {
         setupProperty()
     }
     
+    override func updateUILanguage() {
+        super.updateUILanguage()
+        
+        setupProperty()
+    }
+    
+    override func updateUIThemeColor() {
+        super.updateUIThemeColor()
+        
+        setupProperty()
+    }
+    
     func setupProperty() {
         
         rotateLabel.stringValue = KMLocalizedString("Rotate")

PDF Office/PDF Master/KMClass/KMPDFViewController/RightSideController/Views/Signature/KMSignatureListController.swift

@@ -8,11 +8,11 @@
 import Cocoa
 import KMComponentLibrary
 
-class KMSignatureListController: NSViewController {
+class KMSignatureListController: KMNBaseViewController {
     
     @IBOutlet var scrollView: NSScrollView!
     @IBOutlet var collectionView: NSCollectionView!
-   
+    
     @IBOutlet var emptyView: ComponentEmpty!
     private var createSignWC: KMCreateSignWindowController = KMCreateSignWindowController(windowNibName: "KMCreateSignWindowController")
     
@@ -25,8 +25,6 @@ class KMSignatureListController: NSViewController {
         super.viewDidLoad()
         // Do view setup here.
         
-        reloadUI()
-        
         collectionView.backgroundColors = [NSColor.clear]
         collectionView.wantsLayer = true
         collectionView.layer?.backgroundColor = NSColor.clear.cgColor
@@ -43,17 +41,31 @@ class KMSignatureListController: NSViewController {
         
         reloadData()
     }
-     
-    func setupProperty() { 
-       emptyView.properties = ComponentEmptyProperty(emptyType: .noSign,
-                                                     text: KMLocalizedString("No Signature"),
-                                                     subText: KMLocalizedString("Here is the description."))
+    
+    override func updateUILanguage() {
+        super.updateUILanguage()
+        
+        setupProperty()
+    }
+    
+    override func updateUIThemeColor() {
+        super.updateUIThemeColor()
+        
+        setupProperty()
+    }
+    
+    func setupProperty() {
+        emptyView.properties = ComponentEmptyProperty(emptyType: .noSign,
+                                                      text: KMLocalizedString("No Signature"),
+                                                      subText: KMLocalizedString("Here is the description."))
+        
+        reloadUI()
     }
     
     func reloadUI() {
         self.view.wantsLayer = true
         self.view.layer?.backgroundColor = ComponentLibrary.shared.getComponentColorFromKey("colorBg/layout-middle").cgColor
-      
+        
     }
     
     //MARK: - reloadData
@@ -93,8 +105,8 @@ class KMSignatureListController: NSViewController {
         }
     }
     
-    //MARK: - Action 
-     
+    //MARK: - Action
+    
     func createCustomStamp() {
         createSignWC.own_beginSheetModal(for: view.window) { string in
             
@@ -103,12 +115,12 @@ class KMSignatureListController: NSViewController {
     
     
 }
- 
- 
+
+
 //MARK: - NSCollectionViewDelegate, NSCollectionViewDataSource
 extension KMSignatureListController: NSCollectionViewDelegate, NSCollectionViewDataSource, NSCollectionViewDelegateFlowLayout {
     public func collectionView(_ collectionView: NSCollectionView, numberOfItemsInSection section: Int) -> Int {
-         return allObjects.count
+        return allObjects.count
     }
     
     public func collectionView(_ collectionView: NSCollectionView, itemForRepresentedObjectAt indexPath: IndexPath) -> NSCollectionViewItem {

PDF Office/PDF Master/KMClass/KMPDFViewController/RightSideController/Views/StampList/KMStampController.swift

@@ -15,7 +15,7 @@ import KMComponentLibrary
     @objc func kmStampControllerRotateRight(_ annotations: [CPDFStampAnnotation], withPDFView pdfView: CPDFListView?)
 }
 
-class KMStampController: NSViewController {
+class KMStampController: KMNBaseViewController {
     
     @IBOutlet var rotateBGView: NSView!
     @IBOutlet var rotateLabel: NSTextField!
@@ -40,6 +40,18 @@ class KMStampController: NSViewController {
         setupProperty()
     }
     
+    override func updateUILanguage() {
+        super.updateUILanguage()
+        
+        setupProperty()
+    }
+    
+    override func updateUIThemeColor() {
+        super.updateUIThemeColor()
+        
+        setupProperty()
+    }
+    
     func setupProperty() {
         
         rotateLabel.stringValue = KMLocalizedString("Rotate")

PDF Office/PDF Master/KMClass/KMPDFViewController/RightSideController/Views/StampList/KMStampListController.swift

@@ -15,7 +15,7 @@ import KMComponentLibrary
 }
 
 
-class KMStampListController: NSViewController {
+class KMStampListController: KMNBaseViewController {
     
     @IBOutlet var typeTabs: ComponentTabs!
     @IBOutlet var scrollView: NSScrollView!
@@ -60,9 +60,7 @@ class KMStampListController: NSViewController {
                 }
             }
         }
-        
-        reloadUI()
-        
+         
         collectionView.backgroundColors = [NSColor.clear]
         collectionView.wantsLayer = true
         collectionView.layer?.backgroundColor = NSColor.clear.cgColor
@@ -78,7 +76,19 @@ class KMStampListController: NSViewController {
         reloadData()
     }
     
+    override func updateUILanguage() {
+        super.updateUILanguage()
+        
+        setupProperty()
+    }
     
+    override func updateUIThemeColor() {
+        super.updateUIThemeColor()
+        
+        setupProperty()
+    }
+    
+    //MARK: - UI
     func setupProperty() {
         typeTabs.updateItemProperty([standardTabProperty, dynamicTabProperty, customTabProperty])
         typeTabs.delegate = self
@@ -86,6 +96,8 @@ class KMStampListController: NSViewController {
         emptyView.properties = ComponentEmptyProperty(emptyType: .noStamp,
                                                       text: KMLocalizedString("No Custom Stamps"),
                                                       subText: KMLocalizedString("Here is the description."))
+        
+        reloadUI()
     }
     
     func reloadUI() {

PDF Office/PDF Master/KMClass/KMPDFViewController/RightSideController/Views/TextBox/KMTextBoxController.swift

@@ -8,7 +8,7 @@
 import Cocoa
 import KMComponentLibrary
 
-class KMTextBoxController: NSViewController {
+class KMTextBoxController: KMNBaseViewController {
     
     //Font
     @IBOutlet var fontBGView: NSView!
@@ -65,6 +65,17 @@ class KMTextBoxController: NSViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
         // Do view setup here.
+         
+    }
+    
+    override func updateUILanguage() {
+        super.updateUILanguage()
+        
+        setupProperty()
+    }
+    
+    override func updateUIThemeColor() {
+        super.updateUIThemeColor()
         
         setupProperty()
     }

PDF Office/PDF Master/KMClass/KMPDFViewController/Toolbar/KMPDFSecToolbarController.swift

@@ -26,6 +26,7 @@ import KMComponentLibrary
 class KMPDFSecToolbarController: KMNBaseViewController {
     
     @IBOutlet var contendBox: NSBox!
+    @IBOutlet var sepDivider: ComponentDivider!
     
     @IBOutlet var infoContendView: NSView!
     
@@ -119,6 +120,7 @@ class KMPDFSecToolbarController: KMNBaseViewController {
         moreToolsView.properties = ComponentDropdownToolProperty(state: .normal, leftIcon: NSImage(named: "toolbar_doubleArrow_right"))
         moreToolsView.delegate = self
         
+        sepDivider.properties = sepDivider.properties
     }
     
     @objc func setUpHidePropertys() {

PDF Office/PDF Master/KMClass/KMPDFViewController/Toolbar/KMPDFSecToolbarController.xib

@@ -16,6 +16,7 @@
                 <outlet property="moreToolsView" destination="zRe-Wx-6kc" id="g1s-gB-axF"/>
                 <outlet property="rightContendView" destination="PUC-EB-gWY" id="jfI-08-Gj8"/>
                 <outlet property="rightContendViewWidthConst" destination="sev-BN-gT8" id="Bk4-l1-pu4"/>
+                <outlet property="sepDivider" destination="MdP-Di-AAN" id="Kpy-tI-QXk"/>
                 <outlet property="view" destination="Hz6-mo-xeY" id="0bl-1N-x8E"/>
             </connections>
         </customObject>

PDF Office/PDF Master/KMClass/Settings/SettingsManager.swift

@@ -366,13 +366,6 @@ var autoScrollJumpSpaceKey  = "autoScrollJumpSpaceKey"
     }
     
     @objc private func _themeChanged(_ sender: Notification) {
-//        let isDarkModel = KMAdvertisementConfig.isDarkModel()
-//        if isDarkModel {
-//            NSApp.appearance = NSAppearance(named: .darkAqua)
-//        } else {
-//            NSApp.appearance = NSAppearance(named: .aqua)
-//        }
-//        
         NotificationCenter.default.post(name: APPAppearanceChangedNotificationName, object: nil)
     }
 }

PDF Office/PDF Master/KMClass/Tools/CustomViews/KMPageRangeSelectView/KMPageRangeSelectView.swift

@@ -76,6 +76,11 @@ class KMPageRangeSelectView: NSView {
         
     }
     
+    func refreshUI() {
+        pageSelectView.properties = pageSelectView.properties
+        
+    }
+    
     func reloadData(items:[String]) {
         var menuItemString:[String] = [KMLocalizedString("Current Page"),
                                        KMLocalizedString("All Pages"),