diff --git a/Cargo.lock b/Cargo.lock index a16fb2d3..76909b6b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -983,7 +983,7 @@ dependencies = [ [[package]] name = "libcosmic-widgets" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic?branch=lucy/widgets#6f7d0fad8009b716197c16459492efbd69cf25b6" +source = "git+https://github.com/pop-os/libcosmic?branch=lucy/widgets#feee2bacc313dd15768129de5baabb3aece0e8ec" dependencies = [ "gtk4", "relm4", @@ -1434,7 +1434,7 @@ checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b" [[package]] name = "relm4" version = "0.4.1" -source = "git+https://github.com/AaronErhardt/relm4?branch=new-approach#f5b777ff9530f1dffe3c48614e9a855264c779ec" +source = "git+https://github.com/AaronErhardt/relm4?branch=new-approach#ca2817bec39b0e7720cee4c653c7366484ca0586" dependencies = [ "async-broadcast", "async-oneshot", @@ -1450,7 +1450,7 @@ dependencies = [ [[package]] name = "relm4-macros" version = "0.4.1" -source = "git+https://github.com/AaronErhardt/relm4?branch=new-approach#f5b777ff9530f1dffe3c48614e9a855264c779ec" +source = "git+https://github.com/AaronErhardt/relm4?branch=new-approach#ca2817bec39b0e7720cee4c653c7366484ca0586" dependencies = [ "proc-macro2", "quote", diff --git a/applets/cosmic-applet-network/src/ui/available_wifi.rs b/applets/cosmic-applet-network/src/ui/available_wifi.rs index ae78b79b..5b7e6a6a 100644 --- a/applets/cosmic-applet-network/src/ui/available_wifi.rs +++ b/applets/cosmic-applet-network/src/ui/available_wifi.rs @@ -9,9 +9,9 @@ use futures_util::StreamExt; use gtk4::{ glib::{self, clone, source::PRIORITY_DEFAULT, MainContext, Sender}, prelude::*, - Align, Image, ListBox, ListBoxRow, Separator, + Image, ListBox, ListBoxRow, Separator, }; -use libcosmic_widgets::LabeledItem; +use libcosmic_widgets::{relm4::RelmContainerExt, LabeledItem}; use std::{cell::RefCell, rc::Rc}; use zbus::Connection; @@ -45,9 +45,18 @@ fn build_aps_list( target.remove(&old_ap_box); } for ap in aps { - let entry_box = gtk4::Box::new(gtk4::Orientation::Horizontal, 0); - let labeled_item = LabeledItem::new().attach_to(&entry_box).launch(()).detach(); - let entry = ListBoxRow::builder().child(&entry_box).build(); + view! { + entry = ListBoxRow { + set_child: entry_box = Some(>k4::Box) { + container_add: labeled_item = &LabeledItem { + set_title: &ap.ssid, + set_child: icon = &Image { + set_icon_name: Some("network-wireless-symbolic") + } + } + } + } + } target.append(&entry); ap_entries.push(entry); } diff --git a/applets/cosmic-applet-network/src/ui/current_networks.rs b/applets/cosmic-applet-network/src/ui/current_networks.rs index af93626a..3903f2d5 100644 --- a/applets/cosmic-applet-network/src/ui/current_networks.rs +++ b/applets/cosmic-applet-network/src/ui/current_networks.rs @@ -56,7 +56,7 @@ fn display_active_connections( flags, rsn_flags, wpa_flags, - } => todo!(), + } => continue, ActiveConnectionInfo::Vpn { name, ip_addresses } => render_vpn(name, ip_addresses), }; let entry = ListBoxRow::builder().child(&entry).build();