Revision: 3489
http://skim-app.svn.sourceforge.net/skim-app/?rev=3489&view=rev
Author: hofman
Date: 2008-03-15 13:05:58 -0700 (Sat, 15 Mar 2008)
Log Message:
-----------
Add a "+" badge to add note icons.
Modified Paths:
--------------
trunk/Dutch.lproj/MainWindow.nib/data.dependency
trunk/Dutch.lproj/MainWindow.nib/info.nib
trunk/Dutch.lproj/MainWindow.nib/keyedobjects.nib
trunk/English.lproj/MainWindow.nib/info.nib
trunk/English.lproj/MainWindow.nib/keyedobjects.nib
trunk/French.lproj/MainWindow.nib/info.nib
trunk/French.lproj/MainWindow.nib/keyedobjects.nib
trunk/Italian.lproj/MainWindow.nib/info.nib
trunk/Italian.lproj/MainWindow.nib/keyedobjects.nib
trunk/NSImage_SKExtensions.m
trunk/SKMainWindowController.m
trunk/Spanish.lproj/MainWindow.nib/info.nib
trunk/Spanish.lproj/MainWindow.nib/keyedobjects.nib
trunk/ru.lproj/MainWindow.nib/info.nib
trunk/ru.lproj/MainWindow.nib/keyedobjects.nib
Modified: trunk/Dutch.lproj/MainWindow.nib/data.dependency
===================================================================
--- trunk/Dutch.lproj/MainWindow.nib/data.dependency 2008-03-15 18:13:35 UTC
(rev 3488)
+++ trunk/Dutch.lproj/MainWindow.nib/data.dependency 2008-03-15 20:05:58 UTC
(rev 3489)
@@ -4,8 +4,8 @@
<dict>
<key>IBPaletteDependency</key>
<array>
+ <string>Controllers</string>
<string>PDFKit</string>
- <string>Controllers</string>
</array>
</dict>
</plist>
Modified: trunk/Dutch.lproj/MainWindow.nib/info.nib
===================================================================
--- trunk/Dutch.lproj/MainWindow.nib/info.nib 2008-03-15 18:13:35 UTC (rev
3488)
+++ trunk/Dutch.lproj/MainWindow.nib/info.nib 2008-03-15 20:05:58 UTC (rev
3489)
@@ -29,7 +29,7 @@
<key>855</key>
<string>626 560 188 210 0 0 1440 938 </string>
<key>942</key>
- <string>68 455 75 76 0 0 1440 938 </string>
+ <string>68 455 159 76 0 0 1440 938 </string>
</dict>
<key>IBFramework Version</key>
<string>489.0</string>
Modified: trunk/Dutch.lproj/MainWindow.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/English.lproj/MainWindow.nib/info.nib
===================================================================
--- trunk/English.lproj/MainWindow.nib/info.nib 2008-03-15 18:13:35 UTC (rev
3488)
+++ trunk/English.lproj/MainWindow.nib/info.nib 2008-03-15 20:05:58 UTC (rev
3489)
@@ -29,7 +29,7 @@
<key>855</key>
<string>626 560 188 210 0 0 1440 938 </string>
<key>942</key>
- <string>68 455 75 76 0 0 1440 938 </string>
+ <string>68 455 159 76 0 0 1440 938 </string>
</dict>
<key>IBFramework Version</key>
<string>489.0</string>
@@ -37,9 +37,9 @@
<array/>
<key>IBOpenObjects</key>
<array>
+ <integer>687</integer>
<integer>168</integer>
<integer>942</integer>
- <integer>687</integer>
</array>
<key>IBSystem Version</key>
<string>9C31</string>
Modified: trunk/English.lproj/MainWindow.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/French.lproj/MainWindow.nib/info.nib
===================================================================
--- trunk/French.lproj/MainWindow.nib/info.nib 2008-03-15 18:13:35 UTC (rev
3488)
+++ trunk/French.lproj/MainWindow.nib/info.nib 2008-03-15 20:05:58 UTC (rev
3489)
@@ -29,7 +29,7 @@
<key>855</key>
<string>626 560 188 210 0 0 1440 938 </string>
<key>942</key>
- <string>68 455 159 76 0 0 1440 938 </string>
+ <string>68 455 219 76 0 0 1440 938 </string>
</dict>
<key>IBFramework Version</key>
<string>489.0</string>
@@ -37,8 +37,7 @@
<array/>
<key>IBOpenObjects</key>
<array>
- <integer>687</integer>
- <integer>942</integer>
+ <integer>168</integer>
</array>
<key>IBSystem Version</key>
<string>9C31</string>
Modified: trunk/French.lproj/MainWindow.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/Italian.lproj/MainWindow.nib/info.nib
===================================================================
--- trunk/Italian.lproj/MainWindow.nib/info.nib 2008-03-15 18:13:35 UTC (rev
3488)
+++ trunk/Italian.lproj/MainWindow.nib/info.nib 2008-03-15 20:05:58 UTC (rev
3489)
@@ -29,7 +29,7 @@
<key>815</key>
<string>626 560 188 210 0 0 1440 938 </string>
<key>916</key>
- <string>58 467 159 76 0 0 1440 938 </string>
+ <string>58 467 229 76 0 0 1440 938 </string>
</dict>
<key>IBFramework Version</key>
<string>489.0</string>
@@ -37,9 +37,7 @@
<array/>
<key>IBOpenObjects</key>
<array>
- <integer>676</integer>
- <integer>791</integer>
- <integer>916</integer>
+ <integer>168</integer>
</array>
<key>IBSystem Version</key>
<string>9C31</string>
Modified: trunk/Italian.lproj/MainWindow.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/NSImage_SKExtensions.m
===================================================================
--- trunk/NSImage_SKExtensions.m 2008-03-15 18:13:35 UTC (rev 3488)
+++ trunk/NSImage_SKExtensions.m 2008-03-15 20:05:58 UTC (rev 3489)
@@ -51,15 +51,40 @@
NSImage *image = [[NSImage alloc] initWithSize:NSMakeSize(27.0, 19.0)];
[image lockFocus];
+ [self compositeToPoint:NSMakePoint(-2.0, 0.0) operation:NSCompositeCopy];
[[NSGraphicsContext currentContext] saveGraphicsState];
- [self compositeToPoint:NSMakePoint(-2.0, 0.0) operation:NSCompositeCopy];
[[NSColor colorWithCalibratedWhite:0.0 alpha:0.85] setFill];
[arrowPath fill];
+ [[NSGraphicsContext currentContext] restoreGraphicsState];
[image unlockFocus];
return image;
}
+- (NSImage *)createAddImage {
+ NSBezierPath *addPath = [NSBezierPath bezierPath];
+ addPath = [NSBezierPath bezierPath];
+ [addPath appendBezierPathWithRect:NSMakeRect(17.0, 4.0, 6.0, 2.0)];
+ [addPath appendBezierPathWithRect:NSMakeRect(19.0, 2.0, 2.0, 6.0)];
+
+ NSShadow *shadow1 = [[NSShadow alloc] init];
+ [shadow1 setShadowBlurRadius:2.0];
+ [shadow1 setShadowOffset:NSMakeSize(0.0, 0.0)];
+ [shadow1 setShadowColor:[NSColor colorWithCalibratedWhite:0.0 alpha:0.8]];
+
+ NSImage *image = [[NSImage alloc] initWithSize:NSMakeSize(27.0, 19.0)];
+ [image lockFocus];
+ [self compositeToPoint:NSMakePoint(0.0, 0.0) operation:NSCompositeCopy];
+ [[NSGraphicsContext currentContext] saveGraphicsState];
+ [shadow1 set];
+ [[NSColor colorWithCalibratedWhite:1.0 alpha:1.0] setFill];
+ [addPath fill];
+ [[NSGraphicsContext currentContext] restoreGraphicsState];
+ [image unlockFocus];
+
+ return image;
+}
+
+ (void)makeToolbarImages {
static NSImage *toolbarPageUpImage = nil;
static NSImage *toolbarPageDownImage = nil;
@@ -97,6 +122,22 @@
static NSImage *toolbarUnderlineNoteMenuImage = nil;
static NSImage *toolbarStrikeOutNoteMenuImage = nil;
static NSImage *toolbarLineNoteMenuImage = nil;
+ static NSImage *toolbarAddTextNoteImage = nil;
+ static NSImage *toolbarAddAnchoredNoteImage = nil;
+ static NSImage *toolbarAddCircleNoteImage = nil;
+ static NSImage *toolbarAddSquareNoteImage = nil;
+ static NSImage *toolbarAddHighlightNoteImage = nil;
+ static NSImage *toolbarAddUnderlineNoteImage = nil;
+ static NSImage *toolbarAddStrikeOutNoteImage = nil;
+ static NSImage *toolbarAddLineNoteImage = nil;
+ static NSImage *toolbarAddTextNoteMenuImage = nil;
+ static NSImage *toolbarAddAnchoredNoteMenuImage = nil;
+ static NSImage *toolbarAddCircleNoteMenuImage = nil;
+ static NSImage *toolbarAddSquareNoteMenuImage = nil;
+ static NSImage *toolbarAddHighlightNoteMenuImage = nil;
+ static NSImage *toolbarAddUnderlineNoteMenuImage = nil;
+ static NSImage *toolbarAddStrikeOutNoteMenuImage = nil;
+ static NSImage *toolbarAddLineNoteMenuImage = nil;
static NSImage *toolbarTextToolImage = nil;
//static NSImage *toolbarMoveToolImage = nil;
static NSImage *toolbarMagnifyToolImage = nil;
@@ -640,6 +681,12 @@
toolbarTextNoteMenuImage = [toolbarTextNoteImage createMenuImage];
[toolbarTextNoteMenuImage setName:@"ToolbarTextNoteMenu"];
+ toolbarAddTextNoteImage = [toolbarTextNoteImage createAddImage];
+ [toolbarAddTextNoteImage setName:@"ToolbarAddTextNote"];
+
+ toolbarAddTextNoteMenuImage = [toolbarAddTextNoteImage createMenuImage];
+ [toolbarAddTextNoteMenuImage setName:@"ToolbarAddTextNoteMenu"];
+
toolbarAnchoredNoteImage = [[NSImage alloc] initWithSize:NSMakeSize(27.0,
19.0)];
[toolbarAnchoredNoteImage lockFocus];
[[NSGraphicsContext currentContext] saveGraphicsState];
@@ -675,6 +722,12 @@
toolbarAnchoredNoteMenuImage = [toolbarAnchoredNoteImage createMenuImage];
[toolbarAnchoredNoteMenuImage setName:@"ToolbarAnchoredNoteMenu"];
+
+ toolbarAddAnchoredNoteImage = [toolbarAnchoredNoteImage createAddImage];
+ [toolbarAddAnchoredNoteImage setName:@"ToolbarAddAnchoredNote"];
+
+ toolbarAddAnchoredNoteMenuImage = [toolbarAddAnchoredNoteImage
createMenuImage];
+ [toolbarAddAnchoredNoteMenuImage setName:@"ToolbarAddAnchoredNoteMenu"];
toolbarCircleNoteImage = [[NSImage alloc] initWithSize:NSMakeSize(27.0,
19.0)];
[toolbarCircleNoteImage lockFocus];
@@ -691,6 +744,12 @@
toolbarCircleNoteMenuImage = [toolbarCircleNoteImage createMenuImage];
[toolbarCircleNoteMenuImage setName:@"ToolbarCircleNoteMenu"];
+
+ toolbarAddCircleNoteImage = [toolbarCircleNoteImage createAddImage];
+ [toolbarAddCircleNoteImage setName:@"ToolbarAddCircleNote"];
+
+ toolbarAddCircleNoteMenuImage = [toolbarAddCircleNoteImage
createMenuImage];
+ [toolbarAddCircleNoteMenuImage setName:@"ToolbarAddCircleNoteMenu"];
toolbarSquareNoteImage = [[NSImage alloc] initWithSize:NSMakeSize(27.0,
19.0)];
[toolbarSquareNoteImage lockFocus];
@@ -708,6 +767,12 @@
toolbarSquareNoteMenuImage = [toolbarSquareNoteImage createMenuImage];
[toolbarSquareNoteMenuImage setName:@"ToolbarSquareNoteMenu"];
+ toolbarAddSquareNoteImage = [toolbarSquareNoteImage createAddImage];
+ [toolbarAddSquareNoteImage setName:@"ToolbarAddSquareNote"];
+
+ toolbarAddSquareNoteMenuImage = [toolbarAddSquareNoteImage
createMenuImage];
+ [toolbarAddSquareNoteMenuImage setName:@"ToolbarAddSquareNoteMenu"];
+
toolbarHighlightNoteImage = [[NSImage alloc] initWithSize:NSMakeSize(27.0,
19.0)];
[toolbarHighlightNoteImage lockFocus];
[[NSGraphicsContext currentContext] saveGraphicsState];
@@ -740,6 +805,12 @@
toolbarHighlightNoteMenuImage = [toolbarHighlightNoteImage
createMenuImage];
[toolbarHighlightNoteMenuImage setName:@"ToolbarHighlightNoteMenu"];
+
+ toolbarAddHighlightNoteImage = [toolbarHighlightNoteImage createAddImage];
+ [toolbarAddHighlightNoteImage setName:@"ToolbarAddHighlightNote"];
+
+ toolbarAddHighlightNoteMenuImage = [toolbarAddHighlightNoteImage
createMenuImage];
+ [toolbarAddHighlightNoteMenuImage setName:@"ToolbarAddHighlightNoteMenu"];
toolbarUnderlineNoteImage = [[NSImage alloc] initWithSize:NSMakeSize(27.0,
19.0)];
[toolbarUnderlineNoteImage lockFocus];
@@ -772,6 +843,12 @@
toolbarUnderlineNoteMenuImage = [toolbarUnderlineNoteImage
createMenuImage];
[toolbarUnderlineNoteMenuImage setName:@"ToolbarUnderlineNoteMenu"];
+
+ toolbarAddUnderlineNoteImage = [toolbarUnderlineNoteImage createAddImage];
+ [toolbarAddUnderlineNoteImage setName:@"ToolbarAddUnderlineNote"];
+
+ toolbarAddUnderlineNoteMenuImage = [toolbarAddUnderlineNoteImage
createMenuImage];
+ [toolbarAddUnderlineNoteMenuImage setName:@"ToolbarAddUnderlineNoteMenu"];
toolbarStrikeOutNoteImage = [[NSImage alloc] initWithSize:NSMakeSize(27.0,
19.0)];
[toolbarStrikeOutNoteImage lockFocus];
@@ -804,6 +881,12 @@
toolbarStrikeOutNoteMenuImage = [toolbarStrikeOutNoteImage
createMenuImage];
[toolbarStrikeOutNoteMenuImage setName:@"ToolbarStrikeOutNoteMenu"];
+
+ toolbarAddStrikeOutNoteImage = [toolbarStrikeOutNoteImage createAddImage];
+ [toolbarAddStrikeOutNoteImage setName:@"ToolbarAddStrikeOutNote"];
+
+ toolbarAddStrikeOutNoteMenuImage = [toolbarAddStrikeOutNoteImage
createMenuImage];
+ [toolbarAddStrikeOutNoteMenuImage setName:@"ToolbarAddStrikeOutNoteMenu"];
toolbarLineNoteImage = [[NSImage alloc] initWithSize:NSMakeSize(27.0,
19.0)];
[toolbarLineNoteImage lockFocus];
@@ -827,6 +910,12 @@
toolbarLineNoteMenuImage = [toolbarLineNoteImage createMenuImage];
[toolbarLineNoteMenuImage setName:@"ToolbarLineNoteMenu"];
+ toolbarAddLineNoteImage = [toolbarLineNoteImage createAddImage];
+ [toolbarAddLineNoteImage setName:@"ToolbarAddLineNote"];
+
+ toolbarAddLineNoteMenuImage = [toolbarAddLineNoteImage createMenuImage];
+ [toolbarAddLineNoteMenuImage setName:@"ToolbarAddLineNoteMenu"];
+
toolbarTextToolImage = [[NSImage alloc] initWithSize:NSMakeSize(25.0,
19.0)];
[toolbarTextToolImage lockFocus];
[[NSGraphicsContext currentContext] saveGraphicsState];
Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m 2008-03-15 18:13:35 UTC (rev 3488)
+++ trunk/SKMainWindowController.m 2008-03-15 20:05:58 UTC (rev 3489)
@@ -1402,7 +1402,7 @@
[pdfView addAnnotationWithType:type];
if (isButtonClick == NO && type != [textNoteButton tag]) {
[textNoteButton setTag:type];
- NSString *imgName = type == SKFreeTextNote ?
@"ToolbarTextNoteMenu" : @"ToolbarAnchoredNoteMenu";
+ NSString *imgName = type == SKFreeTextNote ?
@"ToolbarAddTextNoteMenu" : @"ToolbarAddAnchoredNoteMenu";
[textNoteButton setImage:[NSImage imageNamed:imgName]
forSegment:0];
}
} else NSBeep();
@@ -1415,7 +1415,7 @@
[pdfView addAnnotationWithType:type];
if (isButtonClick == NO && type != [circleNoteButton tag]) {
[circleNoteButton setTag:type];
- NSString *imgName = type == SKCircleNote ?
@"ToolbarCircleNoteMenu" : @"ToolbarSquareNoteMenu";
+ NSString *imgName = type == SKCircleNote ?
@"ToolbarAddCircleNoteMenu" : @"ToolbarAddSquareNoteMenu";
[circleNoteButton setImage:[NSImage imageNamed:imgName]
forSegment:0];
}
} else NSBeep();
@@ -1428,7 +1428,7 @@
[pdfView addAnnotationWithType:type];
if (isButtonClick == NO && type != [markupNoteButton tag]) {
[markupNoteButton setTag:type];
- NSString *imgName = type == SKHighlightNote ?
@"ToolbarHighlightNoteMenu" : SKUnderlineNote ? @"ToolbarUnderlineNoteMenu" :
@"ToolbarStrikeOutNoteMenu";
+ NSString *imgName = type == SKHighlightNote ?
@"ToolbarAddHighlightNoteMenu" : SKUnderlineNote ?
@"ToolbarAddUnderlineNoteMenu" : @"ToolbarAddStrikeOutNoteMenu";
[markupNoteButton setImage:[NSImage imageNamed:imgName]
forSegment:0];
}
} else NSBeep();
@@ -4911,21 +4911,21 @@
menu = [[[NSMenu allocWithZone:[NSMenu menuZone]] initWithTitle:@""]
autorelease];
menuItem = [menu addItemWithTitle:NSLocalizedString(@"Text Note", @"Menu
item title") action:@selector(createNewTextNote:) keyEquivalent:@""];
[menuItem setTag:SKFreeTextNote];
- [menuItem setImage:[NSImage imageNamed:@"ToolbarTextNote"]];
+ [menuItem setImage:[NSImage imageNamed:@"ToolbarAddTextNote"]];
[menuItem setTarget:self];
menuItem = [menu addItemWithTitle:NSLocalizedString(@"Anchored Note",
@"Menu item title") action:@selector(createNewTextNote:) keyEquivalent:@""];
[menuItem setTag:SKAnchoredNote];
- [menuItem setImage:[NSImage imageNamed:@"ToolbarAnchoredNote"]];
+ [menuItem setImage:[NSImage imageNamed:@"ToolbarAddAnchoredNote"]];
[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 setImage:[NSImage imageNamed:@"ToolbarAddTextNote"]];
[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 setImage:[NSImage imageNamed:@"ToolbarAddAnchoredNote"]];
[menuItem setTarget:self];
menuItem = [[[NSMenuItem allocWithZone:[NSMenu menuZone]]
initWithTitle:NSLocalizedString(@"Add Note", @"Toolbar item label") action:NULL
keyEquivalent:@""] autorelease];
[menuItem setSubmenu:menu];
@@ -4941,21 +4941,21 @@
menu = [[[NSMenu allocWithZone:[NSMenu menuZone]] initWithTitle:@""]
autorelease];
menuItem = [menu addItemWithTitle:NSLocalizedString(@"Circle", @"Menu item
title") action:@selector(createNewCircleNote:) keyEquivalent:@""];
[menuItem setTag:SKCircleNote];
- [menuItem setImage:[NSImage imageNamed:@"ToolbarCircleNote"]];
+ [menuItem setImage:[NSImage imageNamed:@"ToolbarAddCircleNote"]];
[menuItem setTarget:self];
menuItem = [menu addItemWithTitle:NSLocalizedString(@"Box", @"Menu item
title") action:@selector(createNewCircleNote:) keyEquivalent:@""];
[menuItem setTag:SKSquareNote];
- [menuItem setImage:[NSImage imageNamed:@"ToolbarSquareNote"]];
+ [menuItem setImage:[NSImage imageNamed:@"ToolbarAddSquareNote"]];
[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 setImage:[NSImage imageNamed:@"ToolbarAddCircleNote"]];
[menuItem setTarget:self];
menuItem = [menu addItemWithTitle:NSLocalizedString(@"Box", @"Menu item
title") action:@selector(createNewNote:) keyEquivalent:@""];
[menuItem setTag:SKSquareNote];
- [menuItem setImage:[NSImage imageNamed:@"ToolbarSquareNote"]];
+ [menuItem setImage:[NSImage imageNamed:@"ToolbarAddSquareNote"]];
[menuItem setTarget:self];
menuItem = [[[NSMenuItem allocWithZone:[NSMenu menuZone]]
initWithTitle:NSLocalizedString(@"Add Shape", @"Toolbar item label")
action:NULL keyEquivalent:@""] autorelease];
[menuItem setSubmenu:menu];
@@ -4971,29 +4971,29 @@
menu = [[[NSMenu allocWithZone:[NSMenu menuZone]] initWithTitle:@""]
autorelease];
menuItem = [menu addItemWithTitle:NSLocalizedString(@"Highlight", @"Menu
item title") action:@selector(createNewMarkupNote:) keyEquivalent:@""];
[menuItem setTag:SKHighlightNote];
- [menuItem setImage:[NSImage imageNamed:@"ToolbarHighlightNote"]];
+ [menuItem setImage:[NSImage imageNamed:@"ToolbarAddHighlightNote"]];
[menuItem setTarget:self];
menuItem = [menu addItemWithTitle:NSLocalizedString(@"Underline", @"Menu
item title") action:@selector(createNewMarkupNote:) keyEquivalent:@""];
[menuItem setTag:SKUnderlineNote];
[menuItem setTarget:self];
- [menuItem setImage:[NSImage imageNamed:@"ToolbarUnderlineNote"]];
+ [menuItem setImage:[NSImage imageNamed:@"ToolbarAddUnderlineNote"]];
menuItem = [menu addItemWithTitle:NSLocalizedString(@"Strike Out", @"Menu
item title") action:@selector(createNewMarkupNote:) keyEquivalent:@""];
[menuItem setTag:SKStrikeOutNote];
- [menuItem setImage:[NSImage imageNamed:@"ToolbarStrikeOutNote"]];
+ [menuItem setImage:[NSImage imageNamed:@"ToolbarAddStrikeOutNote"]];
[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 setImage:[NSImage imageNamed:@"ToolbarAddHighlightNote"]];
[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 setImage:[NSImage imageNamed:@"ToolbarAddUnderlineNote"]];
menuItem = [menu addItemWithTitle:NSLocalizedString(@"Strike Out", @"Menu
item title") action:@selector(createNewNote:) keyEquivalent:@""];
[menuItem setTag:SKStrikeOutNote];
- [menuItem setImage:[NSImage imageNamed:@"ToolbarStrikeOutNote"]];
+ [menuItem setImage:[NSImage imageNamed:@"ToolbarAddStrikeOutNote"]];
[menuItem setTarget:self];
menuItem = [[[NSMenuItem allocWithZone:[NSMenu menuZone]]
initWithTitle:NSLocalizedString(@"Add Markup", @"Toolbar item label")
action:NULL keyEquivalent:@""] autorelease];
[menuItem setSubmenu:menu];
@@ -5006,12 +5006,16 @@
[toolbarItems setObject:item
forKey:SKDocumentToolbarNewMarkupItemIdentifier];
[item release];
+ menuItem = [[[NSMenuItem allocWithZone:[NSMenu menuZone]]
initWithTitle:NSLocalizedString(@"Add Line", @"Toolbar item label")
action:@selector(createNewNote:) keyEquivalent:@""] autorelease];
+ [menuItem setTag:SKLineNote];
+ [menuItem setTarget:self];
item = [[SKToolbarItem alloc]
initWithItemIdentifier:SKDocumentToolbarNewLineItemIdentifier];
[item setLabels:NSLocalizedString(@"Add Line", @"Toolbar item label")];
[item setToolTip:NSLocalizedString(@"Add New Line", @"Tool tip message")];
[item setTag:SKLineNote];
[lineNoteButton makeCapsule];
[item setViewWithSizes:lineNoteButton];
+ [item setMenuFormRepresentation:menuItem];
[toolbarItems setObject:item
forKey:SKDocumentToolbarNewLineItemIdentifier];
[item release];
@@ -5019,35 +5023,35 @@
menuItem = [menu addItemWithTitle:NSLocalizedString(@"Text Note", @"Menu
item title") action:@selector(createNewNote:) keyEquivalent:@""];
[menuItem setTarget:self];
[menuItem setTag:SKFreeTextNote];
- [menuItem setImage:[NSImage imageNamed:@"ToolbarTextNote"]];
+ [menuItem setImage:[NSImage imageNamed:@"ToolbarAddTextNote"]];
menuItem = [menu addItemWithTitle:NSLocalizedString(@"Anchored Note",
@"Menu item title") action:@selector(createNewNote:) keyEquivalent:@""];
[menuItem setTarget:self];
[menuItem setTag:SKAnchoredNote];
- [menuItem setImage:[NSImage imageNamed:@"ToolbarAnchoredNote"]];
+ [menuItem setImage:[NSImage imageNamed:@"ToolbarAddAnchoredNote"]];
menuItem = [menu addItemWithTitle:NSLocalizedString(@"Circle", @"Menu item
title") action:@selector(createNewNote:) keyEquivalent:@""];
[menuItem setTarget:self];
[menuItem setTag:SKCircleNote];
- [menuItem setImage:[NSImage imageNamed:@"ToolbarCircleNote"]];
+ [menuItem setImage:[NSImage imageNamed:@"ToolbarAddCircleNote"]];
menuItem = [menu addItemWithTitle:NSLocalizedString(@"Box", @"Menu item
title") action:@selector(createNewNote:) keyEquivalent:@""];
[menuItem setTarget:self];
[menuItem setTag:SKSquareNote];
- [menuItem setImage:[NSImage imageNamed:@"ToolbarSquareNote"]];
+ [menuItem setImage:[NSImage imageNamed:@"ToolbarAddSquareNote"]];
menuItem = [menu addItemWithTitle:NSLocalizedString(@"Highlight", @"Menu
item title") action:@selector(createNewNote:) keyEquivalent:@""];
[menuItem setTarget:self];
[menuItem setTag:SKHighlightNote];
- [menuItem setImage:[NSImage imageNamed:@"ToolbarHighlightNote"]];
+ [menuItem setImage:[NSImage imageNamed:@"ToolbarAddHighlightNote"]];
menuItem = [menu addItemWithTitle:NSLocalizedString(@"Underline", @"Menu
item title") action:@selector(createNewNote:) keyEquivalent:@""];
[menuItem setTarget:self];
[menuItem setTag:SKUnderlineNote];
- [menuItem setImage:[NSImage imageNamed:@"ToolbarUnderlineNote"]];
+ [menuItem setImage:[NSImage imageNamed:@"ToolbarAddUnderlineNote"]];
menuItem = [menu addItemWithTitle:NSLocalizedString(@"Strike Out", @"Menu
item title") action:@selector(createNewNote:) keyEquivalent:@""];
[menuItem setTarget:self];
[menuItem setTag:SKStrikeOutNote];
- [menuItem setImage:[NSImage imageNamed:@"ToolbarStrikeOutNote"]];
+ [menuItem setImage:[NSImage imageNamed:@"ToolbarAddStrikeOutNote"]];
menuItem = [menu addItemWithTitle:NSLocalizedString(@"Line", @"Menu item
title") action:@selector(createNewNote:) keyEquivalent:@""];
[menuItem setTarget:self];
[menuItem setTag:SKLineNote];
- [menuItem setImage:[NSImage imageNamed:@"ToolbarLineNote"]];
+ [menuItem setImage:[NSImage imageNamed:@"ToolbarAddLineNote"]];
menuItem = [[[NSMenuItem allocWithZone:[NSMenu menuZone]]
initWithTitle:NSLocalizedString(@"Add Note", @"Toolbar item label") action:NULL
keyEquivalent:@""] autorelease];
[menuItem setSubmenu:menu];
item = [[SKToolbarItem alloc]
initWithItemIdentifier:SKDocumentToolbarNewNoteItemIdentifier];
@@ -5197,17 +5201,19 @@
[item setToolTip:NSLocalizedString(@"Colors", @"Tool tip message")];
[colorsButton makeCapsule];
[item setViewWithSizes:colorsButton];
+ [item setMenuFormRepresentation:menuItem];
[toolbarItems setObject:item forKey:SKDocumentToolbarColorsItemIdentifier];
[item release];
- item = [[SKToolbarItem alloc]
initWithItemIdentifier:SKDocumentToolbarFontsItemIdentifier];
menuItem = [[[NSMenuItem allocWithZone:[NSMenu menuZone]]
initWithTitle:NSLocalizedString(@"Fonts", @"Menu item title")
action:@selector(orderFrontFontPanel:) keyEquivalent:@""] autorelease];
[menuItem setTarget:self];
+ item = [[SKToolbarItem alloc]
initWithItemIdentifier:SKDocumentToolbarFontsItemIdentifier];
[item setLabels:NSLocalizedString(@"Fonts", @"Toolbar item label")];
[item setToolTip:NSLocalizedString(@"Fonts", @"Tool tip message")];
[item setImageNamed:@"ToolbarFonts"];
[fontsButton makeCapsule];
[item setViewWithSizes:fontsButton];
+ [item setMenuFormRepresentation:menuItem];
[toolbarItems setObject:item forKey:SKDocumentToolbarFontsItemIdentifier];
[item release];
@@ -5218,6 +5224,7 @@
[item setToolTip:NSLocalizedString(@"Lines", @"Tool tip message")];
[linesButton makeCapsule];
[item setViewWithSizes:linesButton];
+ [item setMenuFormRepresentation:menuItem];
[toolbarItems setObject:item forKey:SKDocumentToolbarLinesItemIdentifier];
[item release];
@@ -5228,6 +5235,7 @@
[item setToolTip:NSLocalizedString(@"Get Document Info", @"Tool tip
message")];
[infoButton makeCapsule];
[item setViewWithSizes:infoButton];
+ [item setMenuFormRepresentation:menuItem];
[toolbarItems setObject:item forKey:SKDocumentToolbarInfoItemIdentifier];
[item release];
@@ -5238,6 +5246,7 @@
[item setToolTip:NSLocalizedString(@"Toggle Contents Pane", @"Tool tip
message")];
[leftPaneButton makeCapsule];
[item setViewWithSizes:leftPaneButton];
+ [item setMenuFormRepresentation:menuItem];
[toolbarItems setObject:item
forKey:SKDocumentToolbarContentsPaneItemIdentifier];
[item release];
@@ -5248,6 +5257,7 @@
[item setToolTip:NSLocalizedString(@"Toggle Notes Pane", @"Tool tip
message")];
[rightPaneButton makeCapsule];
[item setViewWithSizes:rightPaneButton];
+ [item setMenuFormRepresentation:menuItem];
[toolbarItems setObject:item
forKey:SKDocumentToolbarNotesPaneItemIdentifier];
[item release];
@@ -5257,6 +5267,7 @@
[item setToolTip:NSLocalizedString(@"Print Document", @"Tool tip
message")];
[printButton makeCapsule];
[item setViewWithSizes:printButton];
+ [item setMenuFormRepresentation:menuItem];
[toolbarItems setObject:item forKey:SKDocumentToolbarPrintItemIdentifier];
[item release];
@@ -5266,6 +5277,7 @@
[item setToolTip:NSLocalizedString(@"Customize Toolbar", @"Tool tip
message")];
[customizeButton makeCapsule];
[item setViewWithSizes:customizeButton];
+ [item setMenuFormRepresentation:menuItem];
[toolbarItems setObject:item
forKey:SKDocumentToolbarCustomizeItemIdentifier];
[item release];
Modified: trunk/Spanish.lproj/MainWindow.nib/info.nib
===================================================================
--- trunk/Spanish.lproj/MainWindow.nib/info.nib 2008-03-15 18:13:35 UTC (rev
3488)
+++ trunk/Spanish.lproj/MainWindow.nib/info.nib 2008-03-15 20:05:58 UTC (rev
3489)
@@ -7,7 +7,7 @@
<key>IBEditorPositions</key>
<dict>
<key>168</key>
- <string>536 448 368 359 0 0 1440 938 </string>
+ <string>536 449 368 358 0 0 1440 938 </string>
<key>224</key>
<string>610 386 220 442 0 0 1440 938 </string>
<key>256</key>
@@ -29,7 +29,7 @@
<key>855</key>
<string>626 560 188 210 0 0 1440 938 </string>
<key>942</key>
- <string>68 455 159 76 0 0 1440 938 </string>
+ <string>68 455 181 76 0 0 1440 938 </string>
</dict>
<key>IBFramework Version</key>
<string>489.0</string>
@@ -37,8 +37,7 @@
<array/>
<key>IBOpenObjects</key>
<array>
- <integer>942</integer>
- <integer>687</integer>
+ <integer>168</integer>
</array>
<key>IBSystem Version</key>
<string>9C31</string>
Modified: trunk/Spanish.lproj/MainWindow.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/ru.lproj/MainWindow.nib/info.nib
===================================================================
--- trunk/ru.lproj/MainWindow.nib/info.nib 2008-03-15 18:13:35 UTC (rev
3488)
+++ trunk/ru.lproj/MainWindow.nib/info.nib 2008-03-15 20:05:58 UTC (rev
3489)
@@ -29,7 +29,7 @@
<key>855</key>
<string>626 560 188 210 0 0 1440 938 </string>
<key>942</key>
- <string>68 455 159 76 0 0 1440 938 </string>
+ <string>68 455 176 76 0 0 1440 938 </string>
</dict>
<key>IBFramework Version</key>
<string>489.0</string>
@@ -37,8 +37,7 @@
<array/>
<key>IBOpenObjects</key>
<array>
- <integer>687</integer>
- <integer>942</integer>
+ <integer>168</integer>
</array>
<key>IBSystem Version</key>
<string>9C31</string>
Modified: trunk/ru.lproj/MainWindow.nib/keyedobjects.nib
===================================================================
(Binary files differ)
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
