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.

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

menu: remove terminal menu #53534

Merged
merged 1 commit into from
Jul 4, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 0 additions & 1 deletion src/vs/platform/actions/common/actions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,6 @@ export class MenuId {
static readonly MenubarWindowMenu = new MenuId();
static readonly MenubarPreferencesMenu = new MenuId();
static readonly MenubarHelpMenu = new MenuId();
static readonly MenubarTerminalMenu = new MenuId();

readonly id: string = String(MenuId.ID++);
}
Expand Down
100 changes: 0 additions & 100 deletions src/vs/workbench/browser/parts/menubar/menubar.contribution.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ layoutMenuRegistration();
goMenuRegistration();
debugMenuRegistration();
tasksMenuRegistration();
terminalMenuRegistration();

if (isMacintosh) {
windowMenuRegistration();
Expand Down Expand Up @@ -1494,102 +1493,3 @@ function helpMenuRegistration() {
order: 1
});
}

function terminalMenuRegistration() {

// Manage

MenuRegistry.appendMenuItem(MenuId.MenubarTerminalMenu, {
group: '1_manage',
command: {
id: 'workbench.action.terminal.new',
title: nls.localize({ key: 'miNewTerminal', comment: ['&& denotes a mnemonic'] }, "&&New Terminal")
},
order: 1
});

MenuRegistry.appendMenuItem(MenuId.MenubarTerminalMenu, {
group: '1_manage',
command: {
id: 'workbench.action.terminal.split',
title: nls.localize({ key: 'miSplitTerminal', comment: ['&& denotes a mnemonic'] }, "&&Split Terminal")
},
order: 2
});

MenuRegistry.appendMenuItem(MenuId.MenubarTerminalMenu, {
group: '1_manage',
command: {
id: 'workbench.action.terminal.kill',
title: nls.localize({ key: 'miKillTerminal', comment: ['&& denotes a mnemonic'] }, "&&Kill Terminal")
},
order: 3
});

// Run

MenuRegistry.appendMenuItem(MenuId.MenubarTerminalMenu, {
group: '2_run',
command: {
id: 'workbench.action.terminal.clear',
title: nls.localize({ key: 'miClear', comment: ['&& denotes a mnemonic'] }, "&&Clear")
},
order: 1
});

MenuRegistry.appendMenuItem(MenuId.MenubarTerminalMenu, {
group: '2_run',
command: {
id: 'workbench.action.terminal.runActiveFile',
title: nls.localize({ key: 'miRunActiveFile', comment: ['&& denotes a mnemonic'] }, "Run &&Active File")
},
order: 2
});

MenuRegistry.appendMenuItem(MenuId.MenubarTerminalMenu, {
group: '2_run',
command: {
id: 'workbench.action.terminal.runSelectedFile',
title: nls.localize({ key: 'miRunSelectedText', comment: ['&& denotes a mnemonic'] }, "Run &&Selected Text")
},
order: 3
});

// Selection

MenuRegistry.appendMenuItem(MenuId.MenubarTerminalMenu, {
group: '3_selection',
command: {
id: 'workbench.action.terminal.scrollToPreviousCommand',
title: nls.localize({ key: 'miScrollToPreviousCommand', comment: ['&& denotes a mnemonic'] }, "Scroll To Previous Command")
},
order: 1
});

MenuRegistry.appendMenuItem(MenuId.MenubarTerminalMenu, {
group: '3_selection',
command: {
id: 'workbench.action.terminal.scrollToNextCommand',
title: nls.localize({ key: 'miScrollToNextCommand', comment: ['&& denotes a mnemonic'] }, "Scroll To Next Command")
},
order: 2
});

MenuRegistry.appendMenuItem(MenuId.MenubarTerminalMenu, {
group: '3_selection',
command: {
id: 'workbench.action.terminal.selectToPreviousCommand',
title: nls.localize({ key: 'miSelectToPreviousCommand', comment: ['&& denotes a mnemonic'] }, "Select To Previous Command")
},
order: 3
});

MenuRegistry.appendMenuItem(MenuId.MenubarTerminalMenu, {
group: '3_selection',
command: {
id: 'workbench.action.terminal.selectToNextCommand',
title: nls.localize({ key: 'miSelectToNextCommand', comment: ['&& denotes a mnemonic'] }, "Select To Next Command")
},
order: 4
});
}
5 changes: 1 addition & 4 deletions src/vs/workbench/browser/parts/menubar/menubarPart.ts
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ export class MenubarPart extends Part {
'Selection': IMenu;
'View': IMenu;
'Go': IMenu;
'Terminal': IMenu;
'Debug': IMenu;
'Tasks': IMenu;
'Window'?: IMenu;
Expand All @@ -74,7 +73,6 @@ export class MenubarPart extends Part {
'Selection': nls.localize({ key: 'mSelection', comment: ['&& denotes a mnemonic'] }, "&&Selection"),
'View': nls.localize({ key: 'mView', comment: ['&& denotes a mnemonic'] }, "&&View"),
'Go': nls.localize({ key: 'mGoto', comment: ['&& denotes a mnemonic'] }, "&&Go"),
'Terminal': nls.localize({ key: 'mTerminal', comment: ['&& denotes a mnemonic'] }, "&&Terminal"),
'Debug': nls.localize({ key: 'mDebug', comment: ['&& denotes a mnemonic'] }, "&&Debug"),
'Tasks': nls.localize({ key: 'mTasks', comment: ['&& denotes a mnemonic'] }, "&&Tasks"),
'Help': nls.localize({ key: 'mHelp', comment: ['&& denotes a mnemonic'] }, "&&Help")
Expand Down Expand Up @@ -125,7 +123,6 @@ export class MenubarPart extends Part {
'Selection': this._register(this.menuService.createMenu(MenuId.MenubarSelectionMenu, this.contextKeyService)),
'View': this._register(this.menuService.createMenu(MenuId.MenubarViewMenu, this.contextKeyService)),
'Go': this._register(this.menuService.createMenu(MenuId.MenubarGoMenu, this.contextKeyService)),
'Terminal': this._register(this.menuService.createMenu(MenuId.MenubarTerminalMenu, this.contextKeyService)),
'Debug': this._register(this.menuService.createMenu(MenuId.MenubarDebugMenu, this.contextKeyService)),
'Tasks': this._register(this.menuService.createMenu(MenuId.MenubarTasksMenu, this.contextKeyService)),
'Help': this._register(this.menuService.createMenu(MenuId.MenubarHelpMenu, this.contextKeyService))
Expand Down Expand Up @@ -862,4 +859,4 @@ class ModifierKeyEmitter extends Emitter<IModifierKeyStatus> {
super.dispose();
this._subscriptions = dispose(this._subscriptions);
}
}
}