From 8f4e9b952e45e849304e2c2735162a6b453ec2a0 Mon Sep 17 00:00:00 2001 From: Romain Vigier Date: Fri, 29 Jul 2022 16:29:33 +0200 Subject: [PATCH] Utils: Remove getSchema function --- src/modules/SwitcherCommands.js | 3 +-- src/modules/SwitcherTheme.js | 8 ++++---- src/modules/Timer.js | 3 +-- src/modules/TimerLocation.js | 3 +-- src/modules/TimerNightlight.js | 3 +-- src/modules/TimerOndemand.js | 2 +- src/modules/TimerSchedule.js | 3 +-- src/preferences/CommandsPage.js | 4 +--- src/preferences/SchedulePage.js | 2 +- src/preferences/ThemesPage.js | 8 ++++---- src/utils.js | 10 ---------- 11 files changed, 16 insertions(+), 33 deletions(-) diff --git a/src/modules/SwitcherCommands.js b/src/modules/SwitcherCommands.js index 2191ce4..84862f7 100644 --- a/src/modules/SwitcherCommands.js +++ b/src/modules/SwitcherCommands.js @@ -7,7 +7,6 @@ const { extensionUtils } = imports.misc; const Me = extensionUtils.getCurrentExtension(); const debug = Me.imports.debug; -const utils = Me.imports.utils; const { Switcher } = Me.imports.modules.Switcher; @@ -24,7 +23,7 @@ var SwitcherCommands = class extends Switcher { #settings; constructor({ timer }) { - const settings = extensionUtils.getSettings(utils.getSettingsSchema('commands')); + const settings = extensionUtils.getSettings(`${Me.metadata['settings-schema']}.commands`); super({ name: 'Command', timer, diff --git a/src/modules/SwitcherTheme.js b/src/modules/SwitcherTheme.js index a5a1cc2..658bb3a 100644 --- a/src/modules/SwitcherTheme.js +++ b/src/modules/SwitcherTheme.js @@ -145,7 +145,7 @@ var SwitcherThemeCursor = class extends SwitcherTheme { super({ name: 'Cursor theme', timer, - settings: extensionUtils.getSettings(utils.getSettingsSchema('cursor-variants')), + settings: extensionUtils.getSettings(`${Me.metadata['settings-schema']}.cursor-variants`), systemSettings: new Gio.Settings({ schema: 'org.gnome.desktop.interface' }), themeKey: 'cursor-theme', }); @@ -158,7 +158,7 @@ var SwitcherThemeGtk = class extends SwitcherTheme { super({ name: 'GTK theme', timer, - settings: extensionUtils.getSettings(utils.getSettingsSchema('gtk-variants')), + settings: extensionUtils.getSettings(`${Me.metadata['settings-schema']}.gtk-variants`), systemSettings: new Gio.Settings({ schema: 'org.gnome.desktop.interface' }), themeKey: 'gtk-theme', }); @@ -171,7 +171,7 @@ var SwitcherThemeIcon = class extends SwitcherTheme { super({ name: 'Icon theme', timer, - settings: extensionUtils.getSettings(utils.getSettingsSchema('icon-variants')), + settings: extensionUtils.getSettings(`${Me.metadata['settings-schema']}.icon-variants`), systemSettings: new Gio.Settings({ schema: 'org.gnome.desktop.interface' }), themeKey: 'icon-theme', }); @@ -183,7 +183,7 @@ var SwitcherThemeShell = class extends SwitcherTheme { #settings; constructor({ timer }) { - const settings = extensionUtils.getSettings(utils.getSettingsSchema('shell-variants')); + const settings = extensionUtils.getSettings(`${Me.metadata['settings-schema']}.shell-variants`); super({ name: 'Shell theme', timer, diff --git a/src/modules/Timer.js b/src/modules/Timer.js index baf87e3..fcc94ca 100644 --- a/src/modules/Timer.js +++ b/src/modules/Timer.js @@ -10,7 +10,6 @@ const { main } = imports.ui; const Me = extensionUtils.getCurrentExtension(); const debug = Me.imports.debug; -const utils = Me.imports.utils; const { Time } = Me.imports.enums.Time; const { TimerNightlight } = Me.imports.modules.TimerNightlight; @@ -46,7 +45,7 @@ var Timer = class { #timeConnections = []; constructor() { - this.#settings = extensionUtils.getSettings(utils.getSettingsSchema('time')); + this.#settings = extensionUtils.getSettings(`${Me.metadata['settings-schema']}.time`); this.#interfaceSettings = new Gio.Settings({ schema: 'org.gnome.desktop.interface' }); this.#colorSettings = new Gio.Settings({ schema: 'org.gnome.settings-daemon.plugins.color' }); this.#locationSettings = new Gio.Settings({ schema: 'org.gnome.system.location' }); diff --git a/src/modules/TimerLocation.js b/src/modules/TimerLocation.js index 50d4ca5..284a6f5 100644 --- a/src/modules/TimerLocation.js +++ b/src/modules/TimerLocation.js @@ -8,7 +8,6 @@ const Signals = imports.signals; const Me = extensionUtils.getCurrentExtension(); const debug = Me.imports.debug; -const utils = Me.imports.utils; const { Time } = Me.imports.enums.Time; @@ -39,7 +38,7 @@ var TimerLocation = class { constructor() { // Before we have the location suntimes, we'll use the manual schedule // times - const timeSettings = extensionUtils.getSettings(utils.getSettingsSchema('time')); + const timeSettings = extensionUtils.getSettings(`${Me.metadata['settings-schema']}.time`); this.#suntimes = new Map([ ['sunrise', timeSettings.get_double('schedule-sunrise')], ['sunset', timeSettings.get_double('schedule-sunset')], diff --git a/src/modules/TimerNightlight.js b/src/modules/TimerNightlight.js index 0fbfcc2..4985c5c 100644 --- a/src/modules/TimerNightlight.js +++ b/src/modules/TimerNightlight.js @@ -8,7 +8,6 @@ const Signals = imports.signals; const Me = extensionUtils.getCurrentExtension(); const debug = Me.imports.debug; -const utils = Me.imports.utils; const { Time } = Me.imports.enums.Time; @@ -38,7 +37,7 @@ var TimerNightlight = class { #previousNightlightState = null; constructor() { - this.#settings = extensionUtils.getSettings(utils.getSettingsSchema('time')); + this.#settings = extensionUtils.getSettings(`${Me.metadata['settings-schema']}.time`); } async enable() { diff --git a/src/modules/TimerOndemand.js b/src/modules/TimerOndemand.js index 539daf7..bf2dbca 100644 --- a/src/modules/TimerOndemand.js +++ b/src/modules/TimerOndemand.js @@ -35,7 +35,7 @@ var TimerOndemand = class { constructor({ timer }) { this.#timer = timer; - this.#settings = extensionUtils.getSettings(utils.getSettingsSchema('time')); + this.#settings = extensionUtils.getSettings(`${Me.metadata['settings-schema']}.time`); } enable() { diff --git a/src/modules/TimerSchedule.js b/src/modules/TimerSchedule.js index 69b5758..38f75f9 100644 --- a/src/modules/TimerSchedule.js +++ b/src/modules/TimerSchedule.js @@ -8,7 +8,6 @@ const Signals = imports.signals; const Me = extensionUtils.getCurrentExtension(); const debug = Me.imports.debug; -const utils = Me.imports.utils; const { Time } = Me.imports.enums.Time; @@ -28,7 +27,7 @@ var TimerSchedule = class { #timeChangeTimer = null; constructor() { - this.#settings = extensionUtils.getSettings(utils.getSettingsSchema('time')); + this.#settings = extensionUtils.getSettings(`${Me.metadata['settings-schema']}.time`); } enable() { diff --git a/src/preferences/CommandsPage.js b/src/preferences/CommandsPage.js index 69a1c08..6b08f74 100644 --- a/src/preferences/CommandsPage.js +++ b/src/preferences/CommandsPage.js @@ -6,8 +6,6 @@ const { extensionUtils } = imports.misc; const Me = extensionUtils.getCurrentExtension(); -const utils = Me.imports.utils; - var CommandsPage = GObject.registerClass({ GTypeName: 'CommandsPage', @@ -20,7 +18,7 @@ var CommandsPage = GObject.registerClass({ }, class CommandsPage extends Adw.PreferencesPage { constructor(props = {}) { super(props); - const settings = extensionUtils.getSettings(utils.getSettingsSchema('commands')); + const settings = extensionUtils.getSettings(`${Me.metadata['settings-schema']}.commands`); settings.bind('enabled', this._enabled_switch, 'active', Gio.SettingsBindFlags.DEFAULT); settings.bind('sunrise', this._sunrise_entry, 'text', Gio.SettingsBindFlags.DEFAULT); diff --git a/src/preferences/SchedulePage.js b/src/preferences/SchedulePage.js index e58d765..ee63260 100644 --- a/src/preferences/SchedulePage.js +++ b/src/preferences/SchedulePage.js @@ -30,7 +30,7 @@ var SchedulePage = GObject.registerClass({ }, class SchedulePage extends Adw.PreferencesPage { constructor(props = {}) { super(props); - const settings = extensionUtils.getSettings(utils.getSettingsSchema('time')); + const settings = extensionUtils.getSettings(`${Me.metadata['settings-schema']}.time`); const colorSettings = new Gio.Settings({ schema: 'org.gnome.settings-daemon.plugins.color' }); const locationSettings = new Gio.Settings({ schema: 'org.gnome.system.location' }); diff --git a/src/preferences/ThemesPage.js b/src/preferences/ThemesPage.js index 95d7857..14416b6 100644 --- a/src/preferences/ThemesPage.js +++ b/src/preferences/ThemesPage.js @@ -32,10 +32,10 @@ var ThemesPage = GObject.registerClass({ }, class ThemesPage extends Adw.PreferencesPage { constructor(props = {}) { super(props); - const gtkSettings = extensionUtils.getSettings(utils.getSettingsSchema('gtk-variants')); - const shellSettings = extensionUtils.getSettings(utils.getSettingsSchema('shell-variants')); - const iconSettings = extensionUtils.getSettings(utils.getSettingsSchema('icon-variants')); - const cursorSettings = extensionUtils.getSettings(utils.getSettingsSchema('cursor-variants')); + const gtkSettings = extensionUtils.getSettings(`${Me.metadata['settings-schema']}.gtk-variants`); + const shellSettings = extensionUtils.getSettings(`${Me.metadata['settings-schema']}.shell-variants`); + const iconSettings = extensionUtils.getSettings(`${Me.metadata['settings-schema']}.icon-variants`); + const cursorSettings = extensionUtils.getSettings(`${Me.metadata['settings-schema']}.cursor-variants`); gtkSettings.bind('enabled', this._gtk_row, 'enable-expansion', Gio.SettingsBindFlags.DEFAULT); diff --git a/src/utils.js b/src/utils.js index 2d0d476..66a08aa 100644 --- a/src/utils.js +++ b/src/utils.js @@ -12,16 +12,6 @@ const _ = Gettext.gettext; const { ExtensionState } = extensionUtils; -/** - * Build the full settings schema from a subschema. - * - * @param {string} subSchema The subschema to get. - * @returns {string} The full schema. - */ -function getSettingsSchema(subSchema) { - return subSchema ? `${Me.metadata['settings-schema']}.${subSchema}` : Me.metadata['settings-schema']; -} - /** * Get all the directories of the system for a resource. *