Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

In context and dock menus move 'New Tab' before 'New Window'. #1

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

In context and dock menus move 'New Tab' before 'New Window'. #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions PseudoTerminal.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down Expand Up @@ -2669,15 +2669,15 @@ - (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
withSelector:@selector(newSessionInTabAtIndex:)
openAllSelector:@selector(newSessionsInWindow:)
startingAt:0];

[theMenu setSubmenu:aMenu forItem:[theMenu itemAtIndex:1]];
[theMenu setSubmenu:aMenu forItem:[theMenu itemAtIndex:0]];
}

// NSTabView
Expand Down
12 changes: 6 additions & 6 deletions iTermApplicationDelegate.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]);
Expand Down