Revision: 7445
http://skim-app.svn.sourceforge.net/skim-app/?rev=7445&view=rev
Author: hofman
Date: 2011-08-26 12:31:07 +0000 (Fri, 26 Aug 2011)
Log Message:
-----------
convenience method for menu item with submenu
Modified Paths:
--------------
trunk/NSMenu_SKExtensions.h
trunk/NSMenu_SKExtensions.m
trunk/SKMainToolbarController.m
Modified: trunk/NSMenu_SKExtensions.h
===================================================================
--- trunk/NSMenu_SKExtensions.h 2011-08-26 09:33:19 UTC (rev 7444)
+++ trunk/NSMenu_SKExtensions.h 2011-08-26 12:31:07 UTC (rev 7445)
@@ -66,6 +66,8 @@
@interface NSMenuItem (SKExtensions)
++ (NSMenuItem *)menuItemWithSubmenuAndTitle:(NSString *)aString;
+
- (id)initWithTitle:(NSString *)aString action:(SEL)aSelector
target:(id)aTarget;
- (id)initWithTitle:(NSString *)aString action:(SEL)aSelector
target:(id)aTarget tag:(NSInteger)aTag;
- (id)initWithTitle:(NSString *)aString imageNamed:(NSString *)anImageName
action:(SEL)aSelector target:(id)aTarget tag:(NSInteger)aTag;
Modified: trunk/NSMenu_SKExtensions.m
===================================================================
--- trunk/NSMenu_SKExtensions.m 2011-08-26 09:33:19 UTC (rev 7444)
+++ trunk/NSMenu_SKExtensions.m 2011-08-26 12:31:07 UTC (rev 7445)
@@ -105,6 +105,10 @@
@implementation NSMenuItem (SKExtensions)
++ (NSMenuItem *)menuItemWithSubmenuAndTitle:(NSString *)aString {
+ return [[[NSMenuItem allocWithZone:[NSMenu menuZone]]
initWithTitle:aString submenu:[NSMenu menu]] autorelease];
+}
+
- (id)initWithTitle:(NSString *)aString action:(SEL)aSelector
target:(id)aTarget {
return [self initWithTitle:aString imageNamed:nil action:aSelector
target:aTarget tag:0];
}
Modified: trunk/SKMainToolbarController.m
===================================================================
--- trunk/SKMainToolbarController.m 2011-08-26 09:33:19 UTC (rev 7444)
+++ trunk/SKMainToolbarController.m 2011-08-26 12:31:07 UTC (rev 7445)
@@ -210,10 +210,10 @@
if ([identifier
isEqualToString:SKDocumentToolbarPreviousNextItemIdentifier]) {
- menu = [NSMenu menu];
+ menuItem = [NSMenuItem
menuItemWithSubmenuAndTitle:NSLocalizedString(@"Previous/Next", @"Toolbar item
label")];
+ menu = [menuItem submenu];
[menu addItemWithTitle:NSLocalizedString(@"Previous", @"Menu item
title") action:@selector(doGoToPreviousPage:) target:mainController];
[menu addItemWithTitle:NSLocalizedString(@"Next", @"Menu item
title") action:@selector(doGoToNextPage:) target:mainController];
- menuItem = [[[NSMenuItem allocWithZone:[NSMenu menuZone]]
initWithTitle:NSLocalizedString(@"Previous/Next", @"Toolbar item label")
submenu:menu] autorelease];
[item setLabels:NSLocalizedString(@"Previous/Next", @"Toolbar item
label")];
[item setToolTip:NSLocalizedString(@"Previous/Next", @"Tool tip
message")];
@@ -224,10 +224,10 @@
} else if ([identifier
isEqualToString:SKDocumentToolbarPreviousItemIdentifier]) {
- menu = [NSMenu menu];
+ menuItem = [NSMenuItem
menuItemWithSubmenuAndTitle:NSLocalizedString(@"Previous", @"Toolbar item
label")];
+ menu = [menuItem submenu];
[menu addItemWithTitle:NSLocalizedString(@"Previous", @"Menu item
title") action:@selector(doGoToPreviousPage:) target:mainController];
[menu addItemWithTitle:NSLocalizedString(@"First", @"Menu item
title") action:@selector(doGoToFirstPage:) target:mainController];
- menuItem = [[[NSMenuItem allocWithZone:[NSMenu menuZone]]
initWithTitle:NSLocalizedString(@"Previous", @"Toolbar item label")
submenu:menu] autorelease];
[item setLabels:NSLocalizedString(@"Previous", @"Toolbar item
label")];
[item setToolTip:NSLocalizedString(@"Go To Previous Page", @"Tool
tip message")];
@@ -238,10 +238,10 @@
} else if ([identifier
isEqualToString:SKDocumentToolbarNextItemIdentifier]) {
- menu = [NSMenu menu];
+ menuItem = [NSMenuItem
menuItemWithSubmenuAndTitle:NSLocalizedString(@"Next", @"Toolbar item label")];
+ menu = [menuItem submenu];
[menu addItemWithTitle:NSLocalizedString(@"Next", @"Menu item
title") action:@selector(doGoToNextPage:) target:mainController];
[menu addItemWithTitle:NSLocalizedString(@"Last", @"Menu item
title") action:@selector(doGoToLastPage:) target:mainController];
- menuItem = [[[NSMenuItem allocWithZone:[NSMenu menuZone]]
initWithTitle:NSLocalizedString(@"Next", @"Toolbar item label") submenu:menu]
autorelease];
[item setLabels:NSLocalizedString(@"Next", @"Toolbar item label")];
[item setToolTip:NSLocalizedString(@"Go To Next Page", @"Tool tip
message")];
@@ -252,12 +252,12 @@
} else if ([identifier
isEqualToString:SKDocumentToolbarPreviousNextFirstLastItemIdentifier]) {
- menu = [NSMenu menu];
- [menu addItemWithTitle:NSLocalizedString(@"Previous", @"Menu item
title") action:@selector(doGoToPreviousPage:) target:mainController];
+ menuItem = [NSMenuItem
menuItemWithSubmenuAndTitle:NSLocalizedString(@"Previous", @"Toolbar item
label")];
+ menu = [menuItem submenu];
+ [menu addItemWithTitle:NSLocalizedString(@"Previous/Next", @"Menu
item title") action:@selector(doGoToPreviousPage:) target:mainController];
[menu addItemWithTitle:NSLocalizedString(@"Next", @"Menu item
title") action:@selector(doGoToNextPage:) target:mainController];
[menu addItemWithTitle:NSLocalizedString(@"First", @"Menu item
title") action:@selector(doGoToFirstPage:) target:mainController];
[menu addItemWithTitle:NSLocalizedString(@"Last", @"Menu item
title") action:@selector(doGoToLastPage:) target:mainController];
- menuItem = [[[NSMenuItem allocWithZone:[NSMenu menuZone]]
initWithTitle:NSLocalizedString(@"Previous/Next", @"Toolbar item label")
submenu:menu] autorelease];
[item setLabels:NSLocalizedString(@"Previous/Next", @"Toolbar item
label")];
[item setToolTip:NSLocalizedString(@"Go To First, Previous, Next
or Last Page", @"Tool tip message")];
@@ -270,10 +270,10 @@
} else if ([identifier
isEqualToString:SKDocumentToolbarBackForwardItemIdentifier]) {
- menu = [NSMenu menu];
+ menuItem = [NSMenuItem
menuItemWithSubmenuAndTitle:NSLocalizedString(@"Back/Forward", @"Toolbar item
label")];
+ menu = [menuItem submenu];
[menu addItemWithTitle:NSLocalizedString(@"Back", @"Menu item
title") action:@selector(doGoBack:) target:mainController];
[menu addItemWithTitle:NSLocalizedString(@"Forward", @"Menu item
title") action:@selector(doGoForward:) target:mainController];
- menuItem = [[[NSMenuItem allocWithZone:[NSMenu menuZone]]
initWithTitle:NSLocalizedString(@"Back/Forward", @"Toolbar item label")
submenu:menu] autorelease];
[item setLabels:NSLocalizedString(@"Back/Forward", @"Toolbar item
label")];
[item setToolTip:NSLocalizedString(@"Back/Forward", @"Tool tip
message")];
@@ -329,10 +329,10 @@
} else if ([identifier
isEqualToString:SKDocumentToolbarZoomInOutItemIdentifier]) {
- menu = [NSMenu menu];
+ menuItem = [NSMenuItem
menuItemWithSubmenuAndTitle:NSLocalizedString(@"Zoom", @"Toolbar item label")];
+ menu = [menuItem submenu];
[menu addItemWithTitle:NSLocalizedString(@"Zoom In", @"Menu item
title") action:@selector(doZoomIn:) target:mainController];
[menu addItemWithTitle:NSLocalizedString(@"Zoom Out", @"Menu item
title") action:@selector(doZoomOut:) target:mainController];
- menuItem = [[[NSMenuItem allocWithZone:[NSMenu menuZone]]
initWithTitle:NSLocalizedString(@"Zoom", @"Toolbar item label") submenu:menu]
autorelease];
[item setLabels:NSLocalizedString(@"Zoom", @"Toolbar item label")];
[item setToolTip:NSLocalizedString(@"Zoom", @"Tool tip message")];
@@ -343,11 +343,11 @@
} else if ([identifier
isEqualToString:SKDocumentToolbarZoomInActualOutItemIdentifier]) {
- menu = [NSMenu menu];
+ menuItem = [NSMenuItem
menuItemWithSubmenuAndTitle:NSLocalizedString(@"Zoom", @"Toolbar item label")];
+ menu = [menuItem submenu];
[menu addItemWithTitle:NSLocalizedString(@"Zoom In", @"Menu item
title") action:@selector(doZoomIn:) target:mainController];
[menu addItemWithTitle:NSLocalizedString(@"Zoom Out", @"Menu item
title") action:@selector(doZoomOut:) target:mainController];
[menu addItemWithTitle:NSLocalizedString(@"Actual Size", @"Menu
item title") action:@selector(zoomActualPhysical:) target:self];
- menuItem = [[[NSMenuItem allocWithZone:[NSMenu menuZone]]
initWithTitle:NSLocalizedString(@"Zoom", @"Toolbar item label") submenu:menu]
autorelease];
[item setLabels:NSLocalizedString(@"Zoom", @"Toolbar item label")];
[item setToolTip:NSLocalizedString(@"Zoom", @"Tool tip message")];
@@ -377,10 +377,10 @@
} else if ([identifier
isEqualToString:SKDocumentToolbarRotateLeftRightItemIdentifier]) {
- menu = [NSMenu menu];
+ menuItem = [NSMenuItem
menuItemWithSubmenuAndTitle:NSLocalizedString(@"Rotate", @"Toolbar item
label")];
+ menu = [menuItem submenu];
[menu addItemWithTitle:NSLocalizedString(@"Rotate Right", @"Menu
item title") action:@selector(rotateAllRight:) target:mainController];
[menu addItemWithTitle:NSLocalizedString(@"Rotate Left", @"Menu
item title") action:@selector(rotateAllLeft:) target:mainController];
- menuItem = [[[NSMenuItem allocWithZone:[NSMenu menuZone]]
initWithTitle:NSLocalizedString(@"Rotate", @"Toolbar item label") submenu:menu]
autorelease];
[item setLabels:NSLocalizedString(@"Rotate", @"Toolbar item
label")];
[item setToolTip:NSLocalizedString(@"Rotate Left or Right", @"Tool
tip message")];
@@ -421,10 +421,10 @@
[menu addItemWithTitle:NSLocalizedString(@"Anchored Note", @"Menu
item title") imageNamed:SKImageNameToolbarAddAnchoredNote
action:@selector(createNewTextNote:) target:self tag:SKAnchoredNote];
[textNoteButton setMenu:menu forSegment:0];
- menu = [NSMenu menu];
+ menuItem = [NSMenuItem
menuItemWithSubmenuAndTitle:NSLocalizedString(@"Add Note", @"Toolbar item
label")];
+ menu = [menuItem submenu];
[menu addItemWithTitle:NSLocalizedString(@"Text Note", @"Menu item
title") imageNamed:SKImageNameToolbarAddTextNote
action:@selector(createNewNote:) target:mainController tag:SKFreeTextNote];
[menu addItemWithTitle:NSLocalizedString(@"Anchored Note", @"Menu
item title") imageNamed:SKImageNameToolbarAddAnchoredNote
action:@selector(createNewNote:) target:mainController tag:SKAnchoredNote];
- menuItem = [[[NSMenuItem allocWithZone:[NSMenu menuZone]]
initWithTitle:NSLocalizedString(@"Add Note", @"Toolbar item label")
submenu:menu] autorelease];
[item setLabels:NSLocalizedString(@"Add Note", @"Toolbar item
label")];
[item setToolTip:NSLocalizedString(@"Add New Note", @"Tool tip
message")];
@@ -438,10 +438,10 @@
[menu addItemWithTitle:NSLocalizedString(@"Box", @"Menu item
title") imageNamed:SKImageNameToolbarAddSquareNote
action:@selector(createNewCircleNote:) target:self tag:SKSquareNote];
[circleNoteButton setMenu:menu forSegment:0];
- menu = [NSMenu menu];
+ menuItem = [NSMenuItem
menuItemWithSubmenuAndTitle:NSLocalizedString(@"Add Shape", @"Toolbar item
label")];
+ menu = [menuItem submenu];
[menu addItemWithTitle:NSLocalizedString(@"Circle", @"Menu item
title") imageNamed:SKImageNameToolbarAddCircleNote
action:@selector(createNewNote:) target:mainController tag:SKCircleNote];
[menu addItemWithTitle:NSLocalizedString(@"Box", @"Menu item
title") imageNamed:SKImageNameToolbarAddSquareNote
action:@selector(createNewNote:) target:mainController tag:SKSquareNote];
- menuItem = [[[NSMenuItem allocWithZone:[NSMenu menuZone]]
initWithTitle:NSLocalizedString(@"Add Shape", @"Toolbar item label")
submenu:menu] autorelease];
[item setLabels:NSLocalizedString(@"Add Shape", @"Toolbar item
label")];
[item setToolTip:NSLocalizedString(@"Add New Circle or Box",
@"Tool tip message")];
@@ -456,11 +456,11 @@
[menu addItemWithTitle:NSLocalizedString(@"Strike Out", @"Menu
item title") imageNamed:SKImageNameToolbarAddStrikeOutNote
action:@selector(createNewMarkupNote:) target:self tag:SKStrikeOutNote];
[markupNoteButton setMenu:menu forSegment:0];
- menu = [NSMenu menu];
+ menuItem = [NSMenuItem
menuItemWithSubmenuAndTitle:NSLocalizedString(@"Add Markup", @"Toolbar item
label")];
+ menu = [menuItem submenu];
[menu addItemWithTitle:NSLocalizedString(@"Highlight", @"Menu item
title") imageNamed:SKImageNameToolbarAddHighlightNote
action:@selector(createNewNote:) target:mainController tag:SKHighlightNote];
[menu addItemWithTitle:NSLocalizedString(@"Underline", @"Menu item
title") imageNamed:SKImageNameToolbarAddUnderlineNote
action:@selector(createNewNote:) target:mainController tag:SKUnderlineNote];
[menu addItemWithTitle:NSLocalizedString(@"Strike Out", @"Menu
item title") imageNamed:SKImageNameToolbarAddStrikeOutNote
action:@selector(createNewNote:) target:mainController tag:SKStrikeOutNote];
- menuItem = [[[NSMenuItem allocWithZone:[NSMenu menuZone]]
initWithTitle:NSLocalizedString(@"Add Markup", @"Toolbar item label")
submenu:menu] autorelease];
[item setLabels:NSLocalizedString(@"Add Markup", @"Toolbar item
label")];
[item setToolTip:NSLocalizedString(@"Add New Markup", @"Tool tip
message")];
@@ -479,7 +479,8 @@
} else if ([identifier
isEqualToString:SKDocumentToolbarNewNoteItemIdentifier]) {
- menu = [NSMenu menu];
+ menuItem = [NSMenuItem
menuItemWithSubmenuAndTitle:NSLocalizedString(@"Add Note", @"Toolbar item
label")];
+ menu = [menuItem submenu];
[menu addItemWithTitle:NSLocalizedString(@"Text Note", @"Menu item
title") imageNamed:SKImageNameToolbarAddTextNote
action:@selector(createNewNote:) target:mainController tag:SKFreeTextNote];
[menu addItemWithTitle:NSLocalizedString(@"Anchored Note", @"Menu
item title") imageNamed:SKImageNameToolbarAddAnchoredNote
action:@selector(createNewNote:) target:mainController tag:SKAnchoredNote];
[menu addItemWithTitle:NSLocalizedString(@"Circle", @"Menu item
title") imageNamed:SKImageNameToolbarAddCircleNote
action:@selector(createNewNote:) target:mainController tag:SKCircleNote];
@@ -488,7 +489,6 @@
[menu addItemWithTitle:NSLocalizedString(@"Underline", @"Menu item
title") imageNamed:SKImageNameToolbarAddUnderlineNote
action:@selector(createNewNote:) target:mainController tag:SKUnderlineNote];
[menu addItemWithTitle:NSLocalizedString(@"Strike Out", @"Menu
item title") imageNamed:SKImageNameToolbarAddStrikeOutNote
action:@selector(createNewNote:) target:mainController tag:SKStrikeOutNote];
[menu addItemWithTitle:NSLocalizedString(@"Line", @"Menu item
title") imageNamed:SKImageNameToolbarAddLineNote
action:@selector(createNewNote:) target:mainController tag:SKLineNote];
- menuItem = [[[NSMenuItem allocWithZone:[NSMenu menuZone]]
initWithTitle:NSLocalizedString(@"Add Note", @"Toolbar item label")
submenu:menu] autorelease];
[item setLabels:NSLocalizedString(@"Add Note", @"Toolbar item
label")];
[item setToolTip:NSLocalizedString(@"Add New Note", @"Tool tip
message")];
@@ -517,7 +517,8 @@
[menu addItemWithTitle:NSLocalizedString(@"Freehand", @"Menu item
title") imageNamed:SKImageNameInkNote action:@selector(changeAnnotationMode:)
target:mainController tag:SKInkNote];
[toolModeButton setMenu:menu forSegment:SKNoteToolMode];
- menu = [NSMenu menu];
+ menuItem = [NSMenuItem
menuItemWithSubmenuAndTitle:NSLocalizedString(@"Tool Mode", @"Toolbar item
label")];
+ menu = [menuItem submenu];
[menu addItemWithTitle:NSLocalizedString(@"Text Tool", @"Menu item
title") action:@selector(changeToolMode:) target:mainController
tag:SKTextToolMode];
[menu addItemWithTitle:NSLocalizedString(@"Scroll Tool", @"Menu
item title") action:@selector(changeToolMode:) target:mainController
tag:SKMoveToolMode];
[menu addItemWithTitle:NSLocalizedString(@"Magnify Tool", @"Menu
item title") action:@selector(changeToolMode:) target:mainController
tag:SKMagnifyToolMode];
@@ -532,7 +533,6 @@
[menu addItemWithTitle:NSLocalizedString(@"Strike Out Tool",
@"Menu item title") action:@selector(changeAnnotationMode:)
target:mainController tag:SKStrikeOutNote];
[menu addItemWithTitle:NSLocalizedString(@"Line Tool", @"Menu item
title") action:@selector(changeAnnotationMode:) target:mainController
tag:SKLineNote];
[menu addItemWithTitle:NSLocalizedString(@"Freehand Tool", @"Menu
item title") action:@selector(changeAnnotationMode:) target:mainController
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")];
[item setToolTip:NSLocalizedString(@"Tool Mode", @"Tool tip
message")];
@@ -546,10 +546,10 @@
} else if ([identifier
isEqualToString:SKDocumentToolbarSingleTwoUpItemIdentifier]) {
- menu = [NSMenu menu];
+ menuItem = [NSMenuItem
menuItemWithSubmenuAndTitle:NSLocalizedString(@"Single/Two Pages", @"Toolbar
item label")];
+ menu = [menuItem submenu];
[menu addItemWithTitle:NSLocalizedString(@"Single Page", @"Menu
item title") action:@selector(changeDisplaySinglePages:) target:mainController
tag:kPDFDisplaySinglePage];
[menu addItemWithTitle:NSLocalizedString(@"Two Pages", @"Menu item
title") action:@selector(changeDisplaySinglePages:) target:mainController
tag:kPDFDisplayTwoUp];
- menuItem = [[[NSMenuItem allocWithZone:[NSMenu menuZone]]
initWithTitle:NSLocalizedString(@"Single/Two Pages", @"Toolbar item label")
submenu:menu] autorelease];
[item setLabels:NSLocalizedString(@"Single/Two Pages", @"Toolbar
item label")];
[item setToolTip:NSLocalizedString(@"Single/Two Pages", @"Tool tip
message")];
@@ -560,10 +560,10 @@
} else if ([identifier
isEqualToString:SKDocumentToolbarContinuousItemIdentifier]) {
- menu = [NSMenu menu];
+ menuItem = [NSMenuItem
menuItemWithSubmenuAndTitle:NSLocalizedString(@"Continuous", @"Toolbar item
label")];
+ menu = [menuItem submenu];
[menu addItemWithTitle:NSLocalizedString(@"Non Continuous", @"Menu
item title") action:@selector(changeDisplayContinuous:) target:mainController
tag:kPDFDisplaySinglePage];
[menu addItemWithTitle:NSLocalizedString(@"Continuous", @"Menu
item title") action:@selector(changeDisplayContinuous:) target:mainController
tag:kPDFDisplaySinglePageContinuous];
- menuItem = [[[NSMenuItem allocWithZone:[NSMenu menuZone]]
initWithTitle:NSLocalizedString(@"Continuous", @"Toolbar item label")
submenu:menu] autorelease];
[item setLabels:NSLocalizedString(@"Continuous", @"Toolbar item
label")];
[item setToolTip:NSLocalizedString(@"Continuous", @"Tool tip
message")];
@@ -574,12 +574,12 @@
} else if ([identifier
isEqualToString:SKDocumentToolbarDisplayModeItemIdentifier]) {
- menu = [NSMenu menu];
+ menuItem = [NSMenuItem
menuItemWithSubmenuAndTitle:NSLocalizedString(@"Display Mode", @"Toolbar item
label")];
+ menu = [menuItem submenu];
[menu addItemWithTitle:NSLocalizedString(@"Single Page", @"Menu
item title") action:@selector(changeDisplayMode:) target:mainController
tag:kPDFDisplaySinglePage];
[menu addItemWithTitle:NSLocalizedString(@"Single Page
Continuous", @"Menu item title") action:@selector(changeDisplayMode:)
target:mainController tag:kPDFDisplaySinglePageContinuous];
[menu addItemWithTitle:NSLocalizedString(@"Two Pages", @"Menu item
title") action:@selector(changeDisplayMode:) target:mainController
tag:kPDFDisplayTwoUp];
[menu addItemWithTitle:NSLocalizedString(@"Two Pages Continuous",
@"Menu item title") action:@selector(changeDisplayMode:) target:mainController
tag:kPDFDisplayTwoUpContinuous];
- menuItem = [[[NSMenuItem allocWithZone:[NSMenu menuZone]]
initWithTitle:NSLocalizedString(@"Display Mode", @"Toolbar item label")
submenu:menu] autorelease];
[item setLabels:NSLocalizedString(@"Display Mode", @"Toolbar item
label")];
[item setToolTip:NSLocalizedString(@"Display Mode", @"Tool tip
message")];
@@ -592,10 +592,10 @@
} else if ([identifier
isEqualToString:SKDocumentToolbarDisplayBoxItemIdentifier]) {
- menu = [NSMenu menu];
+ menuItem = [NSMenuItem
menuItemWithSubmenuAndTitle:NSLocalizedString(@"Display Box", @"Toolbar item
label")];
+ menu = [menuItem submenu];
[menu addItemWithTitle:NSLocalizedString(@"Media Box", @"Menu item
title") action:@selector(changeDisplayBox:) target:mainController
tag:kPDFDisplayBoxMediaBox];
[menu addItemWithTitle:NSLocalizedString(@"Crop Box", @"Menu item
title") action:@selector(changeDisplayBox:) target:mainController
tag:kPDFDisplayBoxCropBox];
- menuItem = [[[NSMenuItem allocWithZone:[NSMenu menuZone]]
initWithTitle:NSLocalizedString(@"Display Box", @"Toolbar item label")
submenu:menu] autorelease];
[item setLabels:NSLocalizedString(@"Display Box", @"Toolbar item
label")];
[item setToolTip:NSLocalizedString(@"Display Box", @"Tool tip
message")];
@@ -610,8 +610,7 @@
[[NSNotificationCenter defaultCenter] addObserver:self
selector:@selector(handleColorSwatchColorsChangedNotification:)
name:SKColorSwatchColorsChangedNotification object:colorSwatch];
- menu = [NSMenu menu];
- menuItem = [[[NSMenuItem allocWithZone:[NSMenu menuZone]]
initWithTitle:NSLocalizedString(@"Colors", @"Toolbar item label") submenu:menu]
autorelease];
+ menuItem = [NSMenuItem
menuItemWithSubmenuAndTitle:NSLocalizedString(@"Colors", @"Toolbar item
label")];
[item setLabels:NSLocalizedString(@"Favorite Colors", @"Toolbar
item label")];
[item setToolTip:NSLocalizedString(@"Favorite Colors", @"Tool tip
message")];
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
EMC VNX: the world's simplest storage, starting under $10K
The only unified storage solution that offers unified management
Up to 160% more powerful than alternatives and 25% more efficient.
Guaranteed. http://p.sf.net/sfu/emc-vnx-dev2dev
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
