Skip to content

Appearance: use settings.create_action #445

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
danirabbit merged 4 commits into from
May 14, 2025
Merged

Appearance: use settings.create_action #445

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7a217e5
Appearance: get/set color-scheme from gsettings
danirabbit May 6, 2025
ecc621a
Appearance: use settings.create_action for prefer-dark-schedule
danirabbit May 6, 2025
ae4bdd8
Update desktop.metainfo.xml.in
danirabbit May 13, 2025
e52a793
Merge branch 'main' into danirabbit/settings-color-scheme
danirabbit May 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions data/desktop.metainfo.xml.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
</description>
<issues>
<issue url="https://github.com/elementary/settings-desktop/issues/112">Remove "Show applications menu" top right hotcorner</issue>
<issue url="https://github.com/elementary/settings-desktop/issues/429">Appearance schedule resets after switch to dark mode</issue>
<issue url="https://github.com/elementary/settings-desktop/issues/431">Crash when entering custom command for hot corner</issue>
<issue url="https://github.com/elementary/settings-desktop/issues/432">The Multitasking window closes when typing or pasting commands into the input field</issue>
</issues>
Expand Down
116 changes: 28 additions & 88 deletions src/Views/Appearance.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,8 @@ public class PantheonShell.Appearance : Switchboard.SettingsPage {
var default_preview = new DesktopPreview ("default");

var prefer_default_radio = new Gtk.CheckButton () {
action_name = "desktop-appearance.prefers-color-scheme",
action_target = new Variant.int32 (Granite.Settings.ColorScheme.NO_PREFERENCE)
action_name = "desktop-appearance.color-scheme",
action_target = new Variant.string ("no-preference")
};
prefer_default_radio.add_css_class ("image-button");

Expand All @@ -90,8 +90,8 @@ public class PantheonShell.Appearance : Switchboard.SettingsPage {
var dark_preview = new DesktopPreview ("dark");

var prefer_dark_radio = new Gtk.CheckButton () {
action_name = "desktop-appearance.prefers-color-scheme",
action_target = new Variant.int32 (Granite.Settings.ColorScheme.DARK),
action_name = "desktop-appearance.color-scheme",
action_target = new Variant.string ("prefer-dark"),
group = prefer_default_radio
};
prefer_dark_radio.add_css_class ("image-button");
Expand Down Expand Up @@ -121,12 +121,16 @@ public class PantheonShell.Appearance : Switchboard.SettingsPage {
dim_box.append (dim_switch);

var schedule_disabled_radio = new Gtk.CheckButton.with_label (_("Disabled")) {
action_name = "desktop-appearance.prefer-dark-schedule",
action_target = new Variant.string ("disabled"),
margin_bottom = 3
};

var schedule_sunset_radio = new Gtk.CheckButton.with_label (
_("Sunset to Sunrise")
) {
action_name = "desktop-appearance.prefer-dark-schedule",
action_target = new Variant.string ("sunset-to-sunrise"),
group = schedule_disabled_radio
};

Expand All @@ -150,6 +154,8 @@ public class PantheonShell.Appearance : Switchboard.SettingsPage {
schedule_manual_box.append (to_time);

var schedule_manual_radio = new Gtk.CheckButton () {
action_name = "desktop-appearance.prefer-dark-schedule",
action_target = new Variant.string ("manual"),
child = schedule_manual_box,
group = schedule_disabled_radio
};
Expand Down Expand Up @@ -196,74 +202,23 @@ public class PantheonShell.Appearance : Switchboard.SettingsPage {
var grid = new Gtk.Grid () {
row_spacing = 6
};
grid.attach (prefer_style_box, 0, 2, 2);
grid.attach (dim_box, 0, 3, 2);
grid.attach (schedule_label, 0, 4, 2);
grid.attach (schedule_box, 0, 5, 2);

if (((GLib.DBusProxy) pantheon_act).get_cached_property ("PrefersColorScheme") != null) {
grid.attach (prefer_style_box, 0, 2, 2);
grid.attach (dim_box, 0, 3, 2);
grid.attach (schedule_label, 0, 4, 2);
grid.attach (schedule_box, 0, 5, 2);

var settings = new GLib.Settings ("io.elementary.settings-daemon.prefers-color-scheme");

settings.bind_with_mapping (
"prefer-dark-schedule", schedule_disabled_radio, "active", GLib.SettingsBindFlags.DEFAULT,
(value, variant, user_data) => {
value.set_boolean (variant.get_string () == "disabled");
return true;
},
(value, expected_type, user_data) => {
if (value.get_boolean ()) {
return new Variant ("s", "disabled");
}

return null;
},
null, null
);

settings.bind_with_mapping (
"prefer-dark-schedule", schedule_manual_radio, "active", GLib.SettingsBindFlags.DEFAULT,
(value, variant, user_data) => {
value.set_boolean (variant.get_string () == "manual");
return true;
},
(value, expected_type, user_data) => {
if (value.get_boolean ()) {
return new Variant ("s", "manual");
}

return null;
},
null, null
);

settings.bind_with_mapping (
"prefer-dark-schedule", schedule_sunset_radio, "active", GLib.SettingsBindFlags.DEFAULT,
(value, variant, user_data) => {
value.set_boolean (variant.get_string () == "sunset-to-sunrise");
return true;
},
(value, expected_type, user_data) => {
if (value.get_boolean ()) {
return new Variant ("s", "sunset-to-sunrise");
}
var settings = new GLib.Settings ("io.elementary.settings-daemon.prefers-color-scheme");

return null;
},
null, null
);

from_time.time = double_date_time (settings.get_double ("prefer-dark-schedule-from"));
from_time.time_changed.connect (() => {
settings.set_double ("prefer-dark-schedule-from", date_time_double (from_time.time));
});
to_time.time = double_date_time (settings.get_double ("prefer-dark-schedule-to"));
to_time.time_changed.connect (() => {
settings.set_double ("prefer-dark-schedule-to", date_time_double (to_time.time));
});
from_time.time = double_date_time (settings.get_double ("prefer-dark-schedule-from"));
from_time.time_changed.connect (() => {
settings.set_double ("prefer-dark-schedule-from", date_time_double (from_time.time));
});
to_time.time = double_date_time (settings.get_double ("prefer-dark-schedule-to"));
to_time.time_changed.connect (() => {
settings.set_double ("prefer-dark-schedule-to", date_time_double (to_time.time));
});

schedule_manual_radio.bind_property ("active", schedule_manual_box, "sensitive", BindingFlags.SYNC_CREATE);
}
schedule_manual_radio.bind_property ("active", schedule_manual_box, "sensitive", BindingFlags.SYNC_CREATE);

var interface_settings = new GLib.Settings (INTERFACE_SCHEMA);
var current_stylesheet = interface_settings.get_string (STYLESHEET_KEY);
Expand Down Expand Up @@ -380,28 +335,25 @@ public class PantheonShell.Appearance : Switchboard.SettingsPage {
background_settings.bind ("dim-wallpaper-in-dark-style", dim_switch, "active", DEFAULT);

var accent_color_action = new SimpleAction.stateful ("prefers-accent-color", GLib.VariantType.INT32, new Variant.int32 (AccentColor.NO_PREFERENCE));
var color_scheme_action = new SimpleAction.stateful ("prefers-color-scheme", GLib.VariantType.INT32, new Variant.int32 (Granite.Settings.ColorScheme.NO_PREFERENCE));

var color_scheme_action = settings.create_action ("color-scheme");
var prefer_dark_action = settings.create_action ("prefer-dark-schedule");

var action_group = new SimpleActionGroup ();
action_group.add_action (accent_color_action);
action_group.add_action (color_scheme_action);
action_group.add_action (prefer_dark_action);

insert_action_group ("desktop-appearance", action_group);

if (pantheon_act != null) {
accent_color_action.set_state (new Variant.int32 (pantheon_act.prefers_accent_color));
color_scheme_action.set_state (new Variant.int32 (pantheon_act.prefers_color_scheme));

((DBusProxy) pantheon_act).g_properties_changed.connect ((changed, invalid) => {
var accent_color = changed.lookup_value ("PrefersAccentColor", new VariantType ("i"));
if (accent_color != null && !accent_color_action.get_state ().equal (accent_color)) {
accent_color_action.set_state (accent_color);
}

var color_scheme = changed.lookup_value ("PrefersColorScheme", new VariantType ("i"));
if (color_scheme != null && !color_scheme_action.get_state ().equal (color_scheme)) {
color_scheme_action.set_state (color_scheme);
}
});

accent_color_action.activate.connect ((value) => {
Expand All @@ -417,18 +369,6 @@ public class PantheonShell.Appearance : Switchboard.SettingsPage {
}
}
});

color_scheme_action.activate.connect ((value) => {
if (!color_scheme_action.get_state ().equal (value)) {
color_scheme_action.set_state (value);
pantheon_act.prefers_color_scheme = value.get_int32 ();

var mutter_settings = new GLib.Settings ("org.gnome.desktop.interface");
mutter_settings.set_enum ("color-scheme", (Granite.Settings.ColorScheme) value.get_int32 ());

schedule_disabled_radio.active = true;
}
});
}
}

Expand Down