Browse Source

【综合】转档窗口调整

tangchao 1 year ago
parent
commit
ccc0d00b54

+ 1 - 1
PDF Office/PDF Master/Class/PDFTools/Convert/Controller/KMConvertExcelWindowController.swift

@@ -39,7 +39,7 @@ class KMConvertExcelWindowController: KMConvertBaseWindowController {
         
         Task { @MainActor in
             if await (KMLightMemberManager.manager.canPayFunction() == false) {
-                self.setupContentHeight(height: 391+16+20, animated: true)
+                self.setupContentHeight(height: 391+20, animated: true)
                 return
             }
             self.setupContentHeight(height: 391)

+ 4 - 4
PDF Office/PDF Master/Class/PDFTools/Convert/View/KMConvertCSVSettingView.swift

@@ -58,10 +58,10 @@ class KMConvertCSVSettingView: KMConvertSettingView {
             self.pageRangeItemView = KMConvertPageRangeSettingItemView.createFromNib()
             self.pageRangeBox.contentView = self.pageRangeItemView
             
-//            self.tipView?.km_add_left_constraint(constant: 8)
-//            self.tipView?.km_add_top_constraint(equalTo: self.pageRangeBox, attribute: .bottom, constant: -5)
-//            self.tipView?.km_add_right_constraint()
-//            self.tipView?.km_add_height_constraint(constant: 16+20+16)
+            self.tipView?.km_add_left_constraint(constant: 8)
+            self.tipView?.km_add_top_constraint(equalTo: self.pageRangeBox, attribute: .bottom, constant: -5)
+            self.tipView?.km_add_right_constraint()
+            self.tipView?.km_add_height_constraint(constant: 16+20+16)
         }
     }
     

+ 4 - 4
PDF Office/PDF Master/Class/PDFTools/Convert/View/KMConvertExcelSettingView.swift

@@ -104,10 +104,10 @@ class KMConvertExcelSettingView: KMConvertSettingView {
             self.pageRangeItemView = KMConvertPageRangeSettingItemView.createFromNib()
             self.pageRangeBox.contentView = self.pageRangeItemView
             
-//            self.tipView?.km_add_left_constraint(constant: 8)
-//            self.tipView?.km_add_top_constraint(equalTo: self.pageRangeBox, attribute: .bottom, constant: -5)
-//            self.tipView?.km_add_right_constraint()
-//            self.tipView?.km_add_height_constraint(constant: 16+20+16)
+            self.tipView?.km_add_left_constraint(constant: 8)
+            self.tipView?.km_add_top_constraint(equalTo: self.pageRangeBox, attribute: .bottom, constant: -5)
+            self.tipView?.km_add_right_constraint()
+            self.tipView?.km_add_height_constraint(constant: 16+20+16)
         }
     }
         

+ 4 - 4
PDF Office/PDF Master/Class/PDFTools/Convert/View/KMConvertImageSettingView.swift

@@ -64,10 +64,10 @@ class KMConvertImageSettingView: KMConvertSettingView {
             self.pageRangeItemView = KMConvertPageRangeSettingItemView.createFromNib()
             self.pageRangeBox.contentView = self.pageRangeItemView
             
-//            self.tipView?.km_add_left_constraint(constant: 8)
-//            self.tipView?.km_add_top_constraint(equalTo: self.pageRangeBox, attribute: .bottom, constant: -5)
-//            self.tipView?.km_add_right_constraint()
-//            self.tipView?.km_add_height_constraint(constant: 16+20+16)
+            self.tipView?.km_add_left_constraint(constant: 8)
+            self.tipView?.km_add_top_constraint(equalTo: self.pageRangeBox, attribute: .bottom, constant: -5)
+            self.tipView?.km_add_right_constraint()
+            self.tipView?.km_add_height_constraint(constant: 16+20+16)
         }
         self.pageRangeItemView?.pageCount = self.pageCount
     }

+ 4 - 4
PDF Office/PDF Master/Class/PDFTools/Convert/View/KMConvertPPTsSettingView.swift

@@ -22,10 +22,10 @@ class KMConvertPPTsSettingView: KMConvertSettingView {
             self.pageRangeItemView = KMConvertPageRangeSettingItemView.createFromNib()
             self.pageRangeBox.contentView = self.pageRangeItemView
             
-//            self.tipView?.km_add_left_constraint(constant: 8)
-//            self.tipView?.km_add_top_constraint(equalTo: self.pageRangeBox, attribute: .bottom, constant: -5)
-//            self.tipView?.km_add_right_constraint()
-//            self.tipView?.km_add_height_constraint(constant: 16+20+16)
+            self.tipView?.km_add_left_constraint(constant: 8)
+            self.tipView?.km_add_top_constraint(equalTo: self.pageRangeBox, attribute: .bottom, constant: -5)
+            self.tipView?.km_add_right_constraint()
+            self.tipView?.km_add_height_constraint(constant: 16+20+16)
         }
     }
 }

+ 3 - 3
PDF Office/PDF Master/Class/PDFTools/Convert/View/KMConvertSettingView.swift

@@ -114,9 +114,9 @@ class KMConvertSettingView: KMConvertBaseView {
     override func layout() {
         super.layout()
         
-        let width = NSWidth(self.bounds)
-        let height = NSHeight(self.bounds)
-        self.tipView?.frame = NSMakeRect(0, 10, width, 16+20+16)
+//        let width = NSWidth(self.bounds)
+//        let height = NSHeight(self.bounds)
+//        self.tipView?.frame = NSMakeRect(0, 10, width, 16+20+16)
     }
     
     var pageCount = 0 {

+ 4 - 4
PDF Office/PDF Master/Class/PDFTools/Convert/View/KMConvertWordSettingView.swift

@@ -48,11 +48,11 @@ class KMConvertWordSettingView: KMConvertSettingView {
         self.pageLayoutVC?.stringValue = NSLocalizedString("Retain Page Layout", comment: "")
         self.pageLayoutVC?.checkbox_radio()
         
-//        self.tipView?.km_add_left_constraint(constant: 8)
-//        self.tipView?.km_add_top_constraint(equalTo: self.pageRangeBox, attribute: .bottom, constant: 0)
-//        self.tipView?.km_add_right_constraint()
+        self.tipView?.km_add_left_constraint(constant: 8)
+        self.tipView?.km_add_top_constraint(equalTo: self.pageRangeBox, attribute: .bottom, constant: -5)
+        self.tipView?.km_add_right_constraint()
 //        self.tipView?.km_add_width_constraint(constant: 300)
-//        self.tipView?.km_add_height_constraint(constant: 16+20+16)
+        self.tipView?.km_add_height_constraint(constant: 16+20+16)
     }
     
     override func initDefaultVlaue() {