【2025】【综合】菜单栏完善

PDF Office/PDF Master/AppDelegate+MenuAction.swift

@@ -312,7 +312,7 @@ extension AppDelegate {
             } else if action == NSSelectorFromString("menuItemAction_property:") {
                 
             } else if action == NSSelectorFromString("menuItemAction_print:") {
-                
+                return mainVC.validPrint()
             } else if action == NSSelectorFromString("menuItemAction_customPrint:") {
                 
             } else if action == NSSelectorFromString("sharePageItemActionWithSender:") {

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

@@ -634,22 +634,26 @@ CA
                                         <menuItem title="PDF Display" id="lGh-mW-7Pc">
                                             <menu key="submenu" title="PDF Display" id="ezi-ly-46p">
                                                 <items>
-                                                    <menuItem title="Single Page" tag="1" id="hxE-iU-6WH">
+                                                    <menuItem title="Single Page" tag="1" keyEquivalent="1" id="hxE-iU-6WH">
+                                                        <modifierMask key="keyEquivalentModifierMask" control="YES" command="YES"/>
                                                         <connections>
                                                             <action selector="menuItemAction_ChangeDisplayMode:" target="Voe-Tx-rLC" id="avx-PB-72a"/>
                                                         </connections>
                                                     </menuItem>
-                                                    <menuItem title="Single Page Continuous" tag="2" id="Wb8-eg-Ml9">
+                                                    <menuItem title="Single Page Continuous" tag="2" keyEquivalent="2" id="Wb8-eg-Ml9">
+                                                        <modifierMask key="keyEquivalentModifierMask" control="YES" command="YES"/>
                                                         <connections>
                                                             <action selector="menuItemAction_ChangeDisplayMode:" target="Voe-Tx-rLC" id="Mld-S2-EgG"/>
                                                         </connections>
                                                     </menuItem>
-                                                    <menuItem title="Two Pages" tag="3" id="hga-cQ-kSj">
+                                                    <menuItem title="Two Pages" tag="3" keyEquivalent="3" id="hga-cQ-kSj">
+                                                        <modifierMask key="keyEquivalentModifierMask" control="YES" command="YES"/>
                                                         <connections>
                                                             <action selector="menuItemAction_ChangeDisplayMode:" target="Voe-Tx-rLC" id="gjz-2P-Cyt"/>
                                                         </connections>
                                                     </menuItem>
-                                                    <menuItem title="Two Pages Continuous" tag="4" id="b6w-rv-YVl">
+                                                    <menuItem title="Two Pages Continuous" tag="4" keyEquivalent="4" id="b6w-rv-YVl">
+                                                        <modifierMask key="keyEquivalentModifierMask" control="YES" command="YES"/>
                                                         <connections>
                                                             <action selector="menuItemAction_ChangeDisplayMode:" target="Voe-Tx-rLC" id="wRC-wN-Tcn"/>
                                                         </connections>
@@ -708,26 +712,26 @@ CA
                                                 </items>
                                             </menu>
                                         </menuItem>
-                                        <menuItem title="Thumbnails" id="pfC-b1-Lf2">
-                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                        <menuItem title="Thumbnails" keyEquivalent="1" id="pfC-b1-Lf2">
+                                            <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
                                             <connections>
                                                 <action selector="menuItemAction_BOTAMode:" target="Voe-Tx-rLC" id="dPA-VN-4DE"/>
                                             </connections>
                                         </menuItem>
-                                        <menuItem title="Outline" tag="1" id="T4N-oM-heb">
-                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                        <menuItem title="Outline" tag="1" keyEquivalent="2" id="T4N-oM-heb">
+                                            <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
                                             <connections>
                                                 <action selector="menuItemAction_BOTAMode:" target="Voe-Tx-rLC" id="ROS-SR-cyS"/>
                                             </connections>
                                         </menuItem>
-                                        <menuItem title="BookMark" tag="2" id="cEK-0C-WTt" userLabel="Notes">
-                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                        <menuItem title="BookMark" tag="2" keyEquivalent="3" id="cEK-0C-WTt" userLabel="Notes">
+                                            <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
                                             <connections>
                                                 <action selector="menuItemAction_BOTAMode:" target="Voe-Tx-rLC" id="PaI-iZ-ZEm"/>
                                             </connections>
                                         </menuItem>
-                                        <menuItem title="注释列表" tag="3" id="ta9-Yg-PIB">
-                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                        <menuItem title="注释列表" tag="3" keyEquivalent="4" id="ta9-Yg-PIB">
+                                            <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
                                             <connections>
                                                 <action selector="menuItemAction_BOTAMode:" target="Voe-Tx-rLC" id="Ega-km-5jJ"/>
                                             </connections>

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

@@ -2938,6 +2938,13 @@ struct KMNMWCFlags {
     }
     
     //MARK: - 打印
+    func validPrint() -> Bool {
+        if NSWindow.currentWindow() == self.view.window {
+            return true
+        }
+        return false
+    }
+    
     internal func showPrintWindow(pageRange: KMPrintPageRange = KMPrintPageRange(type: .allPage, selectPages: [])) {
         self.saveDocument()
         if (self.listView.document != nil && !self.listView.document.allowsPrinting) { // 有打印限制