Skip to content

SettingsPopover: use actions where possible #982

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
jeremypw merged 2 commits into from
Feb 3, 2026
+16 −14
Merged

SettingsPopover: use actions where possible #982

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fec1190
SettingsPopover: use actions where possible
lenemter Feb 1, 2026
87ab6de
Fix crash
lenemter Feb 1, 2026
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
30 changes: 16 additions & 14 deletions src/Widgets/SettingsPopover.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ public sealed class Terminal.SettingsPopover : Gtk.Popover {
}

private const string ACTION_GROUP_NAME = "settings";
private const string ACTION_GROUP_PREFIX = ACTION_GROUP_NAME + ".";

private BindingGroup terminal_binding;

Expand Down Expand Up @@ -57,7 +58,7 @@ public sealed class Terminal.SettingsPopover : Gtk.Popover {
font_size_box.append (zoom_in_button);

var follow_system_button = new Granite.SwitchModelButton (_("Follow System Style")) {
active = Application.settings.get_boolean ("follow-system-style"),
action_name = ACTION_GROUP_PREFIX + "follow-system-style"
};

var hc_button = new ThemeCheckButton (Themes.HIGH_CONTRAST) {
Expand Down Expand Up @@ -108,17 +109,17 @@ public sealed class Terminal.SettingsPopover : Gtk.Popover {

var natural_copy_paste_button = new Granite.SwitchModelButton (_("Natural Copy/Paste")) {
description = _("Shortcuts don’t require Shift; may interfere with CLI apps"),
active = Application.settings.get_boolean ("natural-copy-paste")
action_name = ACTION_GROUP_PREFIX + "natural-copy-paste"
};

var unsafe_paste_alert_button = new Granite.SwitchModelButton (_("Unsafe Paste Alert")) {
description = _("Warn when pasted text contains multiple or administrative commands"),
active = Application.settings.get_boolean ("unsafe-paste-alert")
action_name = ACTION_GROUP_PREFIX + "unsafe-paste-alert"
};

var audible_bell_button = new Granite.SwitchModelButton (_("Event Alerts")) {
description = _("Notify for invalid input or multiple possible completions (subject to System Settings → Sound)"),
active = Application.settings.get_boolean ("audible-bell")
action_name = ACTION_GROUP_PREFIX + "audible-bell"
};

var auto_hide_button = new Granite.SwitchModelButton (_("Auto-hide Tab Bar")) {
Expand All @@ -130,7 +131,6 @@ public sealed class Terminal.SettingsPopover : Gtk.Popover {
Application.settings.set_enum ("tab-bar-behavior", auto_hide_button.active ? 1 : 0);
});


var box = new Gtk.Box (VERTICAL, 6) {
margin_bottom = 6,
margin_top = 12,
Expand All @@ -146,11 +146,18 @@ public sealed class Terminal.SettingsPopover : Gtk.Popover {
box.append (auto_hide_button);
child = box;

var settings_action = Application.settings.create_action ("theme");
var theme_action = Application.settings.create_action ("theme");
var natural_copy_paste_action = Application.settings.create_action ("natural-copy-paste");
var unsafe_paste_alert_action = Application.settings.create_action ("unsafe-paste-alert");
var audible_bell_action = Application.settings.create_action ("audible-bell");
var follow_system_style_action = Application.settings.create_action ("follow-system-style");

var action_group = new SimpleActionGroup ();
action_group.add_action (settings_action);

action_group.add_action (theme_action);
action_group.add_action (natural_copy_paste_action);
action_group.add_action (unsafe_paste_alert_action);
action_group.add_action (audible_bell_action);
action_group.add_action (follow_system_style_action);
insert_action_group (ACTION_GROUP_NAME, action_group);

custom_button.toggled.connect (() => {
Expand All @@ -165,11 +172,6 @@ public sealed class Terminal.SettingsPopover : Gtk.Popover {

follow_system_button.bind_property ("active", theme_revealer, "reveal-child", SYNC_CREATE | INVERT_BOOLEAN);

Application.settings.bind ("follow-system-style", follow_system_button, "active", DEFAULT);
Application.settings.bind ("natural-copy-paste", natural_copy_paste_button, "active", DEFAULT);
Application.settings.bind ("unsafe-paste-alert", unsafe_paste_alert_button, "active", DEFAULT);
Application.settings.bind ("audible-bell", audible_bell_button, "active", DEFAULT);

Application.settings.changed.connect ((s, n) => {
if (n == "background" || n == "foreground") {
custom_button.update_theme_provider ();
Expand Down Expand Up @@ -202,7 +204,7 @@ public sealed class Terminal.SettingsPopover : Gtk.Popover {
}

construct {
action_name = ACTION_GROUP_NAME + ".theme";
action_name = ACTION_GROUP_PREFIX + "theme";
action_target = new Variant.string (theme);
halign = CENTER;

Expand Down