Revision: 4675
http://skim-app.svn.sourceforge.net/skim-app/?rev=4675&view=rev
Author: hofman
Date: 2008-09-23 10:04:18 +0000 (Tue, 23 Sep 2008)
Log Message:
-----------
remove hidden default for freehand note, always enable
Modified Paths:
--------------
trunk/PDFAnnotationInk_SKExtensions.m
trunk/SKMainWindowController_Toolbar.m
trunk/SKNoteOutlineView.m
trunk/SKPDFView.m
Modified: trunk/PDFAnnotationInk_SKExtensions.m
===================================================================
--- trunk/PDFAnnotationInk_SKExtensions.m 2008-09-23 09:40:46 UTC (rev
4674)
+++ trunk/PDFAnnotationInk_SKExtensions.m 2008-09-23 10:04:18 UTC (rev
4675)
@@ -111,7 +111,7 @@
- (BOOL)isMovable { return [self isSkimNote]; }
-- (BOOL)isConvertibleAnnotation { return [[NSUserDefaults
standardUserDefaults] boolForKey:@"SKEnableFreehandTool"]; }
+- (BOOL)isConvertibleAnnotation { return YES; }
- (BOOL)hitTest:(NSPoint)point {
NSPoint relPoint = SKSubstractPoints(point, [self bounds].origin);
Modified: trunk/SKMainWindowController_Toolbar.m
===================================================================
--- trunk/SKMainWindowController_Toolbar.m 2008-09-23 09:40:46 UTC (rev
4674)
+++ trunk/SKMainWindowController_Toolbar.m 2008-09-23 10:04:18 UTC (rev
4675)
@@ -425,8 +425,7 @@
[menu addItemWithTitle:NSLocalizedString(@"Underline", @"Menu item
title") imageNamed:SKImageNameToolbarUnderlineNote
action:@selector(changeAnnotationMode:) target:self tag:SKUnderlineNote];
[menu addItemWithTitle:NSLocalizedString(@"Strike Out", @"Menu
item title") imageNamed:SKImageNameToolbarStrikeOutNote
action:@selector(changeAnnotationMode:) target:self tag:SKStrikeOutNote];
[menu addItemWithTitle:NSLocalizedString(@"Line", @"Menu item
title") imageNamed:SKImageNameToolbarLineNote
action:@selector(changeAnnotationMode:) target:self tag:SKLineNote];
- if ([[NSUserDefaults standardUserDefaults]
boolForKey:@"SKEnableFreehandTool"])
- [menu addItemWithTitle:NSLocalizedString(@"Freehand", @"Menu
item title") imageNamed:SKImageNameToolbarInkNote
action:@selector(changeAnnotationMode:) target:self tag:SKInkNote];
+ [menu addItemWithTitle:NSLocalizedString(@"Freehand", @"Menu item
title") imageNamed:SKImageNameToolbarInkNote
action:@selector(changeAnnotationMode:) target:self tag:SKInkNote];
[toolModeButton setMenu:menu forSegment:SKNoteToolMode];
menu = [NSMenu menu];
@@ -443,8 +442,7 @@
[menu addItemWithTitle:NSLocalizedString(@"Underline Tool", @"Menu
item title") action:@selector(changeAnnotationMode:) target:self
tag:SKUnderlineNote];
[menu addItemWithTitle:NSLocalizedString(@"Strike Out Tool",
@"Menu item title") action:@selector(changeAnnotationMode:) target:self
tag:SKStrikeOutNote];
[menu addItemWithTitle:NSLocalizedString(@"Line Tool", @"Menu item
title") action:@selector(changeAnnotationMode:) target:self tag:SKLineNote];
- if ([[NSUserDefaults standardUserDefaults]
boolForKey:@"SKEnableFreehandTool"])
- [menu addItemWithTitle:NSLocalizedString(@"Freehand Tool",
@"Menu item title") action:@selector(changeAnnotationMode:) target:self
tag:SKInkNote];
+ [menu addItemWithTitle:NSLocalizedString(@"Freehand Tool", @"Menu
item title") action:@selector(changeAnnotationMode:) target:self tag:SKInkNote];
menuItem = [[[NSMenuItem allocWithZone:[NSMenu menuZone]]
initWithTitle:NSLocalizedString(@"Tool Mode", @"Toolbar item label")
submenu:menu] autorelease];
[item setLabels:NSLocalizedString(@"Tool Mode", @"Toolbar item
label")];
Modified: trunk/SKNoteOutlineView.m
===================================================================
--- trunk/SKNoteOutlineView.m 2008-09-23 09:40:46 UTC (rev 4674)
+++ trunk/SKNoteOutlineView.m 2008-09-23 10:04:18 UTC (rev 4675)
@@ -229,11 +229,9 @@
menuItem = [menu addItemWithTitle:[SKNLineString typeName]
action:@selector(toggleDisplayNoteType:) target:self];
[menuItem setRepresentedObject:SKNLineString];
[menuItem setState:NSOnState];
- if ([[NSUserDefaults standardUserDefaults]
boolForKey:@"SKEnableFreehandTool"]) {
- menuItem = [menu addItemWithTitle:[SKNInkString typeName]
action:@selector(toggleDisplayNoteType:) target:self];
- [menuItem setRepresentedObject:SKNInkString];
- [menuItem setState:NSOnState];
- }
+ 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-23 09:40:46 UTC (rev 4674)
+++ trunk/SKPDFView.m 2008-09-23 10:04:18 UTC (rev 4675)
@@ -1064,7 +1064,7 @@
[self setAnnotationMode:SKStrikeOutNote];
} else if ([self toolMode] == SKNoteToolMode && (eventChar == 'l') &&
(modifiers == 0)) {
[self setAnnotationMode:SKLineNote];
- } else if ([self toolMode] == SKNoteToolMode && (eventChar == 'f') &&
(modifiers == 0) && [[NSUserDefaults standardUserDefaults]
boolForKey:@"SKEnableFreehandTool"]) {
+ } else if ([self toolMode] == SKNoteToolMode && (eventChar == 'f') &&
(modifiers == 0)) {
[self setAnnotationMode:SKInkNote];
} else if ([typeSelectHelper processKeyDownEvent:theEvent] == NO) {
[super keyDown:theEvent];
@@ -1333,11 +1333,9 @@
[item setTag:SKLineNote];
[item setTarget:self];
- if ([[NSUserDefaults standardUserDefaults]
boolForKey:@"SKEnableFreehandTool"]) {
- item = [submenu addItemWithTitle:NSLocalizedString(@"Freehand", @"Menu
item title") action:@selector(changeAnnotationMode:) keyEquivalent:@""];
- [item setTag:SKInkNote];
- [item setTarget:self];
- }
+ item = [submenu addItemWithTitle:NSLocalizedString(@"Freehand", @"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
