diff --git a/arduino-ide-extension/src/browser/theia/core/common-frontend-contribution.ts b/arduino-ide-extension/src/browser/theia/core/common-frontend-contribution.ts index ac1f309b..3517f6df 100644 --- a/arduino-ide-extension/src/browser/theia/core/common-frontend-contribution.ts +++ b/arduino-ide-extension/src/browser/theia/core/common-frontend-contribution.ts @@ -19,8 +19,7 @@ export class CommonFrontendContribution extends TheiaCommonFrontendContribution CommonCommands.AUTO_SAVE, CommonCommands.OPEN_PREFERENCES, CommonCommands.SELECT_ICON_THEME, - CommonCommands.SELECT_COLOR_THEME, - CommonCommands.OPEN_PREFERENCES + CommonCommands.SELECT_COLOR_THEME ]) { registry.unregisterMenuAction(command); } diff --git a/arduino-ide-extension/src/browser/theia/preferences/preferences-contribution.ts b/arduino-ide-extension/src/browser/theia/preferences/preferences-contribution.ts index 533e3347..71db31d4 100644 --- a/arduino-ide-extension/src/browser/theia/preferences/preferences-contribution.ts +++ b/arduino-ide-extension/src/browser/theia/preferences/preferences-contribution.ts @@ -1,5 +1,4 @@ import { injectable } from 'inversify'; -import { isOSX } from '@theia/core/lib/common/os'; import { MenuModelRegistry } from '@theia/core/lib/common/menu'; import { KeybindingRegistry } from '@theia/core/lib/browser/keybinding'; import { CommonCommands, CommonMenus } from '@theia/core/lib/browser'; @@ -10,10 +9,9 @@ export class PreferencesContribution extends TheiaPreferencesContribution { registerMenus(registry: MenuModelRegistry): void { super.registerMenus(registry); - if (isOSX) { - // The settings group: preferences, CLI config is not part of the `File` menu on macOS. - registry.unregisterMenuAction(CommonCommands.OPEN_PREFERENCES.id, CommonMenus.FILE_SETTINGS_SUBMENU_OPEN); - } + // The settings group: preferences, CLI config is not part of the `File` menu on macOS. + // On Windows and Linux, we rebind it to `Preferences...`. It is safe to remove here. + registry.unregisterMenuAction(CommonCommands.OPEN_PREFERENCES.id, CommonMenus.FILE_SETTINGS_SUBMENU_OPEN); } registerKeybindings(registry: KeybindingRegistry): void {