Move some more menu registration into registerAction2 (microsoft#163330)

refs microsoft#162713

Author: sbatten

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

@@ -359,12 +359,29 @@ class ToggleSidebarVisibilityAction extends Action2 {
 		super({
 			id: ToggleSidebarVisibilityAction.ID,
 			title: { value: localize('toggleSidebar', "Toggle Primary Side Bar Visibility"), original: 'Toggle Primary Side Bar Visibility' },
+			toggled: {
+				condition: SideBarVisibleContext,
+				title: localize('primary sidebar', "Primary Side Bar"),
+				mnemonicTitle: localize('primary sidebar mnemonic', "&&Primary Side Bar"),
+			},
 			category: Categories.View,
 			f1: true,
 			keybinding: {
 				weight: KeybindingWeight.WorkbenchContrib,
 				primary: KeyMod.CtrlCmd | KeyCode.KeyB
-			}
+			},
+			menu: [
+				{
+					id: MenuId.LayoutControlMenuSubmenu,
+					group: '0_workbench_layout',
+					order: 0
+				},
+				{
+					id: MenuId.MenubarAppearanceMenu,
+					group: '2_workbench_layout',
+					order: 1
+				}
+			]
 		});
 	}
 
@@ -400,28 +417,6 @@ MenuRegistry.appendMenuItems([
 			when: ContextKeyExpr.and(SideBarVisibleContext, ContextKeyExpr.equals('viewLocation', ViewContainerLocationToString(ViewContainerLocation.Sidebar))),
 			order: 2
 		}
-	}, {
-		id: MenuId.MenubarAppearanceMenu,
-		item: {
-			group: '2_workbench_layout',
-			command: {
-				id: ToggleSidebarVisibilityAction.ID,
-				title: localize({ key: 'miShowSidebar', comment: ['&& denotes a mnemonic'] }, "&&Primary Side Bar"),
-				toggled: SideBarVisibleContext
-			},
-			order: 1
-		}
-	}, {
-		id: MenuId.LayoutControlMenuSubmenu,
-		item: {
-			group: '0_workbench_layout',
-			command: {
-				id: ToggleSidebarVisibilityAction.ID,
-				title: localize('miSidebarNoMnnemonic', "Primary Side Bar"),
-				toggled: SideBarVisibleContext
-			},
-			order: 0
-		}
 	}, {
 		id: MenuId.LayoutControlMenu,
 		item: {

src/vs/workbench/browser/parts/auxiliarybar/auxiliaryBarActions.ts

@@ -30,8 +30,26 @@ export class ToggleAuxiliaryBarAction extends Action2 {
 		super({
 			id: ToggleAuxiliaryBarAction.ID,
 			title: { value: ToggleAuxiliaryBarAction.LABEL, original: 'Toggle Secondary Side Bar Visibility' },
+			toggled: {
+				condition: AuxiliaryBarVisibleContext,
+				title: localize('secondary sidebar', "Secondary Side Bar"),
+				mnemonicTitle: localize('secondary sidebar mnemonic', "Secondary Si&&de Bar"),
+			},
+
 			category: Categories.View,
 			f1: true,
+			menu: [
+				{
+					id: MenuId.LayoutControlMenuSubmenu,
+					group: '0_workbench_layout',
+					order: 1
+				},
+				{
+					id: MenuId.MenubarAppearanceMenu,
+					group: '2_workbench_layout',
+					order: 2
+				}
+			]
 		});
 	}
 
@@ -74,18 +92,6 @@ registerAction2(class FocusAuxiliaryBarAction extends Action2 {
 });
 
 MenuRegistry.appendMenuItems([
-	{
-		id: MenuId.LayoutControlMenuSubmenu,
-		item: {
-			group: '0_workbench_layout',
-			command: {
-				id: ToggleAuxiliaryBarAction.ID,
-				title: localize('miAuxiliaryBarNoMnemonic', "Secondary Side Bar"),
-				toggled: AuxiliaryBarVisibleContext
-			},
-			order: 2
-		}
-	},
 	{
 		id: MenuId.LayoutControlMenu,
 		item: {
@@ -99,8 +105,7 @@ MenuRegistry.appendMenuItems([
 			when: ContextKeyExpr.and(ContextKeyExpr.or(ContextKeyExpr.equals('config.workbench.layoutControl.type', 'toggles'), ContextKeyExpr.equals('config.workbench.layoutControl.type', 'both')), ContextKeyExpr.equals('config.workbench.sideBar.location', 'right')),
 			order: 0
 		}
-	},
-	{
+	}, {
 		id: MenuId.LayoutControlMenu,
 		item: {
 			group: '0_workbench_toggles',
@@ -113,18 +118,6 @@ MenuRegistry.appendMenuItems([
 			when: ContextKeyExpr.and(ContextKeyExpr.or(ContextKeyExpr.equals('config.workbench.layoutControl.type', 'toggles'), ContextKeyExpr.equals('config.workbench.layoutControl.type', 'both')), ContextKeyExpr.equals('config.workbench.sideBar.location', 'left')),
 			order: 2
 		}
-	},
-	{
-		id: MenuId.MenubarAppearanceMenu,
-		item: {
-			group: '2_workbench_layout',
-			command: {
-				id: ToggleAuxiliaryBarAction.ID,
-				title: localize({ key: 'miAuxiliaryBar', comment: ['&& denotes a mnemonic'] }, "Secondary Si&&de Bar"),
-				toggled: AuxiliaryBarVisibleContext
-			},
-			order: 2
-		}
 	}, {
 		id: MenuId.ViewTitleContext,
 		item: {

src/vs/workbench/browser/parts/panel/panelActions.ts

@@ -38,9 +38,25 @@ export class TogglePanelAction extends Action2 {
 		super({
 			id: TogglePanelAction.ID,
 			title: { value: TogglePanelAction.LABEL, original: 'Toggle Panel Visibility' },
+			toggled: {
+				condition: PanelVisibleContext,
+				title: localize('toggle panel', "Panel"),
+				mnemonicTitle: localize('toggle panel mnemonic', "&&Panel"),
+			},
 			f1: true,
 			category: Categories.View,
 			keybinding: { primary: KeyMod.CtrlCmd | KeyCode.KeyJ, weight: KeybindingWeight.WorkbenchContrib },
+			menu: [
+				{
+					id: MenuId.MenubarAppearanceMenu,
+					group: '2_workbench_layout',
+					order: 5
+				}, {
+					id: MenuId.LayoutControlMenuSubmenu,
+					group: '0_workbench_layout',
+					order: 4
+				},
+			]
 		});
 	}
 
@@ -408,28 +424,6 @@ registerAction2(class extends Action2 {
 
 MenuRegistry.appendMenuItems([
 	{
-		id: MenuId.MenubarAppearanceMenu,
-		item: {
-			group: '2_workbench_layout',
-			command: {
-				id: TogglePanelAction.ID,
-				title: localize({ key: 'miPanel', comment: ['&& denotes a mnemonic'] }, "&&Panel"),
-				toggled: PanelVisibleContext
-			},
-			order: 5
-		}
-	}, {
-		id: MenuId.LayoutControlMenuSubmenu,
-		item: {
-			group: '0_workbench_layout',
-			command: {
-				id: TogglePanelAction.ID,
-				title: localize('miPanelNoMnemonic', "Panel"),
-				toggled: PanelVisibleContext
-			},
-			order: 4
-		}
-	}, {
 		id: MenuId.LayoutControlMenu,
 		item: {
 			group: '0_workbench_toggles',