Desktop: Remove from keymap editor commands that cannot be associated with a shortcut

.eslintignore

@@ -126,6 +126,7 @@ ElectronClient/gui/MainScreen/commands/toggleSideBar.js
 ElectronClient/gui/MainScreen/commands/toggleVisiblePanes.js
 ElectronClient/gui/MainScreen/MainScreen.js
 ElectronClient/gui/MenuBar.js
+ElectronClient/gui/menuCommandNames.js
 ElectronClient/gui/MultiNoteActions.js
 ElectronClient/gui/NoteContentPropertiesDialog.js
 ElectronClient/gui/NoteEditor/commands/editorCommandDeclarations.js

.gitignore

@@ -120,6 +120,7 @@ ElectronClient/gui/MainScreen/commands/toggleSideBar.js
 ElectronClient/gui/MainScreen/commands/toggleVisiblePanes.js
 ElectronClient/gui/MainScreen/MainScreen.js
 ElectronClient/gui/MenuBar.js
+ElectronClient/gui/menuCommandNames.js
 ElectronClient/gui/MultiNoteActions.js
 ElectronClient/gui/NoteContentPropertiesDialog.js
 ElectronClient/gui/NoteEditor/commands/editorCommandDeclarations.js

.ignore

@@ -69,6 +69,7 @@ ElectronClient/gui/MainScreen/commands/toggleSideBar.js
 ElectronClient/gui/MainScreen/commands/toggleVisiblePanes.js
 ElectronClient/gui/MainScreen/MainScreen.js
 ElectronClient/gui/MenuBar.js
+ElectronClient/gui/menuCommandNames.js
 ElectronClient/gui/MultiNoteActions.js
 ElectronClient/gui/NoteContentPropertiesDialog.js
 ElectronClient/gui/NoteEditor/commands/editorCommandDeclarations.js

ElectronClient/app.ts

@@ -14,6 +14,7 @@ import Setting from 'lib/models/Setting';
 import actionApi from 'lib/services/rest/actionApi.desktop';
 import BaseApplication from 'lib/BaseApplication';
 import { _, setLocale } from 'lib/locale';
+import menuCommandNames from './gui/menuCommandNames';
 
 require('app-module-path').addPath(__dirname);
 
@@ -526,7 +527,9 @@ class Application extends BaseApplication {
 		}
 
 		const keymapService = KeymapService.instance();
-		keymapService.initialize(CommandService.instance().commandNames(true));
+		// We only add the commands that appear in the menu because only
+		// those can have a shortcut associated with them.
+		keymapService.initialize(menuCommandNames());
 
 		try {
 			await keymapService.loadCustomKeymap(`${dir}/keymap-desktop.json`);
@@ -534,9 +537,10 @@ class Application extends BaseApplication {
 			reg.logger().error(error);
 		}
 
-		// Since the settings need to be loaded before the store is created, it will never
+		// Since the settings need to be loaded before the store is
-		// receive the SETTING_UPDATE_ALL even, which mean state.settings will not be
+		// created, it will never receive the SETTING_UPDATE_ALL even,
-		// initialised. So we manually call dispatchUpdateAll() to force an update.
+		// which mean state.settings will not be initialised. So we
+		// manually call dispatchUpdateAll() to force an update.
 		Setting.dispatchUpdateAll();
 
 		await FoldersScreenUtils.refreshFolders();

ElectronClient/gui/MenuBar.tsx

@@ -14,6 +14,7 @@ import InteropServiceHelper from '../InteropServiceHelper';
 import { _ } from 'lib/locale';
 import { MenuItem, MenuItemLocation } from 'lib/services/plugins/api/types';
 import stateToWhenClauseContext from 'lib/services/commands/stateToWhenClauseContext';
+import menuCommandNames from './menuCommandNames';
 
 const { connect } = require('react-redux');
 const { reg } = require('lib/registry.js');
@@ -86,41 +87,7 @@ interface Props {
 	pluginMenus: any[],
 }
 
-const commandNames:string[] = [
+const commandNames:string[] = menuCommandNames();
-	'focusElementSideBar',
-	'focusElementNoteList',
-	'focusElementNoteTitle',
-	'focusElementNoteBody',
-	'exportPdf',
-	'newNote',
-	'newTodo',
-	'newFolder',
-	'newSubFolder',
-	'print',
-	'synchronize',
-	'textCopy',
-	'textCut',
-	'textPaste',
-	'textSelectAll',
-	'textBold',
-	'textItalic',
-	'textLink',
-	'textCode',
-	'insertDateTime',
-	'attachFile',
-	'focusSearch',
-	'showLocalSearch',
-	'toggleSideBar',
-	'toggleNoteList',
-	'toggleVisiblePanes',
-	'toggleExternalEditing',
-	'setTags',
-	'showNoteContentProperties',
-	'copyDevCommand',
-	'openProfileDirectory',
-	'historyBackward',
-	'historyForward',
-];
 
 function menuItemSetChecked(id:string, checked:boolean) {
 	const menu = Menu.getApplicationMenu();

ElectronClient/gui/menuCommandNames.ts

@@ -0,0 +1,37 @@
+export default function() {
+	return [
+		'attachFile',
+		'copyDevCommand',
+		'exportPdf',
+		'focusElementNoteBody',
+		'focusElementNoteList',
+		'focusElementNoteTitle',
+		'focusElementSideBar',
+		'focusSearch',
+		'historyBackward',
+		'historyForward',
+		'insertDateTime',
+		'newFolder',
+		'newNote',
+		'newSubFolder',
+		'newTodo',
+		'openProfileDirectory',
+		'print',
+		'setTags',
+		'showLocalSearch',
+		'showNoteContentProperties',
+		'synchronize',
+		'textBold',
+		'textCode',
+		'textCopy',
+		'textCut',
+		'textItalic',
+		'textLink',
+		'textPaste',
+		'textSelectAll',
+		'toggleExternalEditing',
+		'toggleNoteList',
+		'toggleSideBar',
+		'toggleVisiblePanes',
+	];
+}