浏览代码

【2025】【综合】快捷键补充

niehaoyu 4 周之前
父节点
当前提交
3c9156089e

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

@@ -773,13 +773,12 @@ CA
                                         <menuItem isSeparatorItem="YES" id="CxI-K8-HwB">
                                             <modifierMask key="keyEquivalentModifierMask" command="YES"/>
                                         </menuItem>
-                                        <menuItem title="Zoom To Width" alternate="YES" keyEquivalent="_" id="jxZ-v8-esI">
-                                            <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
+                                        <menuItem title="Zoom To Width" alternate="YES" keyEquivalent="1" id="jxZ-v8-esI">
                                             <connections>
                                                 <action selector="menuItemAction_Zoom:" target="Voe-Tx-rLC" id="dZT-wl-uy0"/>
                                             </connections>
                                         </menuItem>
-                                        <menuItem title="Zoom To Fit" tag="1" keyEquivalent="_" id="tu0-DY-mzp">
+                                        <menuItem title="Zoom To Fit" tag="1" keyEquivalent="2" id="tu0-DY-mzp">
                                             <connections>
                                                 <action selector="menuItemAction_Zoom:" target="Voe-Tx-rLC" id="3W9-6e-VF0"/>
                                             </connections>
@@ -801,13 +800,11 @@ CA
                                         </menuItem>
                                         <menuItem isSeparatorItem="YES" id="t8Z-Zy-agE"/>
                                         <menuItem title="Rotate Left" keyEquivalent="l" id="L85-QJ-7b7">
-                                            <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
                                             <connections>
                                                 <action selector="menuItemAction_Rotate:" target="Voe-Tx-rLC" id="GBo-5w-qW3"/>
                                             </connections>
                                         </menuItem>
                                         <menuItem title="Rotate Right" tag="1" keyEquivalent="r" id="5A8-e1-kJN">
-                                            <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
                                             <connections>
                                                 <action selector="menuItemAction_Rotate:" target="Voe-Tx-rLC" id="RJ2-ux-DnI"/>
                                             </connections>

+ 15 - 6
PDF Office/PDF Master/KMClass/KMPDFViewController/KMMainViewController.swift

@@ -5863,7 +5863,7 @@ extension KMMainViewController: CPDFViewDelegate,CPDFListViewDelegate {
         let option = theEvent.modifierFlags.contains(.option)
         
         KMPrint(theEvent.keyCode)
-        if self.listView.isEditing() == true {
+        if self.listView.isEditing() == true { 
             if control && theEvent.keyCode == 11 { // ctr + b
                 self.listView.setEditingTextarea_Bold()
                 rightSideController?.reloadEditingAreas()
@@ -5956,6 +5956,15 @@ extension KMMainViewController: CPDFViewDelegate,CPDFListViewDelegate {
                 if self.listView.isEditImage {
                     self.menuItemEditingClick_CropImage(sender: NSMenuItem())
                 }
+            } else if command && shift && theEvent.keyCode == 36 {
+                //PPT,从头放映
+                listView.go(toPageIndex: 0, animated: false)
+                
+                togglePresentation(nil)
+                
+            } else if command && theEvent.keyCode == 36 {
+                //PPT,从当前页放映
+                togglePresentation(nil)
             }
             
         } else if option && theEvent.keyCode == 18 {
@@ -5984,11 +5993,11 @@ extension KMMainViewController: CPDFViewDelegate,CPDFListViewDelegate {
             
             self.leftSideViewCancelSelect()
             
-        } else if command && theEvent.keyCode == 17 {
-            //新标签
-//            if let mainDocument = self.myDocument as? KMMainDocument, let browserWindowController = mainDocument.browser?.windowController as? KMBrowserWindowController {
-//                browserWindowController.openDocumentWindow()
-//            }
+        } else if theEvent.keyCode == 49 {
+            //空格
+            if (self.listView.canGoToNextPage()) {
+                self.listView.goToNextPage(nil)
+            }
         }
         return true
     }