menubar registration: layout menu to appropriate owners

#54510

src/vs/workbench/browser/actions/toggleCenteredLayout.ts

@@ -43,3 +43,12 @@ MenuRegistry.appendMenuItem(MenuId.MenubarAppearanceMenu, {
 	},
 	order: 3
 });
+
+MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
+	group: '2_layouts',
+	command: {
+		id: 'workbench.action.editorLayoutCentered',
+		title: nls.localize({ key: 'miCenteredEditorLayout', comment: ['&& denotes a mnemonic'] }, "&&Centered")
+	},
+	order: 2
+});

src/vs/workbench/browser/actions/toggleEditorLayout.ts

@@ -9,7 +9,7 @@ import { TPromise } from 'vs/base/common/winjs.base';
 import * as nls from 'vs/nls';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { Action } from 'vs/base/common/actions';
-import { SyncActionDescriptor } from 'vs/platform/actions/common/actions';
+import { SyncActionDescriptor, MenuRegistry, MenuId } from 'vs/platform/actions/common/actions';
 import { IWorkbenchActionRegistry, Extensions } from 'vs/workbench/common/actions';
 import { KeyMod, KeyCode } from 'vs/base/common/keyCodes';
 import { dispose, IDisposable } from 'vs/base/common/lifecycle';
@@ -73,4 +73,13 @@ CommandsRegistry.registerCommand('_workbench.editor.setGroupOrientation', functi
 
 const registry = Registry.as<IWorkbenchActionRegistry>(Extensions.WorkbenchActions);
 const group = nls.localize('view', "View");
-registry.registerWorkbenchAction(new SyncActionDescriptor(ToggleEditorLayoutAction, ToggleEditorLayoutAction.ID, ToggleEditorLayoutAction.LABEL, { primary: KeyMod.Shift | KeyMod.Alt | KeyCode.KEY_0, mac: { primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.KEY_0 } }), 'View: Flip Editor Group Layout', group);
\ No newline at end of file
+registry.registerWorkbenchAction(new SyncActionDescriptor(ToggleEditorLayoutAction, ToggleEditorLayoutAction.ID, ToggleEditorLayoutAction.LABEL, { primary: KeyMod.Shift | KeyMod.Alt | KeyCode.KEY_0, mac: { primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.KEY_0 } }), 'View: Flip Editor Group Layout', group);
+
+MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
+	group: 'z_flip',
+	command: {
+		id: ToggleEditorLayoutAction.ID,
+		title: nls.localize({ key: 'miToggleEditorLayout', comment: ['&& denotes a mnemonic'] }, "Flip &&Layout")
+	},
+	order: 1
+});

src/vs/workbench/browser/parts/editor/editor.contribution.ts

@@ -555,3 +555,119 @@ MenuRegistry.appendMenuItem(MenuId.MenubarRecentMenu, {
 	},
 	order: 1
 });
