Skip to content

SettingsToggle: use action-name #108

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

Draft
wants to merge 4 commits into
base: main
Choose a base branch
from
Draft

SettingsToggle: use action-name #108

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
4518ea4
SettingsToggle: use action-name
danirabbit Apr 24, 2025
53be0f5
merge main
danirabbit Apr 24, 2025
e2e853d
Use settings.create_action
danirabbit Apr 24, 2025
fd75785
Merge branch 'main' into danirabbit/settingstoggle-actionname
danirabbit Jun 6, 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
10 changes: 8 additions & 2 deletions src/PopoverWidget.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,15 @@ public class QuickSettings.PopoverWidget : Gtk.Box {
var screen_reader = new SettingsToggle (
_("Screen Reader")
) {
action_name = "quick-settings.screen-reader-enabled",
icon_name = "orca-symbolic",
settings_uri = "settings://sound"
};

var onscreen_keyboard = new SettingsToggle (
_("Onscreen Keyboard")
) {
action_name = "quick-settings.screen-keyboard-enabled",
icon_name = "input-keyboard-symbolic",
settings_uri = "settings://input/keyboard/behavior"
};
Expand Down Expand Up @@ -117,8 +119,12 @@ public class QuickSettings.PopoverWidget : Gtk.Box {
});

var applications_settings = new Settings ("org.gnome.desktop.a11y.applications");
applications_settings.bind ("screen-keyboard-enabled", onscreen_keyboard, "active", DEFAULT);
applications_settings.bind ("screen-reader-enabled", screen_reader, "active", DEFAULT);

var action_group = new SimpleActionGroup ();
action_group.add_action (applications_settings.create_action ("screen-reader-enabled"));
action_group.add_action (applications_settings.create_action ("screen-keyboard-enabled"));

insert_action_group ("quick-settings", action_group);

var glib_settings = new Settings ("io.elementary.desktop.quick-settings");

Expand Down
29 changes: 21 additions & 8 deletions src/Widgets/DarkModeToggle.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,22 +11,35 @@ public class QuickSettings.DarkModeToggle: SettingsToggle {
}

