From d612f9b3d18e119abeaaa7b9f9560db5dd1d7437 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?D=C3=A9v=C3=A9nyi=20Benedek?= Date: Sun, 1 Dec 2024 12:57:07 +0100 Subject: [PATCH] Remove togglable sleep timer fadeout preference Instead of this being an optional thing, let's make it an actual feature, and use it always --- cozy/settings.py | 8 -------- cozy/ui/preferences_window.py | 4 ---- data/com.github.geigi.cozy.gschema.xml | 10 ---------- data/ui/preferences.blp | 24 ------------------------ 4 files changed, 46 deletions(-) diff --git a/cozy/settings.py b/cozy/settings.py index d98123c2..6dc75b6e 100644 --- a/cozy/settings.py +++ b/cozy/settings.py @@ -62,14 +62,6 @@ def prefer_external_cover(self) -> bool: def prefer_external_cover(self, new_value: bool): self._settings.set_boolean("prefer-external-cover", new_value) - @property - def sleep_timer_fadeout(self) -> bool: - return self._settings.get_boolean("sleep-timer-fadeout") - - @property - def sleep_timer_fadeout_duration(self) -> int: - return self._settings.get_int("sleep-timer-fadeout-duration") - @property def timer(self) -> int: return self._settings.get_int("timer") diff --git a/cozy/ui/preferences_window.py b/cozy/ui/preferences_window.py index 6c9bc157..5d2a7046 100644 --- a/cozy/ui/preferences_window.py +++ b/cozy/ui/preferences_window.py @@ -18,12 +18,10 @@ class PreferencesWindow(Adw.PreferencesDialog): swap_author_reader_switch: Adw.SwitchRow = Gtk.Template.Child() replay_switch: Adw.SwitchRow = Gtk.Template.Child() - sleep_timer_fadeout_switch: Adw.SwitchRow = Gtk.Template.Child() artwork_prefer_external_switch: Adw.SwitchRow = Gtk.Template.Child() rewind_duration_adjustment: Gtk.Adjustment = Gtk.Template.Child() forward_duration_adjustment: Gtk.Adjustment = Gtk.Template.Child() - fadeout_duration_adjustment: Gtk.Adjustment = Gtk.Template.Child() def __init__(self) -> None: super().__init__() @@ -47,8 +45,6 @@ def _bind_settings(self) -> None: bind_settings("replay", self.replay_switch, "active") bind_settings("rewind-duration", self.rewind_duration_adjustment, "value") bind_settings("forward-duration", self.forward_duration_adjustment, "value") - bind_settings("sleep-timer-fadeout", self.sleep_timer_fadeout_switch, "enable-expansion") - bind_settings("sleep-timer-fadeout-duration", self.fadeout_duration_adjustment, "value") bind_settings("prefer-external-cover", self.artwork_prefer_external_switch, "active") def _on_lock_ui_changed(self) -> None: diff --git a/data/com.github.geigi.cozy.gschema.xml b/data/com.github.geigi.cozy.gschema.xml index b8ddeec9..1a2c9647 100644 --- a/data/com.github.geigi.cozy.gschema.xml +++ b/data/com.github.geigi.cozy.gschema.xml @@ -46,16 +46,6 @@ Swap author and reader tag assignment. - - false - Enable fading out when using the sleep timer. - - - - 15 - Duration of the sleep timer fadeout. - - 1.0 Volume. diff --git a/data/ui/preferences.blp b/data/ui/preferences.blp index 312dcb74..4629445f 100644 --- a/data/ui/preferences.blp +++ b/data/ui/preferences.blp @@ -1,12 +1,6 @@ using Gtk 4.0; using Adw 1; -Adjustment fadeout_duration_adjustment { - upper: 120; - value: 15; - step-increment: 5; - page-increment: 10; -} Adjustment forward_duration_adjustment { lower: 5; @@ -61,24 +55,6 @@ template $PreferencesWindow: Adw.PreferencesDialog { numeric: true; } } - - Adw.PreferencesGroup { - title: _("Sleep Timer"); - - Adw.ExpanderRow sleep_timer_fadeout_switch { - title: _("Fadeout"); - expanded: true; - show-enable-switch: true; - - Adw.SpinRow { - title: _("Fadeout Duration"); - focusable: true; - adjustment: fadeout_duration_adjustment; - snap-to-ticks: true; - numeric: true; - } - } - } } Adw.PreferencesPage storages_page {