diff --git a/data/de.haeckerfelix.Shortwave.gschema.xml.in b/data/de.haeckerfelix.Shortwave.gschema.xml.in index 87191cee83ff6e857164d5f36fd033ec54103461..d394846bf25bbc0ec4257dba148fdf0685f230b9 100644 --- a/data/de.haeckerfelix.Shortwave.gschema.xml.in +++ b/data/de.haeckerfelix.Shortwave.gschema.xml.in @@ -4,9 +4,6 @@ "all.api.radio-browser.info" - - false - true diff --git a/data/gtk/settings_window.ui b/data/gtk/settings_window.ui index 79c8ef76261334f5784493128dd42243a3d64999..ef3d9a477650586b0854baeed13184bd6c8c1796 100644 --- a/data/gtk/settings_window.ui +++ b/data/gtk/settings_window.ui @@ -5,25 +5,6 @@ preferences-system-symbolic General - - - Appearance - False - - - _Dark Mode - True - Whether the application should use a dark theme - dark_mode_button - - - center - - - - - - Features diff --git a/src/app.rs b/src/app.rs index d49c9000e38823b88b4ada8d6d3d35214f5b099e..32cbb3f9a4aa8cb48cb53073f64f692bb1609f6b 100644 --- a/src/app.rs +++ b/src/app.rs @@ -150,9 +150,6 @@ mod imp { }), ); - // Needs to be called after settings.connect_changed for it to trigger. - app.update_color_scheme(); - // Small workaround to update every view to the correct sorting/order. send!(self.sender, Action::SettingsKeyChanged(Key::ViewSorting)); } @@ -284,23 +281,10 @@ impl SwApplication { .unwrap() .set_sorting(sorting, descending); } - Key::DarkMode => self.update_color_scheme(), _ => (), } } - fn update_color_scheme(&self) { - let manager = adw::StyleManager::default(); - if !manager.system_supports_color_schemes() { - let color_scheme = if settings_manager::boolean(Key::DarkMode) { - adw::ColorScheme::PreferDark - } else { - adw::ColorScheme::PreferLight - }; - manager.set_color_scheme(color_scheme); - } - } - pub fn refresh_data(&self) { let fut = clone!(@weak self as this => async move { let imp = this.imp(); diff --git a/src/settings/key.rs b/src/settings/key.rs index 8846fc16e4e1546c4ff73518286cd65e1a36d0fd..987d43e19781794cbab77659f21724eebda3e579 100644 --- a/src/settings/key.rs +++ b/src/settings/key.rs @@ -21,7 +21,6 @@ pub enum Key { ApiLookupDomain, // User Interface - DarkMode, Notifications, WindowWidth, WindowHeight, diff --git a/src/settings/settings_window.rs b/src/settings/settings_window.rs index 33933eee50d5a552777b766fe482a2d76b8cb7b0..82457e61e131884ab7906fa2b82abd30f8a4adae 100644 --- a/src/settings/settings_window.rs +++ b/src/settings/settings_window.rs @@ -38,7 +38,6 @@ impl SettingsWindow { builder, }; - window.setup_widgets(); window.setup_signals(); window } @@ -47,16 +46,7 @@ impl SettingsWindow { self.widget.set_visible(true); } - fn setup_widgets(&self) { - let manager = adw::StyleManager::default(); - get_widget!(self.builder, gtk::Widget, appearance_group); - appearance_group.set_visible(!manager.system_supports_color_schemes()) - } - fn setup_signals(&self) { - get_widget!(self.builder, gtk::Switch, dark_mode_button); - settings_manager::bind_property(Key::DarkMode, &dark_mode_button, "active"); - get_widget!(self.builder, gtk::Switch, show_notifications_button); settings_manager::bind_property(Key::Notifications, &show_notifications_button, "active"); }