construct {
action_name = "quick-settings.dark-mode";
icon_name = "dark-mode-symbolic";
settings_uri = "settings://desktop/appearance";

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

active = settings.get_enum ("color-scheme") == Granite.Settings.ColorScheme.DARK;
settings.changed["color-scheme"].connect (() => {
active = settings.get_enum ("color-scheme") == Granite.Settings.ColorScheme.DARK;
});
var dark_mode_action = new SimpleAction.stateful (
"dark-mode",
null,
new Variant.boolean (settings.get_enum ("color-scheme") == Granite.Settings.ColorScheme.DARK)
);

notify["active"].connect (() => {
if (active) {
settings.set_enum ("color-scheme", Granite.Settings.ColorScheme.DARK);
} else {
dark_mode_action.activate.connect (() => {
if (settings.get_enum ("color-scheme") == Granite.Settings.ColorScheme.DARK) {
settings.set_enum ("color-scheme", Granite.Settings.ColorScheme.NO_PREFERENCE);
} else {
settings.set_enum ("color-scheme", Granite.Settings.ColorScheme.DARK);
}
});

settings.changed["color-scheme"].connect (() => {
dark_mode_action.set_state (
new Variant.boolean (settings.get_enum ("color-scheme") == Granite.Settings.ColorScheme.DARK)
);
});

map.connect (() => {
var action_group = (SimpleActionGroup) get_action_group ("quick-settings");
action_group.add_action (dark_mode_action);
});
}
}
64 changes: 38 additions & 26 deletions src/Widgets/PreventSleepToggle.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,42 +7,54 @@ public class QuickSettings.PreventSleepToggle: SettingsToggle {
private uint suspend_cookie = 0;
private uint idle_cookie = 0;

private SimpleAction inhibit_action;

public PreventSleepToggle () {
Object (
label: _("Prevent Sleep")
);
}

construct {
action_name = "quick-settings.inhibit";
icon_name = "system-suspend-symbolic";
settings_uri = "settings://power";

notify["active"].connect ((obj, pspec) => {
var _prevent_sleep_toggle = (SettingsToggle) obj;
unowned var application = (Gtk.Application) GLib.Application.get_default ();

if (_prevent_sleep_toggle.active && suspend_cookie == 0 && idle_cookie == 0) {
suspend_cookie = application.inhibit (
(Gtk.Window) get_toplevel (),
Gtk.ApplicationInhibitFlags.SUSPEND,
"Prevent session from suspending"
);
idle_cookie = application.inhibit (
(Gtk.Window) get_toplevel (),
Gtk.ApplicationInhibitFlags.IDLE,
"Prevent session from idle"
);

icon_name = "system-suspend-disabled-symbolic";
} else if (!_prevent_sleep_toggle.active && suspend_cookie > 0 && idle_cookie > 0) {
application.uninhibit (suspend_cookie);
application.uninhibit (idle_cookie);

icon_name = "system-suspend-symbolic";

suspend_cookie = 0;
idle_cookie = 0;
}
inhibit_action = new SimpleAction.stateful ("inhibit", null, new Variant.boolean (suspend_cookie > 0 && idle_cookie > 0));
inhibit_action.activate.connect (toggle_inibit);

map.connect (() => {
var action_group = (SimpleActionGroup) get_action_group ("quick-settings");
action_group.add_action (inhibit_action);
});
}

private void toggle_inibit () {
unowned var application = (Gtk.Application) GLib.Application.get_default ();

if (suspend_cookie == 0 && idle_cookie == 0) {
suspend_cookie = application.inhibit (
(Gtk.Window) get_toplevel (),
Gtk.ApplicationInhibitFlags.SUSPEND,
"Prevent session from suspending"
);
idle_cookie = application.inhibit (
(Gtk.Window) get_toplevel (),
Gtk.ApplicationInhibitFlags.IDLE,
"Prevent session from idle"
);

inhibit_action.set_state (new Variant.boolean (true));
icon_name = "system-suspend-disabled-symbolic";
} else if (suspend_cookie > 0 && idle_cookie > 0) {
application.uninhibit (suspend_cookie);
application.uninhibit (idle_cookie);

inhibit_action.set_state (new Variant.boolean (false));
icon_name = "system-suspend-symbolic";

suspend_cookie = 0;
idle_cookie = 0;
}
}
}
19 changes: 12 additions & 7 deletions src/Widgets/RotationToggle.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,24 @@ public class QuickSettings.RotationToggle: SettingsToggle {
}

construct {
action_name = "quick-settings.orientation-lock";
icon_name = "quick-settings-rotation-locked-symbolic";
settings_uri = "settings://display";

var touchscreen_settings = new Settings ("org.gnome.settings-daemon.peripherals.touchscreen");
touchscreen_settings.bind ("orientation-lock", this, "active", DEFAULT);
var settings = new Settings ("org.gnome.settings-daemon.peripherals.touchscreen");
var rotation_lock_action = settings.create_action ("orientation-lock");

bind_property ("active", this, "icon-name", SYNC_CREATE, (binding, srcval, ref targetval) => {
if ((bool) srcval) {
targetval = "quick-settings-rotation-locked-symbolic";
rotation_lock_action.notify["state"].connect (() => {
if (rotation_lock_action.state.get_boolean ()) {
icon_name = "quick-settings-rotation-locked-symbolic";
} else {
targetval = "quick-settings-rotation-allowed-symbolic";
icon_name = "quick-settings-rotation-allowed-symbolic";
}
return true;
});

map.connect (() => {
var action_group = (SimpleActionGroup) get_action_group ("quick-settings");
action_group.add_action (rotation_lock_action);
});
}
}
5 changes: 2 additions & 3 deletions src/Widgets/SettingsToggle.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*/

public class QuickSettings.SettingsToggle : Gtk.FlowBoxChild {
public bool active { get; set; }
public string action_name { get; set; }
public string icon_name { get; set; }
public string label { get; construct; }
public string settings_uri { get; set; default = "settings://"; }
Expand Down Expand Up @@ -41,8 +41,7 @@ public class QuickSettings.SettingsToggle : Gtk.FlowBoxChild {
can_focus = false;
child = box;

button.bind_property ("active", this, "active", SYNC_CREATE | BIDIRECTIONAL);

bind_property ("action-name", button, "action-name");
bind_property ("icon-name", image, "icon-name");

middle_click_gesture = new Gtk.GestureMultiPress (button) {
Expand Down