Explorar o código

【2025】【综合】动态图章显示优化,多语完善

niehaoyu hai 1 semana
pai
achega
39561b52b9

+ 6 - 0
PDF Office/PDF Master/AppDelegate+MenuAction.swift

@@ -241,6 +241,8 @@ extension AppDelegate {
                     subItem.isHidden = true
                 } else if subItem.action == NSSelectorFromString("menuItemAction_CheckForUpdate:") {
                     subItem.isHidden = true
+                } else if subItem.action == NSSelectorFromString("menuItemAction_Separator:") {
+                    subItem.isHidden = true
                 } else if subItem.action == NSSelectorFromString("menuItemAction_VPP:") {
                     subItem.isHidden = true
                 }
@@ -1320,6 +1322,10 @@ extension AppDelegate {
 #endif
     }
     
+    @IBAction func menuItemAction_Separator(_ sender: NSMenuItem) -> Void {
+        
+    }
+    
     @IBAction func menuItemAction_VPP(_ sender: NSMenuItem) -> Void {
         KMTools.openVPPWebSite()
     }

+ 10 - 2
PDF Office/PDF Master/Base.lproj/Main.storyboard

@@ -1008,14 +1008,22 @@ CQ
                                                 <action selector="menuItemAction_SubscribeUs:" target="Voe-Tx-rLC" id="Nez-yf-vfN"/>
                                             </connections>
                                         </menuItem>
-                                        <menuItem isSeparatorItem="YES" id="C1N-73-Tat"/>
+                                        <menuItem isSeparatorItem="YES" id="C1N-73-Tat">
+                                            <connections>
+                                                <action selector="menuItemAction_Separator:" target="Voe-Tx-rLC" id="hE0-rx-vTK"/>
+                                            </connections>
+                                        </menuItem>
                                         <menuItem title="Check for Updates" id="eMQ-TN-vWH" userLabel="Check for Updates">
                                             <modifierMask key="keyEquivalentModifierMask"/>
                                             <connections>
                                                 <action selector="menuItemAction_CheckForUpdate:" target="Voe-Tx-rLC" id="kIS-4V-x5A"/>
                                             </connections>
                                         </menuItem>
-                                        <menuItem isSeparatorItem="YES" id="S7k-23-3l3"/>
+                                        <menuItem isSeparatorItem="YES" id="S7k-23-3l3">
+                                            <connections>
+                                                <action selector="menuItemAction_Separator:" target="Voe-Tx-rLC" id="WbR-mq-d6e"/>
+                                            </connections>
+                                        </menuItem>
                                         <menuItem title="Volume Discount" id="lZE-0y-nFr" userLabel="VPP">
                                             <modifierMask key="keyEquivalentModifierMask"/>
                                             <connections>

+ 4 - 3
PDF Office/PDF Master/KMClass/KMPDFViewController/RightSideController/Views/StampList/Controllers/KMStampSettingWindowController.swift

@@ -120,7 +120,8 @@ class KMStampSettingWindowController: KMNBaseWindowController {
                                                                                     itemSelected: false,
                                                                                     isDisabled: false,
                                                                                     keyEquivalent: nil,
-                                                                                    text: language)
+                                                                                    text: KMLocalizedString(language))
+            itemProperty.englishTitle = language
             menuItemArr.append(itemProperty)
         }
         dateSelect.updateMenuItemsArr(menuItemArr)
@@ -175,7 +176,7 @@ class KMStampSettingWindowController: KMNBaseWindowController {
         authorInput.properties.text = self.author
         authorInput.reloadData()
         
-        dateSelect.properties.text = self.dateString
+        dateSelect.properties.text = KMLocalizedString(self.dateString)
         dateSelect.reloadData()
         
     }
@@ -211,7 +212,7 @@ class KMStampSettingWindowController: KMNBaseWindowController {
 //MARK: - ComponentSelectDelegate
 extension KMStampSettingWindowController: ComponentSelectDelegate {
     func componentSelectDidSelect(view: ComponentSelect?, menuItemProperty: ComponentMenuitemProperty?) {
-        dateString = view?.properties.text ?? ""
+        dateString = menuItemProperty?.englishTitle ?? "Default"
         
         reloadData()
     }

+ 1 - 1
PDF Office/PDF Master/KMClass/KMPDFViewController/RightSideController/Views/StampList/KMStampManager.swift

@@ -99,7 +99,7 @@ struct KMPDFAnnotationSignatureType: OptionSet {
     }
     
     func dateStyleArray() -> [String] {
-        return [KMLocalizedString("Default"), "m/d", "m/d/yy", "m/d/yyyy", "mm/dd/yy", "mm/dd/yyyy", "d/m/yy", "d/m/yyyy", "dd/mm/yy", "dd/mm/yyyy", "mm/yy", "mm/yyyy", "m.d.yy", "m.d.yyyy", "mm.dd.yy", "mm.dd.yyyy", "mm.yy", "mm.yyyy", "d.m.yy", "d.m.yyyy", "dd.mm.yy", "dd.mm.yyyy", "yy-mm-dd", "yyyy-mm-dd"]
+        return ["Default", "m/d", "m/d/yy", "m/d/yyyy", "mm/dd/yy", "mm/dd/yyyy", "d/m/yy", "d/m/yyyy", "dd/mm/yy", "dd/mm/yyyy", "mm/yy", "mm/yyyy", "m.d.yy", "m.d.yyyy", "mm.dd.yy", "mm.dd.yyyy", "mm.yy", "mm.yyyy", "d.m.yy", "d.m.yyyy", "dd.mm.yy", "dd.mm.yyyy", "yy-mm-dd", "yyyy-mm-dd"]
     }
     
     func getNameAndDateString() -> String {

+ 1 - 1
PDF Office/PDF Master/KMClass/Settings/SettingsGeneralView.swift

@@ -163,7 +163,7 @@ class SettingsGeneralView: BaseXibView {
                                                                   creatable: false,
                                                                   text: "English")
         if true {
-            let languageArr = ["Follow System", "English", "Chinese_CN", "Chinese_TW", "Dutch", "French", "Spanish", "German", "Russian", "Italian", "Japanese"]
+            let languageArr = ["System Language", "English", "Chinese_CN", "Chinese_TW", "Dutch", "French", "Spanish", "German", "Russian", "Italian", "Japanese"]
             var menuItemArr: [ComponentMenuitemProperty] = []
             for language in languageArr {
                 let itemProperty: ComponentMenuitemProperty = ComponentMenuitemProperty(multipleSelect: false,