【2025】【综合】自测完善

PDF Office/PDF Master/Class/PDFTools/AddPassword/View/KMSecurityView.swift

@@ -49,6 +49,13 @@ class KMSecurityView: BaseXibView {
         self.securityContentView.textDidChangedAction = { [unowned self] view in
             self.updateEncryptButtonEnabledState()
         }
+        batchButton.setTarget(self, action: #selector(batchButtonAction(_:)))
+
+        cancelButton.keyEquivalent = KMKeyEquivalent.esc.string()
+        cancelButton.setTarget(self, action: #selector(cancelButtonAction(_:)))
+
+        doneButton.setTarget(self, action: #selector(doneButtonAction(_:)))
+        doneButton.keyEquivalent = KMKeyEquivalent.enter
         
         updateUILanguage()
     }
@@ -61,7 +68,6 @@ class KMSecurityView: BaseXibView {
                                                          state: .normal,
                                                          onlyIcon: false,
                                                          buttonText: KMLocalizedString("Batch"))
-        batchButton.setTarget(self, action: #selector(batchButtonAction(_:)))
         batchWidthConst.constant = batchButton.properties.propertyInfo.viewWidth
         
         cancelButton.properties = ComponentButtonProperty(type: .default_tertiary,
@@ -69,7 +75,6 @@ class KMSecurityView: BaseXibView {
                                                           state: .normal,
                                                           onlyIcon: false,
                                                           buttonText: KMLocalizedString("Cancel"))
-        cancelButton.setTarget(self, action: #selector(cancelButtonAction(_:)))
         cancelWidthConst.constant = cancelButton.properties.propertyInfo.viewWidth
         
         doneButton.properties = ComponentButtonProperty(type: .primary,
@@ -78,7 +83,6 @@ class KMSecurityView: BaseXibView {
                                                         onlyIcon: false,
                                                         buttonText: KMLocalizedString("Encrypt"),
                                                         keepPressState: false)
-        doneButton.setTarget(self, action: #selector(doneButtonAction(_:)))
         doneWidthConst.constant = doneButton.properties.propertyInfo.viewWidth
         
     }

PDF Office/PDF Master/Class/PDFTools/AddPassword/View/KMSecurityView.xib

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="23504" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22505" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="23504"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22505"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>

PDF Office/PDF Master/Class/PDFTools/Redact/Window/KMRedactPropertiesWindowController.swift

@@ -113,12 +113,14 @@ class KMRedactPropertiesWindowController: KMNBaseWindowController {
                                                       state: .normal,
                                                       buttonText: KMLocalizedString("OK"))
         okButton.setTarget(self, action: #selector(okButtonClicked(_ :)))
+        okButton.keyEquivalent = KMKeyEquivalent.enter
         
         cancelButton.properties = ComponentButtonProperty(type: .default_tertiary,
                                                           size: .s,
                                                           state: .normal,
                                                           buttonText: KMLocalizedString("Cancel"))
         cancelButton.setTarget(self, action: #selector(cancelButtonClicked(_ :)))
+        cancelButton.keyEquivalent = KMKeyEquivalent.esc.string()
         
         makePropertiesButton.properties = ComponentButtonProperty(type: .default_tertiary,
                                                                   size: .s,

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

@@ -13,7 +13,7 @@ import KMComponentLibrary
     @objc optional func redactToolbarControllerDidButtonClick(controller: KMRedactToolbarController, buttonIndex: Int)
 }
 
-class KMRedactToolbarController: NSViewController {
+class KMRedactToolbarController: KMNBaseViewController {
 
     @IBOutlet var contendView: NSView!
     @IBOutlet var titleLabel: NSTextField!
@@ -37,11 +37,20 @@ class KMRedactToolbarController: NSViewController {
         
     }
     
+    override func updateUILanguage() {
+        super.updateUILanguage()
+        
+        self.updateUI()
+    }
+    
+    override func updateUIThemeColor() {
+        super.updateUIThemeColor()
+        
+        self.updateUI()
+    }
+    
+    
     func setupProperty() {
-        titleLabel.stringValue = KMLocalizedString("Redact")
-        titleLabel.textColor = ComponentLibrary.shared.getComponentColorFromKey("colorText/1")
-        titleLabel.font = ComponentLibrary.shared.getFontFromKey("mac/body-s-medium")
-         
         redactButton.properties = ComponentButtonProperty(type: .text_gray_opacity,
                                                           size: .xs,
                                                           state: .pressed,
@@ -86,6 +95,22 @@ class KMRedactToolbarController: NSViewController {
         self.contendView.wantsLayer = true
         self.contendView.layer?.backgroundColor = ComponentLibrary.shared.getComponentColorFromKey("colorBg/layout-middle").cgColor
         
+        titleLabel.stringValue = KMLocalizedString("Redact")
+        titleLabel.textColor = ComponentLibrary.shared.getComponentColorFromKey("colorText/1")
+        titleLabel.font = ComponentLibrary.shared.getFontFromKey("mac/body-s-medium")
+        
+        redactButton.properties.buttonText = KMLocalizedString("Redact")
+        redactButton.reloadData()
+        
+        propertyButton.properties.buttonText = KMLocalizedString("Properties")
+        propertyButton.reloadData()
+        
+        applyButton.properties.buttonText = KMLocalizedString("Apply")
+        applyButton.reloadData()
+        
+        exitButton.properties.buttonText = KMLocalizedString("Exit")
+        exitButton.reloadData()
+        
     }
     
     func reloadData() {
@@ -93,8 +118,7 @@ class KMRedactToolbarController: NSViewController {
         propertyButton.reloadData()
         applyButton.reloadData()
         exitButton.reloadData()
-        
-        
+         
     }
     
     @objc func buttonClicked(_ sender: ComponentButton) {