【2025】【综合】快捷键逻辑完善

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

@@ -105,8 +105,7 @@
                                             <modifierMask key="keyEquivalentModifierMask"/>
                                             <menu key="submenu" id="Ezv-e9-zNi">
                                                 <items>
-                                                    <menuItem title="New From File" id="dmH-To-Yta">
-                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                    <menuItem title="New From File" keyEquivalent="n" id="dmH-To-Yta">
                                                         <connections>
                                                             <action selector="menuItemAction_NewFromFile:" target="Voe-Tx-rLC" id="jVh-s6-EMH"/>
                                                         </connections>
@@ -398,8 +397,7 @@
                                                 <action selector="menuItemAction_showInFinder:" target="Voe-Tx-rLC" id="g8K-el-Xqj"/>
                                             </connections>
                                         </menuItem>
-                                        <menuItem title="Properties" id="ZuD-lN-pe0">
-                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                        <menuItem title="Properties" keyEquivalent="d" id="ZuD-lN-pe0">
                                             <connections>
                                                 <action selector="menuItemAction_property:" target="Voe-Tx-rLC" id="chW-iT-bHu"/>
                                             </connections>
@@ -471,8 +469,8 @@
                                                 <action selector="paste:" target="Ady-hI-5gd" id="Rnq-uM-VNB"/>
                                             </connections>
                                         </menuItem>
-                                        <menuItem title="Paste and Match Style" keyEquivalent="V" id="QCp-fs-HKo">
-                                            <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
+                                        <menuItem title="粘贴无格式文本" keyEquivalent="v" id="QCp-fs-HKo">
+                                            <modifierMask key="keyEquivalentModifierMask" control="YES" command="YES"/>
                                             <connections>
                                                 <action selector="menuItemAction_PasteAndMatch:" target="Voe-Tx-rLC" id="6ET-bB-c0P"/>
                                             </connections>
@@ -501,20 +499,17 @@ CA
                                                             <action selector="menuItemAction_ShowFont:" target="Voe-Tx-rLC" id="OtB-jN-fhl"/>
                                                         </connections>
                                                     </menuItem>
-                                                    <menuItem title="Bold" id="8AK-2Z-Yd3">
-                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                    <menuItem title="Bold" keyEquivalent="b" id="8AK-2Z-Yd3">
                                                         <connections>
                                                             <action selector="menuItemAction_FontAction:" target="Voe-Tx-rLC" id="TtS-dU-e9h"/>
                                                         </connections>
                                                     </menuItem>
-                                                    <menuItem title="Italic" tag="1" id="5s5-8l-acM">
-                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                    <menuItem title="Italic" tag="1" keyEquivalent="i" id="5s5-8l-acM">
                                                         <connections>
                                                             <action selector="menuItemAction_FontAction:" target="Voe-Tx-rLC" id="KmI-QW-M3V"/>
                                                         </connections>
                                                     </menuItem>
-                                                    <menuItem title="Underline" tag="2" id="g6D-1F-HJ8">
-                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                    <menuItem title="Underline" tag="2" keyEquivalent="u" id="g6D-1F-HJ8">
                                                         <connections>
                                                             <action selector="menuItemAction_FontAction:" target="Voe-Tx-rLC" id="h3X-lZ-Vjs"/>
                                                         </connections>
@@ -538,6 +533,12 @@ CA
                                                             <action selector="menuItemAction_FontAction:" target="Voe-Tx-rLC" id="0C4-HJ-MRH"/>
                                                         </connections>
                                                     </menuItem>
+                                                    <menuItem title="显示颜色" tag="5" keyEquivalent="C" id="QL2-at-3pA">
+                                                        <modifierMask key="keyEquivalentModifierMask" shift="YES" command="YES"/>
+                                                        <connections>
+                                                            <action selector="menuItemAction_FontAction:" target="Voe-Tx-rLC" id="vb4-nE-8Wl"/>
+                                                        </connections>
+                                                    </menuItem>
                                                     <menuItem isSeparatorItem="YES" id="0ha-ov-V7g"/>
                                                     <menuItem title="Copy Style" tag="6" id="h99-zI-hKU">
                                                         <modifierMask key="keyEquivalentModifierMask"/>
@@ -832,11 +833,13 @@ 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>

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

@@ -320,6 +320,55 @@ class KMPDFSecToolbarController: NSViewController {
                     button.frame = CGRectMake(itemXvalue, CGRectGetHeight(infoContendView.frame)/2-14, button.properties.propertyInfo.viewWidth, 28)
                 }
                 button.setTarget(self, action: #selector(buttonClicked(_:)))
+                if buttonProperty.identifier == KMPDFToolbar_highlight_Identifier {
+                    button.keyEquivalent = "H"
+                    button.keyEquivalentModifierMask = [.control, .command]
+                } else if buttonProperty.identifier == KMPDFToolbar_underline_Identifier {
+                    button.keyEquivalent = "U"
+                    button.keyEquivalentModifierMask = [.control, .command]
+                } else if buttonProperty.identifier == KMPDFToolbar_waveline_Identifier {
+                    button.keyEquivalent = "V"
+                    button.keyEquivalentModifierMask = [.control, .command]
+                } else if buttonProperty.identifier == KMPDFToolbar_strikethrough_Identifier {
+                    button.keyEquivalent = "S"
+                    button.keyEquivalentModifierMask = [.control, .command]
+                } else if buttonProperty.identifier == KMPDFToolbar_text_Identifier {
+                    button.keyEquivalent = "T"
+                    button.keyEquivalentModifierMask = [.control, .command]
+                } else if buttonProperty.identifier == KMPDFToolbar_note_Identifier {
+                    button.keyEquivalent = "N"
+                    button.keyEquivalentModifierMask = [.control, .command]
+                } else if buttonProperty.identifier == KMPDFToolbar_pen_Identifier {
+                    button.keyEquivalent = "P"
+                    button.keyEquivalentModifierMask = [.control, .command]
+                } else if buttonProperty.identifier == KMPDFToolbar_eraser_Identifier {
+                    button.keyEquivalent = "E"
+                    button.keyEquivalentModifierMask = [.control, .command]
+                } else if buttonProperty.identifier == KMPDFToolbar_rectangle_Identifier {
+                    button.keyEquivalent = "R"
+                    button.keyEquivalentModifierMask = [.control, .command]
+                } else if buttonProperty.identifier == KMPDFToolbar_circle_Identifier {
+                    button.keyEquivalent = "O"
+                    button.keyEquivalentModifierMask = [.control, .command]
+                } else if buttonProperty.identifier == KMPDFToolbar_arrow_Identifier {
+                    button.keyEquivalent = "A"
+                    button.keyEquivalentModifierMask = [.control, .command]
+                } else if buttonProperty.identifier == KMPDFToolbar_line_Identifier {
+                    button.keyEquivalent = "L"
+                    button.keyEquivalentModifierMask = [.control, .command]
+                }
+                
+                else if buttonProperty.identifier == KMPDFToolbar_edit_text_Identifier {
+                    button.keyEquivalent = "T"
+                    button.keyEquivalentModifierMask = [.shift, .command]
+                } else if buttonProperty.identifier == KMPDFToolbar_edit_image_Identifier {
+                    button.keyEquivalent = "I"
+                    button.keyEquivalentModifierMask = [.shift, .command]
+                } else if buttonProperty.identifier == KMPDFToolbar_edit_link_Identifier {
+                    button.keyEquivalent = "L"
+                    button.keyEquivalentModifierMask = [.shift, .command]
+                }
+                
                 infoContendView.addSubview(button)
                 
                 itemXvalue += CGRectGetWidth(button.frame)