【2025】【综合】

1、工具栏优化
2、注释弹窗操作优化

PDF Office/PDF Master/KMClass/KMHomeViewController/Views/KMHomeRightView/HistoryFilesItems/KMHistoryFileListItem.xib

@@ -60,7 +60,7 @@
                                 </textFieldCell>
                             </textField>
                             <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="zKu-lm-fyn">
-                                <rect key="frame" x="70" y="24" width="249" height="16"/>
+                                <rect key="frame" x="70" y="24" width="281" height="16"/>
                                 <constraints>
                                     <constraint firstAttribute="height" relation="lessThanOrEqual" constant="40" id="2fQ-an-Qkg"/>
                                     <constraint firstAttribute="width" relation="lessThanOrEqual" constant="536" id="dDV-7O-phh"/>
@@ -81,9 +81,9 @@
                         </subviews>
                         <constraints>
                             <constraint firstItem="jHX-dD-CQO" firstAttribute="centerY" secondItem="0Ch-gP-aK4" secondAttribute="centerY" id="5t0-42-DSl"/>
+                            <constraint firstAttribute="trailing" secondItem="zKu-lm-fyn" secondAttribute="trailing" constant="320" id="CKn-Ec-LRp"/>
                             <constraint firstAttribute="trailing" secondItem="u8Q-G3-15h" secondAttribute="trailing" constant="12" id="CXR-CG-sDa"/>
                             <constraint firstItem="NTN-kq-Yvv" firstAttribute="centerY" secondItem="0Ch-gP-aK4" secondAttribute="centerY" id="Gfc-wI-t9o"/>
-                            <constraint firstItem="qDy-wE-i8c" firstAttribute="leading" secondItem="zKu-lm-fyn" secondAttribute="trailing" constant="44" id="Hq1-q0-4me"/>
                             <constraint firstItem="jHX-dD-CQO" firstAttribute="leading" secondItem="0Ch-gP-aK4" secondAttribute="leading" constant="12" id="Kr2-gm-jme"/>
                             <constraint firstItem="NTN-kq-Yvv" firstAttribute="leading" secondItem="qDy-wE-i8c" secondAttribute="trailing" constant="12" id="Qla-1G-pIj"/>
                             <constraint firstItem="zKu-lm-fyn" firstAttribute="centerY" secondItem="0Ch-gP-aK4" secondAttribute="centerY" id="hl6-yv-V1X"/>

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

