[快捷键] - 快捷键更新

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

@@ -762,46 +762,45 @@ CA
                                                 <action selector="menuItemAction_highlight:" target="Ady-hI-5gd" id="71j-3x-mgh"/>
                                             </connections>
                                         </menuItem>
-                                        <menuItem title="Underline" keyEquivalent="u" id="3gi-1B-3Ja">
-                                            <modifierMask key="keyEquivalentModifierMask" control="YES" command="YES"/>
+                                        <menuItem title="Underline" keyEquivalent="M" id="3gi-1B-3Ja">
+                                            <modifierMask key="keyEquivalentModifierMask" shift="YES" command="YES"/>
                                             <connections>
                                                 <action selector="menuItemAction_underline:" target="Ady-hI-5gd" id="yHd-Aa-gr1"/>
                                             </connections>
                                         </menuItem>
-                                        <menuItem title="Strikethrough" keyEquivalent="s" id="prT-w7-aSq">
+                                        <menuItem title="Strikethrough" keyEquivalent="m" id="prT-w7-aSq">
                                             <modifierMask key="keyEquivalentModifierMask" control="YES" command="YES"/>
                                             <connections>
                                                 <action selector="menuItemAction_deleteLine:" target="Ady-hI-5gd" id="bjk-Ab-PIT"/>
                                             </connections>
                                         </menuItem>
                                         <menuItem isSeparatorItem="YES" id="GqA-jN-zhH"/>
-                                        <menuItem title="Freehand" keyEquivalent="p" id="Dru-oa-CRm">
-                                            <modifierMask key="keyEquivalentModifierMask" control="YES" command="YES"/>
+                                        <menuItem title="Freehand" id="Dru-oa-CRm">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
                                             <connections>
                                                 <action selector="menuItemAction_freehand:" target="Ady-hI-5gd" id="g2y-Fx-Bnh"/>
                                             </connections>
                                         </menuItem>
-                                        <menuItem title="Text Note" keyEquivalent="t" id="f1K-nh-zy2">
-                                            <modifierMask key="keyEquivalentModifierMask" control="YES" command="YES"/>
+                                        <menuItem title="Text Note" keyEquivalent="n" id="f1K-nh-zy2">
                                             <connections>
                                                 <action selector="menuItemAction_text:" target="Ady-hI-5gd" id="g4x-UT-p0o"/>
                                             </connections>
                                         </menuItem>
                                         <menuItem title="Anchored Note" keyEquivalent="n" id="gIX-7g-Tuf">
-                                            <modifierMask key="keyEquivalentModifierMask" control="YES" command="YES"/>
+                                            <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
                                             <connections>
                                                 <action selector="menuItemAction_note:" target="Ady-hI-5gd" id="Wi7-eg-drX"/>
                                             </connections>
                                         </menuItem>
                                         <menuItem isSeparatorItem="YES" id="9Pw-8a-sbZ"/>
-                                        <menuItem title="Rectangle" keyEquivalent="r" id="pB9-lW-cGp">
+                                        <menuItem title="Rectangle" keyEquivalent="c" id="pB9-lW-cGp">
                                             <modifierMask key="keyEquivalentModifierMask" control="YES" command="YES"/>
                                             <connections>
                                                 <action selector="menuItemAction_squre:" target="Ady-hI-5gd" id="xOD-Wa-ZZg"/>
                                             </connections>
                                         </menuItem>
-                                        <menuItem title="Circle" keyEquivalent="o" id="rBC-aJ-Gce">
-                                            <modifierMask key="keyEquivalentModifierMask" control="YES" command="YES"/>
+                                        <menuItem title="Circle" keyEquivalent="c" id="rBC-aJ-Gce">
+                                            <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
                                             <connections>
                                                 <action selector="menuItemAction_circle:" target="Ady-hI-5gd" id="QIv-A9-C8y"/>
                                             </connections>
