Skip to content

Commit

Permalink
MainView: absorb DeviceList (#368)
Browse files Browse the repository at this point in the history 
* MainView: absorb DeviceList

* code style

* Rename sort_func by convention

* Remove extra whitespace

* Again

* Add pages when we build them

* Fix vpn and proxy

* sort

---------

Co-authored-by: Jeremy Wootten <jeremywootten@gmail.com>
  • Loading branch information
@danirabbit @jeremypw
danirabbit and jeremypw authored Jan 10, 2024
1 parent 54c3b18 commit 2e18254
Show file tree
Hide file tree
Showing 4 changed files with 125 additions and 216 deletions.
1 change: 0 additions & 1 deletion po/POTFILES
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ src/Widgets/SettingsButton.vala
src/Widgets/Page.vala
src/Widgets/InfoBox.vala
src/Widgets/Footer.vala
src/Widgets/DeviceList.vala
src/Widgets/DeviceItem.vala
src/Widgets/WifiMenuItem.vala
src/Widgets/VPN/VPNInfoDialog.vala
Expand Down
167 changes: 125 additions & 42 deletions src/MainView.vala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,18 +22,40 @@ public class Network.MainView : Gtk.Box {

public NM.DeviceState state { private set; get; default = NM.DeviceState.PREPARE; }

private NM.Device current_device = null;
private Granite.HeaderLabel devices_header;
private Granite.HeaderLabel virtual_header;
private Gtk.ListBox device_list;
private Gtk.Stack content;
private Widgets.Page page;
private Widgets.DeviceList device_list;
private NM.Device current_device = null;
private VPNPage vpn_page;

construct {
network_interface = new GLib.List<Widgets.Page> ();

device_list = new Widgets.DeviceList () {
virtual_header = new Granite.HeaderLabel (_("Virtual"));
devices_header = new Granite.HeaderLabel (_("Devices"));

var proxy = new Widgets.DeviceItem (_("Proxy"), "preferences-system-network") {
item_type = VIRTUAL
};
proxy.page = new Widgets.ProxyPage (proxy);

var vpn = new Widgets.DeviceItem (_("VPN"), "network-vpn") {
item_type = VIRTUAL
};
vpn_page = new VPNPage (vpn);
vpn.page = vpn_page;

device_list = new Gtk.ListBox () {
activate_on_single_click = true,
selection_mode = SINGLE,
hexpand = true,
vexpand = true
};
device_list.set_sort_func (sort_func);
device_list.set_header_func (update_headers);
device_list.add (proxy);
device_list.add (vpn);

var footer = new Widgets.Footer ();

Expand All @@ -47,20 +69,12 @@ public class Network.MainView : Gtk.Box {

airplane_mode.show_all ();

var no_devices = new Granite.Widgets.AlertView (
_("There is nothing to do"),
_("There are no available Wi-Fi connections or Wi-Fi devices connected to this computer.\n") +
_("Please connect at least one device to begin configuring the network."),
"dialog-cancel"
);

no_devices.show_all ();

content = new Gtk.Stack () {
hexpand = true
};
content.add_named (airplane_mode, "airplane-mode-info");
content.add_named (no_devices, "no-devices-info");
content.add (vpn_page);
content.add (proxy.page);

var scrolled_window = new Gtk.ScrolledWindow (null, null) {
child = device_list
Expand All @@ -78,24 +92,15 @@ public class Network.MainView : Gtk.Box {

add (paned);

device_list.row_selected.connect ((row) => {
row.activate ();
});

device_list.row_activated.connect ((row) => {
var page = ((Widgets.DeviceItem)row).page;
if (content.get_children ().find (page) == null) {
content.add (page);
}

content.visible_child = page;
});

device_list.show_no_devices.connect ((show) => {
scrolled_window.sensitive = !show;
if (show) {
content.set_visible_child (no_devices);
} else {
content.set_visible_child (page);
}
});

unowned NetworkManager network_manager = NetworkManager.get_default ();
network_manager.client.notify["networking-enabled"].connect (update_networking_state);

Expand All @@ -111,7 +116,7 @@ public class Network.MainView : Gtk.Box {
nm_client.device_removed.connect (device_removed_cb);

nm_client.get_devices ().foreach ((device) => device_added_cb (device));
nm_client.get_connections ().foreach ((connection) => device_list.add_connection (connection));
nm_client.get_connections ().foreach ((connection) => connection_added_cb (connection));

show_all ();
}
Expand Down Expand Up @@ -147,16 +152,26 @@ public class Network.MainView : Gtk.Box {
}
}

private void connection_added_cb (Object obj) {
var connection = (NM.RemoteConnection)obj;

device_list.add_connection (connection);
private void connection_added_cb (NM.RemoteConnection connection) {
switch (connection.get_connection_type ()) {
case NM.SettingWireGuard.SETTING_NAME:
case NM.SettingVpn.SETTING_NAME:
vpn_page.add_connection (connection);
break;
default:
break;
}
}

private void connection_removed_cb (Object obj) {
var connection = (NM.RemoteConnection)obj;

device_list.add_connection (connection);
private void connection_removed_cb (NM.RemoteConnection connection) {
switch (connection.get_connection_type ()) {
case NM.SettingWireGuard.SETTING_NAME:
case NM.SettingVpn.SETTING_NAME:
vpn_page.remove_connection (connection);
break;
default:
break;
}
}

private void device_added_cb (NM.Device device) {
Expand Down Expand Up @@ -217,40 +232,108 @@ public class Network.MainView : Gtk.Box {
state = next_state;
}

private void add_interface (Widgets.Page widget_interface) {
device_list.add_iface_to_list (widget_interface);
private void add_interface (Widgets.Page page) {
Widgets.DeviceItem item;
if (page is WifiInterface) {
item = new Widgets.DeviceItem.from_page (page);
} else if (page is Widgets.HotspotInterface) {
item = new Widgets.DeviceItem.from_page (page);
item.item_type = VIRTUAL;
} else if (page is Widgets.ModemInterface) {
item = new Widgets.DeviceItem.from_page (page);
} else {
if (page.device.get_iface ().has_prefix ("usb")) {
item = new Widgets.DeviceItem.from_page (page, "drive-removable-media");
} else {
item = new Widgets.DeviceItem.from_page (page);
}
}

if (content.get_children ().find (page) == null) {
content.add (page);
}

device_list.add (item);
update_networking_state ();
}

private void remove_interface (Widgets.Page widget_interface) {
if (content.get_visible_child () == widget_interface) {
var row = device_list.get_selected_row ();
int index = device_list.get_selected_row ().get_index ();
device_list.remove_iface_from_list (widget_interface);
remove_iface_from_list (widget_interface);

if (row != null && row.get_index () >= 0) {
device_list.get_row_at_index (index).activate ();
} else {
device_list.select_first_item ();
device_list.get_row_at_index (0).activate ();
}
} else {
device_list.remove_iface_from_list (widget_interface);
remove_iface_from_list (widget_interface);
}

widget_interface.destroy ();
}

private void remove_iface_from_list (Widgets.Page iface) {
foreach (unowned var _list_item in get_children ()) {
var list_item = (Widgets.DeviceItem)_list_item;
if (list_item.page == iface) {
device_list.remove (list_item);
}
}
}

private void update_networking_state () {
unowned NetworkManager network_manager = NetworkManager.get_default ();
if (network_manager.client.networking_get_enabled ()) {
device_list.sensitive = true;
device_list.select_first_item ();
device_list.get_row_at_index (0).activate ();
} else {
device_list.sensitive = false;
current_device = null;
device_list.select_row (null);
content.set_visible_child_name ("airplane-mode-info");
}
}

private int sort_func (Gtk.ListBoxRow row1, Gtk.ListBoxRow row2) {
if (((Widgets.DeviceItem) row1).item_type == DEVICE) {
return -1;
} else if (((Widgets.DeviceItem) row1).item_type == VIRTUAL) {
return 1;
} else {
return 0;
}
}

private void update_headers (Gtk.ListBoxRow row, Gtk.ListBoxRow? before = null) {
unowned Widgets.DeviceItem row_item = (Widgets.DeviceItem) row;
unowned Widgets.DeviceItem? before_item = (Widgets.DeviceItem) before;
if (row_item.item_type == VIRTUAL) {
if (before_item != null && before_item.item_type == VIRTUAL) {
row.set_header (null);
return;
}

if (virtual_header.get_parent () != null) {
virtual_header.unparent ();
}

row.set_header (virtual_header);
} else if (row_item.item_type == DEVICE) {
if (before_item != null && before_item.item_type == DEVICE) {
row.set_header (null);
return;
}

if (devices_header.get_parent () != null) {
devices_header.unparent ();
}

row.set_header (devices_header);
} else {
row.set_header (null);
}
}
}
Loading

0 comments on commit 2e18254

Please sign in to comment.