+
+// Layout menu
+MenuRegistry.appendMenuItem(MenuId.MenubarViewMenu, {
+	group: '2_appearance',
+	title: nls.localize({ key: 'miEditorLayout', comment: ['&& denotes a mnemonic'] }, "Editor &&Layout"),
+	submenu: MenuId.MenubarLayoutMenu,
+	order: 2
+});
+
+MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
+	group: '1_split',
+	command: {
+		id: editorCommands.SPLIT_EDITOR_UP,
+		title: nls.localize({ key: 'miSplitEditorUp', comment: ['&& denotes a mnemonic'] }, "Split &&Up")
+	},
+	order: 1
+});
+
+MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
+	group: '1_split',
+	command: {
+		id: editorCommands.SPLIT_EDITOR_DOWN,
+		title: nls.localize({ key: 'miSplitEditorDown', comment: ['&& denotes a mnemonic'] }, "Split &&Down")
+	},
+	order: 2
+});
+
+MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
+	group: '1_split',
+	command: {
+		id: editorCommands.SPLIT_EDITOR_LEFT,
+		title: nls.localize({ key: 'miSplitEditorLeft', comment: ['&& denotes a mnemonic'] }, "Split &&Left")
+	},
+	order: 3
+});
+
+MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
+	group: '1_split',
+	command: {
+		id: editorCommands.SPLIT_EDITOR_RIGHT,
+		title: nls.localize({ key: 'miSplitEditorRight', comment: ['&& denotes a mnemonic'] }, "Split &&Right")
+	},
+	order: 4
+});
+
+MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
+	group: '2_layouts',
+	command: {
+		id: EditorLayoutSingleAction.ID,
+		title: nls.localize({ key: 'miSingleColumnEditorLayout', comment: ['&& denotes a mnemonic'] }, "&&Single")
+	},
+	order: 1
+});
+
+MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
+	group: '2_layouts',
+	command: {
+		id: EditorLayoutTwoColumnsAction.ID,
+		title: nls.localize({ key: 'miTwoColumnsEditorLayout', comment: ['&& denotes a mnemonic'] }, "&&Two Columns")
+	},
+	order: 3
+});
+
+MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
+	group: '2_layouts',
+	command: {
+		id: EditorLayoutThreeColumnsAction.ID,
+		title: nls.localize({ key: 'miThreeColumnsEditorLayout', comment: ['&& denotes a mnemonic'] }, "T&&hree Columns")
+	},
+	order: 4
+});
+
+MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
+	group: '2_layouts',
+	command: {
+		id: EditorLayoutTwoRowsAction.ID,
+		title: nls.localize({ key: 'miTwoRowsEditorLayout', comment: ['&& denotes a mnemonic'] }, "T&&wo Rows")
+	},
+	order: 5
+});
+
+MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
+	group: '2_layouts',
+	command: {
+		id: EditorLayoutThreeRowsAction.ID,
+		title: nls.localize({ key: 'miThreeRowsEditorLayout', comment: ['&& denotes a mnemonic'] }, "Three &&Rows")
+	},
+	order: 6
+});
+
+MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
+	group: '2_layouts',
+	command: {
+		id: EditorLayoutTwoByTwoGridAction.ID,
+		title: nls.localize({ key: 'miTwoByTwoGridEditorLayout', comment: ['&& denotes a mnemonic'] }, "&&Grid (2x2)")
+	},
+	order: 7
+});
+
+MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
+	group: '2_layouts',
+	command: {
+		id: EditorLayoutTwoRowsRightAction.ID,
+		title: nls.localize({ key: 'miTwoRowsRightEditorLayout', comment: ['&& denotes a mnemonic'] }, "Two R&&ows Right")
+	},
+	order: 8
+});
+
+MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
+	group: '2_layouts',
+	command: {
+		id: EditorLayoutTwoColumnsBottomAction.ID,
+		title: nls.localize({ key: 'miTwoColumnsBottomEditorLayout', comment: ['&& denotes a mnemonic'] }, "Two &&Columns Bottom")
+	},
+	order: 9
+});

src/vs/workbench/browser/parts/menubar/menubar.contribution.ts

@@ -9,7 +9,6 @@ import { isMacintosh } from 'vs/base/common/platform';
 
 editMenuRegistration();
 selectionMenuRegistration();
-layoutMenuRegistration();
 goMenuRegistration();
 tasksMenuRegistration();
 
@@ -270,146 +269,6 @@ function selectionMenuRegistration() {
 	});
 }
 
