【2025】【综合】菜单栏修改，细节完善

PDF Office/PDF Master/AppDelegate+MenuAction.swift

@@ -369,8 +369,10 @@ extension AppDelegate {
                 }
                 return false
             } else if action == NSSelectorFromString("menuItemAction_unlockFunction:") {
-                if mainVC.listView.document.permissionsStatus != .owner {
-                    return true
+                if mainVC.listView.document.isLocked == true || mainVC.listView.document.isEncrypted == true {
+                    if mainVC.listView.document.permissionsStatus != .owner {
+                        return true
+                    }
                 }
                 return false
             } else if action == NSSelectorFromString("menuItemAction_searchPDF:") {

PDF Office/PDF Master/Base.lproj/Main.storyboard

@@ -101,6 +101,11 @@
                                 <modifierMask key="keyEquivalentModifierMask"/>
                                 <menu key="submenu" title="File" id="bib-Uj-vzu">
                                     <items>
+                                        <menuItem title="Open…" keyEquivalent="o" id="d0B-s2-mwc">
+                                            <connections>
+                                                <action selector="menuItemAction_Open:" target="Voe-Tx-rLC" id="Wab-TQ-9Vu"/>
+                                            </connections>
+                                        </menuItem>
                                         <menuItem title="New" id="S7l-RN-GCc">
                                             <modifierMask key="keyEquivalentModifierMask"/>
                                             <menu key="submenu" id="Ezv-e9-zNi">
@@ -174,18 +179,6 @@
                                                 <action selector="menuItemAction_NewWindow:" target="Voe-Tx-rLC" id="yw1-8h-ej4"/>
                                             </connections>
                                         </menuItem>
-                                        <menuItem isSeparatorItem="YES" id="Ncz-3w-KFo"/>
-                                        <menuItem title="Open…" keyEquivalent="o" id="d0B-s2-mwc">
-                                            <connections>
-                                                <action selector="menuItemAction_Open:" target="Voe-Tx-rLC" id="Wab-TQ-9Vu"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Merge PDF Files" id="tXI-mr-wws">
-                                            <modifierMask key="keyEquivalentModifierMask"/>
-                                            <connections>
-                                                <action selector="menuItemAction_MergePDFFiles:" target="Voe-Tx-rLC" id="2vT-pO-PTQ"/>
-                                            </connections>
-                                        </menuItem>
                                         <menuItem isSeparatorItem="YES" id="m54-Is-iLE"/>
                                         <menuItem title="Close Tab" keyEquivalent="w" id="BZU-2b-PDw">
                                             <connections>
@@ -220,12 +213,6 @@
                                                 <action selector="menuItemClick_saveAsFlattenedPDF:" target="Voe-Tx-rLC" id="1W7-qt-BiY"/>
                                             </connections>
                                         </menuItem>
-                                        <menuItem title="Compress" id="x7B-9Y-Yq7">
-                                            <modifierMask key="keyEquivalentModifierMask"/>
-                                            <connections>
-                                                <action selector="menuItemClick_Compress:" target="Voe-Tx-rLC" id="BPD-bx-iba"/>
-                                            </connections>
-                                        </menuItem>
                                         <menuItem title="Convert To" id="gk1-vZ-Tq6">
                                             <modifierMask key="keyEquivalentModifierMask"/>
                                             <menu key="submenu" title="Convert To" id="bmt-zX-A6l">
@@ -339,7 +326,19 @@
                                                 </items>
                                             </menu>
                                         </menuItem>
-                                        <menuItem isSeparatorItem="YES" id="aJh-i4-bef"/>
+                                        <menuItem isSeparatorItem="YES" id="Ncz-3w-KFo"/>
+                                        <menuItem title="Compress" id="x7B-9Y-Yq7">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <connections>
+                                                <action selector="menuItemClick_Compress:" target="Voe-Tx-rLC" id="BPD-bx-iba"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Merge PDF Files" id="tXI-mr-wws">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <connections>
+                                                <action selector="menuItemAction_MergePDFFiles:" target="Voe-Tx-rLC" id="2vT-pO-PTQ"/>
+                                            </connections>
+                                        </menuItem>
                                         <menuItem title="Protect" id="kHT-uu-nOK" userLabel="Protect">
                                             <modifierMask key="keyEquivalentModifierMask"/>
                                             <menu key="submenu" title="Protect" id="F3R-EN-Yep">
@@ -398,9 +397,7 @@
                                                 </items>
                                             </menu>
                                         </menuItem>
-                                        <menuItem isSeparatorItem="YES" hidden="YES" id="3X9-nS-taN">
-                                            <modifierMask key="keyEquivalentModifierMask" command="YES"/>
-                                        </menuItem>
+                                        <menuItem isSeparatorItem="YES" id="aJh-i4-bef"/>
                                         <menuItem title="Show in Finder" id="KQn-iE-Prc">
                                             <modifierMask key="keyEquivalentModifierMask"/>
                                             <connections>

PDF Office/PDF Master/Class/PDFTools/Compress/View/KMCompressView.swift

@@ -80,9 +80,11 @@ class KMCompressView: BaseXibView {
         
         compressButton.properties = ComponentButtonProperty(type: .primary, size: .xs, buttonText: KMLocalizedString("Compress"), keepPressState: false)
         compressButton.setTarget(self, action: #selector(compressButtonAction(_:)))
+        compressButton.keyEquivalent = KMKeyEquivalent.enter
         
         cancelButton.properties = ComponentButtonProperty(type: .default_tertiary, size: .xs, buttonText: KMLocalizedString("Cancel"), keepPressState: false)
         cancelButton.setTarget(self, action: #selector(cancelButtonAction(_:)))
+        cancelButton.keyEquivalent = KMKeyEquivalent.esc.string()
         
         batchButton.properties = ComponentButtonProperty(type: .default_tertiary, size: .xs, buttonText: KMLocalizedString("Batch"), keepPressState: false)
         batchButton.setTarget(self, action: #selector(batchButtonAction(_:)))

PDF Office/PDF Master/KMClass/Secure/View/KMSecureTextFiled.swift

@@ -183,6 +183,10 @@ class KMSecureTextFiled: NSView {
             }
             callback(self)
         }
+        
+        textFiled.drawsBackground = false
+        
+        secureTextField.drawsBackground = false
     }
     
     func initSubViews() {

PDF Office/PDF Master/Strings/zh-Hans.lproj/Localizable.strings

@@ -4352,7 +4352,7 @@
 "Sign in" = "登录";
 "Sign in(titile)" = "登录PDF Reader Pro";
 "Verification Code" = "验证码登录";
-"Password" = "密码登录";
+"Password" = "密码";
 "Welcome to PDF Reader Pro" = "欢迎使用 PDF Reader Pro";
 "Please enter email address" = "请输入邮箱";
 "Please enter code" = "请输入验证码";

PDF Office/PDF Master/Strings/zh-Hant.lproj/Localizable.strings

@@ -4251,7 +4251,7 @@
 "Sign in" = "登入";
 "Sign in(titile)" = "登入PDF Reader Pro";
 "Verification Code" = "驗證碼登入";
-"Password" = "密碼登入";
+"Password" = "密碼";
 "Welcome to PDF Reader Pro" = "歡迎使用 PDF Reader Pro";
 "Please enter email address" = "請輸入電子郵件地址";
 "Please enter code" = "請輸入驗證碼";