From a3866294af99645093316fed704371e542223f12 Mon Sep 17 00:00:00 2001
From: takotori <tranfelix99@gmail.com>
Date: Sun, 3 Dec 2023 14:11:59 +0100
Subject: [PATCH] some things

---
 src/components/bluetooth/bluetoothBox.rs     |  11 +-
 src/components/bluetooth/bluetoothBoxImpl.rs |   8 +-
 src/components/wifi/wifiBox.rs               |   9 +-
 src/components/wifi/wifiEntry.rs             |  10 +-
 src/components/wifi/wifiEntryImpl.rs         |   2 +-
 src/resources/resetBluetooth.ui              |  52 +++------
 src/resources/resetUI.cmb                    | 117 +++++++++----------
 src/resources/resetWiFi.ui                   |  25 +---
 src/resources/resetWifiEntry.ui              |  17 ++-
 9 files changed, 105 insertions(+), 146 deletions(-)

diff --git a/src/components/bluetooth/bluetoothBox.rs b/src/components/bluetooth/bluetoothBox.rs
index c10aa6d..a5af1b6 100644
--- a/src/components/bluetooth/bluetoothBox.rs
+++ b/src/components/bluetooth/bluetoothBox.rs
@@ -12,7 +12,7 @@ use dbus::message::SignalArgs;
 use dbus::{Error, Path};
 use glib::{clone, Cast};
 use gtk::glib::Variant;
-use gtk::prelude::{ActionableExt, ListBoxRowExt, WidgetExt};
+use gtk::prelude::{ActionableExt, BoxExt, ListBoxRowExt, WidgetExt};
 use gtk::{gio, StringObject};
 use ReSet_Lib::bluetooth::bluetooth::{BluetoothAdapter, BluetoothDevice};
 use ReSet_Lib::signals::{BluetoothDeviceAdded, BluetoothDeviceChanged, BluetoothDeviceRemoved};
@@ -217,7 +217,6 @@ pub fn start_bluetooth_listener(listeners: Arc<Listeners>, bluetooth_box: Arc<Bl
                     let imp = bluetooth_box.imp();
                     let map = imp.availableDevices.borrow_mut();
                     if let Some(list_entry) = map.get(&ir.bluetooth_device) {
-                        imp.resetBluetoothAvailableDevices.remove(&*list_entry.1);
                         imp.resetBluetoothConnectedDevices.remove(&*list_entry.1);
                     }
                 });
