From d677812d95231dfacb69ac50dcc8768d0e76e558 Mon Sep 17 00:00:00 2001 From: Romain Vigier Date: Tue, 16 Aug 2022 02:20:37 +0200 Subject: [PATCH] Timer: Always run transition --- ....extensions.nightthemeswitcher.gschema.xml | 3 --- src/data/ui/SchedulePage.ui | 12 ---------- src/modules/Timer.js | 3 +-- src/po/nightthemeswitcher@romainvigier.fr.pot | 22 ++++++------------- src/preferences/SchedulePage.js | 3 --- 5 files changed, 8 insertions(+), 35 deletions(-) diff --git a/src/data/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml b/src/data/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml index a133d13..798d0fc 100644 --- a/src/data/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml +++ b/src/data/org.gnome.shell.extensions.nightthemeswitcher.gschema.xml @@ -85,8 +85,5 @@ SPDX-License-Identifier: GPL-3.0-or-later 20 - - true - diff --git a/src/data/ui/SchedulePage.ui b/src/data/ui/SchedulePage.ui index d047b60..f981ec2 100644 --- a/src/data/ui/SchedulePage.ui +++ b/src/data/ui/SchedulePage.ui @@ -33,18 +33,6 @@ SPDX-License-Identifier: GPL-3.0-or-later Advanced - - - Transition - Smooth transition between day and night appearance. - transition_switch - - - center - - - - Keyboard shortcut diff --git a/src/modules/Timer.js b/src/modules/Timer.js index acb3683..b5fc059 100644 --- a/src/modules/Timer.js +++ b/src/modules/Timer.js @@ -81,8 +81,7 @@ var Timer = class { return; debug.message(`Time has changed to ${time}.`); this.#time = time; - if (this.#settings.get_boolean('transition')) - main.layoutManager.screenTransition.run(); + main.layoutManager.screenTransition.run(); this.#interfaceSettings.set_string('color-scheme', time === Time.NIGHT ? 'prefer-dark' : 'default'); this.emit('time-changed', time); } diff --git a/src/po/nightthemeswitcher@romainvigier.fr.pot b/src/po/nightthemeswitcher@romainvigier.fr.pot index a0b9e97..d7ec2f6 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-08-16 02:16+0200\n" +"POT-Creation-Date: 2022-08-16 02:19+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -50,7 +50,7 @@ msgstr "" msgid "Run commands" msgstr "" -#: src/data/ui/CommandsPage.ui:21 src/data/ui/SchedulePage.ui:65 +#: src/data/ui/CommandsPage.ui:21 src/data/ui/SchedulePage.ui:53 msgid "Sunrise" msgstr "" @@ -59,7 +59,7 @@ msgstr "" msgid "notify-send \"Hello sunshine!\"" msgstr "" -#: src/data/ui/CommandsPage.ui:35 src/data/ui/SchedulePage.ui:77 +#: src/data/ui/CommandsPage.ui:35 src/data/ui/SchedulePage.ui:65 msgid "Sunset" msgstr "" @@ -108,22 +108,14 @@ msgid "Advanced" msgstr "" #: src/data/ui/SchedulePage.ui:38 -msgid "Transition" -msgstr "" - -#: src/data/ui/SchedulePage.ui:39 -msgid "Smooth transition between day and night appearance." -msgstr "" - -#: src/data/ui/SchedulePage.ui:50 msgid "Keyboard shortcut" msgstr "" -#: src/data/ui/SchedulePage.ui:61 src/preferences/SchedulePage.js:51 +#: src/data/ui/SchedulePage.ui:49 src/preferences/SchedulePage.js:48 msgid "Manual schedule" msgstr "" -#: src/data/ui/SchedulePage.ui:62 +#: src/data/ui/SchedulePage.ui:50 msgid "" "These settings only apply when using the manual schedule as the time source." msgstr "" @@ -196,11 +188,11 @@ msgstr "" msgid "Version %d" msgstr "" -#: src/preferences/SchedulePage.js:39 +#: src/preferences/SchedulePage.js:36 msgid "Night Light" msgstr "" -#: src/preferences/SchedulePage.js:43 +#: src/preferences/SchedulePage.js:40 msgid "Location Services" msgstr "" diff --git a/src/preferences/SchedulePage.js b/src/preferences/SchedulePage.js index 9763348..4471dff 100644 --- a/src/preferences/SchedulePage.js +++ b/src/preferences/SchedulePage.js @@ -17,7 +17,6 @@ var SchedulePage = GObject.registerClass({ Template: 'resource:///org/gnome/shell/extensions/nightthemeswitcher/preferences/ui/SchedulePage.ui', InternalChildren: [ 'keyboard_shortcut_button', - 'transition_switch', 'manual_time_source_switch', 'time_source_combo_row', 'schedule_sunrise_time_chooser', @@ -30,8 +29,6 @@ var SchedulePage = GObject.registerClass({ const colorSettings = new Gio.Settings({ schema: 'org.gnome.settings-daemon.plugins.color' }); const locationSettings = new Gio.Settings({ schema: 'org.gnome.system.location' }); - settings.bind('transition', this._transition_switch, 'active', Gio.SettingsBindFlags.DEFAULT); - settings.bind('manual-time-source', this._manual_time_source_switch, 'active', Gio.SettingsBindFlags.DEFAULT); const choiceFilter = new Gtk.BoolFilter({ expression: Gtk.PropertyExpression.new(DropDownChoice, null, 'enabled') });