Revision: 15145
          http://sourceforge.net/p/skim-app/code/15145
Author:   hofman
Date:     2025-05-03 09:17:24 +0000 (Sat, 03 May 2025)
Log Message:
-----------
Set shortcuts for Next/previous to Option-arrow, so Command-arrow can work 
while text editing (to go to end/beginning of line). Don't set shortcuts for 
First/Last, so Option-left/right can work in text editing (to go to 
next/previous word). Instead, handle Option-up/down in keyDown, so it does work 
when not editing a text note. Also implement old shortcuts Command-left/right 
in keyDown, so it can work when not using a reading bar. Change default reading 
bar shortcuts to Command-arrow and Shift-Command-arrow.

Modified Paths:
--------------
    trunk/Base.lproj/MainMenu.xib
    trunk/SKPDFView.m

Modified: trunk/Base.lproj/MainMenu.xib
===================================================================
--- trunk/Base.lproj/MainMenu.xib       2025-05-02 21:38:44 UTC (rev 15144)
+++ trunk/Base.lproj/MainMenu.xib       2025-05-03 09:17:24 UTC (rev 15145)
@@ -886,22 +886,26 @@
                 <menuItem title="Go" id="271">
                     <menu key="submenu" title="Go" id="272">
                         <items>
-                            <menuItem title="Next" keyEquivalent="" id="273">
+                            <menuItem title="Next" keyEquivalent="" id="273">
+                                <modifierMask key="keyEquivalentModifierMask" 
option="YES"/>
                                 <connections>
                                     <action selector="doGoToNextPage:" 
target="-1" id="282"/>
                                 </connections>
                             </menuItem>
-                            <menuItem title="Previous" keyEquivalent="" 
id="274">
+                            <menuItem title="Previous" keyEquivalent="" 
id="274">
+                                <modifierMask key="keyEquivalentModifierMask" 
option="YES"/>
                                 <connections>
                                     <action selector="doGoToPreviousPage:" 
target="-1" id="283"/>
                                 </connections>
                             </menuItem>
-                            <menuItem title="First" keyEquivalent="" id="912">
+                            <menuItem title="First" id="912">
+                                <modifierMask key="keyEquivalentModifierMask"/>
                                 <connections>
                                     <action selector="doGoToFirstPage:" 
target="-1" id="916"/>
                                 </connections>
                             </menuItem>
-                            <menuItem title="Last" keyEquivalent="" id="914">
+                            <menuItem title="Last" id="914">
+                                <modifierMask key="keyEquivalentModifierMask"/>
                                 <connections>
                                     <action selector="doGoToLastPage:" 
target="-1" id="917"/>
                                 </connections>

Modified: trunk/SKPDFView.m
===================================================================
--- trunk/SKPDFView.m   2025-05-02 21:38:44 UTC (rev 15144)
+++ trunk/SKPDFView.m   2025-05-03 09:17:24 UTC (rev 15145)
@@ -139,8 +139,8 @@
 
 static char SKPDFViewDefaultsObservationContext;
 
-static NSUInteger moveReadingBarModifiers = NSEventModifierFlagOption;
-static NSUInteger resizeReadingBarModifiers = NSEventModifierFlagOption | 
NSEventModifierFlagShift;
+static NSUInteger moveReadingBarModifiers = NSEventModifierFlagCommand;
+static NSUInteger resizeReadingBarModifiers = NSEventModifierFlagCommand | 
NSEventModifierFlagShift;
 
 static BOOL useToolModeCursors = NO;
 
@@ -1679,6 +1679,14 @@
         [self setAnnotationMode:SKNoteTypeInk];
     } else if ((eventChar == '?') && ((modifiers & ~NSEventModifierFlagShift) 
== 0)) {
         [self showHelpMenu];
+    } else if ((eventChar == NSLeftArrowFunctionKey) && (standardModifiers == 
NSEventModifierFlagOption) && [self canGoToFirstPage]) {
+        [self goToFirstPage:nil];
+    } else if ((eventChar == NSRightArrowFunctionKey) && (standardModifiers == 
NSEventModifierFlagOption) && [self canGoToLastPage]) {
+        [self goToLastPage:nil];
+    } else if ((eventChar == NSLeftArrowFunctionKey) && (standardModifiers == 
NSEventModifierFlagCommand) && [self canGoToPreviousPage]) {
+        [self goToPreviousPage:nil];
+    } else if ((eventChar == NSRightArrowFunctionKey) && (standardModifiers == 
NSEventModifierFlagCommand) && [self canGoToNextPage]) {
+        [self goToNextPage:nil];
     } else if ([typeSelectHelper handleEvent:theEvent] == NO) {
         [super keyDown:theEvent];
     }

This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.



_______________________________________________
Skim-app-commit mailing list
Skim-app-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/skim-app-commit

Reply via email to