Browse Source

【2025】【综合】

niehaoyu 3 months ago
parent
commit
04f28ccc60

+ 2 - 0
PDF Office/KMComponentLibrary/KMComponentLibrary/View/Controller/ComponentCSelector.swift

@@ -71,6 +71,8 @@ public class ComponentCSelector: ComponentBaseXibView {
         } else {
             iconImgWidthConst.constant = 20
         }
+        iconImage.wantsLayer = true
+        iconImage.layer?.backgroundColor = NSColor.red.cgColor
         
         if properties.text?.isEmpty == false {
             infoLabel.isHidden = false

+ 1 - 1
PDF Office/PDF Master/KMClass/KMHomeViewController/KMURLCreatePDFWindowController/KMURLCreatePDFWindowController.swift

@@ -98,7 +98,7 @@ class KMURLCreatePDFWindowController: NSWindowController {
                                                           state: .normal,
                                                           isError: false,
                                                           isDisabled: false,
-                                                          placeholder: KMLocalizedString("Select File..."),
+                                                          placeholder: KMLocalizedString("Select Files(.html,.webarchive)"),
                                                           creatable: false)
         fileInputView.properties.propertyInfo.cornerRadius_topRight = 0
         fileInputView.properties.propertyInfo.cornerRadius_bottomRight = 0

+ 1 - 2
PDF Office/PDF Master/KMClass/KMPDFViewController/EditTool/Watermark/Views/KMNWatermarkPropertyController.swift

@@ -673,8 +673,7 @@ extension KMNWatermarkPropertyController: ComponentTextareaDelegate {
         watermarkData.text = view.properties.text
         
         delegate?.watermarkPropertyControllerDidUpdate?(self)
-
-        reloadData()
+ 
     }
     
     func componentTextareaTextDidEndEditing(_ view: ComponentTextarea) {

+ 1 - 1
PDF Office/PDF Master/KMClass/KMPDFViewController/RightSideController/KMRightSideController.swift

@@ -451,7 +451,7 @@ class KMRightSideController: NSViewController {
                 signature_Controller?.pdfView = self.pdfView
                 
                 contentViewController = signature_Controller
-            } else if subToolMode == .Sign {
+            } else if subToolMode == .Sign || subToolMode == .fill_sign {
                 if signatureList_Controller == nil {
                     signatureList_Controller = KMSignatureListController.init()
                 }

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

@@ -47,7 +47,7 @@ class KMHighlightController: NSViewController {
     
     func setupProperty() {
         
-        colorLabel.stringValue = KMLocalizedString("Font")
+        colorLabel.stringValue = KMLocalizedString("Color")
         colorLabel.textColor = ComponentLibrary.shared.getComponentColorFromKey("colorText/2")
         colorLabel.font = ComponentLibrary.shared.getFontFromKey("mac/body-s-medium")
         

+ 5 - 0
PDF Office/PDF Master/KMClass/KMPDFViewController/RightSideController/Views/TextBox/KMTextBoxController.swift

@@ -69,6 +69,11 @@ class KMTextBoxController: NSViewController {
     
     func setupProperty() {
         //Font
+        
+        fontLabel.stringValue = KMLocalizedString("Font")
+        fontLabel.textColor = ComponentLibrary.shared.getComponentColorFromKey("colorText/2")
+        fontLabel.font = ComponentLibrary.shared.getFontFromKey("mac/body-s-medium")
+        
         fontNameSelect.properties = ComponentSelectProperties(size: .s,
                                                               state: .normal,
                                                               text: "")

+ 2 - 0
PDF Office/PDF Master/KMClass/KMPDFViewController/Toolbar/Model/KMPDFToolbarConfig.swift

@@ -192,6 +192,8 @@ let KMPDFToolbar_tools_compress_Identifier             = "KMPDFToolbar_tools_com
 let KMPDFToolbar_tools_batch_compress_Identifier       = "KMPDFToolbar_tools_batch_compress_Identifier"
 
 let KMPDFToolbar_tools_compare_Identifier              = "KMPDFToolbar_tools_compare_Identifier"
+let KMPDFToolbar_tools_compare_side_Identifier         = "KMPDFToolbar_tools_compare_side_Identifier"
+let KMPDFToolbar_tools_compare_Overlay_Identifier      = "KMPDFToolbar_tools_compare_Overlay_Identifier"
 let KMPDFToolbar_tools_extractImage_Identifier         = "KMPDFToolbar_tools_extractImage_Identifier"
 let KMPDFToolbar_tools_TTS_Identifier                  = "KMPDFToolbar_tools_TTS_Identifier"
 let KMPDFToolbar_tools_batch_Identifier                = "KMPDFToolbar_tools_batch_Identifier"

+ 6 - 0
PDF Office/PDF Master/KMClass/KMPDFViewController/Toolbar/Model/KMPDFToolbarManager.swift

@@ -208,6 +208,8 @@ class KMPDFToolbarManager: NSObject {
     var tools_compress_batchCompress_Property: ComponentMenuitemProperty = ComponentMenuitemProperty(text: KMLocalizedString("Batch Compress"), identifier: KMPDFToolbar_tools_batch_compress_Identifier)
     
     let tools_compare_Property = ComponentDropdownToolProperty(state: .normal, text: KMLocalizedString("Compare"), leftIcon: NSImage(named: "tools_compare"), showDropdown: true, arrowIcon: NSImage(named: "toolbar_arrowDown_fill"))
+    var tools_compare_Side_Property: ComponentMenuitemProperty = ComponentMenuitemProperty(text: KMLocalizedString("Compare Side-by-Side"), identifier: KMPDFToolbar_tools_compare_side_Identifier)
+    var tools_compare_Overlay_Property: ComponentMenuitemProperty = ComponentMenuitemProperty(text: KMLocalizedString("Compare by Overlay"), identifier: KMPDFToolbar_tools_compare_Overlay_Identifier)
     
     let tools_extractImage_Property = ComponentButtonProperty(type: .text_gray_opacity, size: .xs, showLeftIcon: true, buttonText: KMLocalizedString("Extract Image"), icon: NSImage(named: "tools_extractImg"), identifier: KMPDFToolbar_tools_extractImage_Identifier)
     let tools_TTS_Property = ComponentButtonProperty(type: .text_gray_opacity, size: .xs, showLeftIcon: true, buttonText: KMLocalizedString("TTS"), icon: NSImage(named: "tools_TTS"), identifier: KMPDFToolbar_tools_TTS_Identifier)
@@ -381,6 +383,8 @@ class KMPDFToolbarManager: NSObject {
                                     tools_compress_compress_Property.identifier,
                                     tools_compress_batchCompress_Property.identifier,
                                     tools_compare_Property.identifier,
+                                    tools_compare_Side_Property.identifier,
+                                    tools_compare_Overlay_Property.identifier,
                                     tools_extractImage_Property.identifier,
                                     tools_TTS_Property.identifier,
                                     tools_batch_Property.identifier,
@@ -482,6 +486,8 @@ class KMPDFToolbarManager: NSObject {
         } else if modeType == .Tools {
             tools_compress_Property.menuItemArr = [tools_compress_compress_Property,
                                                    tools_compress_batchCompress_Property]
+            tools_compare_Property.menuItemArr = [tools_compare_Side_Property,
+                                                  tools_compare_Overlay_Property]
             
             return[tools_OCR_Property, tools_merge_Property, tools_compress_Property, tools_compare_Property,
                    tools_extractImage_Property, tools_TTS_Property, tools_batch_Property, tools_AITools_Property]