Desktop: Fixes #4010: Add history backward and forward commands to keymap and menus

ElectronClient/gui/MenuBar.tsx

@@ -118,6 +118,8 @@ const commandNames:string[] = [
 	'showNoteContentProperties',
 	'copyDevCommand',
 	'openProfileDirectory',
+	'historyBackward',
+	'historyForward',
 ];
 
 function menuItemSetChecked(id:string, checked:boolean) {
@@ -249,10 +251,8 @@ function useMenu(props:Props) {
 			menuItemDic.focusElementNoteBody,
 		];
 
-		let toolsItems:any[] = [];
 		const importItems = [];
 		const exportItems = [];
-		const toolsItemsFirst = [];
 		const templateItems:any[] = [];
 		const ioService = InteropService.instance();
 		const ioModules = ioService.modules();
@@ -299,16 +299,18 @@ function useMenu(props:Props) {
 			},
 		};
 
+		const separator = () => {
+			return {
+				type: 'separator',
+			};
+		};
+
 		const newNoteItem = menuItemDic.newNote;
 		const newTodoItem = menuItemDic.newTodo;
 		const newFolderItem = menuItemDic.newFolder;
 		const newSubFolderItem = menuItemDic.newSubFolder;
 		const printItem = menuItemDic.print;
 
-		toolsItemsFirst.push(syncStatusItem, {
-			type: 'separator',
-		});
-
 		templateItems.push({
 			label: _('Create note from template'),
 			click: () => {
@@ -342,18 +344,22 @@ function useMenu(props:Props) {
 			},
 		});
 
+		let toolsItems:any[] = [];
+
 		// we need this workaround, because on macOS the menu is different
-		const toolsItemsWindowsLinux:any[] = toolsItemsFirst.concat([{
+		const toolsItemsWindowsLinux:any[] = [
-			label: _('Options'),
+			{
-			visible: !shim.isMac(),
+				label: _('Options'),
-			accelerator: !shim.isMac() && keymapService.getAccelerator('config'),
+				accelerator: keymapService.getAccelerator('config'),
-			click: () => {
+				click: () => {
-				props.dispatch({
+					props.dispatch({
-					type: 'NAV_GO',
+						type: 'NAV_GO',
-					routeName: 'Config',
+						routeName: 'Config',
-				});
+					});
+				},
 			},
-		} as any]);
+			separator(),
+		];
 
 		// the following menu items will be available for all OS under Tools
 		const toolsItemsAll = [{
@@ -451,9 +457,7 @@ function useMenu(props:Props) {
 
 			menuItemDic.synchronize,
 
-			shim.isMac() ? syncStatusItem : noItem, {
+			shim.isMac() ? noItem : printItem, {
-				type: 'separator',
-			}, shim.isMac() ? noItem : printItem, {
 				type: 'separator',
 				platforms: ['darwin'],
 			},
@@ -518,12 +522,6 @@ function useMenu(props:Props) {
 			});
 		}
 
-		const separator = () => {
-			return {
-				type: 'separator',
-			};
-		};
-
 		const rootMenus:any = {
 			edit: {
 				id: 'edit',
@@ -586,11 +584,6 @@ function useMenu(props:Props) {
 						},
 					},
 					separator(),
-					{
-						label: _('Focus'),
-						submenu: focusItems,
-					},
-					separator(),
 					{
 						label: _('Actual Size'),
 						click: () => {
@@ -623,6 +616,18 @@ function useMenu(props:Props) {
 						accelerator: 'CommandOrControl+-',
 					}],
 			},
+			go: {
+				label: _('&Go'),
+				submenu: [
+					menuItemDic.historyBackward,
+					menuItemDic.historyForward,
+					separator(),
+					{
+						label: _('Focus'),
+						submenu: focusItems,
+					},
+				],
+			},
 			note: {
 				label: _('&Note'),
 				submenu: [
@@ -655,6 +660,8 @@ function useMenu(props:Props) {
 					click: () => _checkForUpdates(),
 				},
 				separator(),
+				syncStatusItem,
+				separator(),
 				{
 					id: 'help:toggleDevTools',
 					label: _('Toggle development tools'),
@@ -709,6 +716,7 @@ function useMenu(props:Props) {
 			const pluginMenuItems = PluginManager.instance().menuItems();
 			for (const item of pluginMenuItems) {
 				const itemParent = rootMenus[item.parent] ? rootMenus[item.parent] : 'tools';
+				itemParent.submenu.push(separator());
 				itemParent.submenu.push(item);
 			}
 		}
@@ -741,6 +749,7 @@ function useMenu(props:Props) {
 			rootMenus.file,
 			rootMenus.edit,
 			rootMenus.view,
+			rootMenus.go,
 			rootMenus.note,
 			rootMenus.tools,
 			rootMenus.help,
@@ -748,46 +757,6 @@ function useMenu(props:Props) {
 
 		if (shim.isMac()) template.splice(0, 0, rootMenus.macOsApp);
 
-		// TODO
-
-		// function isEmptyMenu(template:any[]) {
-		// 	for (let i = 0; i < template.length; i++) {
-		// 		const t = template[i];
-		// 		if (t.type !== 'separator') return false;
-		// 	}
-		// 	return true;
-		// }
-
-		// function removeUnwantedItems(template:any[], screen:string) {
-		// 	const platform = shim.platformName();
-
-		// 	let output = [];
-		// 	for (let i = 0; i < template.length; i++) {
-		// 		const t = Object.assign({}, template[i]);
-		// 		if (t.screens && t.screens.indexOf(screen) < 0) continue;
-		// 		if (t.platforms && t.platforms.indexOf(platform) < 0) continue;
-		// 		if (t.submenu) t.submenu = removeUnwantedItems(t.submenu, screen);
-		// 		if (('submenu' in t) && isEmptyMenu(t.submenu)) continue;
-		// 		output.push(t);
-		// 	}
-
-		// 	// Remove empty separator for now empty sections
-		// 	const temp = [];
-		// 	let previous = null;
-		// 	for (let i = 0; i < output.length; i++) {
-		// 		const t = Object.assign({}, output[i]);
-		// 		if (t.type === 'separator') {
-		// 			if (!previous) continue;
-		// 			if (previous.type === 'separator') continue;
-		// 		}
-		// 		temp.push(t);
-		// 		previous = t;
-		// 	}
-		// 	output = temp;
-
-		// 	return output;
-		// }
-
 		if (props.routeName !== 'Main') {
 			setMenu(Menu.buildFromTemplate([
 				{

ElectronClient/plugins/GotoAnything.tsx

@@ -557,7 +557,7 @@ GotoAnything.manifest = {
 	menuItems: [
 		{
 			name: 'main',
-			parent: 'tools',
+			parent: 'go',
 			label: _('Goto Anything...'),
 			accelerator: () => KeymapService.instance().getAccelerator('gotoAnything'),
 			screens: ['Main'],