-// TODO: Editor Layout Submenu
-MenuRegistry.appendMenuItem(MenuId.MenubarViewMenu, {
-	group: '2_appearance',
-	title: nls.localize({ key: 'miEditorLayout', comment: ['&& denotes a mnemonic'] }, "Editor &&Layout"),
-	submenu: MenuId.MenubarLayoutMenu,
-	order: 2
-});
-
-
-function layoutMenuRegistration() {
-	// Split
-	MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
-		group: '1_split',
-		command: {
-			id: 'workbench.action.splitEditorUp',
-			title: nls.localize({ key: 'miSplitEditorUp', comment: ['&& denotes a mnemonic'] }, "Split &&Up")
-		},
-		order: 1
-	});
-
-	MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
-		group: '1_split',
-		command: {
-			id: 'workbench.action.splitEditorDown',
-			title: nls.localize({ key: 'miSplitEditorDown', comment: ['&& denotes a mnemonic'] }, "Split &&Down")
-		},
-		order: 2
-	});
-
-	MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
-		group: '1_split',
-		command: {
-			id: 'workbench.action.splitEditorLeft',
-			title: nls.localize({ key: 'miSplitEditorLeft', comment: ['&& denotes a mnemonic'] }, "Split &&Left")
-		},
-		order: 3
-	});
-
-	MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
-		group: '1_split',
-		command: {
-			id: 'workbench.action.splitEditorRight',
-			title: nls.localize({ key: 'miSplitEditorRight', comment: ['&& denotes a mnemonic'] }, "Split &&Right")
-		},
-		order: 4
-	});
-
-	// Layouts
-	MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
-		group: '2_layouts',
-		command: {
-			id: 'workbench.action.editorLayoutSingle',
-			title: nls.localize({ key: 'miSingleColumnEditorLayout', comment: ['&& denotes a mnemonic'] }, "&&Single")
-		},
-		order: 1
-	});
-
-	MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
-		group: '2_layouts',
-		command: {
-			id: 'workbench.action.editorLayoutCentered',
-			title: nls.localize({ key: 'miCenteredEditorLayout', comment: ['&& denotes a mnemonic'] }, "&&Centered")
-		},
-		order: 2
-	});
-
-	MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
-		group: '2_layouts',
-		command: {
-			id: 'workbench.action.editorLayoutTwoColumns',
-			title: nls.localize({ key: 'miTwoColumnsEditorLayout', comment: ['&& denotes a mnemonic'] }, "&&Two Columns")
-		},
-		order: 3
-	});
-
-	MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
-		group: '2_layouts',
-		command: {
-			id: 'workbench.action.editorLayoutThreeColumns',
-			title: nls.localize({ key: 'miThreeColumnsEditorLayout', comment: ['&& denotes a mnemonic'] }, "T&&hree Columns")
-		},
-		order: 4
-	});
-
-	MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
-		group: '2_layouts',
-		command: {
-			id: 'workbench.action.editorLayoutTwoRows',
-			title: nls.localize({ key: 'miTwoRowsEditorLayout', comment: ['&& denotes a mnemonic'] }, "T&&wo Rows")
-		},
-		order: 5
-	});
-
-	MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
-		group: '2_layouts',
-		command: {
-			id: 'workbench.action.editorLayoutThreeRows',
-			title: nls.localize({ key: 'miThreeRowsEditorLayout', comment: ['&& denotes a mnemonic'] }, "Three &&Rows")
-		},
-		order: 6
-	});
-
-	MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
-		group: '2_layouts',
-		command: {
-			id: 'workbench.action.editorLayoutTwoByTwoGrid',
-			title: nls.localize({ key: 'miTwoByTwoGridEditorLayout', comment: ['&& denotes a mnemonic'] }, "&&Grid (2x2)")
-		},
-		order: 7
-	});
-
-	MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
-		group: '2_layouts',
-		command: {
-			id: 'workbench.action.editorLayoutTwoRowsRight',
-			title: nls.localize({ key: 'miTwoRowsRightEditorLayout', comment: ['&& denotes a mnemonic'] }, "Two R&&ows Right")
-		},
-		order: 8
-	});
-
-	MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
-		group: '2_layouts',
-		command: {
-			id: 'workbench.action.editorLayoutTwoColumnsBottom',
-			title: nls.localize({ key: 'miTwoColumnsBottomEditorLayout', comment: ['&& denotes a mnemonic'] }, "Two &&Columns Bottom")
-		},
-		order: 9
-	});
-
-	// Flip
-	MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
-		group: 'z_flip',
-		command: {
-			id: 'workbench.action.toggleEditorGroupLayout',
-			title: nls.localize({ key: 'miToggleEditorLayout', comment: ['&& denotes a mnemonic'] }, "Flip &&Layout")
-		},
-		order: 1
-	});
-
-}
 
 function goMenuRegistration() {
 	// Forward/Back