@@ -1910,10 +1910,10 @@ struct KMNMWCFlags {
             }
             
             popWindow.paneCallback = {[weak self] isOpen in
-                if isOpen == true && self?.viewManager.showRightSide == false {
-                    self?.viewManager.showRightSide = false
-                } else {
+                if isOpen == true {
                     self?.viewManager.showRightSide = true
+                } else {
+                    self?.viewManager.showRightSide = false
                 }
                 self?.refreshToolbarRightViewInfo()
             }

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

@@ -488,11 +488,6 @@ class KMPDFSecToolbarController: NSViewController {
 //MARK: - ComponentDropdownToolDelegate
 extension KMPDFSecToolbarController: ComponentDropdownToolDelegate {
     func componentDropdownToolDidShowPopupView(_ view: ComponentDropdownTool) {
-        if viewManager?.subToolMode != .None {
-            viewManager?.subToolMode = .None
-        }
-        refreshToolbarModeInfo()
-        
         delegate?.kmPDFSecToolbarControllerDidItemClicked?(self, view.properties)
     }
     

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

@@ -1081,6 +1081,9 @@ extension KMPDFToolbarController: ComponentTabsDelegate {
                 _manager.toolMode = .Form
             }
             _manager.subToolMode = .None
+            
+            pdfViewActiveAnnotationsChanged()
+            
         } else if property == toolbarManager.fillMode_Property {
             if _manager.toolMode == .Fill {
                 _manager.toolMode = .None
@@ -1141,7 +1144,15 @@ extension KMPDFToolbarController: KMPDFSecToolbarControllerDelegate {
             delegate?.kmPDFToolbarControllerDidToolbarItemClicked?(self, value.identifier)
             reloadData()
         } else if let value = property as? ComponentDropdownToolProperty {
-//            delegate?.kmPDFToolbarControllerDidToolbarItemClicked?(self, value.identifier)
+            if value.identifier == KMPDFToolbar_edit_Watermark_Identifier ||
+                value.identifier == KMPDFToolbar_edit_BG_Identifier ||
+                value.identifier == KMPDFToolbar_edit_HF_Identifier ||
+                value.identifier == KMPDFToolbar_edit_Bates_Identifier {
+                if viewManager?.subToolMode != .None {
+                    viewManager?.subToolMode = .None
+                }
+                delegate?.kmPDFToolbarControllerDidToolbarItemClicked?(self, value.identifier)
+            }
         }
     }
     

PDF Office/PDF Master/KMClass/KMPDFViewController/Toolbar/Model/KMPDFToolbarConfig.swift

@@ -112,21 +112,25 @@ let KMPDFToolbar_edit_image_Identifier                  = "KMPDFToolbar_edit_ima
 let KMPDFToolbar_edit_link_Identifier                   = "KMPDFToolbar_edit_link_Identifier"
 let KMPDFToolbar_edit_crop_Identifier                   = "KMPDFToolbar_edit_crop_Identifier"
 
-let KMPDFToolbar_edit_addWatermark_Identifier                   = "KMPDFToolbar_edit_addWatermark_Identifier"
-let KMPDFToolbar_edit_removeWatermark_Identifier                = "KMPDFToolbar_edit_removeWatermark_Identifier"
-let KMPDFToolbar_edit_batch_AddWatermark_Identifier             = "KMPDFToolbar_edit_batch_AddWatermark_Identifier"
-let KMPDFToolbar_edit_batchRemoveWatermark_Identifier           = "KMPDFToolbar_edit_batchRemoveWatermark_Identifier"
+let KMPDFToolbar_edit_Watermark_Identifier                   = "KMPDFToolbar_edit_Watermark_Identifier"
+let KMPDFToolbar_edit_addWatermark_Identifier                = "KMPDFToolbar_edit_addWatermark_Identifier"
+let KMPDFToolbar_edit_removeWatermark_Identifier             = "KMPDFToolbar_edit_removeWatermark_Identifier"
+let KMPDFToolbar_edit_batch_AddWatermark_Identifier          = "KMPDFToolbar_edit_batch_AddWatermark_Identifier"
+let KMPDFToolbar_edit_batchRemoveWatermark_Identifier        = "KMPDFToolbar_edit_batchRemoveWatermark_Identifier"
 
+let KMPDFToolbar_edit_BG_Identifier                      = "KMPDFToolbar_edit_BG_Identifier"
 let KMPDFToolbar_edit_addBG_Identifier                   = "KMPDFToolbar_edit_addBG_Identifier"
 let KMPDFToolbar_edit_removeBG_Identifier                = "KMPDFToolbar_edit_removeBG_Identifier"
 let KMPDFToolbar_edit_batch_AddBG_Identifier             = "KMPDFToolbar_edit_batch_AddBG_Identifier"
 let KMPDFToolbar_edit_batchRemoveBG_Identifier           = "KMPDFToolbar_edit_batchRemoveBG_Identifier"
 
+let KMPDFToolbar_edit_HF_Identifier                      = "KMPDFToolbar_edit_HF_Identifier"
 let KMPDFToolbar_edit_addHF_Identifier                   = "KMPDFToolbar_edit_addHF_Identifier"
 let KMPDFToolbar_edit_removeHF_Identifier                = "KMPDFToolbar_edit_removeHF_Identifier"
 let KMPDFToolbar_edit_batch_AddHF_Identifier             = "KMPDFToolbar_edit_batch_AddHF_Identifier"
 let KMPDFToolbar_edit_batchRemoveHF_Identifier           = "KMPDFToolbar_edit_batchRemoveHF_Identifier"
- 
+
+let KMPDFToolbar_edit_Bates_Identifier                      = "KMPDFToolbar_edit_Bates_Identifier"
 let KMPDFToolbar_edit_addBates_Identifier                   = "KMPDFToolbar_edit_addBates_Identifier"
 let KMPDFToolbar_edit_removeBates_Identifier                = "KMPDFToolbar_edit_removeBates_Identifier"
 let KMPDFToolbar_edit_batch_AddBates_Identifier             = "KMPDFToolbar_edit_batch_AddBates_Identifier"

PDF Office/PDF Master/KMClass/KMPDFViewController/Toolbar/Model/KMPDFToolbarManager.swift

@@ -117,25 +117,25 @@ class KMPDFToolbarManager: NSObject {
     
     let edit_crop_Property = ComponentButtonProperty(type: .text_gray_opacity, size: .xs, showLeftIcon: true, buttonText: KMLocalizedString("Crop"), icon: NSImage(named: "edit_crop"), identifier: KMPDFToolbar_edit_crop_Identifier)
     
-    let edit_watermark_Property = ComponentDropdownToolProperty(state: .normal, text: KMLocalizedString("Watermark"), leftIcon: NSImage(named: "edit_watermark"), showDropdown: true, arrowIcon: NSImage(named: "toolbar_arrowDown_fill"))
+    let edit_watermark_Property = ComponentDropdownToolProperty(state: .normal, text: KMLocalizedString("Watermark"), leftIcon: NSImage(named: "edit_watermark"), showDropdown: true, arrowIcon: NSImage(named: "toolbar_arrowDown_fill"), identifier: "")
     var edit_watermark_add_Property: ComponentMenuitemProperty = ComponentMenuitemProperty(text: KMLocalizedString("Add Watermark"), identifier: KMPDFToolbar_edit_addWatermark_Identifier)
     var edit_watermark_remove_Property: ComponentMenuitemProperty = ComponentMenuitemProperty(text: KMLocalizedString("Remove Watermark"), identifier: KMPDFToolbar_edit_removeWatermark_Identifier)
     var edit_watermark_batchAdd_Property: ComponentMenuitemProperty = ComponentMenuitemProperty(text: KMLocalizedString("Batch Add Watermarks"), identifier: KMPDFToolbar_edit_batch_AddWatermark_Identifier)
     var edit_watermark_batchRemove_Property: ComponentMenuitemProperty = ComponentMenuitemProperty(text: KMLocalizedString("Batch Remove Watermarks"), identifier: KMPDFToolbar_edit_batchRemoveWatermark_Identifier)
     
-    let edit_background_Property = ComponentDropdownToolProperty(state: .normal, text: KMLocalizedString("Background"), leftIcon: NSImage(named: "edit_background"), showDropdown: true, arrowIcon: NSImage(named: "toolbar_arrowDown_fill"))
+    let edit_background_Property = ComponentDropdownToolProperty(state: .normal, text: KMLocalizedString("Background"), leftIcon: NSImage(named: "edit_background"), showDropdown: true, arrowIcon: NSImage(named: "toolbar_arrowDown_fill"), identifier: "")
     var edit_bg_add_Property: ComponentMenuitemProperty = ComponentMenuitemProperty(text: KMLocalizedString("Add Background"), identifier: KMPDFToolbar_edit_addBG_Identifier)
     var edit_bg_remove_Property: ComponentMenuitemProperty = ComponentMenuitemProperty(text: KMLocalizedString("Remove Background"), identifier: KMPDFToolbar_edit_removeBG_Identifier)
     var edit_bg_batchAdd_Property: ComponentMenuitemProperty = ComponentMenuitemProperty(text: KMLocalizedString("Batch Add Background"), identifier: KMPDFToolbar_edit_batch_AddBG_Identifier)
     var edit_bg_batchRemove_Property: ComponentMenuitemProperty = ComponentMenuitemProperty(text: KMLocalizedString("Batch Remove Background"), identifier: KMPDFToolbar_edit_batchRemoveBG_Identifier)
     
-    let edit_headerfooter_Property = ComponentDropdownToolProperty(state: .normal, text: KMLocalizedString("Header & Footer"), leftIcon: NSImage(named: "edit_headerfooter"), showDropdown: true, arrowIcon: NSImage(named: "toolbar_arrowDown_fill"))
+    let edit_headerfooter_Property = ComponentDropdownToolProperty(state: .normal, text: KMLocalizedString("Header & Footer"), leftIcon: NSImage(named: "edit_headerfooter"), showDropdown: true, arrowIcon: NSImage(named: "toolbar_arrowDown_fill"), identifier: "")
     var edit_hf_add_Property: ComponentMenuitemProperty = ComponentMenuitemProperty(text: KMLocalizedString("Add Header & Footer"), identifier: KMPDFToolbar_edit_addHF_Identifier)
     var edit_hf_remove_Property: ComponentMenuitemProperty = ComponentMenuitemProperty(text: KMLocalizedString("Remove Header & Footer"), identifier: KMPDFToolbar_edit_removeHF_Identifier)
     var edit_hf_batchAdd_Property: ComponentMenuitemProperty = ComponentMenuitemProperty(text: KMLocalizedString("Batch Add Header & Footer"), identifier: KMPDFToolbar_edit_batch_AddHF_Identifier)
     var edit_hf_batchRemove_Property: ComponentMenuitemProperty = ComponentMenuitemProperty(text: KMLocalizedString("Batch Remove Header & Footer"), identifier: KMPDFToolbar_edit_batchRemoveHF_Identifier)
     
-    let edit_bates_Property = ComponentDropdownToolProperty(state: .normal, text: KMLocalizedString("Bates Numbers"), leftIcon: NSImage(named: "edit_bates"), showDropdown: true, arrowIcon: NSImage(named: "toolbar_arrowDown_fill"))
+    let edit_bates_Property = ComponentDropdownToolProperty(state: .normal, text: KMLocalizedString("Bates Numbers"), leftIcon: NSImage(named: "edit_bates"), showDropdown: true, arrowIcon: NSImage(named: "toolbar_arrowDown_fill"), identifier: "")
     var edit_bates_add_Property: ComponentMenuitemProperty = ComponentMenuitemProperty(text: KMLocalizedString("Add Bates Numbers"), identifier: KMPDFToolbar_edit_addBates_Identifier)
     var edit_bates_remove_Property: ComponentMenuitemProperty = ComponentMenuitemProperty(text: KMLocalizedString("Remove Bates Numbers"), identifier: KMPDFToolbar_edit_removeBates_Identifier)
     var edit_bates_batchAdd_Property: ComponentMenuitemProperty = ComponentMenuitemProperty(text: KMLocalizedString("Batch Add Bates Numbers"), identifier: KMPDFToolbar_edit_batch_AddBates_Identifier)
@@ -345,16 +345,16 @@ class KMPDFToolbarManager: NSObject {
                                     stampProperty.identifier, signProperty.identifier,
                                     eyeProperty.identifier])
         } else if mainIdentify == KMPDFToolbar_Edit_Identifier {
-            ids.append(contentsOf: [edit_watermark_add_Property.identifier, edit_watermark_remove_Property.identifier,
+            ids.append(contentsOf: [KMPDFToolbar_edit_Watermark_Identifier, edit_watermark_add_Property.identifier, edit_watermark_remove_Property.identifier,
                                     edit_watermark_batchAdd_Property.identifier, edit_watermark_batchRemove_Property.identifier])
             
-            ids.append(contentsOf: [edit_bg_add_Property.identifier, edit_bg_remove_Property.identifier,
+            ids.append(contentsOf: [KMPDFToolbar_edit_BG_Identifier, edit_bg_add_Property.identifier, edit_bg_remove_Property.identifier,
                                     edit_bg_batchAdd_Property.identifier, edit_bg_batchRemove_Property.identifier])
             
-            ids.append(contentsOf: [edit_hf_add_Property.identifier, edit_hf_remove_Property.identifier,
+            ids.append(contentsOf: [KMPDFToolbar_edit_HF_Identifier, edit_hf_add_Property.identifier, edit_hf_remove_Property.identifier,
                                     edit_hf_batchAdd_Property.identifier, edit_hf_batchRemove_Property.identifier])
             
-            ids.append(contentsOf: [edit_bates_add_Property.identifier, edit_bates_remove_Property.identifier,
+            ids.append(contentsOf: [KMPDFToolbar_edit_Bates_Identifier, edit_bates_add_Property.identifier, edit_bates_remove_Property.identifier,
                                     edit_bates_batchAdd_Property.identifier, edit_bates_batchRemove_Property.identifier])
             
             ids.append(contentsOf: [edit_text_Property.identifier, edit_image_Property.identifier,