@@ -1062,7 +1061,8 @@ CA
                                             <modifierMask key="keyEquivalentModifierMask"/>
                                             <menu key="submenu" title="PDF Display" id="s0W-mP-LYh">
                                                 <items>
-                                                    <menuItem title="Single Page" keyEquivalent="1" id="aGV-2E-cPe">
+                                                    <menuItem title="Single Page" id="aGV-2E-cPe">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
                                                         <connections>
                                                             <action selector="menuItemAction_singlePage:" target="Ady-hI-5gd" id="6UR-Js-ktg"/>
                                                         </connections>
@@ -1073,7 +1073,8 @@ CA
                                                             <action selector="menuItemAction_singlePageContinue:" target="Ady-hI-5gd" id="YmP-7k-4lr"/>
                                                         </connections>
                                                     </menuItem>
-                                                    <menuItem title="Two Pages" keyEquivalent="2" id="LeN-ad-l5G">
+                                                    <menuItem title="Two Pages" id="LeN-ad-l5G">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
                                                         <connections>
                                                             <action selector="menuItemAction_doublePage:" target="Ady-hI-5gd" id="YDV-Pb-cyN"/>
                                                         </connections>
@@ -1111,23 +1112,23 @@ CA
                                             <menu key="submenu" title="Rotate" id="2tF-bG-HSn">
                                                 <items>
                                                     <menuItem title="Rotate Left" keyEquivalent="l" id="2sD-3u-XVu">
+                                                        <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
                                                         <connections>
                                                             <action selector="menuItemAction_rotateLeft:" target="Ady-hI-5gd" id="xWq-fN-sEB"/>
                                                         </connections>
                                                     </menuItem>
                                                     <menuItem title="Rotate Right" keyEquivalent="r" id="XSD-mr-dG1">
+                                                        <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
                                                         <connections>
                                                             <action selector="menuItemAction_rotateRight:" target="Ady-hI-5gd" id="QLa-bA-ofq"/>
                                                         </connections>
                                                     </menuItem>
                                                     <menuItem title="Rotate All Pages to Left" keyEquivalent="l" id="Tc0-dN-hhQ">
-                                                        <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
                                                         <connections>
                                                             <action selector="menuItemAction_rotateAllPageLeft:" target="Ady-hI-5gd" id="WCU-wG-vXs"/>
                                                         </connections>
                                                     </menuItem>
                                                     <menuItem title="Rotate All Pages to Right" keyEquivalent="r" id="N4r-93-ANT">
-                                                        <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
                                                         <connections>
                                                             <action selector="menuItemAction_rotateAllPageRight:" target="Ady-hI-5gd" id="Je3-vd-JMY"/>
                                                         </connections>
@@ -1441,13 +1442,11 @@ CA
                                 <menu key="submenu" title="Go" id="GTp-Ac-vi8">
                                     <items>
                                         <menuItem title="Next" keyEquivalent="" id="pO6-Zz-d6k">
-                                            <modifierMask key="keyEquivalentModifierMask"/>
                                             <connections>
                                                 <action selector="menuItemAction_nextPage:" target="Ady-hI-5gd" id="NRw-0V-Icz"/>
                                             </connections>
                                         </menuItem>
                                         <menuItem title="Previous" keyEquivalent="" id="4Vo-Yp-w3w">
-                                            <modifierMask key="keyEquivalentModifierMask"/>
                                             <connections>
                                                 <action selector="menuItemAction_forwardPage:" target="Ady-hI-5gd" id="WpH-fi-Iyb"/>
                                             </connections>

PDF Office/PDF Master/Class/PDFWindowController/Toolbar/KMToolbarView.swift

@@ -711,7 +711,7 @@ private let KMToolbarItemSpace = 8.0
         let height = NSHeight(self.bounds)
         let leftMargin = Self.kLeftMargin
         let hSpace = Self.kHSpace
-        var itemH: CGFloat = 40
+        let itemH: CGFloat = 40
         var itemY: CGFloat = (height-itemH)*0.5
         let contentLength = leftW + contentW + rightW
         if (contentLength <= 0) {