【2025】【综合】细节修正

PDF Office/PDF Master/KMClass/KMPDFViewController/EditTool/Background/Views/KMBGTemplateItem.swift

@@ -32,7 +32,7 @@ class KMBGTemplateItem: NSCollectionViewItem {
     
     weak open var delegate: KMBGTemplateItemDelegate?
 
-    var watermarkProperty: ComponentCardWMProperty = ComponentCardWMProperty(state: .normal, icon: nil, bgIcon: NSImage(named: "waterBG"), text: "Sample Text", editIcon: NSImage(named: "watermark_edit"), deleteIcon: NSImage(named: "pageEdit_delete"))
+    var watermarkProperty: ComponentCardWMProperty = ComponentCardWMProperty(state: .normal, icon: nil, bgIcon: NSImage(named: "backgroundBG"), text: "Sample Text", editIcon: NSImage(named: "watermark_edit"), deleteIcon: NSImage(named: "pageEdit_delete"))
     
     override func viewDidLoad() {
         super.viewDidLoad()
@@ -56,7 +56,8 @@ class KMBGTemplateItem: NSCollectionViewItem {
     }
     
     func reloadData() {
-        watermarkItem.properties.icon = backgroundModel?.modelPreviewImage()
+        watermarkItem.properties.icon = NSImage(named: "backgroundBG")
+        watermarkItem.properties.bgIcon = backgroundModel?.modelPreviewImage()
         watermarkItem.properties.state = isSelected ? .pressed : .normal
         watermarkItem.properties.text = backgroundModel?.name
         watermarkItem.reloadData()

PDF Office/PDF Master/KMClass/KMPDFViewController/KMPDFMenuConfig.swift

@@ -878,7 +878,7 @@ let PDFViewMenuIdentifier_Edit_Reset = "PDFViewMenuIdentifier_Edit_Reset"
     
     class func editContentProperty(theEvent:NSEvent?,listView:CPDFListView?)->ComponentMenuitemProperty {
         let propertie_Menuitem: ComponentMenuitemProperty = ComponentMenuitemProperty(keyEquivalent: nil,
-                                                                                       text: KMLocalizedString("Add Note"),
+                                                                                       text: KMLocalizedString("Edit Note"),
                                                                                        identifier: PDFViewMenuIdentifier_Normal_Content,representedObject: theEvent)
         return propertie_Menuitem
     }

PDF Office/PDF Master/KMClass/KMPDFViewController/PDFImages.xcassets/PDF_Edit/backgroundBG.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "image.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

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

@@ -784,6 +784,9 @@ class KMPDFToolbarController: KMNBaseViewController {
             return
         }
         if sender.properties == toolbarManager.viewProperty {
+            if viewManager.subToolMode == .Redact {
+                return
+            }
             //MARK: -View
             viewManager.showDisplayView = !viewManager.showDisplayView
             
@@ -792,7 +795,9 @@ class KMPDFToolbarController: KMNBaseViewController {
             
         } else if sender.properties == toolbarManager.pageProperty {
             //MARK: -页面编辑
-             
+            if viewManager.subToolMode == .Redact {
+                return
+            }
             if delegate?.kmPDFToolbarControllerDidToolbarItemClickedEnable?(self, sender.properties.identifier) == false {
                 viewManager.isPageEditMode = false
                 sender.properties.state = viewManager.isPageEditMode ? .pressed : .normal
@@ -814,6 +819,9 @@ class KMPDFToolbarController: KMNBaseViewController {
             }
         } else if sender.properties == toolbarManager.rightViewProperty {
             //MARK: -属性栏
+            if viewManager.subToolMode == .Redact {
+                return
+            }
             viewManager.showRightSide = !viewManager.showRightSide
             
         }