preferences does not fallback currently, moved to render side

src/vs/code/electron-main/menubar.ts

@@ -364,7 +364,6 @@ export class Menubar {
 	private shouldDrawMenu(menuId: string): boolean {
 		switch (menuId) {
 			case 'File':
-			case 'Preferences':
 			case 'Recent':
 			case 'Help':
 				return true;
@@ -396,26 +395,6 @@ export class Menubar {
 
 				break;
 
-			case 'Preferences':
-				const settings = this.createMenuItem(nls.localize({ key: 'miOpenSettings', comment: ['&& denotes a mnemonic'] }, "&&Settings"), 'workbench.action.openSettings');
-				const kebindingSettings = this.createMenuItem(nls.localize({ key: 'miOpenKeymap', comment: ['&& denotes a mnemonic'] }, "&&Keyboard Shortcuts"), 'workbench.action.openGlobalKeybindings');
-				const keymapExtensions = this.createMenuItem(nls.localize({ key: 'miOpenKeymapExtensions', comment: ['&& denotes a mnemonic'] }, "&&Keymap Extensions"), 'workbench.extensions.action.showRecommendedKeymapExtensions');
-				const snippetsSettings = this.createMenuItem(nls.localize({ key: 'miOpenSnippets', comment: ['&& denotes a mnemonic'] }, "User &&Snippets"), 'workbench.action.openSnippets');
-				const colorThemeSelection = this.createMenuItem(nls.localize({ key: 'miSelectColorTheme', comment: ['&& denotes a mnemonic'] }, "&&Color Theme"), 'workbench.action.selectTheme');
-				const iconThemeSelection = this.createMenuItem(nls.localize({ key: 'miSelectIconTheme', comment: ['&& denotes a mnemonic'] }, "File &&Icon Theme"), 'workbench.action.selectIconTheme');
-
-				menu.append(settings);
-				menu.append(__separator__());
-				menu.append(kebindingSettings);
-				menu.append(keymapExtensions);
-				menu.append(__separator__());
-				menu.append(snippetsSettings);
-				menu.append(__separator__());
-				menu.append(colorThemeSelection);
-				menu.append(iconThemeSelection);
-
-				break;
-
 			case 'Recent':
 				menu.append(this.createMenuItem(nls.localize({ key: 'miReopenClosedEditor', comment: ['&& denotes a mnemonic'] }, "&&Reopen Closed Editor"), 'workbench.action.reopenClosedEditor'));
 

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

@@ -451,7 +451,59 @@ function windowMenuRegistration() {
 }
 
 function preferencesMenuRegistration() {
+	MenuRegistry.appendMenuItem(MenuId.MenubarPreferencesMenu, {
+		group: '1_settings',
+		command: {
+			id: 'workbench.action.openSettings',
+			title: nls.localize({ key: 'miOpenSettings', comment: ['&& denotes a mnemonic'] }, "&&Settings")
+		},
+		order: 1
+	});
+
+	MenuRegistry.appendMenuItem(MenuId.MenubarPreferencesMenu, {
+		group: '2_keybindings',
+		command: {
+			id: 'workbench.action.openGlobalKeybindings',
+			title: nls.localize({ key: 'miOpenKeymap', comment: ['&& denotes a mnemonic'] }, "&&Keyboard Shortcuts")
+		},
+		order: 1
+	});
+
+	MenuRegistry.appendMenuItem(MenuId.MenubarPreferencesMenu, {
+		group: '2_keybindings',
+		command: {
+			id: 'workbench.extensions.action.showRecommendedKeymapExtensions',
+			title: nls.localize({ key: 'miOpenKeymapExtensions', comment: ['&& denotes a mnemonic'] }, "&&Keymap Extensions")
+		},
+		order: 2
+	});
 
+	MenuRegistry.appendMenuItem(MenuId.MenubarPreferencesMenu, {
+		group: '3_snippets',
+		command: {
+			id: 'workbench.action.openSnippets',
+			title: nls.localize({ key: 'miOpenSnippets', comment: ['&& denotes a mnemonic'] }, "User &&Snippets")
+		},
+		order: 1
+	});
+
+	MenuRegistry.appendMenuItem(MenuId.MenubarPreferencesMenu, {
+		group: '4_themes',
+		command: {
+			id: 'workbench.action.selectTheme',
+			title: nls.localize({ key: 'miSelectColorTheme', comment: ['&& denotes a mnemonic'] }, "&&Color Theme")
+		},
+		order: 1
+	});
+
+	MenuRegistry.appendMenuItem(MenuId.MenubarPreferencesMenu, {
+		group: '4_themes',
+		command: {
+			id: 'workbench.action.selectIconTheme',
+			title: nls.localize({ key: 'miSelectIconTheme', comment: ['&& denotes a mnemonic'] }, "File &&Icon Theme")
+		},
+		order: 2
+	});
 }
 
 function helpMenuRegistration() {