Bladeren bron

【2025版】【转档】UI处理

tangchao 4 maanden geleden
bovenliggende
commit
7963a14d01
1 gewijzigde bestanden met toevoegingen van 16 en 13 verwijderingen
  1. 16 13
      PDF Office/PDF Master/KMClass/Convert/Base/KMConvertBaseWindowController.swift

+ 16 - 13
PDF Office/PDF Master/KMClass/Convert/Base/KMConvertBaseWindowController.swift

@@ -30,9 +30,9 @@ class KMConvertBaseWindowController: KMNBaseWindowController {
     
     @IBOutlet weak var rightBoxHeightConst: NSLayoutConstraint!
     
-    var canelButtonVC: KMDesignButton?
     private var cancelButton_: ComponentButton?
-    var convertButtonVC: KMDesignButton?
+//    var convertButtonVC: KMDesignButton?
+    private var convertButton_: ComponentButton?
     var backButtonVC: KMDesignButton?
     var nextButtonVC: KMDesignButton?
 
@@ -233,15 +233,16 @@ class KMConvertBaseWindowController: KMNBaseWindowController {
         self.nextButtonVC = KMDesignButton.init(withType: .Image)
         self.nextBox.contentView = self.nextButtonVC!.view
         
-        self.canelButtonVC = KMDesignButton.init(withType: .Text)
         cancelButton_ = ComponentButton()
         cancelButton_?.properties = ComponentButtonProperty(type: .default_tertiary, size: .s, state: .normal, buttonText: KMLocalizedString("Cancel"))
         cancelButton_?.setTarget(self, action: #selector(cancelButtonAction))
         self.canelBox.contentView = self.cancelButton_
         
         
-        self.convertButtonVC = KMDesignButton.init(withType: .Text)
-        self.convertBox.contentView = self.convertButtonVC!.view
+//        self.convertButtonVC = KMDesignButton.init(withType: .Text)
+//        self.convertBox.contentView = self.convertButtonVC!.view
+        convertButton_ = ComponentButton()
+        convertBox.contentView = convertButton_
     }
     
     override func initDefaultValue() {
@@ -277,18 +278,20 @@ class KMConvertBaseWindowController: KMNBaseWindowController {
         self.nextButtonVC?.pagination()
         
         self.canelBox.fillColor = .clear
-//        self.canelButtonVC?.target = self
-//        self.canelButtonVC?.action = #selector(cancelButtonAction)
-//        self.canelButtonVC?.stringValue = NSLocalizedString("Cancel", comment: "")
-//        self.canelButtonVC?.button(type: .Sec, size: .m)
 //        self.canelButtonVC?.button.keyEquivalent = KMKeyEquivalent.esc.string()
         
         self.convertBox.fillColor = .clear
-        self.convertButtonVC?.target = self
-        self.convertButtonVC?.action = #selector(convertButtonAction)
-        self.convertButtonVC?.stringValue = NSLocalizedString("Convert", comment: "")
-        self.convertButtonVC?.button(type: .Cta, size: .m)
+//        self.convertButtonVC?.target = self
+//        self.convertButtonVC?.action = #selector(convertButtonAction)
+//        self.convertButtonVC?.stringValue = NSLocalizedString("Convert", comment: "")
+//        self.convertButtonVC?.button(type: .Cta, size: .m)
 //        convertButtonVC.button.keyEquivalent = KMKeyEquivalent.enter
+        convertButton_?.properties = ComponentButtonProperty(type: .primary,
+                                                          size: .s,
+                                                          state: .normal,
+                                                          isDisable: false,
+                                                          buttonText: KMLocalizedString("Convert"))
+        convertButton_?.setTarget(self, action: #selector(convertButtonAction))
         
         self.rightScrollView.hasVerticalScroller = false
         self.rightScrollView.hasHorizontalScroller = false