diff --git a/PseudoTerminal.m b/PseudoTerminal.m index 0cb21aeae4..483b12c928 100644 --- a/PseudoTerminal.m +++ b/PseudoTerminal.m @@ -2614,14 +2614,14 @@ - (void)menuForEvent:(NSEvent *)theEvent menu:(NSMenu *)theMenu } // Bookmarks - [theMenu insertItemWithTitle:NSLocalizedStringFromTableInBundle(@"New Window", + [theMenu insertItemWithTitle:NSLocalizedStringFromTableInBundle(@"New Tab", @"iTerm", [NSBundle bundleForClass:[self class]], @"Context menu") action:nil keyEquivalent:@"" atIndex:nextIndex++]; - [theMenu insertItemWithTitle:NSLocalizedStringFromTableInBundle(@"New Tab", + [theMenu insertItemWithTitle:NSLocalizedStringFromTableInBundle(@"New Window", @"iTerm", [NSBundle bundleForClass:[self class]], @"Context menu") @@ -2669,7 +2669,7 @@ - (void)menuForEvent:(NSEvent *)theEvent menu:(NSMenu *)theMenu openAllSelector:@selector(newSessionsInNewWindow:) startingAt:0]; - [theMenu setSubmenu:aMenu forItem:[theMenu itemAtIndex:0]]; + [theMenu setSubmenu:aMenu forItem:[theMenu itemAtIndex:1]]; aMenu = [[[NSMenu alloc] init] autorelease]; [[iTermController sharedInstance] addBookmarksToMenu:aMenu @@ -2677,7 +2677,7 @@ - (void)menuForEvent:(NSEvent *)theEvent menu:(NSMenu *)theMenu openAllSelector:@selector(newSessionsInWindow:) startingAt:0]; - [theMenu setSubmenu:aMenu forItem:[theMenu itemAtIndex:1]]; + [theMenu setSubmenu:aMenu forItem:[theMenu itemAtIndex:0]]; } // NSTabView diff --git a/iTermApplicationDelegate.m b/iTermApplicationDelegate.m index 0319a927e4..955621c562 100644 --- a/iTermApplicationDelegate.m +++ b/iTermApplicationDelegate.m @@ -877,15 +877,15 @@ - (NSMenu *)applicationDockMenu:(NSApplication *)sender keyEquivalent:@""]; [aMenu addItem:[NSMenuItem separatorItem]]; [self _newSessionMenu:aMenu - title:@"New Window…" - target:[iTermController sharedInstance] - selector:@selector(newSessionInWindowAtIndex:) - openAllSelector:@selector(newSessionsInNewWindow:)]; - [self _newSessionMenu:aMenu - title:@"New Tab…" + title:@"New Tab" target:frontTerminal selector:@selector(newSessionInTabAtIndex:) openAllSelector:@selector(newSessionsInWindow:)]; + [self _newSessionMenu:aMenu + title:@"New Window" + target:[iTermController sharedInstance] + selector:@selector(newSessionInWindowAtIndex:) + openAllSelector:@selector(newSessionsInNewWindow:)]; [self _addArrangementsMenuTo:aMenu]; return ([aMenu autorelease]);