Skip to content

Create AirplaneModeToggle class #339

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
danirabbit wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

Create AirplaneModeToggle class #339

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0caa3a2
Self contain AirplaneModeToggle
danirabbit May 3, 2025
3375749
Try to scope down action
danirabbit May 3, 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 meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ shared_module(
'src/Indicator.vala',
'src/rfkill.vala',
'src/Utils.vala',
'src/Widgets/AirplaneModeToggle.vala',
'src/Widgets/DisplayWidget.vala',
'src/Widgets/EtherInterface.vala',
'src/Widgets/ModemInterface.vala',
Expand Down
1 change: 1 addition & 0 deletions po/POTFILES
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
src/Indicator.vala
src/rfkill.vala
src/Utils.vala
src/Widgets/AirplaneModeToggle.vala
src/Widgets/DisplayWidget.vala
src/Widgets/EtherInterface.vala
src/Widgets/ModemInterface.vala
Expand Down
24 changes: 2 additions & 22 deletions src/Indicator.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ public class Network.Indicator : Wingpanel.Indicator {
NetworkMonitor network_monitor;

private Gtk.GestureMultiPress gesture_click;
private SimpleAction airplane_action;

public bool is_in_session { get; set; default = false; }

Expand Down Expand Up @@ -61,28 +60,11 @@ public class Network.Indicator : Wingpanel.Indicator {
};

gesture_click.pressed.connect (() => {
airplane_action.activate (null);
var action_group = (SimpleActionGroup) popover_widget.get_action_group ("airplane-mode");
action_group.activate_action ("toggle", null);
});
}

airplane_action = new SimpleAction.stateful ("airplane-mode", null, new Variant.boolean (popover_widget.nm_client.networking_get_enabled ()));
airplane_action.activate.connect (() => {
popover_widget.nm_client.dbus_call.begin (
NM.DBUS_PATH, NM.DBUS_INTERFACE,
"Enable", new Variant.tuple ({new Variant.boolean (!popover_widget.nm_client.networking_get_enabled ())}),
null, -1, null, (obj, res) => {
try {
((NM.Client) obj).dbus_set_property.end (res);
} catch (Error e) {
warning ("Error setting airplane mode: %s", e.message);
}
}
);
});

var action_group = (SimpleActionGroup) popover_widget.get_action_group ("network");
action_group.add_action (airplane_action);

update_tooltip ();
on_state_changed ();
start_monitor ();
Expand All @@ -102,8 +84,6 @@ public class Network.Indicator : Wingpanel.Indicator {

display_widget.update_state (popover_widget.state, popover_widget.secure, popover_widget.extra_info);

airplane_action.set_state (new Variant.boolean (!popover_widget.nm_client.networking_get_enabled ()));

update_tooltip ();
}

Expand Down
26 changes: 26 additions & 0 deletions src/Widgets/AirplaneModeToggle.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
/*
* SPDX-License-Identifier: LGPL-2.1-or-later
* SPDX-FileCopyrightText: 2025 elementary, Inc. (https://elementary.io)
*/

public class Network.AirplaneModeToggle : SettingsToggle {
construct {
action_name = "airplane-mode.toggle";
icon_name = "airplane-mode-disabled-symbolic";
settings_uri = "settings://network";
text = _("Airplane Mode");

map.connect (() => {
var action_group = (SimpleActionGroup) get_action_group ("airplane-mode");
action_group.action_state_changed.connect ((action_name, state) => {
if (action_name == "toggle") {
if (state.get_boolean ()) {
icon_name = "airplane-mode-symbolic";
} else {
icon_name = "airplane-mode-disabled-symbolic";
}
}
});
});
}
}
38 changes: 21 additions & 17 deletions src/Widgets/PopoverWidget.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ public class Network.Widgets.PopoverWidget : Gtk.Box {
public string? extra_info { private set; get; default = null; }
public Network.State state { private set; get; default = Network.State.CONNECTING_WIRED; }

private SimpleAction airplane_action;
private Gtk.FlowBox other_box;
private Gtk.Box wifi_box;
private Gtk.Box vpn_box;
Expand Down Expand Up @@ -56,26 +57,27 @@ public class Network.Widgets.PopoverWidget : Gtk.Box {
}

if (is_in_session) {
var airplane_toggle = new SettingsToggle () {
action_name = "network.airplane-mode",
icon_name = "airplane-mode-disabled-symbolic",
settings_uri = "settings://network",
text = _("Airplane Mode")
};

var action_group = new SimpleActionGroup ();
action_group.action_state_changed.connect ((action_name, state) => {
critical ("got a state change");
if (action_name == "airplane-mode") {
if (state.get_boolean ()) {
airplane_toggle.icon_name = "airplane-mode-symbolic";
} else {
airplane_toggle.icon_name = "airplane-mode-disabled-symbolic";
airplane_action = new SimpleAction.stateful ("toggle", null, new Variant.boolean (nm_client.networking_get_enabled ()));
airplane_action.activate.connect (() => {
nm_client.dbus_call.begin (
NM.DBUS_PATH, NM.DBUS_INTERFACE,
"Enable", new Variant.tuple ({new Variant.boolean (!nm_client.networking_get_enabled ())}),
null, -1, null, (obj, res) => {
try {
((NM.Client) obj).dbus_set_property.end (res);
} catch (Error e) {
warning ("Error setting airplane mode: %s", e.message);
}
}
}
);
});

insert_action_group ("network", action_group);
var action_group = new SimpleActionGroup ();
action_group.add_action (airplane_action);

insert_action_group ("airplane-mode", action_group);

var airplane_toggle = new AirplaneModeToggle ();

var airplane_child = new Gtk.FlowBoxChild () {
// Prevent weird double focus border
Expand Down Expand Up @@ -314,6 +316,8 @@ public class Network.Widgets.PopoverWidget : Gtk.Box {

state = next_state;
}

airplane_action.set_state (new Variant.boolean (!nm_client.networking_get_enabled ()));
}

private void update_vpn_connection () {
Expand Down