Revision: 3238
http://skim-app.svn.sourceforge.net/skim-app/?rev=3238&view=rev
Author: hofman
Date: 2007-11-23 04:12:12 -0800 (Fri, 23 Nov 2007)
Log Message:
-----------
Change shortcuts for moving/resizing the reading bar, as Opt-arrow conflicts
with the default shortcuts for Spaces on Leopard.
Modified Paths:
--------------
trunk/SKPDFView.m
Modified: trunk/SKPDFView.m
===================================================================
--- trunk/SKPDFView.m 2007-11-23 11:05:34 UTC (rev 3237)
+++ trunk/SKPDFView.m 2007-11-23 12:12:12 UTC (rev 3238)
@@ -908,10 +908,6 @@
// backtab is a bit inconsistent, it seems Shift+Tab gives a
Shift-BackTab key event, I would have expected either Shift-Tab (as for the raw
event) or BackTab (as for most shift-modified keys)
} else if (([self toolMode] == SKTextToolMode || [self toolMode] ==
SKNoteToolMode) && (((eventChar == NSBackTabCharacter) && (modifiers ==
(NSAlternateKeyMask | NSShiftKeyMask))) || ((eventChar == NSBackTabCharacter)
&& (modifiers == NSAlternateKeyMask)) || ((eventChar == NSTabCharacter) &&
(modifiers == NSAlternateKeyMask)))) {
[self selectPreviousActiveAnnotation:self];
- } else if ([activeAnnotation isNoteAnnotation] && [activeAnnotation
isMovable] && (eventChar == NSRightArrowFunctionKey || eventChar ==
NSLeftArrowFunctionKey || eventChar == NSUpArrowFunctionKey || eventChar ==
NSDownArrowFunctionKey) && (modifiers == 0 || modifiers == NSShiftKeyMask)) {
- [self moveActiveAnnotationForKey:eventChar byAmount:(modifiers &
NSShiftKeyMask) ? 10.0 : 1.0];
- } else if ([activeAnnotation isNoteAnnotation] && [activeAnnotation
isResizable] && (eventChar == NSRightArrowFunctionKey || eventChar ==
NSLeftArrowFunctionKey || eventChar == NSUpArrowFunctionKey || eventChar ==
NSDownArrowFunctionKey) && (modifiers == NSControlKeyMask || modifiers ==
(NSControlKeyMask | NSShiftKeyMask))) {
- [self resizeActiveAnnotationForKey:eventChar byAmount:(modifiers &
NSShiftKeyMask) ? 10.0 : 1.0];
} else if ((eventChar == NSRightArrowFunctionKey) && (modifiers ==
(NSCommandKeyMask | NSAlternateKeyMask))) {
[self setToolMode:(toolMode + 1) % 5];
} else if ((eventChar == NSLeftArrowFunctionKey) && (modifiers ==
(NSCommandKeyMask | NSAlternateKeyMask))) {
@@ -920,9 +916,13 @@
[self setAnnotationMode:(annotationMode + 1) % 8];
} else if ((eventChar == NSUpArrowFunctionKey) && (modifiers ==
(NSCommandKeyMask | NSAlternateKeyMask))) {
[self setAnnotationMode:(annotationMode + 7) % 8];
- } else if (readingBar && (eventChar == NSRightArrowFunctionKey ||
eventChar == NSLeftArrowFunctionKey || eventChar == NSUpArrowFunctionKey ||
eventChar == NSDownArrowFunctionKey) && (modifiers == NSAlternateKeyMask)) {
+ } else if ([self hasReadingBar] == NO && [activeAnnotation
isNoteAnnotation] && [activeAnnotation isMovable] && (eventChar ==
NSRightArrowFunctionKey || eventChar == NSLeftArrowFunctionKey || eventChar ==
NSUpArrowFunctionKey || eventChar == NSDownArrowFunctionKey) && (modifiers == 0
|| modifiers == NSShiftKeyMask)) {
+ [self moveActiveAnnotationForKey:eventChar byAmount:(modifiers &
NSShiftKeyMask) ? 10.0 : 1.0];
+ } else if ([self hasReadingBar] == NO && [activeAnnotation
isNoteAnnotation] && [activeAnnotation isResizable] && (eventChar ==
NSRightArrowFunctionKey || eventChar == NSLeftArrowFunctionKey || eventChar ==
NSUpArrowFunctionKey || eventChar == NSDownArrowFunctionKey) && (modifiers ==
NSControlKeyMask || modifiers == (NSControlKeyMask | NSShiftKeyMask))) {
+ [self resizeActiveAnnotationForKey:eventChar byAmount:(modifiers &
NSShiftKeyMask) ? 10.0 : 1.0];
+ } else if ([self hasReadingBar] && (eventChar ==
NSRightArrowFunctionKey || eventChar == NSLeftArrowFunctionKey || eventChar ==
NSUpArrowFunctionKey || eventChar == NSDownArrowFunctionKey) && (modifiers ==
NSControlKeyMask)) {
[self moveReadingBarForKey:eventChar];
- } else if (readingBar && (eventChar == NSUpArrowFunctionKey ||
eventChar == NSDownArrowFunctionKey) && (modifiers == (NSAlternateKeyMask |
NSShiftKeyMask))) {
+ } else if ([self hasReadingBar] && (eventChar == NSUpArrowFunctionKey
|| eventChar == NSDownArrowFunctionKey) && (modifiers == (NSControlKeyMask |
NSShiftKeyMask))) {
[self resizeReadingBarForKey:eventChar];
} else if ([self toolMode] == SKNoteToolMode && modifiers == 0 &&
eventChar == 't') {
[self setAnnotationMode:SKFreeTextNote];
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
