Revision: 4004
http://skim-app.svn.sourceforge.net/skim-app/?rev=4004&view=rev
Author: hofman
Date: 2008-06-11 10:45:49 -0700 (Wed, 11 Jun 2008)
Log Message:
-----------
Simplify some convenience method by passing the image name instead of the image.
Modified Paths:
--------------
trunk/NSMenu_SKExtensions.h
trunk/NSMenu_SKExtensions.m
trunk/SKMainWindowController_Toolbar.m
Modified: trunk/NSMenu_SKExtensions.h
===================================================================
--- trunk/NSMenu_SKExtensions.h 2008-06-11 17:40:07 UTC (rev 4003)
+++ trunk/NSMenu_SKExtensions.h 2008-06-11 17:45:49 UTC (rev 4004)
@@ -49,8 +49,8 @@
- (NSMenuItem *)insertItemWithTitle:(NSString *)aString action:(SEL)aSelector
target:(id)aTarget tag:(NSInteger)aTag atIndex:(NSInteger)anIndex;
- (NSMenuItem *)addItemWithTitle:(NSString *)aString action:(SEL)aSelector
target:(id)aTarget tag:(NSInteger)aTag;
-- (NSMenuItem *)insertItemWithTitle:(NSString *)aString image:(NSImage
*)anImage action:(SEL)aSelector target:(id)aTarget tag:(NSInteger)aTag
atIndex:(NSInteger)anIndex;
-- (NSMenuItem *)addItemWithTitle:(NSString *)aString image:(NSImage *)anImage
action:(SEL)aSelector target:(id)aTarget tag:(NSInteger)aTag;
+- (NSMenuItem *)insertItemWithTitle:(NSString *)aString imageNamed:(NSString
*)anImageName action:(SEL)aSelector target:(id)aTarget tag:(NSInteger)aTag
atIndex:(NSInteger)anIndex;
+- (NSMenuItem *)addItemWithTitle:(NSString *)aString imageNamed:(NSString
*)anImageName action:(SEL)aSelector target:(id)aTarget tag:(NSInteger)aTag;
- (NSMenuItem *)insertItemWithTitle:(NSString *)aString submenu:(NSMenu
*)aSubmenu atIndex:(NSInteger)anIndex;
- (NSMenuItem *)addItemWithTitle:(NSString *)aString submenu:(NSMenu
*)aSubmenu;
@@ -62,7 +62,7 @@
- (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 image:(NSImage *)anImage
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;
- (id)initWithTitle:(NSString *)aString submenu:(NSMenu *)aSubmenu;
@end
Modified: trunk/NSMenu_SKExtensions.m
===================================================================
--- trunk/NSMenu_SKExtensions.m 2008-06-11 17:40:07 UTC (rev 4003)
+++ trunk/NSMenu_SKExtensions.m 2008-06-11 17:45:49 UTC (rev 4004)
@@ -69,15 +69,15 @@
return [self insertItemWithTitle:aString action:aSelector target:aTarget
tag:aTag atIndex:[self numberOfItems]];
}
-- (NSMenuItem *)insertItemWithTitle:(NSString *)aString image:(NSImage
*)anImage action:(SEL)aSelector target:(id)aTarget tag:(NSInteger)aTag
atIndex:(NSInteger)anIndex {
- NSMenuItem *item = [[NSMenuItem allocWithZone:[self zone]]
initWithTitle:aString image:anImage action:aSelector target:aTarget tag:aTag];
+- (NSMenuItem *)insertItemWithTitle:(NSString *)aString imageNamed:(NSString
*)anImageName action:(SEL)aSelector target:(id)aTarget tag:(NSInteger)aTag
atIndex:(NSInteger)anIndex {
+ NSMenuItem *item = [[NSMenuItem allocWithZone:[self zone]]
initWithTitle:aString imageNamed:anImageName action:aSelector target:aTarget
tag:aTag];
[self insertItem:item atIndex:anIndex];
[item release];
return item;
}
-- (NSMenuItem *)addItemWithTitle:(NSString *)aString image:(NSImage *)anImage
action:(SEL)aSelector target:(id)aTarget tag:(NSInteger)aTag {
- return [self insertItemWithTitle:aString image:anImage action:aSelector
target:aTarget tag:aTag atIndex:[self numberOfItems]];
+- (NSMenuItem *)addItemWithTitle:(NSString *)aString imageNamed:(NSString
*)anImageName action:(SEL)aSelector target:(id)aTarget tag:(NSInteger)aTag {
+ return [self insertItemWithTitle:aString imageNamed:anImageName
action:aSelector target:aTarget tag:aTag atIndex:[self numberOfItems]];
}
- (NSMenuItem *)insertItemWithTitle:(NSString *)aString submenu:(NSMenu
*)aSubmenu atIndex:(NSInteger)anIndex {
@@ -97,16 +97,17 @@
@implementation NSMenuItem (SKExtensions)
- (id)initWithTitle:(NSString *)aString action:(SEL)aSelector
target:(id)aTarget {
- return [self initWithTitle:aString image:nil action:aSelector
target:aTarget tag:0];
+ return [self initWithTitle:aString imageNamed:nil action:aSelector
target:aTarget tag:0];
}
- (id)initWithTitle:(NSString *)aString action:(SEL)aSelector
target:(id)aTarget tag:(NSInteger)aTag {
- return [self initWithTitle:aString image:nil action:aSelector
target:aTarget tag:aTag];
+ return [self initWithTitle:aString imageNamed:nil action:aSelector
target:aTarget tag:aTag];
}
-- (id)initWithTitle:(NSString *)aString image:(NSImage *)anImage
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 {
if (self = [self initWithTitle:aString action:aSelector
keyEquivalent:@""]) {
- [self setImage:anImage];
+ if (anImageName)
+ [self setImage:[NSImage imageNamed:anImageName]];
[self setTarget:aTarget];
[self setTag:aTag];
}
Modified: trunk/SKMainWindowController_Toolbar.m
===================================================================
--- trunk/SKMainWindowController_Toolbar.m 2008-06-11 17:40:07 UTC (rev
4003)
+++ trunk/SKMainWindowController_Toolbar.m 2008-06-11 17:45:49 UTC (rev
4004)
@@ -423,13 +423,13 @@
#pragma mark SKDocumentToolbarNewTextNoteItemIdentifier
menu = [[[NSMenu allocWithZone:[NSMenu menuZone]] initWithTitle:@""]
autorelease];
- [menu addItemWithTitle:NSLocalizedString(@"Text Note", @"Menu item title")
image:[NSImage imageNamed:SKImageNameToolbarAddTextNote]
action:@selector(createNewTextNote:) target:self tag:SKFreeTextNote];
- [menu addItemWithTitle:NSLocalizedString(@"Anchored Note", @"Menu item
title") image:[NSImage imageNamed:SKImageNameToolbarAddAnchoredNote]
action:@selector(createNewTextNote:) target:self tag:SKAnchoredNote];
+ [menu addItemWithTitle:NSLocalizedString(@"Text Note", @"Menu item title")
imageNamed:SKImageNameToolbarAddTextNote action:@selector(createNewTextNote:)
target:self tag:SKFreeTextNote];
+ [menu addItemWithTitle:NSLocalizedString(@"Anchored Note", @"Menu item
title") imageNamed:SKImageNameToolbarAddAnchoredNote
action:@selector(createNewTextNote:) target:self tag:SKAnchoredNote];
[textNoteButton setMenu:menu forSegment:0];
menu = [[[NSMenu allocWithZone:[NSMenu menuZone]] initWithTitle:@""]
autorelease];
- [menu addItemWithTitle:NSLocalizedString(@"Text Note", @"Menu item title")
image:[NSImage imageNamed:SKImageNameToolbarAddTextNote]
action:@selector(createNewNote:) target:self tag:SKFreeTextNote];
- [menu addItemWithTitle:NSLocalizedString(@"Anchored Note", @"Menu item
title") image:[NSImage imageNamed:SKImageNameToolbarAddAnchoredNote]
action:@selector(createNewNote:) target:self tag:SKAnchoredNote];
+ [menu addItemWithTitle:NSLocalizedString(@"Text Note", @"Menu item title")
imageNamed:SKImageNameToolbarAddTextNote action:@selector(createNewNote:)
target:self tag:SKFreeTextNote];
+ [menu addItemWithTitle:NSLocalizedString(@"Anchored Note", @"Menu item
title") imageNamed:SKImageNameToolbarAddAnchoredNote
action:@selector(createNewNote:) target:self tag:SKAnchoredNote];
menuItem = [[[NSMenuItem allocWithZone:[NSMenu menuZone]]
initWithTitle:NSLocalizedString(@"Add Note", @"Toolbar item label")
submenu:menu] autorelease];
item = [[SKToolbarItem alloc]
initWithItemIdentifier:SKDocumentToolbarNewTextNoteItemIdentifier];
@@ -444,13 +444,13 @@
#pragma mark SKDocumentToolbarNewCircleNoteItemIdentifier
menu = [[[NSMenu allocWithZone:[NSMenu menuZone]] initWithTitle:@""]
autorelease];
- [menu addItemWithTitle:NSLocalizedString(@"Circle", @"Menu item title")
image:[NSImage imageNamed:SKImageNameToolbarAddCircleNote]
action:@selector(createNewCircleNote:) target:self tag:SKCircleNote];
- [menu addItemWithTitle:NSLocalizedString(@"Box", @"Menu item title")
image:[NSImage imageNamed:SKImageNameToolbarAddSquareNote]
action:@selector(createNewCircleNote:) target:self tag:SKSquareNote];
+ [menu addItemWithTitle:NSLocalizedString(@"Circle", @"Menu item title")
imageNamed:SKImageNameToolbarAddCircleNote
action:@selector(createNewCircleNote:) target:self tag:SKCircleNote];
+ [menu addItemWithTitle:NSLocalizedString(@"Box", @"Menu item title")
imageNamed:SKImageNameToolbarAddSquareNote
action:@selector(createNewCircleNote:) target:self tag:SKSquareNote];
[circleNoteButton setMenu:menu forSegment:0];
menu = [[[NSMenu allocWithZone:[NSMenu menuZone]] initWithTitle:@""]
autorelease];
- [menu addItemWithTitle:NSLocalizedString(@"Circle", @"Menu item title")
image:[NSImage imageNamed:SKImageNameToolbarAddCircleNote]
action:@selector(createNewNote:) target:self tag:SKCircleNote];
- [menu addItemWithTitle:NSLocalizedString(@"Box", @"Menu item title")
image:[NSImage imageNamed:SKImageNameToolbarAddSquareNote]
action:@selector(createNewNote:) target:self tag:SKSquareNote];
+ [menu addItemWithTitle:NSLocalizedString(@"Circle", @"Menu item title")
imageNamed:SKImageNameToolbarAddCircleNote action:@selector(createNewNote:)
target:self tag:SKCircleNote];
+ [menu addItemWithTitle:NSLocalizedString(@"Box", @"Menu item title")
imageNamed:SKImageNameToolbarAddSquareNote action:@selector(createNewNote:)
target:self tag:SKSquareNote];
menuItem = [[[NSMenuItem allocWithZone:[NSMenu menuZone]]
initWithTitle:NSLocalizedString(@"Add Shape", @"Toolbar item label")
submenu:menu] autorelease];
item = [[SKToolbarItem alloc]
initWithItemIdentifier:SKDocumentToolbarNewCircleNoteItemIdentifier];
@@ -465,15 +465,15 @@
#pragma mark SKDocumentToolbarNewMarkupItemIdentifier
menu = [[[NSMenu allocWithZone:[NSMenu menuZone]] initWithTitle:@""]
autorelease];
- [menu addItemWithTitle:NSLocalizedString(@"Highlight", @"Menu item title")
image:[NSImage imageNamed:SKImageNameToolbarAddHighlightNote]
action:@selector(createNewMarkupNote:) target:self tag:SKHighlightNote];
- [menu addItemWithTitle:NSLocalizedString(@"Underline", @"Menu item title")
image:[NSImage imageNamed:SKImageNameToolbarAddUnderlineNote]
action:@selector(createNewMarkupNote:) target:self tag:SKUnderlineNote];
- [menu addItemWithTitle:NSLocalizedString(@"Strike Out", @"Menu item
title") image:[NSImage imageNamed:SKImageNameToolbarAddStrikeOutNote]
action:@selector(createNewMarkupNote:) target:self tag:SKStrikeOutNote];
+ [menu addItemWithTitle:NSLocalizedString(@"Highlight", @"Menu item title")
imageNamed:SKImageNameToolbarAddHighlightNote
action:@selector(createNewMarkupNote:) target:self tag:SKHighlightNote];
+ [menu addItemWithTitle:NSLocalizedString(@"Underline", @"Menu item title")
imageNamed:SKImageNameToolbarAddUnderlineNote
action:@selector(createNewMarkupNote:) target:self tag:SKUnderlineNote];
+ [menu addItemWithTitle:NSLocalizedString(@"Strike Out", @"Menu item
title") imageNamed:SKImageNameToolbarAddStrikeOutNote
action:@selector(createNewMarkupNote:) target:self tag:SKStrikeOutNote];
[markupNoteButton setMenu:menu forSegment:0];
menu = [[[NSMenu allocWithZone:[NSMenu menuZone]] initWithTitle:@""]
autorelease];
- [menu addItemWithTitle:NSLocalizedString(@"Highlight", @"Menu item title")
image:[NSImage imageNamed:SKImageNameToolbarAddHighlightNote]
action:@selector(createNewNote:) target:self tag:SKHighlightNote];
- [menu addItemWithTitle:NSLocalizedString(@"Underline", @"Menu item title")
image:[NSImage imageNamed:SKImageNameToolbarAddUnderlineNote]
action:@selector(createNewNote:) target:self tag:SKUnderlineNote];
- [menu addItemWithTitle:NSLocalizedString(@"Strike Out", @"Menu item
title") image:[NSImage imageNamed:SKImageNameToolbarAddStrikeOutNote]
action:@selector(createNewNote:) target:self tag:SKStrikeOutNote];
+ [menu addItemWithTitle:NSLocalizedString(@"Highlight", @"Menu item title")
imageNamed:SKImageNameToolbarAddHighlightNote action:@selector(createNewNote:)
target:self tag:SKHighlightNote];
+ [menu addItemWithTitle:NSLocalizedString(@"Underline", @"Menu item title")
imageNamed:SKImageNameToolbarAddUnderlineNote action:@selector(createNewNote:)
target:self tag:SKUnderlineNote];
+ [menu addItemWithTitle:NSLocalizedString(@"Strike Out", @"Menu item
title") imageNamed:SKImageNameToolbarAddStrikeOutNote
action:@selector(createNewNote:) target:self tag:SKStrikeOutNote];
menuItem = [[[NSMenuItem allocWithZone:[NSMenu menuZone]]
initWithTitle:NSLocalizedString(@"Add Markup", @"Toolbar item label")
submenu:menu] autorelease];
item = [[SKToolbarItem alloc]
initWithItemIdentifier:SKDocumentToolbarNewMarkupItemIdentifier];
@@ -502,14 +502,14 @@
#pragma mark SKDocumentToolbarNewNoteItemIdentifier
menu = [[[NSMenu allocWithZone:[NSMenu menuZone]] initWithTitle:@""]
autorelease];
- [menu addItemWithTitle:NSLocalizedString(@"Text Note", @"Menu item title")
image:[NSImage imageNamed:SKImageNameToolbarAddTextNote]
action:@selector(createNewNote:) target:self tag:SKFreeTextNote];
- [menu addItemWithTitle:NSLocalizedString(@"Anchored Note", @"Menu item
title") image:[NSImage imageNamed:SKImageNameToolbarAddAnchoredNote]
action:@selector(createNewNote:) target:self tag:SKAnchoredNote];
- [menu addItemWithTitle:NSLocalizedString(@"Circle", @"Menu item title")
image:[NSImage imageNamed:SKImageNameToolbarAddCircleNote]
action:@selector(createNewNote:) target:self tag:SKCircleNote];
- [menu addItemWithTitle:NSLocalizedString(@"Box", @"Menu item title")
image:[NSImage imageNamed:SKImageNameToolbarAddSquareNote]
action:@selector(createNewNote:) target:self tag:SKSquareNote];
- [menu addItemWithTitle:NSLocalizedString(@"Highlight", @"Menu item title")
image:[NSImage imageNamed:SKImageNameToolbarAddHighlightNote]
action:@selector(createNewNote:) target:self tag:SKHighlightNote];
- [menu addItemWithTitle:NSLocalizedString(@"Underline", @"Menu item title")
image:[NSImage imageNamed:SKImageNameToolbarAddUnderlineNote]
action:@selector(createNewNote:) target:self tag:SKUnderlineNote];
- [menu addItemWithTitle:NSLocalizedString(@"Strike Out", @"Menu item
title") image:[NSImage imageNamed:SKImageNameToolbarAddStrikeOutNote]
action:@selector(createNewNote:) target:self tag:SKStrikeOutNote];
- [menu addItemWithTitle:NSLocalizedString(@"Line", @"Menu item title")
image:[NSImage imageNamed:SKImageNameToolbarAddLineNote]
action:@selector(createNewNote:) target:self tag:SKLineNote];
+ [menu addItemWithTitle:NSLocalizedString(@"Text Note", @"Menu item title")
imageNamed:SKImageNameToolbarAddTextNote action:@selector(createNewNote:)
target:self tag:SKFreeTextNote];
+ [menu addItemWithTitle:NSLocalizedString(@"Anchored Note", @"Menu item
title") imageNamed:SKImageNameToolbarAddAnchoredNote
action:@selector(createNewNote:) target:self tag:SKAnchoredNote];
+ [menu addItemWithTitle:NSLocalizedString(@"Circle", @"Menu item title")
imageNamed:SKImageNameToolbarAddCircleNote action:@selector(createNewNote:)
target:self tag:SKCircleNote];
+ [menu addItemWithTitle:NSLocalizedString(@"Box", @"Menu item title")
imageNamed:SKImageNameToolbarAddSquareNote action:@selector(createNewNote:)
target:self tag:SKSquareNote];
+ [menu addItemWithTitle:NSLocalizedString(@"Highlight", @"Menu item title")
imageNamed:SKImageNameToolbarAddHighlightNote action:@selector(createNewNote:)
target:self tag:SKHighlightNote];
+ [menu addItemWithTitle:NSLocalizedString(@"Underline", @"Menu item title")
imageNamed:SKImageNameToolbarAddUnderlineNote action:@selector(createNewNote:)
target:self tag:SKUnderlineNote];
+ [menu addItemWithTitle:NSLocalizedString(@"Strike Out", @"Menu item
title") imageNamed:SKImageNameToolbarAddStrikeOutNote
action:@selector(createNewNote:) target:self tag:SKStrikeOutNote];
+ [menu addItemWithTitle:NSLocalizedString(@"Line", @"Menu item title")
imageNamed:SKImageNameToolbarAddLineNote action:@selector(createNewNote:)
target:self tag:SKLineNote];
menuItem = [[[NSMenuItem allocWithZone:[NSMenu menuZone]]
initWithTitle:NSLocalizedString(@"Add Note", @"Toolbar item label")
submenu:menu] autorelease];
item = [[SKToolbarItem alloc]
initWithItemIdentifier:SKDocumentToolbarNewNoteItemIdentifier];
@@ -532,14 +532,14 @@
#pragma mark SKDocumentToolbarToolModeItemIdentifier
menu = [[[NSMenu allocWithZone:[NSMenu menuZone]] initWithTitle:@""]
autorelease];
- [menu addItemWithTitle:NSLocalizedString(@"Text Note", @"Menu item title")
image:[NSImage imageNamed:SKImageNameToolbarTextNote]
action:@selector(changeAnnotationMode:) target:self tag:SKFreeTextNote];
- [menu addItemWithTitle:NSLocalizedString(@"Anchored Note", @"Menu item
title") image:[NSImage imageNamed:SKImageNameToolbarAnchoredNote]
action:@selector(changeAnnotationMode:) target:self tag:SKAnchoredNote];
- [menu addItemWithTitle:NSLocalizedString(@"Circle", @"Menu item title")
image:[NSImage imageNamed:SKImageNameToolbarCircleNote]
action:@selector(changeAnnotationMode:) target:self tag:SKCircleNote];
- [menu addItemWithTitle:NSLocalizedString(@"Box", @"Menu item title")
image:[NSImage imageNamed:SKImageNameToolbarSquareNote]
action:@selector(changeAnnotationMode:) target:self tag:SKSquareNote];
- [menu addItemWithTitle:NSLocalizedString(@"Highlight", @"Menu item title")
image:[NSImage imageNamed:SKImageNameToolbarHighlightNote]
action:@selector(changeAnnotationMode:) target:self tag:SKHighlightNote];
- [menu addItemWithTitle:NSLocalizedString(@"Underline", @"Menu item title")
image:[NSImage imageNamed:SKImageNameToolbarUnderlineNote]
action:@selector(changeAnnotationMode:) target:self tag:SKUnderlineNote];
- [menu addItemWithTitle:NSLocalizedString(@"Strike Out", @"Menu item
title") image:[NSImage imageNamed:SKImageNameToolbarStrikeOutNote]
action:@selector(changeAnnotationMode:) target:self tag:SKStrikeOutNote];
- [menu addItemWithTitle:NSLocalizedString(@"Line", @"Menu item title")
image:[NSImage imageNamed:SKImageNameToolbarLineNote]
action:@selector(changeAnnotationMode:) target:self tag:SKLineNote];
+ [menu addItemWithTitle:NSLocalizedString(@"Text Note", @"Menu item title")
imageNamed:SKImageNameToolbarTextNote action:@selector(changeAnnotationMode:)
target:self tag:SKFreeTextNote];
+ [menu addItemWithTitle:NSLocalizedString(@"Anchored Note", @"Menu item
title") imageNamed:SKImageNameToolbarAnchoredNote
action:@selector(changeAnnotationMode:) target:self tag:SKAnchoredNote];
+ [menu addItemWithTitle:NSLocalizedString(@"Circle", @"Menu item title")
imageNamed:SKImageNameToolbarCircleNote action:@selector(changeAnnotationMode:)
target:self tag:SKCircleNote];
+ [menu addItemWithTitle:NSLocalizedString(@"Box", @"Menu item title")
imageNamed:SKImageNameToolbarSquareNote action:@selector(changeAnnotationMode:)
target:self tag:SKSquareNote];
+ [menu addItemWithTitle:NSLocalizedString(@"Highlight", @"Menu item title")
imageNamed:SKImageNameToolbarHighlightNote
action:@selector(changeAnnotationMode:) target:self tag:SKHighlightNote];
+ [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];
[toolModeButton setMenu:menu forSegment:SKNoteToolMode];
menu = [[[NSMenu allocWithZone:[NSMenu menuZone]] initWithTitle:@""]
autorelease];
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
