Revision: 3420
http://skim-app.svn.sourceforge.net/skim-app/?rev=3420&view=rev
Author: hofman
Date: 2008-02-21 06:16:39 -0800 (Thu, 21 Feb 2008)
Log Message:
-----------
Select note to add in menus of new note toolbar items.
Modified Paths:
--------------
trunk/SKMainWindowController.m
Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m 2008-02-21 13:39:14 UTC (rev 3419)
+++ trunk/SKMainWindowController.m 2008-02-21 14:16:39 UTC (rev 3420)
@@ -4862,13 +4862,22 @@
[menuItem setTag:SKAnchoredNote];
[menuItem setImage:[NSImage imageNamed:@"ToolbarAnchoredNote"]];
[menuItem setTarget:self];
+ [textNoteButton setMenu:menu forSegment:0];
+ menu = [[[NSMenu allocWithZone:[NSMenu menuZone]] initWithTitle:@""]
autorelease];
+ menuItem = [menu addItemWithTitle:NSLocalizedString(@"Text Note", @"Menu
item title") action:@selector(createNewNote:) keyEquivalent:@""];
+ [menuItem setTag:SKFreeTextNote];
+ [menuItem setImage:[NSImage imageNamed:@"ToolbarTextNote"]];
+ [menuItem setTarget:self];
+ menuItem = [menu addItemWithTitle:NSLocalizedString(@"Anchored Note",
@"Menu item title") action:@selector(createNewNote:) keyEquivalent:@""];
+ [menuItem setTag:SKAnchoredNote];
+ [menuItem setImage:[NSImage imageNamed:@"ToolbarAnchoredNote"]];
+ [menuItem setTarget:self];
menuItem = [[[NSMenuItem allocWithZone:[NSMenu menuZone]]
initWithTitle:NSLocalizedString(@"Add Note", @"Toolbar item label") action:NULL
keyEquivalent:@""] autorelease];
[menuItem setSubmenu:menu];
item = [[SKToolbarItem alloc]
initWithItemIdentifier:SKDocumentToolbarNewTextNoteItemIdentifier];
[item setLabels:NSLocalizedString(@"Add Note", @"Toolbar item label")];
[item setToolTip:NSLocalizedString(@"Add New Note", @"Tool tip message")];
[textNoteButton makeCapsule];
- [textNoteButton setMenu:menu forSegment:0];
[item setViewWithSizes:textNoteButton];
[item setMenuFormRepresentation:menuItem];
[toolbarItems setObject:item
forKey:SKDocumentToolbarNewTextNoteItemIdentifier];
@@ -4883,13 +4892,22 @@
[menuItem setTag:SKSquareNote];
[menuItem setImage:[NSImage imageNamed:@"ToolbarSquareNote"]];
[menuItem setTarget:self];
+ [circleNoteButton setMenu:menu forSegment:0];
+ menu = [[[NSMenu allocWithZone:[NSMenu menuZone]] initWithTitle:@""]
autorelease];
+ menuItem = [menu addItemWithTitle:NSLocalizedString(@"Circle", @"Menu item
title") action:@selector(createNewNote:) keyEquivalent:@""];
+ [menuItem setTag:SKCircleNote];
+ [menuItem setImage:[NSImage imageNamed:@"ToolbarCircleNote"]];
+ [menuItem setTarget:self];
+ menuItem = [menu addItemWithTitle:NSLocalizedString(@"Box", @"Menu item
title") action:@selector(createNewNote:) keyEquivalent:@""];
+ [menuItem setTag:SKSquareNote];
+ [menuItem setImage:[NSImage imageNamed:@"ToolbarSquareNote"]];
+ [menuItem setTarget:self];
menuItem = [[[NSMenuItem allocWithZone:[NSMenu menuZone]]
initWithTitle:NSLocalizedString(@"Add Shape", @"Toolbar item label")
action:NULL keyEquivalent:@""] autorelease];
[menuItem setSubmenu:menu];
item = [[SKToolbarItem alloc]
initWithItemIdentifier:SKDocumentToolbarNewCircleNoteItemIdentifier];
[item setLabels:NSLocalizedString(@"Add Shape", @"Toolbar item label")];
[item setToolTip:NSLocalizedString(@"Add New Circle or Box", @"Tool tip
message")];
[circleNoteButton makeCapsule];
- [circleNoteButton setMenu:menu forSegment:0];
[item setViewWithSizes:circleNoteButton];
[item setMenuFormRepresentation:menuItem];
[toolbarItems setObject:item
forKey:SKDocumentToolbarNewCircleNoteItemIdentifier];
@@ -4908,13 +4926,26 @@
[menuItem setTag:SKStrikeOutNote];
[menuItem setImage:[NSImage imageNamed:@"ToolbarStrikeOutNote"]];
[menuItem setTarget:self];
+ [markupNoteButton setMenu:menu forSegment:0];
+ menu = [[[NSMenu allocWithZone:[NSMenu menuZone]] initWithTitle:@""]
autorelease];
+ menuItem = [menu addItemWithTitle:NSLocalizedString(@"Highlight", @"Menu
item title") action:@selector(createNewNote:) keyEquivalent:@""];
+ [menuItem setTag:SKHighlightNote];
+ [menuItem setImage:[NSImage imageNamed:@"ToolbarHighlightNote"]];
+ [menuItem setTarget:self];
+ menuItem = [menu addItemWithTitle:NSLocalizedString(@"Underline", @"Menu
item title") action:@selector(createNewNote:) keyEquivalent:@""];
+ [menuItem setTag:SKUnderlineNote];
+ [menuItem setTarget:self];
+ [menuItem setImage:[NSImage imageNamed:@"ToolbarUnderlineNote"]];
+ menuItem = [menu addItemWithTitle:NSLocalizedString(@"Strike Out", @"Menu
item title") action:@selector(createNewNote:) keyEquivalent:@""];
+ [menuItem setTag:SKStrikeOutNote];
+ [menuItem setImage:[NSImage imageNamed:@"ToolbarStrikeOutNote"]];
+ [menuItem setTarget:self];
menuItem = [[[NSMenuItem allocWithZone:[NSMenu menuZone]]
initWithTitle:NSLocalizedString(@"Add Markup", @"Toolbar item label")
action:NULL keyEquivalent:@""] autorelease];
[menuItem setSubmenu:menu];
item = [[SKToolbarItem alloc]
initWithItemIdentifier:SKDocumentToolbarNewMarkupItemIdentifier];
[item setLabels:NSLocalizedString(@"Add Markup", @"Toolbar item label")];
[item setToolTip:NSLocalizedString(@"Add New Markup", @"Tool tip
message")];
[markupNoteButton makeCapsule];
- [markupNoteButton setMenu:menu forSegment:0];
[item setViewWithSizes:markupNoteButton];
[item setMenuFormRepresentation:menuItem];
[toolbarItems setObject:item
forKey:SKDocumentToolbarNewMarkupItemIdentifier];
@@ -5309,10 +5340,13 @@
BOOL isMarkup = [menuItem tag] == SKHighlightNote || [menuItem tag] ==
SKUnderlineNote || [menuItem tag] == SKStrikeOutNote;
return [self isPresentation] == NO && ([pdfView toolMode] ==
SKTextToolMode || [pdfView toolMode] == SKNoteToolMode) && (isMarkup == NO ||
[[[pdfView currentSelection] pages] count]) && [pdfView hideNotes] == NO;
} else if (action == @selector(createNewTextNote:)) {
+ [menuItem setState:[textNoteButton tag] == [menuItem tag] ? NSOnState
: NSOffState];
return [self isPresentation] == NO && ([pdfView toolMode] ==
SKTextToolMode || [pdfView toolMode] == SKNoteToolMode) && [pdfView hideNotes]
== NO;
} else if (action == @selector(createNewCircleNote:)) {
+ [menuItem setState:[circleNoteButton tag] == [menuItem tag] ?
NSOnState : NSOffState];
return [self isPresentation] == NO && ([pdfView toolMode] ==
SKTextToolMode || [pdfView toolMode] == SKNoteToolMode) && [pdfView hideNotes]
== NO;
} else if (action == @selector(createNewMarkupNote:)) {
+ [menuItem setState:[markupNoteButton tag] == [menuItem tag] ?
NSOnState : NSOffState];
return [self isPresentation] == NO && ([pdfView toolMode] ==
SKTextToolMode || [pdfView toolMode] == SKNoteToolMode) && [[[pdfView
currentSelection] pages] count] && [pdfView hideNotes] == NO;
} else if (action == @selector(editNote:)) {
PDFAnnotation *annotation = [pdfView activeAnnotation];
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 2008.
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
