diff --git a/arduino-ide-extension/src/browser/arduino-frontend-contribution.tsx b/arduino-ide-extension/src/browser/arduino-frontend-contribution.tsx index bcbd4747f..4227122cb 100644 --- a/arduino-ide-extension/src/browser/arduino-frontend-contribution.tsx +++ b/arduino-ide-extension/src/browser/arduino-frontend-contribution.tsx @@ -31,7 +31,7 @@ import { EditorCommands, EditorMainMenu } from '@theia/editor/lib/browser'; import { MonacoMenus } from '@theia/monaco/lib/browser/monaco-menu'; import { FileNavigatorCommands } from '@theia/navigator/lib/browser/navigator-contribution'; import { TerminalMenus } from '@theia/terminal/lib/browser/terminal-frontend-contribution'; -import { ArduinoPreferences } from './arduino-preferences'; +import { ElectronWindowPreferences } from '@theia/core/lib/electron-browser/window/electron-window-preferences'; import { BoardsServiceProvider } from './boards/boards-service-provider'; import { BoardsToolBarItem } from './boards/boards-toolbar-item'; import { ArduinoMenus } from './menu/arduino-menus'; @@ -58,8 +58,8 @@ export class ArduinoFrontendContribution @inject(CommandRegistry) private readonly commandRegistry: CommandRegistry; - @inject(ArduinoPreferences) - private readonly arduinoPreferences: ArduinoPreferences; + @inject(ElectronWindowPreferences) + private readonly electronWindowPreferences: ElectronWindowPreferences; @inject(FrontendApplicationStateService) private readonly appStateService: FrontendApplicationStateService; @@ -78,10 +78,10 @@ export class ArduinoFrontendContribution } onStart(app: FrontendApplication): void { - this.arduinoPreferences.onPreferenceChanged((event) => { + this.electronWindowPreferences.onPreferenceChanged((event) => { if (event.newValue !== event.oldValue) { switch (event.preferenceName) { - case 'arduino.window.zoomLevel': + case 'window.zoomLevel': if (typeof event.newValue === 'number') { const webContents = remote.getCurrentWebContents(); webContents.setZoomLevel(event.newValue || 0); @@ -91,11 +91,10 @@ export class ArduinoFrontendContribution } }); this.appStateService.reachedState('ready').then(() => - this.arduinoPreferences.ready.then(() => { + this.electronWindowPreferences.ready.then(() => { const webContents = remote.getCurrentWebContents(); - const zoomLevel = this.arduinoPreferences.get( - 'arduino.window.zoomLevel' - ); + const zoomLevel = + this.electronWindowPreferences.get('window.zoomLevel'); webContents.setZoomLevel(zoomLevel); }) ); diff --git a/arduino-ide-extension/src/browser/arduino-preferences.ts b/arduino-ide-extension/src/browser/arduino-preferences.ts index ecd45735d..5adc8b9c2 100644 --- a/arduino-ide-extension/src/browser/arduino-preferences.ts +++ b/arduino-ide-extension/src/browser/arduino-preferences.ts @@ -114,11 +114,12 @@ export const ArduinoConfigSchema: PreferenceSchema = { }, 'arduino.window.zoomLevel': { type: 'number', - description: nls.localize( - 'arduino/preferences/window.zoomLevel', - 'Adjust the zoom level of the window. The original size is 0 and each increment above (e.g. 1) or below (e.g. -1) represents zooming 20% larger or smaller. You can also enter decimals to adjust the zoom level with a finer granularity.' - ), + description: '', default: 0, + deprecationMessage: nls.localize( + 'arduino/preferences/window.zoomLevel/deprecationMessage', + "Deprecated. Use 'window.zoomLevel' instead." + ), }, 'arduino.ide.updateChannel': { type: 'string', @@ -270,7 +271,6 @@ export interface ArduinoConfiguration { 'arduino.upload.verbose': boolean; 'arduino.upload.verify': boolean; 'arduino.window.autoScale': boolean; - 'arduino.window.zoomLevel': number; 'arduino.ide.updateChannel': UpdateChannel; 'arduino.ide.updateBaseUrl': string; 'arduino.board.certificates': string; diff --git a/arduino-ide-extension/src/browser/dialogs/settings/settings.ts b/arduino-ide-extension/src/browser/dialogs/settings/settings.ts index c8c0344ec..c7729c739 100644 --- a/arduino-ide-extension/src/browser/dialogs/settings/settings.ts +++ b/arduino-ide-extension/src/browser/dialogs/settings/settings.ts @@ -28,16 +28,17 @@ import { ElectronCommands } from '@theia/core/lib/electron-browser/menu/electron import { DefaultTheme } from '@theia/application-package/lib/application-props'; import { FrontendApplicationConfigProvider } from '@theia/core/lib/browser/frontend-application-config-provider'; +export const WINDOW_SETTING = 'window'; export const EDITOR_SETTING = 'editor'; export const FONT_SIZE_SETTING = `${EDITOR_SETTING}.fontSize`; export const AUTO_SAVE_SETTING = `files.autoSave`; export const QUICK_SUGGESTIONS_SETTING = `${EDITOR_SETTING}.quickSuggestions`; export const ARDUINO_SETTING = 'arduino'; -export const WINDOW_SETTING = `${ARDUINO_SETTING}.window`; +export const ARDUINO_WINDOW_SETTING = `${ARDUINO_SETTING}.window`; export const COMPILE_SETTING = `${ARDUINO_SETTING}.compile`; export const UPLOAD_SETTING = `${ARDUINO_SETTING}.upload`; export const SKETCHBOOK_SETTING = `${ARDUINO_SETTING}.sketchbook`; -export const AUTO_SCALE_SETTING = `${WINDOW_SETTING}.autoScale`; +export const AUTO_SCALE_SETTING = `${ARDUINO_WINDOW_SETTING}.autoScale`; export const ZOOM_LEVEL_SETTING = `${WINDOW_SETTING}.zoomLevel`; export const COMPILE_VERBOSE_SETTING = `${COMPILE_SETTING}.verbose`; export const COMPILE_WARNINGS_SETTING = `${COMPILE_SETTING}.warnings`; @@ -55,7 +56,7 @@ export interface Settings { currentLanguage: string; autoScaleInterface: boolean; // `arduino.window.autoScale` - interfaceScale: number; // `arduino.window.zoomLevel` https://github.com/eclipse-theia/theia/issues/8751 + interfaceScale: number; // `window.zoomLevel` verboseOnCompile: boolean; // `arduino.compile.verbose` compilerWarnings: CompilerWarnings; // `arduino.compile.warnings` verboseOnUpload: boolean; // `arduino.upload.verbose` diff --git a/i18n/en.json b/i18n/en.json index 73642759a..778914aa6 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -371,7 +371,9 @@ "upload.verbose": "True for verbose upload output. False by default.", "verifyAfterUpload": "Verify code after upload", "window.autoScale": "True if the user interface automatically scales with the font size.", - "window.zoomLevel": "Adjust the zoom level of the window. The original size is 0 and each increment above (e.g. 1) or below (e.g. -1) represents zooming 20% larger or smaller. You can also enter decimals to adjust the zoom level with a finer granularity." + "window.zoomLevel": { + "deprecationMessage": "Deprecated. Use 'window.zoomLevel' instead." + } }, "replaceMsg": "Replace the existing version of {0}?", "selectZip": "Select a zip file containing the library you'd like to add",