Revision: 4646
http://skim-app.svn.sourceforge.net/skim-app/?rev=4646&view=rev
Author: hofman
Date: 2008-09-16 17:20:05 +0000 (Tue, 16 Sep 2008)
Log Message:
-----------
Uncomment all remaining freehand note support and make it conditional on the
hidden pref.
Modified Paths:
--------------
trunk/SKNoteOutlineView.m
trunk/SKPDFView.m
Modified: trunk/SKNoteOutlineView.m
===================================================================
--- trunk/SKNoteOutlineView.m 2008-09-16 17:11:22 UTC (rev 4645)
+++ trunk/SKNoteOutlineView.m 2008-09-16 17:20:05 UTC (rev 4646)
@@ -229,9 +229,11 @@
menuItem = [menu addItemWithTitle:[SKNLineString typeName]
action:@selector(toggleDisplayNoteType:) target:self];
[menuItem setRepresentedObject:SKNLineString];
[menuItem setState:NSOnState];
- //menuItem = [menu addItemWithTitle:[SKNInkString typeName]
action:@selector(toggleDisplayNoteType:) target:self];
- //[menuItem setRepresentedObject:SKNInkString];
- //[menuItem setState:NSOnState];
+ if ([[NSUserDefaults standardUserDefaults]
boolForKey:@"SKEnableFreehandTool"]) {
+ menuItem = [menu addItemWithTitle:[SKNInkString typeName]
action:@selector(toggleDisplayNoteType:) target:self];
+ [menuItem setRepresentedObject:SKNInkString];
+ [menuItem setState:NSOnState];
+ }
[menu addItem:[NSMenuItem separatorItem]];
menuItem = [menu addItemWithTitle:NSLocalizedString(@"Show All",
@"Menu item title") action:@selector(displayAllNoteTypes:) target:self];
menuItem = [menu addItemWithTitle:[NSLocalizedString(@"Select", @"Menu
item title") stringByAppendingEllipsis] action:@selector(selectNoteTypes:)
target:self];
Modified: trunk/SKPDFView.m
===================================================================
--- trunk/SKPDFView.m 2008-09-16 17:11:22 UTC (rev 4645)
+++ trunk/SKPDFView.m 2008-09-16 17:20:05 UTC (rev 4646)
@@ -1063,8 +1063,8 @@
[self setAnnotationMode:SKStrikeOutNote];
} else if ([self toolMode] == SKNoteToolMode && (eventChar == 'l') &&
(modifiers == 0)) {
[self setAnnotationMode:SKLineNote];
- //} else if ([self toolMode] == SKNoteToolMode && (eventChar == 'f')
&& (modifiers == 0)) {
- // [self setAnnotationMode:SKInkNote];
+ } else if ([self toolMode] == SKNoteToolMode && (eventChar == 'f') &&
(modifiers == 0) && [[NSUserDefaults standardUserDefaults]
boolForKey:@"SKEnableFreehandTool"]) {
+ [self setAnnotationMode:SKInkNote];
} else if ([typeSelectHelper processKeyDownEvent:theEvent] == NO) {
[super keyDown:theEvent];
}
@@ -1332,9 +1332,11 @@
[item setTag:SKLineNote];
[item setTarget:self];
- //item = [submenu addItemWithTitle:NSLocalizedString(@"Ink", @"Menu item
title") action:@selector(changeAnnotationMode:) keyEquivalent:@""];
- //[item setTag:SKInkNote];
- //[item setTarget:self];
+ if ([[NSUserDefaults standardUserDefaults]
boolForKey:@"SKEnableFreehandTool"]) {
+ item = [submenu addItemWithTitle:NSLocalizedString(@"Ink", @"Menu item
title") action:@selector(changeAnnotationMode:) keyEquivalent:@""];
+ [item setTag:SKInkNote];
+ [item setTarget:self];
+ }
item = [menu insertItemWithTitle:NSLocalizedString(@"Tools", @"Menu item
title") action:NULL keyEquivalent:@"" atIndex:0];
[item setSubmenu:submenu];
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 the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
