diff --git a/src/data/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml b/src/data/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml index 1e39e0c..3a3c1f6 100644 --- a/src/data/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml +++ b/src/data/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml @@ -14,7 +14,7 @@ SPDX-License-Identifier: GPL-3.0-or-later false - Switch GTK variants + Switch GTK theme Enable GTK variants switching @@ -31,7 +31,7 @@ SPDX-License-Identifier: GPL-3.0-or-later false - Switch shell variants + Switch Shell theme Enable shell variants switching @@ -48,7 +48,7 @@ SPDX-License-Identifier: GPL-3.0-or-later false - Switch icon variants + Switch icon theme Enable icon variants switching @@ -65,7 +65,7 @@ SPDX-License-Identifier: GPL-3.0-or-later false - Switch cursor variants + Switch cursor theme Enable cursor variants switching diff --git a/src/data/ui/ThemesPage.ui b/src/data/ui/ThemesPage.ui index 2b02f81..36c82b6 100644 --- a/src/data/ui/ThemesPage.ui +++ b/src/data/ui/ThemesPage.ui @@ -25,81 +25,69 @@ SPDX-License-Identifier: GPL-3.0-or-later - GTK theme - Forcing a dark theme on applications not designed to support it can have undesirable side-effects such as unreadable text or invisible icons. - - - center - - - - Day variant + + Switch GTK theme + Forcing a dark theme on applications not designed to support it can have undesirable side-effects such as unreadable text or invisible icons. + True + + + Day variant + + + + + Night variant + + - - Night variant - - - - - - - Shell theme - - - center - - - - - Day variant + + Switch Shell theme + True + + + Day variant + + + + + Night variant + + - - Night variant - - - - - - - Icon theme - - - center - - - - - Day variant + + Switch icon theme + True + + + Day variant + + + + + Night variant + + - - Night variant - - - - - - - Cursor theme - - - center - - - - - Day variant - - - - - Night variant + + Switch cursor theme + True + + + Day variant + + + + + Night variant + + diff --git a/src/po/nightthemeswitcher@romainvigier.fr.pot b/src/po/nightthemeswitcher@romainvigier.fr.pot index 6c2a552..d851b35 100644 --- a/src/po/nightthemeswitcher@romainvigier.fr.pot +++ b/src/po/nightthemeswitcher@romainvigier.fr.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: nightthemeswitcher@romainvigier.fr\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-05 11:41+0200\n" +"POT-Creation-Date: 2022-04-05 12:01+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -26,7 +26,8 @@ msgid "The current extension settings version" msgstr "" #: src/data/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml:17 -msgid "Switch GTK variants" +#: src/data/ui/ThemesPage.ui:30 +msgid "Switch GTK theme" msgstr "" #: src/data/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml:18 @@ -50,7 +51,8 @@ msgid "The GTK theme to use during nighttime" msgstr "" #: src/data/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml:34 -msgid "Switch shell variants" +#: src/data/ui/ThemesPage.ui:47 +msgid "Switch Shell theme" msgstr "" #: src/data/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml:35 @@ -74,7 +76,8 @@ msgid "The shell theme to use during nighttime" msgstr "" #: src/data/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml:51 -msgid "Switch icon variants" +#: src/data/ui/ThemesPage.ui:63 +msgid "Switch icon theme" msgstr "" #: src/data/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml:52 @@ -98,7 +101,8 @@ msgid "The icon theme to use during nighttime" msgstr "" #: src/data/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml:68 -msgid "Switch cursor variants" +#: src/data/ui/ThemesPage.ui:79 +msgid "Switch cursor theme" msgstr "" #: src/data/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml:69 @@ -400,38 +404,22 @@ msgid "" "themes is discouraged and is only here for legacy reasons." msgstr "" -#: src/data/ui/ThemesPage.ui:28 -msgid "GTK theme" -msgstr "" - -#: src/data/ui/ThemesPage.ui:29 +#: src/data/ui/ThemesPage.ui:31 msgid "" "Forcing a dark theme on applications not designed to support it can have " "undesirable side-effects such as unreadable text or invisible icons." msgstr "" -#: src/data/ui/ThemesPage.ui:37 src/data/ui/ThemesPage.ui:57 -#: src/data/ui/ThemesPage.ui:77 src/data/ui/ThemesPage.ui:97 +#: src/data/ui/ThemesPage.ui:35 src/data/ui/ThemesPage.ui:51 +#: src/data/ui/ThemesPage.ui:67 src/data/ui/ThemesPage.ui:83 msgid "Day variant" msgstr "" -#: src/data/ui/ThemesPage.ui:42 src/data/ui/ThemesPage.ui:62 -#: src/data/ui/ThemesPage.ui:82 src/data/ui/ThemesPage.ui:102 +#: src/data/ui/ThemesPage.ui:40 src/data/ui/ThemesPage.ui:56 +#: src/data/ui/ThemesPage.ui:72 src/data/ui/ThemesPage.ui:88 msgid "Night variant" msgstr "" -#: src/data/ui/ThemesPage.ui:49 -msgid "Shell theme" -msgstr "" - -#: src/data/ui/ThemesPage.ui:69 -msgid "Icon theme" -msgstr "" - -#: src/data/ui/ThemesPage.ui:89 -msgid "Cursor theme" -msgstr "" - #. Time separator (eg. 08:27) #: src/data/ui/TimeChooser.ui:23 msgid ":" diff --git a/src/preferences/ThemesPage.js b/src/preferences/ThemesPage.js index 5583c77..95d7857 100644 --- a/src/preferences/ThemesPage.js +++ b/src/preferences/ThemesPage.js @@ -16,16 +16,16 @@ var ThemesPage = GObject.registerClass({ GTypeName: 'ThemesPage', Template: 'resource:///org/gnome/shell/extensions/nightthemeswitcher/preferences/ui/ThemesPage.ui', InternalChildren: [ - 'gtk_enabled_switch', + 'gtk_row', 'gtk_day_variant_combo_row', 'gtk_night_variant_combo_row', - 'shell_enabled_switch', + 'shell_row', 'shell_day_variant_combo_row', 'shell_night_variant_combo_row', - 'icon_enabled_switch', + 'icon_row', 'icon_day_variant_combo_row', 'icon_night_variant_combo_row', - 'cursor_enabled_switch', + 'cursor_row', 'cursor_day_variant_combo_row', 'cursor_night_variant_combo_row', ], @@ -37,28 +37,28 @@ var ThemesPage = GObject.registerClass({ const iconSettings = extensionUtils.getSettings(utils.getSettingsSchema('icon-variants')); const cursorSettings = extensionUtils.getSettings(utils.getSettingsSchema('cursor-variants')); - gtkSettings.bind('enabled', this._gtk_enabled_switch, 'active', Gio.SettingsBindFlags.DEFAULT); + gtkSettings.bind('enabled', this._gtk_row, 'enable-expansion', Gio.SettingsBindFlags.DEFAULT); const gtkThemesStore = Gio.ListStore.new(DropDownChoice); gtkThemesStore.splice(0, 0, Array.from(utils.getInstalledGtkThemes()).sort().map(theme => new DropDownChoice({ id: theme, title: theme }))); _setupComboRow(this._gtk_day_variant_combo_row, gtkThemesStore, gtkSettings, 'day'); _setupComboRow(this._gtk_night_variant_combo_row, gtkThemesStore, gtkSettings, 'night'); - shellSettings.bind('enabled', this._shell_enabled_switch, 'active', Gio.SettingsBindFlags.DEFAULT); + shellSettings.bind('enabled', this._shell_row, 'enable-expansion', Gio.SettingsBindFlags.DEFAULT); const shellThemesStore = Gio.ListStore.new(DropDownChoice); shellThemesStore.splice(0, 0, Array.from(utils.getInstalledShellThemes()).sort().map(theme => new DropDownChoice({ id: theme, title: theme || _('Default') }))); _setupComboRow(this._shell_day_variant_combo_row, shellThemesStore, shellSettings, 'day'); _setupComboRow(this._shell_night_variant_combo_row, shellThemesStore, shellSettings, 'night'); - iconSettings.bind('enabled', this._icon_enabled_switch, 'active', Gio.SettingsBindFlags.DEFAULT); + iconSettings.bind('enabled', this._icon_row, 'enable-expansion', Gio.SettingsBindFlags.DEFAULT); const iconThemesStore = Gio.ListStore.new(DropDownChoice); iconThemesStore.splice(0, 0, Array.from(utils.getInstalledIconThemes()).sort().map(theme => new DropDownChoice({ id: theme, title: theme }))); _setupComboRow(this._icon_day_variant_combo_row, iconThemesStore, iconSettings, 'day'); _setupComboRow(this._icon_night_variant_combo_row, iconThemesStore, iconSettings, 'night'); - cursorSettings.bind('enabled', this._cursor_enabled_switch, 'active', Gio.SettingsBindFlags.DEFAULT); + cursorSettings.bind('enabled', this._cursor_row, 'enable-expansion', Gio.SettingsBindFlags.DEFAULT); const cursorThemesStore = Gio.ListStore.new(DropDownChoice); cursorThemesStore.splice(0, 0, Array.from(utils.getInstalledCursorThemes()).sort().map(theme => new DropDownChoice({ id: theme, title: theme })));