@@ -274,7 +273,13 @@ pub fn start_bluetooth_listener(listeners: Arc<Listeners>, bluetooth_box: Arc<Bl
                 glib::spawn_future(async move {
                     glib::idle_add_once(move || {
                         let imp = loop_box.imp();
-                        imp.resetBluetoothAvailableDevices.remove_all();
+                        for x in imp.resetBluetoothAvailableDevices.observe_children().iter::<Object>() {
+                            if let Ok(entry) = x { // todo test this
+                                if let Some(item) = entry.downcast_ref::<Widget>() {
+                                    imp.resetBluetoothAvailableDevices.remove(item);
+                                }
+                            }
+                        };
                     });
                 });
                 println!("stopping bluetooth listener");
diff --git a/src/components/bluetooth/bluetoothBoxImpl.rs b/src/components/bluetooth/bluetoothBoxImpl.rs
index 46b2cc5..878f23a 100644
--- a/src/components/bluetooth/bluetoothBoxImpl.rs
+++ b/src/components/bluetooth/bluetoothBoxImpl.rs
@@ -1,7 +1,7 @@
 use adw::{ActionRow, ComboRow};
 use dbus::Path;
 use gtk::subclass::prelude::*;
-use gtk::{glib, CompositeTemplate, ListBox, Switch};
+use gtk::{glib, CompositeTemplate, ListBox, Switch, Button};
 use gtk::{prelude::*, StringList};
 use std::cell::RefCell;
 use std::collections::HashMap;
@@ -22,11 +22,13 @@ pub struct BluetoothBox {
     #[template_child]
     pub resetBluetoothSwitch: TemplateChild<Switch>,
     #[template_child]
-    pub resetBluetoothAvailableDevices: TemplateChild<ListBox>,
+    pub resetBluetoothAvailableDevices: TemplateChild<gtk::Box>,
+    #[template_child]
+    pub resetBluetoothRefreshButton: TemplateChild<Button>,
     #[template_child]
     pub resetBluetoothAdapter: TemplateChild<ComboRow>,
     #[template_child]
-    pub resetBluetoothConnectedDevices: TemplateChild<ListBox>,
+    pub resetBluetoothConnectedDevices: TemplateChild<gtk::Box>,
     #[template_child]
     pub resetVisibility: TemplateChild<ActionRow>,
     #[template_child]
diff --git a/src/components/wifi/wifiBox.rs b/src/components/wifi/wifiBox.rs
index 1e35e4f..34f4fa3 100644
--- a/src/components/wifi/wifiBox.rs
+++ b/src/components/wifi/wifiBox.rs
@@ -16,7 +16,7 @@ use dbus::Error;
 use dbus::Path;
 use glib::{clone, Cast, PropertySet};
 use gtk::glib::Variant;
-use gtk::prelude::{ActionableExt, WidgetExt};
+use gtk::prelude::{ActionableExt, WidgetExt, BoxExt};
 use gtk::{gio, StringObject};
 use ReSet_Lib::network::network::{AccessPoint, WifiDevice, WifiStrength};
 use ReSet_Lib::signals::{AccessPointAdded, WifiDeviceChanged};
@@ -373,12 +373,9 @@ pub fn start_event_listener(listeners: Arc<Listeners>, wifi_box: Arc<WifiBox>) {
                     if ir.access_point.dbus_path
                         == imp.resetCurrentWifiDevice.borrow().active_access_point
                     {
-                        entryImp
-                            .resetWifiConnected
-                            .get()
-                            .set_from_icon_name(Some("network-wireless-connected-symbolic"));
+                        entryImp.resetWifiConnected.set_text("Connected");
                     } else {
-                        entryImp.resetWifiConnected.get().set_from_icon_name(None);
+                        entryImp.resetWifiConnected.set_text("");
                     }
                     {
                         let mut wifiName = entryImp.wifiName.borrow_mut();
diff --git a/src/components/wifi/wifiEntry.rs b/src/components/wifi/wifiEntry.rs
index 60ebcc7..fb77380 100644
--- a/src/components/wifi/wifiEntry.rs
+++ b/src/components/wifi/wifiEntry.rs
@@ -55,9 +55,7 @@ impl WifiEntry {
         }
         if connected {
             entryImp
-                .resetWifiConnected
-                .get()
-                .set_from_icon_name(Some("network-wireless-connected-symbolic"));
+                .resetWifiConnected.set_text("Connected");
         }
         {
             let mut wifiName = entryImp.wifiName.borrow_mut();
@@ -110,7 +108,7 @@ pub fn click_disconnect(entry: Arc<WifiEntry>) {
             imp.connected.replace(false);
             return;
         }
-        imp.resetWifiConnected.get().set_from_icon_name(None);
+        imp.resetWifiConnected.set_text("");
         imp.connected.replace(false);
         glib::spawn_future(async move {
             glib::idle_add_once(move || {
@@ -152,9 +150,7 @@ pub fn click_stored_network(entry: Arc<WifiEntry>) {
                     return;
                 }
                 let imp = entry_ref.imp();
-                imp.resetWifiConnected
-                    .get()
-                    .set_from_icon_name(Some("network-wireless-connected-symbolic"));
+                imp.resetWifiConnected.set_text("Connected");
                 imp.connected.replace(true);
             });
         });
diff --git a/src/components/wifi/wifiEntryImpl.rs b/src/components/wifi/wifiEntryImpl.rs
index 81fb42d..ff76b65 100644
--- a/src/components/wifi/wifiEntryImpl.rs
+++ b/src/components/wifi/wifiEntryImpl.rs
@@ -21,7 +21,7 @@ pub struct WifiEntry {
     #[template_child]
     pub resetWifiEditButton: TemplateChild<Button>,
     #[template_child]
-    pub resetWifiConnected: TemplateChild<Image>,
+    pub resetWifiConnected: TemplateChild<Label>,
     #[template_child]
     pub resetWifiPopup: TemplateChild<Popup>,
     pub wifiName: RefCell<String>,
diff --git a/src/resources/resetBluetooth.ui b/src/resources/resetBluetooth.ui
index 3b205db..60251d5 100644
--- a/src/resources/resetBluetooth.ui
+++ b/src/resources/resetBluetooth.ui
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!-- Created with Cambalache 0.17.0 -->
 <interface>
-  <requires lib="gtk" version="4.6"/>
+  <requires lib="gtk" version="4.12"/>
   <requires lib="libadwaita" version="1.4"/>
   <template class="resetBluetooth" parent="GtkBox">
     <property name="orientation">vertical</property>
@@ -59,17 +59,14 @@
                   </object>
                 </child>
                 <child>
-                  <object class="GtkBox">
-                    <property name="margin-top">10</property>
-                    <property name="orientation">vertical</property>
-                    <child>
-                      <object class="GtkLabel">
-                        <property name="halign">start</property>
-                        <property name="justify">right</property>
-                        <property name="label">Available devices</property>
-                        <property name="margin-start">5</property>
+                  <object class="AdwPreferencesGroup">
+                    <property name="header-suffix">
+                      <object class="GtkButton" id="resetBluetoothRefreshButton">
+                        <property name="icon-name">view-refresh-symbolic</property>
                       </object>
-                    </child>
+                    </property>
+                    <property name="margin-top">10</property>
+                    <property name="title">Available Devices</property>
                     <child>
                       <object class="GtkScrolledWindow">
                         <property name="min-content-height">100</property>
@@ -77,14 +74,8 @@
                         <child>
                           <object class="GtkViewport">
                             <child>
-                              <object class="GtkListBox" id="resetBluetoothAvailableDevices">
-                                <property name="css-classes">boxed-list
-</property>
-                                <property name="margin-end">5</property>
-                                <property name="margin-start">5</property>
-                                <property name="margin-top">5</property>
-                                <property name="show-separators">True</property>
-                                <property name="valign">start</property>
+                              <object class="GtkBox" id="resetBluetoothAvailableDevices">
+                                <property name="orientation">vertical</property>
                               </object>
                             </child>
                           </object>
@@ -94,17 +85,8 @@
                   </object>
                 </child>
                 <child>
-                  <object class="GtkBox">
-                    <property name="margin-top">10</property>
-                    <property name="orientation">vertical</property>
-                    <child>
-                      <object class="GtkLabel">
-                        <property name="halign">start</property>
-                        <property name="justify">right</property>
-                        <property name="label">Connected devices</property>
-                        <property name="margin-start">5</property>
-                      </object>
-                    </child>
+                  <object class="AdwPreferencesGroup">
+                    <property name="title">Connected Devices</property>
                     <child>
                       <object class="GtkScrolledWindow">
                         <property name="min-content-height">100</property>
@@ -112,14 +94,8 @@
                         <child>
                           <object class="GtkViewport">
                             <child>
-                              <object class="GtkListBox" id="resetBluetoothConnectedDevices">
-                                <property name="css-classes">boxed-list
-</property>
-                                <property name="margin-end">5</property>
-                                <property name="margin-start">5</property>
-                                <property name="margin-top">5</property>
-                                <property name="show-separators">True</property>
-                                <property name="valign">start</property>
+                              <object class="GtkBox" id="resetBluetoothConnectedDevices">
+                                <property name="orientation">vertical</property>
                               </object>
                             </child>
                           </object>
diff --git a/src/resources/resetUI.cmb b/src/resources/resetUI.cmb
index aed8a17..5e801da 100644
--- a/src/resources/resetUI.cmb
+++ b/src/resources/resetUI.cmb
@@ -21,7 +21,8 @@
 	(20,None,None,"resetCardEntry.ui",None,None,None,None,None,None,None),
 	(21,1,None,"resetWifiOptions.ui",None,None,None,None,None,None,None),
 	(22,1,None,"resetWifiAddressEntry.ui",None,None,None,None,None,None,None),
-	(23,1,None,"resetWifiRouteEntry.ui",None,None,None,None,None,None,None)
+	(23,1,None,"resetWifiRouteEntry.ui",None,None,None,None,None,None,None),
+	(24,None,None,None,None,None,None,None,None,None,None)
   </ui>
   <ui_library>
 	(21,"gtk","4.12",None),
@@ -54,11 +55,7 @@
 	(4,7,"GtkBox","resetWifi",None,None,None,None,None,None),
 	(4,152,"AdwNavigationView","resetWifiNavigation",7,None,None,None,1,None),
 	(4,153,"AdwNavigationPage",None,152,None,None,None,None,None),
-	(4,154,"GtkBox",None,153,None,None,None,None,None),
-	(4,164,"GtkBox",None,154,None,None,None,1,None),
-	(4,165,"GtkLabel",None,164,None,None,None,None,None),
-	(4,166,"GtkScrolledWindow",None,164,None,None,None,1,None),
-	(4,167,"GtkViewport",None,166,None,None,None,None,None),
+	(4,154,"GtkBox",None,153,None,None,None,1,None),
 	(4,174,"AdwNavigationPage",None,152,None,None,None,2,None),
 	(4,175,"GtkBox",None,174,None,None,None,None,None),
 	(4,182,"GtkBox",None,7,None,None,None,None,None),
@@ -68,20 +65,20 @@
 	(4,200,"AdwComboRow","resetWiFiDevice",199,None,None,None,-1,None),
 	(4,201,"AdwActionRow","resetSavedNetworks",199,None,None,None,-1,None),
 	(4,202,"GtkImage",None,201,None,None,None,None,None),
-	(4,203,"AdwPreferencesGroup","resetWifiList",167,None,None,None,-1,None),
 	(4,204,"AdwPreferencesGroup","resetStoredWifiList",175,None,None,None,2,None),
 	(4,205,"AdwPreferencesGroup",None,175,None,None,None,None,None),
 	(4,206,"AdwActionRow","resetAvailableNetworks",205,None,None,None,-1,None),
 	(4,207,"GtkImage",None,206,None,None,None,None,None),
+	(4,208,"AdwPreferencesGroup","resetWifiList",154,None,None,None,1,None),
 	(5,12,"AdwActionRow","resetWifiEntry",None,None,None,None,-1,None),
 	(5,13,"GtkBox",None,12,None,None,None,None,None),
 	(5,14,"GtkBox",None,13,None,None,None,None,None),
 	(5,15,"GtkImage","resetWifiStrength",14,None,None,None,None,None),
 	(5,16,"GtkImage","resetWifiEncrypted",14,None,None,None,1,None),
 	(5,18,"GtkLabel","resetWifiLabel",13,None,None,None,1,None),
-	(5,19,"GtkImage","resetWifiConnected",13,None,None,None,3,None),
-	(5,20,"GtkButton","resetWifiEditButton",13,None,None,None,2,None),
+	(5,20,"GtkButton","resetWifiEditButton",13,None,None,None,3,None),
 	(5,21,"resetPopup","resetWifiPopup",13,None,None,None,4,None),
+	(5,22,"GtkLabel","resetWifiConnected",13,None,None,None,2,None),
 	(6,1,"GtkListBoxRow","resetSidebarEntry",None,None,None,None,None,None),
 	(6,2,"GtkBox",None,1,None,None,None,-1,None),
 	(6,6,"GtkImage","resetSidebarImage",2,None,None,None,None,None),
@@ -137,16 +134,6 @@
 	(10,119,"AdwNavigationView",None,1,None,None,None,1,None),
 	(10,120,"AdwNavigationPage",None,119,None,None,None,None,None),
 	(10,121,"GtkBox",None,120,None,None,None,None,None),
-	(10,127,"GtkBox",None,121,None,None,None,1,None),
-	(10,128,"GtkLabel",None,127,None,None,None,None,None),
-	(10,129,"GtkScrolledWindow",None,127,None,None,None,1,None),
-	(10,130,"GtkViewport",None,129,None,None,None,None,None),
-	(10,131,"GtkListBox","resetBluetoothAvailableDevices",130,None,None,None,None,None),
-	(10,132,"GtkBox",None,121,None,None,None,2,None),
-	(10,133,"GtkLabel",None,132,None,None,None,None,None),
-	(10,134,"GtkScrolledWindow",None,132,None,None,None,1,None),
-	(10,135,"GtkViewport",None,134,None,None,None,None,None),
-	(10,136,"GtkListBox","resetBluetoothConnectedDevices",135,None,None,None,None,None),
 	(10,138,"AdwNavigationPage",None,119,None,None,None,1,None),
 	(10,142,"GtkBox",None,1,None,None,None,None,None),
 	(10,143,"GtkLabel",None,142,None,None,None,None,None),
@@ -162,6 +149,15 @@
 	(10,173,"AdwComboRow","resetBluetoothDevice",172,None,None,None,None,None),
 	(10,174,"AdwActionRow","resetVisibility",172,None,None,None,1,None),
 	(10,175,"GtkImage",None,174,None,None,None,None,None),
+	(10,176,"AdwPreferencesGroup",None,121,None,None,None,1,None),
+	(10,177,"GtkButton","resetBluetoothRefreshButton",176,None,None,None,None,None),
+	(10,178,"GtkScrolledWindow",None,176,None,None,None,None,None),
+	(10,179,"GtkViewport",None,178,None,None,None,None,None),
+	(10,180,"GtkBox","resetBluetoothAvailableDevices",179,None,None,None,None,None),
+	(10,181,"AdwPreferencesGroup",None,121,None,None,None,2,None),
+	(10,183,"GtkScrolledWindow",None,181,None,None,None,None,None),
+	(10,184,"GtkViewport",None,183,None,None,None,None,None),
+	(10,185,"GtkBox","resetBluetoothConnectedDevices",184,None,None,None,None,None),
 	(11,2,"GtkBox","resetBluetoothEntry",None,None,None,None,None,None),
 	(11,3,"GtkImage","resetBluetoothDeviceType",2,None,None,None,None,None),
 	(11,5,"GtkButton","resetBluetoothButton",2,None,None,None,3,None),
@@ -317,7 +313,17 @@
 	(23,8,"AdwEntryRow","resetRouteMetric",6,None,None,None,1,None),
 	(23,9,"GtkBox",None,2,None,None,None,None,None),
 	(23,10,"AdwEntryRow","resetRouteAddress",9,None,None,None,None,None),
-	(23,11,"AdwEntryRow","resetRoutePrefix",9,None,None,None,1,None)
+	(23,11,"AdwEntryRow","resetRoutePrefix",9,None,None,None,1,None),
+	(24,1,"AdwPreferencesGroup",None,None,None,None,None,-1,None),
+	(24,4,"GtkButton",None,1,None,None,None,-1,None),
+	(24,5,"GtkScrolledWindow",None,1,None,None,None,None,None),
+	(24,6,"GtkViewport",None,5,None,None,None,None,None),
+	(24,9,"GtkBox",None,6,None,None,None,None,None),
+	(24,10,"AdwActionRow",None,9,None,None,None,None,None),
+	(24,11,"AdwActionRow",None,9,None,None,None,1,None),
+	(24,12,"AdwActionRow",None,9,None,None,None,2,None),
+	(24,13,"AdwActionRow",None,9,None,None,None,3,None),
+	(24,14,"AdwActionRow",None,9,None,None,None,4,None)
   </object>
   <object_property>
 	(3,1,"GtkWidget","height-request","200",None,None,None,None,None,None,None,None,None),
@@ -384,14 +390,6 @@
 	(4,153,"AdwNavigationPage","tag","main",None,None,None,None,None,None,None,None,None),
 	(4,153,"AdwNavigationPage","title","main",None,None,None,None,None,None,None,None,None),
 	(4,154,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
-	(4,164,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
-	(4,164,"GtkWidget","margin-top","10",None,None,None,None,None,None,None,None,None),
-	(4,165,"GtkLabel","justify","right",None,None,None,None,None,None,None,None,None),
-	(4,165,"GtkLabel","label","Available networks",None,None,None,None,None,None,None,None,None),
-	(4,165,"GtkWidget","halign","start",None,None,None,None,None,None,None,None,None),
-	(4,165,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
-	(4,166,"GtkScrolledWindow","min-content-height","100",None,None,None,None,None,None,None,None,None),
-	(4,166,"GtkScrolledWindow","propagate-natural-height","True",None,None,None,None,None,None,None,None,None),
 	(4,174,"AdwNavigationPage","tag","saved",None,None,None,None,None,None,None,None,None),
 	(4,174,"AdwNavigationPage","title","saved",None,None,None,None,None,None,None,None,None),
 	(4,175,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
@@ -416,6 +414,8 @@
 	(4,207,"GtkWidget","halign","end",None,None,None,None,None,None,None,None,None),
 	(4,207,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
 	(4,207,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
+	(4,208,"AdwPreferencesGroup","title","Available networks",None,None,None,None,None,None,None,None,None),
+	(4,208,"GtkWidget","margin-top","10",None,None,None,None,None,None,None,None,None),
 	(5,12,"GtkListBoxRow","child",None,None,None,None,None,13,None,None,None,None),
 	(5,13,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
 	(5,14,"GtkWidget","width-request","35",None,None,None,None,None,None,None,None,None),
@@ -432,12 +432,17 @@
 	(5,18,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
 	(5,18,"GtkWidget","margin-end","10",None,None,None,None,None,None,None,None,None),
 	(5,18,"GtkWidget","width-request","200",None,None,None,None,None,None,None,None,None),
-	(5,19,"GtkWidget","halign","end",None,None,None,None,None,None,None,None,None),
-	(5,19,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None),
 	(5,20,"GtkButton","has-frame","False",None,None,None,None,None,None,None,None,None),
 	(5,20,"GtkButton","icon-name","document-edit-symbolic",None,None,None,None,None,None,None,None,None),
 	(5,20,"GtkWidget","halign","start",None,None,None,None,None,None,None,None,None),
 	(5,20,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None),
+	(5,22,"GtkLabel","justify","right",None,None,None,None,None,None,None,None,None),
+	(5,22,"GtkLabel","label","Connected",None,None,None,None,None,None,None,None,None),
+	(5,22,"GtkLabel","single-line-mode","True",None,None,None,None,None,None,None,None,None),
+	(5,22,"GtkLabel","xalign","0.0",None,None,None,None,None,None,None,None,None),
+	(5,22,"GtkWidget","halign","end",None,None,None,None,None,None,None,None,None),
+	(5,22,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
+	(5,22,"GtkWidget","margin-end","10",None,None,None,None,None,None,None,None,None),
 	(6,1,"GtkListBoxRow","child",None,None,None,None,None,2,None,None,None,None),
 	(6,1,"GtkWidget","css-classes","resetSidebarEntry",None,None,None,None,None,None,None,None,None),
 	(6,2,"GtkWidget","margin-bottom","10",None,None,None,None,None,None,None,None,None),
@@ -536,34 +541,6 @@
 	(10,120,"AdwNavigationPage","tag","main",None,None,None,None,None,None,None,None,None),
 	(10,120,"AdwNavigationPage","title","main",None,None,None,None,None,None,None,None,None),
 	(10,121,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
-	(10,127,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
-	(10,127,"GtkWidget","margin-top","10",None,None,None,None,None,None,None,None,None),
-	(10,128,"GtkLabel","justify","right",None,None,None,None,None,None,None,None,None),
-	(10,128,"GtkLabel","label","Available devices",None,None,None,None,None,None,None,None,None),
-	(10,128,"GtkWidget","halign","start",None,None,None,None,None,None,None,None,None),
-	(10,128,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
-	(10,129,"GtkScrolledWindow","min-content-height","100",None,None,None,None,None,None,None,None,None),
-	(10,129,"GtkScrolledWindow","propagate-natural-height","True",None,None,None,None,None,None,None,None,None),
-	(10,131,"GtkListBox","show-separators","True",None,None,None,None,None,None,None,None,None),
-	(10,131,"GtkWidget","css-classes","boxed-list\n",None,None,None,None,None,None,None,None,None),
-	(10,131,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
-	(10,131,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
-	(10,131,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
-	(10,131,"GtkWidget","valign","start",None,None,None,None,None,None,None,None,None),
-	(10,132,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
-	(10,132,"GtkWidget","margin-top","10",None,None,None,None,None,None,None,None,None),
-	(10,133,"GtkLabel","justify","right",None,None,None,None,None,None,None,None,None),
-	(10,133,"GtkLabel","label","Connected devices",None,None,None,None,None,None,None,None,None),
-	(10,133,"GtkWidget","halign","start",None,None,None,None,None,None,None,None,None),
-	(10,133,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
-	(10,134,"GtkScrolledWindow","min-content-height","100",None,None,None,None,None,None,None,None,None),
-	(10,134,"GtkScrolledWindow","propagate-natural-height","True",None,None,None,None,None,None,None,None,None),
-	(10,136,"GtkListBox","show-separators","True",None,None,None,None,None,None,None,None,None),
-	(10,136,"GtkWidget","css-classes","boxed-list\n",None,None,None,None,None,None,None,None,None),
-	(10,136,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
-	(10,136,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
-	(10,136,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
-	(10,136,"GtkWidget","valign","start",None,None,None,None,None,None,None,None,None),
 	(10,138,"AdwNavigationPage","tag","visibility",None,None,None,None,None,None,None,None,None),
 	(10,138,"AdwNavigationPage","title","visibility",None,None,None,None,None,None,None,None,None),
 	(10,142,"GtkWidget","height-request","40",None,None,None,None,None,None,None,None,None),
@@ -599,6 +576,17 @@
 	(10,175,"GtkWidget","halign","end",None,None,None,None,None,None,None,None,None),
 	(10,175,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
 	(10,175,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
+	(10,176,"AdwPreferencesGroup","header-suffix",None,None,None,None,None,177,None,None,None,None),
+	(10,176,"AdwPreferencesGroup","title","Available Devices",None,None,None,None,None,None,None,None,None),
+	(10,176,"GtkWidget","margin-top","10",None,None,None,None,None,None,None,None,None),
+	(10,177,"GtkButton","icon-name","view-refresh-symbolic",None,None,None,None,None,None,None,None,None),
+	(10,178,"GtkScrolledWindow","min-content-height","100",None,None,None,None,None,None,None,None,None),
+	(10,178,"GtkScrolledWindow","propagate-natural-height","True",None,None,None,None,None,None,None,None,None),
+	(10,180,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
+	(10,181,"AdwPreferencesGroup","title","Connected Devices",None,None,None,None,None,None,None,None,None),
+	(10,183,"GtkScrolledWindow","min-content-height","100",None,None,None,None,None,None,None,None,None),
+	(10,183,"GtkScrolledWindow","propagate-natural-height","True",None,None,None,None,None,None,None,None,None),
+	(10,185,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
 	(11,2,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
 	(11,3,"GtkImage","icon-name","input-mouse-symbolic",None,None,None,None,None,None,None,None,None),
 	(11,3,"GtkWidget","margin-end","15",None,None,None,None,None,None,None,None,None),
@@ -895,7 +883,18 @@
 	(23,10,"AdwPreferencesRow","title","Address",None,None,None,None,None,None,None,None,None),
 	(23,10,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
 	(23,11,"AdwPreferencesRow","title","Prefix",None,None,None,None,None,None,None,None,None),
-	(23,11,"GtkEditable","max-width-chars","5",None,None,None,None,None,None,None,None,None)
+	(23,11,"GtkEditable","max-width-chars","5",None,None,None,None,None,None,None,None,None),
+	(24,1,"AdwPreferencesGroup","header-suffix",None,None,None,None,None,4,None,None,None,None),
+	(24,1,"AdwPreferencesGroup","title","Available Devices",None,None,None,None,None,None,None,None,None),
+	(24,4,"GtkButton","icon-name","view-refresh-symbolic",None,None,None,None,None,None,None,None,None),
+	(24,5,"GtkScrolledWindow","min-content-height","100",None,None,None,None,None,None,None,None,None),
+	(24,5,"GtkScrolledWindow","propagate-natural-height","True",None,None,None,None,None,None,None,None,None),
+	(24,9,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
+	(24,10,"AdwPreferencesRow","title","device 2",None,None,None,None,None,None,None,None,None),
+	(24,11,"AdwPreferencesRow","title","device 1",None,None,None,None,None,None,None,None,None),
+	(24,12,"AdwPreferencesRow","title","device 2",None,None,None,None,None,None,None,None,None),
+	(24,13,"AdwPreferencesRow","title","device 2",None,None,None,None,None,None,None,None,None),
+	(24,14,"AdwPreferencesRow","title","device 2",None,None,None,None,None,None,None,None,None)
   </object_property>
   <object_data>
 	(3,42,"GtkWidget",1,1,None,None,None,None,None,None),
diff --git a/src/resources/resetWiFi.ui b/src/resources/resetWiFi.ui
index a534d1e..2d4137b 100644
--- a/src/resources/resetWiFi.ui
+++ b/src/resources/resetWiFi.ui
@@ -61,30 +61,9 @@
                   </object>
                 </child>
                 <child>
-                  <object class="GtkBox">
+                  <object class="AdwPreferencesGroup" id="resetWifiList">
                     <property name="margin-top">10</property>
-                    <property name="orientation">vertical</property>
-                    <child>
-                      <object class="GtkLabel">
-                        <property name="halign">start</property>
-                        <property name="justify">right</property>
-                        <property name="label">Available networks</property>
-                        <property name="margin-start">5</property>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkScrolledWindow">
-                        <property name="min-content-height">100</property>
-                        <property name="propagate-natural-height">True</property>
-                        <child>
-                          <object class="GtkViewport">
-                            <child>
-                              <object class="AdwPreferencesGroup" id="resetWifiList"/>
-                            </child>
-                          </object>
-                        </child>
-                      </object>
-                    </child>
+                    <property name="title">Available networks</property>
                   </object>
                 </child>
               </object>
diff --git a/src/resources/resetWifiEntry.ui b/src/resources/resetWifiEntry.ui
index 3f6f6f0..0d329a9 100644
--- a/src/resources/resetWifiEntry.ui
+++ b/src/resources/resetWifiEntry.ui
@@ -37,6 +37,17 @@
             <property name="xalign">0.0</property>
           </object>
         </child>
+        <child>
+          <object class="GtkLabel" id="resetWifiConnected">
+            <property name="halign">end</property>
+            <property name="hexpand">True</property>
+            <property name="justify">right</property>
+            <property name="label">Connected</property>
+            <property name="margin-end">10</property>
+            <property name="single-line-mode">True</property>
+            <property name="xalign">0.0</property>
+          </object>
+        </child>
         <child>
           <object class="GtkButton" id="resetWifiEditButton">
             <property name="halign">start</property>
@@ -45,12 +56,6 @@
             <property name="valign">center</property>
           </object>
         </child>
-        <child>
-          <object class="GtkImage" id="resetWifiConnected">
-            <property name="halign">end</property>
-            <property name="valign">center</property>
-          </object>
-        </child>
         <child>
           <object class="resetPopup" id="resetWifiPopup"/>
         </child>