Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-03-01 14:15:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

finalize

Browse Source
This commit is contained in:
Benjamin Pasero
2016-01-14 11:06:49 +01:00
parent 2ef91b81a4
commit 3c276ed22e
2 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/vs/workbench/electron-main/menus.ts
View File

@@ -486,15 +486,10 @@ export class VSCodeMenu {
}
private setViewMenu(viewMenu: Electron.Menu): void {
let explorer = this.createMenuItem(nls.localize('miViewExplorer', "&&Explorer"),
'workbench.view.explorer');
let search = this.createMenuItem(nls.localize('miViewSearch', "&&Search"),
'workbench.view.search');
let scc = this.createMenuItem(nls.localize('miViewSCC', "S&&ource Code Control"),
'workbench.view.git');
let debug = this.createMenuItem(nls.localize('miViewDebug', "&&Debug"),
'workbench.view.debug');
let explorer = this.createMenuItem(nls.localize('miViewExplorer', "&&Explorer"), 'workbench.view.explorer');
let search = this.createMenuItem(nls.localize('miViewSearch', "&&Search"), 'workbench.view.search');
let git = this.createMenuItem(nls.localize('miViewGit', "&&Git"), 'workbench.view.git');
let debug = this.createMenuItem(nls.localize('miViewDebug', "&&Debug"), 'workbench.view.debug');
let commands = this.createMenuItem(nls.localize('miCommandPalette', "&&Command Palette..."), 'workbench.action.showCommands');
let markers = this.createMenuItem(nls.localize('miMarker', "&&Errors and Warnings..."), 'workbench.action.showErrorsWarnings');
@@ -512,7 +507,7 @@ export class VSCodeMenu {
arrays.coalesce([
explorer,
search,
scc,
git,
debug,
__separator__(),
commands,

3
src/vs/workbench/parts/git/browser/gitWorkbenchContributions.ts
View File

@@ -458,7 +458,8 @@ export function registerContributions(): void {
new SyncActionDescriptor(OpenGitViewletAction, OpenGitViewletAction.ID, OpenGitViewletAction.LABEL, {
primary: null,
win: { primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KEY_G },
linux: { primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KEY_G }
linux: { primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KEY_G },
mac: { primary: KeyMod.WinCtrl | KeyMod.Shift | KeyCode.KEY_G }
}),
nls.localize('view', "View")
);