From 7d0fc0b9e75b5c8f784ed9be85d5a7119c7c1539 Mon Sep 17 00:00:00 2001
From: Fabio Lenherr / DashieTM <fabio.lenherr@gmail.com>
Date: Sat, 11 Nov 2023 17:55:59 +0100
Subject: [PATCH 1/4] feat: Add popups for password

---
 src/components/base/popup.rs          | 10 +--
 src/components/base/popupImpl.rs      | 30 ++++++---
 src/components/wifi/wifiBox.rs        |  1 +
 src/components/wifi/wifiEntry.rs      | 88 ++++++++++++++++++++++++---
 src/components/wifi/wifiEntryImpl.rs  | 11 ++--
 src/resources/resetPasswordPopup.ui   | 23 -------
 src/resources/resetPopup.ui           | 31 ++++++++++
 src/resources/resetUI.cmb             | 26 +++++---
 src/resources/resetWifiEntry.ui       |  3 +
 src/resources/resources.gresource.xml |  1 +
 10 files changed, 168 insertions(+), 56 deletions(-)
 delete mode 100644 src/resources/resetPasswordPopup.ui
 create mode 100644 src/resources/resetPopup.ui

diff --git a/src/components/base/popup.rs b/src/components/base/popup.rs
index a25d8e2..19d5b13 100644
--- a/src/components/base/popup.rs
+++ b/src/components/base/popup.rs
@@ -1,17 +1,17 @@
 use adw::glib;
-use adw::glib::{IsA, Object};
-use gtk::Widget;
+use adw::glib::Object;
+use gtk::{gdk, Editable, Popover};
 
 use super::popupImpl;
 
 glib::wrapper! {
     pub struct Popup(ObjectSubclass<popupImpl::Popup>)
-    @extends adw::Window, gtk::Widget,
-    @implements gtk::Accessible, gtk::Buildable, gtk::ConstraintTarget, gtk::Orientable;
+    @extends Popover, gtk::Widget,
+    @implements Editable,gdk::Popup, gtk::Accessible, gtk::Buildable, gtk::ConstraintTarget, gtk::Orientable;
 }
 
 impl Popup {
-    pub fn new(child: &impl IsA<Widget>) -> Self {
+    pub fn new() -> Self {
         let popup: Popup = Object::builder().build();
         // popup.set_child(child);
         popup
diff --git a/src/components/base/popupImpl.rs b/src/components/base/popupImpl.rs
index 7bf6caf..19534ba 100644
--- a/src/components/base/popupImpl.rs
+++ b/src/components/base/popupImpl.rs
@@ -1,19 +1,35 @@
+use std::cell::RefCell;
+use std::sync::Arc;
+
+use adw::subclass::prelude::{ActionRowImpl, PreferencesRowImpl};
 use adw::subclass::window::AdwWindowImpl;
+use gtk::gdk_pixbuf::subclass::prelude::{
+    PixbufAnimationImpl, PixbufAnimationIterImpl, PixbufLoaderImpl,
+};
+use gtk::prelude::PopupExt;
 use gtk::subclass::prelude::*;
-use gtk::{glib, CompositeTemplate};
+use gtk::{
+    gdk, glib, Button, CompositeTemplate, Entry, EntryBuffer, PasswordEntry, PasswordEntryBuffer, Popover,
+};
 
 use super::popup;
 
 #[allow(non_snake_case)]
 #[derive(Default, CompositeTemplate)]
 #[template(resource = "/org/Xetibo/ReSet/resetPopup.ui")]
-pub struct Popup {}
+pub struct Popup {
+    #[template_child]
+    pub resetPopupEntry: TemplateChild<PasswordEntry>,
+    #[template_child]
+    pub resetPopupButton: TemplateChild<Button>,
+    pub resetPopupText: Arc<RefCell<PasswordEntryBuffer>>,
+}
 
 #[glib::object_subclass]
 impl ObjectSubclass for Popup {
     const NAME: &'static str = "resetPopup";
     type Type = popup::Popup;
-    type ParentType = adw::Window;
+    type ParentType = Popover;
 
     fn class_init(klass: &mut Self::Class) {
         klass.bind_template();
@@ -30,12 +46,12 @@ impl ObjectImpl for Popup {
     }
 }
 
-impl BoxImpl for Popup {}
-
 impl WidgetImpl for Popup {}
 
-impl AdwWindowImpl for Popup {}
-
 impl WindowImpl for Popup {}
 
+impl PopoverImpl for Popup {}
+
 impl ApplicationWindowImpl for Popup {}
+
+impl EditableImpl for Popup {}
diff --git a/src/components/wifi/wifiBox.rs b/src/components/wifi/wifiBox.rs
index f98495e..c81e14d 100644
--- a/src/components/wifi/wifiBox.rs
+++ b/src/components/wifi/wifiBox.rs
@@ -109,6 +109,7 @@ pub fn scanForWifi(wifiBox: Arc<WifiBox>) {
         }
     });
 }
+
 pub async fn wat() -> Vec<AccessPoint> {
     let conn = Connection::new_session().unwrap();
     let proxy = conn.with_proxy(
diff --git a/src/components/wifi/wifiEntry.rs b/src/components/wifi/wifiEntry.rs
index f2bf11b..91d1422 100644
--- a/src/components/wifi/wifiEntry.rs
+++ b/src/components/wifi/wifiEntry.rs
@@ -1,12 +1,15 @@
+use crate::components::base::popup::{self, Popup};
 use crate::components::wifi::wifiEntryImpl;
 use adw::glib;
 use adw::glib::{Object, PropertySet};
+use adw::prelude::{ButtonExt, EditableExt, EntryExt, PopoverExt};
 use adw::subclass::prelude::ObjectSubclassIsExt;
 use dbus::blocking::Connection;
 use dbus::Error;
-use glib::clone;
+use glib::{clone, Cast};
 use gtk::prelude::WidgetExt;
-use gtk::GestureClick;
+use gtk::{AlertDialog, Editable, GestureClick, PasswordEntry, PasswordEntryBuffer, Window};
+use std::sync::atomic::AtomicBool;
 use std::sync::Arc;
 use std::time::Duration;
 use ReSet_Lib::network::network::{AccessPoint, WifiStrength};
@@ -75,6 +78,14 @@ impl WifiEntry {
 }
 
 pub fn click_stored_network(entry: Arc<WifiEntry>) {
+    let alert = AlertDialog::builder().build();
+    let root = &entry.root().unwrap();
+    let root = root.downcast_ref::<gtk::Window>();
+    if root.is_none() {
+        println!("ERROR BRO");
+        return;
+    }
+    let root = root.unwrap();
     // TODO handle unknown access point -> should be done by having 2 different categories
     let entryImp = entry.imp();
     let conn = Connection::new_session().unwrap();
@@ -88,12 +99,14 @@ pub fn click_stored_network(entry: Arc<WifiEntry>) {
         let res: Result<(bool,), Error> =
             proxy.method_call("org.xetibo.ReSet", "DisconnectFromCurrentAccessPoint", ());
         if res.is_err() {
-            // TODO handle error
-            println!("no worky");
+            alert.set_message("Error on connecting to dbus.");
+            alert.show(Some(root));
             return;
         }
         let (res,) = res.unwrap();
         if res == false {
+            alert.set_message("Could not disconnect from access point.");
+            alert.show(Some(root));
         } else {
             entryImp.resetWifiConnected.get().set_from_icon_name(None);
             let mut access_point = entryImp.accessPoint.borrow_mut();
@@ -108,14 +121,14 @@ pub fn click_stored_network(entry: Arc<WifiEntry>) {
         (access_point,),
     );
     if res.is_err() {
-        // TODO handle error
-        println!("no worky");
+        alert.set_message("Error on connecting to dbus.");
+        alert.show(Some(root));
     } else {
         let (res,) = res.unwrap();
         if res == false {
-            println!("no worky but it connected");
+            alert.set_message("Could not connect to access point.");
+            alert.show(Some(root));
         } else {
-            println!("worky");
             entryImp
                 .resetWifiConnected
                 .get()
@@ -127,5 +140,62 @@ pub fn click_stored_network(entry: Arc<WifiEntry>) {
 }
 
 pub fn click_new_network(entry: Arc<WifiEntry>) {
-    println!("Not implemented yet :)");
+    let connect_new_network =
+        |entry: Arc<WifiEntry>, access_point: AccessPoint, password: String| -> bool {
+            let alert = AlertDialog::builder().build();
+            let root = &entry.root().unwrap();
+            let root = root.downcast_ref::<gtk::Window>();
+            if root.is_none() {
+                println!("ERROR BRO");
+                return false;
+            }
+            let root = root.unwrap();
+            let conn = Connection::new_session().unwrap();
+            let proxy = conn.with_proxy(
+                "org.xetibo.ReSet",
+                "/org/xetibo/ReSet",
+                Duration::from_millis(10000),
+            );
+            // TODO crate spinner animation and block UI
+            let res: Result<(bool,), Error> = proxy.method_call(
+                "org.xetibo.ReSet",
+                "ConnectToNewAccessPoint",
+                (access_point, password),
+            );
+            if res.is_err() {
+                alert.set_message("Could not connect to dbus.");
+                alert.show(Some(root));
+                return false;
+            }
+            if res.unwrap() == (false,) {
+                alert.set_message("Could not connect to access point.");
+                alert.show(Some(root));
+                return false;
+            }
+            true
+        };
+
+    let result = Arc::new(AtomicBool::new(false));
+    let result_ref = result.clone();
+    let entryImp = entry.imp();
+    let popupImp = entryImp.resetWifiPopup.imp();
+    popupImp
+        .resetPopupEntry
+        .connect_activate(clone!(@weak entry as origEntry, @weak entryImp => move |entry| {
+            result_ref.store(
+                connect_new_network(origEntry, entryImp.accessPoint.clone().take(), entry.text().to_string()),
+                std::sync::atomic::Ordering::SeqCst,
+            );
+            entryImp.resetWifiPopup.popdown();
+        }));
+    popupImp
+        .resetPopupButton
+        .connect_clicked(clone!(@weak popupImp => move |_| {
+            popupImp.resetPopupEntry.activate();
+        }));
+    entryImp.resetWifiPopup.popup();
+    println!(
+        "result is {}",
+        result.load(std::sync::atomic::Ordering::SeqCst)
+    );
 }
diff --git a/src/components/wifi/wifiEntryImpl.rs b/src/components/wifi/wifiEntryImpl.rs
index b766900..4807f18 100644
--- a/src/components/wifi/wifiEntryImpl.rs
+++ b/src/components/wifi/wifiEntryImpl.rs
@@ -1,8 +1,9 @@
-use std::cell::RefCell;
-use ReSet_Lib::network::network::{WifiStrength, AccessPoint};
-use gtk::{Button, CompositeTemplate, glib, Image, Label, Gesture, GestureClick};
-use gtk::subclass::prelude::*;
+use crate::components::base::popup::Popup;
 use crate::components::wifi::wifiEntry;
+use gtk::subclass::prelude::*;
+use gtk::{glib, Button, CompositeTemplate, Image, Label};
+use std::cell::RefCell;
+use ReSet_Lib::network::network::{AccessPoint, WifiStrength};
 
 #[allow(non_snake_case)]
 #[derive(Default, CompositeTemplate)]
@@ -20,6 +21,8 @@ pub struct WifiEntry {
     pub resetWifiConnected: TemplateChild<Image>,
     #[template_child]
     pub resetWifiStored: TemplateChild<Image>,
+    #[template_child]
+    pub resetWifiPopup: TemplateChild<Popup>,
     pub wifiName: RefCell<String>,
     pub wifiStrength: RefCell<WifiStrength>,
     pub accessPoint: RefCell<AccessPoint>,
diff --git a/src/resources/resetPasswordPopup.ui b/src/resources/resetPasswordPopup.ui
deleted file mode 100644
index f281b91..0000000
--- a/src/resources/resetPasswordPopup.ui
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Created with Cambalache 0.17.0 -->
-<interface>
-  <requires lib="gtk" version="4.12"/>
-  <requires lib="libadwaita" version="1.0"/>
-  <template class="resetPasswordPopup" parent="AdwWindow">
-    <child>
-      <object class="GtkBox">
-        <child>
-          <object class="GtkEntry" id="resetWifiPasswordEntry">
-            <property name="activates-default">True</property>
-            <property name="invisible-char-set">True</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkButton" id="resetWifiPasswordButton">
-            <property name="label">connect</property>
-          </object>
-        </child>
-      </object>
-    </child>
-  </template>
-</interface>
diff --git a/src/resources/resetPopup.ui b/src/resources/resetPopup.ui
new file mode 100644
index 0000000..f9461dd
--- /dev/null
+++ b/src/resources/resetPopup.ui
@@ -0,0 +1,31 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Created with Cambalache 0.17.0 -->
+<interface>
+  <requires lib="gtk" version="4.12"/>
+  <template class="resetPopup" parent="GtkPopover">
+    <child>
+      <object class="GtkBox">
+        <child>
+          <object class="GtkPasswordEntry" id="resetPopupEntry">
+            <property name="activates-default">True</property>
+            <property name="margin-bottom">5</property>
+            <property name="margin-end">5</property>
+            <property name="margin-start">5</property>
+            <property name="margin-top">5</property>
+            <property name="placeholder-text">Wifi Password</property>
+            <property name="show-peek-icon">True</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkButton" id="resetPopupButton">
+            <property name="label">connect</property>
+            <property name="margin-bottom">5</property>
+            <property name="margin-end">5</property>
+            <property name="margin-start">5</property>
+            <property name="margin-top">5</property>
+          </object>
+        </child>
+      </object>
+    </child>
+  </template>
+</interface>
diff --git a/src/resources/resetUI.cmb b/src/resources/resetUI.cmb
index 2b43735..e7a3469 100644
--- a/src/resources/resetUI.cmb
+++ b/src/resources/resetUI.cmb
@@ -14,7 +14,7 @@
 	(13,1,None,"resetMicSourceEntry.ui",None,None,None,None,None,None,None),
 	(14,1,None,"resetSettingBox.ui",None,None,None,None,None,None,None),
 	(15,1,None,"resetListBoxRow.ui",None,None,None,None,None,None,None),
-	(16,1,None,"resetPasswordPopup.ui",None,None,None,None,None,None,None)
+	(16,6,None,"resetPopup.ui",None,None,None,None,None,None,None)
   </ui>
   <object>
 	(3,1,"AdwApplicationWindow","resetUI",None,None,None,None,-1,"  &lt;child&gt;\n    &lt;object id=\"resetSidebarBreakpoint\" class=\"AdwBreakpoint\"&gt;\n    &lt;/object&gt;\n  &lt;/child&gt;"),
@@ -83,6 +83,7 @@
 	(5,7,"GtkButton","resetWifiButton",2,None,None,None,4,None),
 	(5,8,"GtkImage","resetWifiConnected",2,None,None,None,3,None),
 	(5,10,"GtkImage","resetWifiStored",2,None,None,None,2,None),
+	(5,11,"resetPopup","resetWifiPopup",2,None,None,None,-1,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),
@@ -156,10 +157,10 @@
 	(13,10,"GtkProgressBar","resetMicMeter",1,None,None,None,2,None),
 	(14,1,"GtkBox","resetSetting",None,None,None,None,-1,None),
 	(15,1,"GtkListBoxRow","resetListBoxRow",None,None,None,None,None,None),
-	(16,1,"AdwWindow","resetPasswordPopup",None,None,None,None,-1,None),
-	(16,2,"GtkBox",None,1,None,None,None,-1,None),
-	(16,3,"GtkEntry","resetWifiPasswordEntry",2,None,None,None,-1,None),
-	(16,4,"GtkButton","resetWifiPasswordButton",2,None,None,None,-1,None)
+	(16,6,"GtkPopover","resetPopup",None,None,None,None,-1,None),
+	(16,7,"GtkBox",None,6,None,None,None,None,None),
+	(16,8,"GtkPasswordEntry","resetPopupEntry",7,None,None,None,None,None),
+	(16,9,"GtkButton","resetPopupButton",7,None,None,None,1,None)
   </object>
   <object_property>
 	(3,1,"GtkWindow","default-height","500",None,None,None,None,None,None,None,None,None),
@@ -477,9 +478,18 @@
 	(14,1,"GtkWidget","width-request","500",None,None,None,None,None,None,None,None,None),
 	(15,1,"GtkListBoxRow","selectable","False",None,None,None,None,None,None,None,None,None),
 	(15,1,"GtkWidget","height-request","40",None,None,None,None,None,None,None,None,None),
-	(16,3,"GtkEntry","activates-default","True",None,None,None,None,None,None,None,None,None),
-	(16,3,"GtkEntry","invisible-char-set","True",None,None,None,None,None,None,None,None,None),
-	(16,4,"GtkButton","label","connect",None,None,None,None,None,None,None,None,None)
+	(16,8,"GtkPasswordEntry","activates-default","True",None,None,None,None,None,None,None,None,None),
+	(16,8,"GtkPasswordEntry","placeholder-text","Wifi Password",None,None,None,None,None,None,None,None,None),
+	(16,8,"GtkPasswordEntry","show-peek-icon","True",None,None,None,None,None,None,None,None,None),
+	(16,8,"GtkWidget","margin-bottom","5",None,None,None,None,None,None,None,None,None),
+	(16,8,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
+	(16,8,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
+	(16,8,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
+	(16,9,"GtkButton","label","connect",None,None,None,None,None,None,None,None,None),
+	(16,9,"GtkWidget","margin-bottom","5",None,None,None,None,None,None,None,None,None),
+	(16,9,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
+	(16,9,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
+	(16,9,"GtkWidget","margin-top","5",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/resetWifiEntry.ui b/src/resources/resetWifiEntry.ui
index bb12fb7..6b1d6a9 100644
--- a/src/resources/resetWifiEntry.ui
+++ b/src/resources/resetWifiEntry.ui
@@ -4,6 +4,9 @@
   <requires lib="gtk" version="4.12"/>
   <template class="resetWifiEntry" parent="GtkBox">
     <property name="margin-start">5</property>
+    <child>
+      <object class="resetPopup" id="resetWifiPopup"/>
+    </child>
     <child>
       <object class="GtkBox">
         <property name="width-request">35</property>
diff --git a/src/resources/resources.gresource.xml b/src/resources/resources.gresource.xml
index 5f0bed4..f86c757 100644
--- a/src/resources/resources.gresource.xml
+++ b/src/resources/resources.gresource.xml
@@ -13,5 +13,6 @@
     <file compressed="true" preprocess="xml-stripblanks">resetAudioSourceEntry.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">resetMicrophone.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">resetMicSourceEntry.ui</file>
+    <file compressed="true" preprocess="xml-stripblanks">resetPopup.ui</file>
   </gresource>
 </gresources>

From bbfd07688d5ce79fd7c097d9fdee87cb7d66ffdf Mon Sep 17 00:00:00 2001
From: DashieTM <fabio.lenherr@gmail.com>
Date: Sat, 11 Nov 2023 23:00:38 +0100
Subject: [PATCH 2/4] fix: Execute connect function with wifi connect button

---
 src/components/wifi/wifiEntry.rs | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/components/wifi/wifiEntry.rs b/src/components/wifi/wifiEntry.rs
index 91d1422..f827ec2 100644
--- a/src/components/wifi/wifiEntry.rs
+++ b/src/components/wifi/wifiEntry.rs
@@ -177,6 +177,7 @@ pub fn click_new_network(entry: Arc<WifiEntry>) {
 
     let result = Arc::new(AtomicBool::new(false));
     let result_ref = result.clone();
+    let result_ref_button = result.clone();
     let entryImp = entry.imp();
     let popupImp = entryImp.resetWifiPopup.imp();
     popupImp
@@ -190,8 +191,13 @@ pub fn click_new_network(entry: Arc<WifiEntry>) {
         }));
     popupImp
         .resetPopupButton
-        .connect_clicked(clone!(@weak popupImp => move |_| {
-            popupImp.resetPopupEntry.activate();
+        .connect_clicked(clone!(@weak entry as origEntry,@weak entryImp, @weak popupImp => move |_| {
+            let entry = entryImp.resetWifiPopup.imp().resetPopupEntry.text().to_string();
+            result_ref_button.store(
+                connect_new_network(origEntry, entryImp.accessPoint.clone().take(), entry),
+                std::sync::atomic::Ordering::SeqCst,
+            );
+            entryImp.resetWifiPopup.popdown();
         }));
     entryImp.resetWifiPopup.popup();
     println!(

From 9cad376a400cfe8ebf909efa408b1f9ceacb3581 Mon Sep 17 00:00:00 2001
From: Fabio Lenherr / DashieTM <fabio.lenherr@gmail.com>
Date: Sun, 12 Nov 2023 03:41:29 +0100
Subject: [PATCH 3/4] feat: Add saved WifiList

---
 src/components/base/popupImpl.rs            |  8 +-
 src/components/wifi/mod.rs                  |  4 +-
 src/components/wifi/savedWifiEntry.rs       | 46 ++++++++++
 src/components/wifi/savedWifiEntryImpl.rs   | 52 +++++++++++
 src/components/wifi/wifiBox.rs              | 79 ++++++++++++++---
 src/components/wifi/wifiBoxImpl.rs          |  3 +
 src/components/wifi/wifiEntry.rs            | 98 +++++++++++----------
 src/components/window/handleSidebarClick.rs | 38 ++++----
 src/resources/resetPopup.ui                 | 39 +++++---
 src/resources/resetSavedWifiEntry.ui        | 23 +++++
 src/resources/resetUI.cmb                   | 75 ++++++++++------
 src/resources/resetWiFi.ui                  | 32 +++++--
 src/resources/resources.gresource.xml       |  1 +
 13 files changed, 372 insertions(+), 126 deletions(-)
 create mode 100644 src/components/wifi/savedWifiEntry.rs
 create mode 100644 src/components/wifi/savedWifiEntryImpl.rs
 create mode 100644 src/resources/resetSavedWifiEntry.ui

diff --git a/src/components/base/popupImpl.rs b/src/components/base/popupImpl.rs
index 19534ba..ecf032b 100644
--- a/src/components/base/popupImpl.rs
+++ b/src/components/base/popupImpl.rs
@@ -9,7 +9,8 @@ use gtk::gdk_pixbuf::subclass::prelude::{
 use gtk::prelude::PopupExt;
 use gtk::subclass::prelude::*;
 use gtk::{
-    gdk, glib, Button, CompositeTemplate, Entry, EntryBuffer, PasswordEntry, PasswordEntryBuffer, Popover,
+    gdk, glib, Button, CompositeTemplate, Entry, EntryBuffer, Label, PasswordEntry,
+    PasswordEntryBuffer, Popover,
 };
 
 use super::popup;
@@ -18,6 +19,8 @@ use super::popup;
 #[derive(Default, CompositeTemplate)]
 #[template(resource = "/org/Xetibo/ReSet/resetPopup.ui")]
 pub struct Popup {
+    #[template_child]
+    pub resetPopupLabel: TemplateChild<Label>,
     #[template_child]
     pub resetPopupEntry: TemplateChild<PasswordEntry>,
     #[template_child]
@@ -25,6 +28,9 @@ pub struct Popup {
     pub resetPopupText: Arc<RefCell<PasswordEntryBuffer>>,
 }
 
+unsafe impl Send for Popup {}
+unsafe impl Sync for Popup {}
+
 #[glib::object_subclass]
 impl ObjectSubclass for Popup {
     const NAME: &'static str = "resetPopup";
diff --git a/src/components/wifi/mod.rs b/src/components/wifi/mod.rs
index 7a65bcb..f740b0b 100644
--- a/src/components/wifi/mod.rs
+++ b/src/components/wifi/mod.rs
@@ -1,5 +1,7 @@
 #![allow(non_snake_case)]
+pub mod savedWifiEntry;
 pub mod wifiBox;
 pub mod wifiBoxImpl;
 pub mod wifiEntry;
-pub mod wifiEntryImpl;
\ No newline at end of file
+pub mod wifiEntryImpl;
+pub mod savedWifiEntryImpl;
diff --git a/src/components/wifi/savedWifiEntry.rs b/src/components/wifi/savedWifiEntry.rs
new file mode 100644
index 0000000..9983778
--- /dev/null
+++ b/src/components/wifi/savedWifiEntry.rs
@@ -0,0 +1,46 @@
+use std::sync::Arc;
+use std::time::Duration;
+
+use crate::components::wifi::savedWifiEntryImpl;
+use adw::glib;
+use adw::glib::Object;
+use adw::prelude::{ButtonExt, WidgetExt};
+use dbus::{Error, Path};
+use dbus::blocking::Connection;
+use glib::{clone, PropertySet};
+use glib::subclass::types::ObjectSubclassIsExt;
+
+glib::wrapper! {
+    pub struct SavedWifiEntry(ObjectSubclass<savedWifiEntryImpl::SavedWifiEntry>)
+        @extends gtk::Box, gtk::Widget,
+        @implements gtk::Accessible, gtk::Buildable, gtk::Actionable, gtk::ConstraintTarget;
+}
+
+impl SavedWifiEntry {
+    pub fn new(name: &String, path: Path<'static>) -> Self {
+        let entry: SavedWifiEntry = Object::builder().build();
+        let entryImp = entry.imp();
+        // TODO handle edit
+        entryImp.resetSavedWifiLabel.set_text(name);
+        entryImp.resetConnectionPath.set(path);
+        entryImp.resetDeleteSavedWifiButton.connect_clicked(clone!(@weak entry as entry => move |_| {
+        let conn = Connection::new_session().unwrap();
+        let proxy = conn.with_proxy(
+            "org.xetibo.ReSet",
+            "/org/xetibo/ReSet",
+            Duration::from_millis(1000),
+        );
+        let res: Result<(bool,), Error> = proxy.method_call("org.xetibo.ReSet", "DeleteConnection", (entry.imp().resetConnectionPath.take(),));
+        if res.is_err() || res.unwrap() == (false,) { 
+            // TODO handle error -> inform user
+            println!("no worky");
+           return; 
+        }
+        println!("worked, should be ded");
+        let parent = entry.parent().unwrap();
+        parent.set_visible(false);
+        parent.unparent();
+        }));
+        entry
+    }
+}
diff --git a/src/components/wifi/savedWifiEntryImpl.rs b/src/components/wifi/savedWifiEntryImpl.rs
new file mode 100644
index 0000000..45b9898
--- /dev/null
+++ b/src/components/wifi/savedWifiEntryImpl.rs
@@ -0,0 +1,52 @@
+use std::cell::RefCell;
+
+use dbus::Path;
+use gtk::subclass::prelude::*;
+use gtk::{glib, Button, CompositeTemplate, Label};
+
+use super::savedWifiEntry;
+
+#[allow(non_snake_case)]
+#[derive(Default, CompositeTemplate)]
+#[template(resource = "/org/Xetibo/ReSet/resetSavedWifiEntry.ui")]
+pub struct SavedWifiEntry {
+    #[template_child]
+    pub resetDeleteSavedWifiButton: TemplateChild<Button>,
+    #[template_child]
+    pub resetEditSavedWifiButton: TemplateChild<Button>,
+    #[template_child]
+    pub resetSavedWifiLabel: TemplateChild<Label>,
+    pub resetConnectionPath: RefCell<Path<'static>>,
+}
+
+unsafe impl Send for SavedWifiEntry {}
+unsafe impl Sync for SavedWifiEntry {}
+
+#[glib::object_subclass]
+impl ObjectSubclass for SavedWifiEntry {
+    const NAME: &'static str = "resetSavedWifiEntry";
+    type Type = savedWifiEntry::SavedWifiEntry;
+    type ParentType = gtk::Box;
+
+    fn class_init(klass: &mut Self::Class) {
+        klass.bind_template();
+    }
+
+    fn instance_init(obj: &glib::subclass::InitializingObject<Self>) {
+        obj.init_template();
+    }
+}
+
+impl ObjectImpl for SavedWifiEntry {
+    fn constructed(&self) {
+        self.parent_constructed();
+    }
+}
+
+impl BoxImpl for SavedWifiEntry {}
+
+impl WidgetImpl for SavedWifiEntry {}
+
+impl WindowImpl for SavedWifiEntry {}
+
+impl ApplicationWindowImpl for SavedWifiEntry {}
diff --git a/src/components/wifi/wifiBox.rs b/src/components/wifi/wifiBox.rs
index c81e14d..b40ffed 100644
--- a/src/components/wifi/wifiBox.rs
+++ b/src/components/wifi/wifiBox.rs
@@ -6,12 +6,14 @@ use std::time::Duration;
 use crate::components::base::listEntry::ListEntry;
 use adw::glib;
 use adw::glib::Object;
+use adw::prelude::{BoxExt, ButtonExt, ListBoxRowExt};
 use adw::subclass::prelude::ObjectSubclassIsExt;
 use dbus::blocking::Connection;
 use dbus::Error;
 use dbus::Path;
 use gtk::glib::{clone, Variant};
 use gtk::prelude::ActionableExt;
+use gtk::{Button, Label, Orientation};
 use ReSet_Lib::network::network::{AccessPoint, WifiStrength};
 use ReSet_Lib::signals::{
     AccessPointAdded, AccessPointRemoved, BluetoothDeviceAdded, BluetoothDeviceRemoved,
@@ -21,6 +23,8 @@ use ReSet_Lib::utils::Events;
 use crate::components::wifi::wifiBoxImpl;
 use crate::components::wifi::wifiEntry::WifiEntry;
 
+use super::savedWifiEntry::SavedWifiEntry;
+
 glib::wrapper! {
     pub struct WifiBox(ObjectSubclass<wifiBoxImpl::WifiBox>)
     @extends gtk::Box, gtk::Widget,
@@ -46,18 +50,18 @@ impl WifiBox {
             .set_action_target_value(Some(&Variant::from("saved")));
     }
 
-    pub fn donotdisturb() {
-        thread::spawn(|| {
-            let conn = Connection::new_session().unwrap();
-            let proxy = conn.with_proxy(
-                "org.freedesktop.Notifications",
-                "/org/freedesktop/Notifications",
-                Duration::from_millis(1000),
-            );
-            let _: Result<(), Error> =
-                proxy.method_call("org.freedesktop.Notifications", "DoNotDisturb", ());
-        });
-    }
+    // pub fn donotdisturb() {
+    //     thread::spawn(|| {
+    //         let conn = Connection::new_session().unwrap();
+    //         let proxy = conn.with_proxy(
+    //             "org.freedesktop.Notifications",
+    //             "/org/freedesktop/Notifications",
+    //             Duration::from_millis(1000),
+    //         );
+    //         let _: Result<(), Error> =
+    //             proxy.method_call("org.freedesktop.Notifications", "DoNotDisturb", ());
+    //     });
+    // }
 }
 
 pub fn scanForWifi(wifiBox: Arc<WifiBox>) {
@@ -65,7 +69,7 @@ pub fn scanForWifi(wifiBox: Arc<WifiBox>) {
     let wifiEntries = wifiBox.imp().wifiEntries.clone();
 
     glib::spawn_future_local(async move {
-        let accessPoints = wat().await;
+        let accessPoints = get_access_points().await;
         let wifiEntries = wifiEntries.clone();
         {
             let mut wifiEntries = wifiEntries.lock().unwrap();
@@ -110,7 +114,36 @@ pub fn scanForWifi(wifiBox: Arc<WifiBox>) {
     });
 }
 
-pub async fn wat() -> Vec<AccessPoint> {
+pub fn show_stored_connections(wifiBox: Arc<WifiBox>) {
+    let wifibox_ref = wifiBox.clone();
+    let wifiEntries = wifiBox.imp().savedWifiEntries.clone();
+
+    glib::spawn_future_local(async move {
+        let connections = get_stored_connections().await;
+        let wifiEntries = wifiEntries.clone();
+        {
+            let mut wifiEntries = wifiEntries.lock().unwrap();
+            for connection in connections {
+                // TODO include button for settings
+                let name = &String::from_utf8(connection.1).unwrap_or_else(|_| String::from(""));
+                let entry = ListEntry::new(&SavedWifiEntry::new(name, connection.0));
+                entry.set_activatable(false);
+                wifiEntries.push(entry);
+            }
+        }
+        glib::MainContext::default().spawn_local(async move {
+            glib::idle_add_once(move || {
+                let wifiEntries = wifiEntries.lock().unwrap();
+                let selfImp = wifibox_ref.imp();
+                for wifiEntry in wifiEntries.iter() {
+                    selfImp.resetStoredWifiList.append(wifiEntry);
+                }
+            });
+        });
+    });
+}
+
+pub async fn get_access_points() -> Vec<AccessPoint> {
     let conn = Connection::new_session().unwrap();
     let proxy = conn.with_proxy(
         "org.xetibo.ReSet",
@@ -125,3 +158,21 @@ pub async fn wat() -> Vec<AccessPoint> {
     let (accessPoints,) = res.unwrap();
     accessPoints
 }
+
+pub async fn get_stored_connections() -> Vec<(Path<'static>, Vec<u8>)> {
+    let conn = Connection::new_session().unwrap();
+    let proxy = conn.with_proxy(
+        "org.xetibo.ReSet",
+        "/org/xetibo/ReSet",
+        Duration::from_millis(1000),
+    );
+    let res: Result<(Vec<(Path<'static>, Vec<u8>)>,), Error> =
+        proxy.method_call("org.xetibo.ReSet", "ListStoredConnections", ());
+    if res.is_err() {
+        println!("we got error...");
+        return Vec::new();
+    }
+    let (connections,) = res.unwrap();
+    dbg!(connections.clone());
+    connections
+}
diff --git a/src/components/wifi/wifiBoxImpl.rs b/src/components/wifi/wifiBoxImpl.rs
index cb8cca6..ebb1d67 100644
--- a/src/components/wifi/wifiBoxImpl.rs
+++ b/src/components/wifi/wifiBoxImpl.rs
@@ -26,7 +26,10 @@ pub struct WifiBox {
     pub resetWifiList: TemplateChild<ListBox>,
     #[template_child]
     pub resetWifiAdvanced: TemplateChild<Button>,
+    #[template_child]
+    pub resetStoredWifiList: TemplateChild<ListBox>,
     pub wifiEntries: Arc<Mutex<Vec<ListEntry>>>,
+    pub savedWifiEntries: Arc<Mutex<Vec<ListEntry>>>,
 }
 
 unsafe impl Send for WifiBox {}
diff --git a/src/components/wifi/wifiEntry.rs b/src/components/wifi/wifiEntry.rs
index f827ec2..48daa74 100644
--- a/src/components/wifi/wifiEntry.rs
+++ b/src/components/wifi/wifiEntry.rs
@@ -141,38 +141,54 @@ pub fn click_stored_network(entry: Arc<WifiEntry>) {
 
 pub fn click_new_network(entry: Arc<WifiEntry>) {
     let connect_new_network =
-        |entry: Arc<WifiEntry>, access_point: AccessPoint, password: String| -> bool {
-            let alert = AlertDialog::builder().build();
-            let root = &entry.root().unwrap();
-            let root = root.downcast_ref::<gtk::Window>();
-            if root.is_none() {
-                println!("ERROR BRO");
-                return false;
-            }
-            let root = root.unwrap();
-            let conn = Connection::new_session().unwrap();
-            let proxy = conn.with_proxy(
-                "org.xetibo.ReSet",
-                "/org/xetibo/ReSet",
-                Duration::from_millis(10000),
-            );
+        |result: Arc<AtomicBool>, entry: Arc<WifiEntry>, access_point: AccessPoint, password: String| {
+            let entry_ref = entry.clone();
+            let popup = entry.imp().resetWifiPopup.imp();
+            popup.resetPopupLabel.set_text("Connecting...");
+            popup.resetPopupLabel.set_visible(true);
+            popup.resetPopupEntry.set_sensitive(false);
+            popup.resetPopupButton.set_sensitive(false);
+
+            glib::spawn_future_local(async move {
+                let conn = Connection::new_session().unwrap();
+                let proxy = conn.with_proxy(
+                    "org.xetibo.ReSet",
+                    "/org/xetibo/ReSet",
+                    Duration::from_millis(10000),
+                );
+                let res: Result<(bool,), Error> = proxy.method_call(
+                    "org.xetibo.ReSet",
+                    "ConnectToNewAccessPoint",
+                    (access_point, password),
+                );
+                glib::MainContext::default().spawn_local(async move {
+                    glib::idle_add_once(move || {
+                        if res.is_err() {
+                            entry_ref
+                                .imp()
+                                .resetWifiPopup
+                                .imp()
+                                .resetPopupLabel
+                                .set_text("Could not connect to dbus.");
+                            result.store(false, std::sync::atomic::Ordering::SeqCst);
+                            return;
+                        }
+                        if res.unwrap() == (false,) {
+                            entry_ref
+                                .imp()
+                                .resetWifiPopup
+                                .imp()
+                                .resetPopupLabel
+                                .set_text("Could not connect to access point.");
+                            result.store(false, std::sync::atomic::Ordering::SeqCst);
+                            return;
+                        }
+                        entry_ref.imp().resetWifiPopup.popdown();
+                        result.store(true, std::sync::atomic::Ordering::SeqCst);
+                    });
+                });
+            });
             // TODO crate spinner animation and block UI
-            let res: Result<(bool,), Error> = proxy.method_call(
-                "org.xetibo.ReSet",
-                "ConnectToNewAccessPoint",
-                (access_point, password),
-            );
-            if res.is_err() {
-                alert.set_message("Could not connect to dbus.");
-                alert.show(Some(root));
-                return false;
-            }
-            if res.unwrap() == (false,) {
-                alert.set_message("Could not connect to access point.");
-                alert.show(Some(root));
-                return false;
-            }
-            true
         };
 
     let result = Arc::new(AtomicBool::new(false));
@@ -183,22 +199,14 @@ pub fn click_new_network(entry: Arc<WifiEntry>) {
     popupImp
         .resetPopupEntry
         .connect_activate(clone!(@weak entry as origEntry, @weak entryImp => move |entry| {
-            result_ref.store(
-                connect_new_network(origEntry, entryImp.accessPoint.clone().take(), entry.text().to_string()),
-                std::sync::atomic::Ordering::SeqCst,
-            );
-            entryImp.resetWifiPopup.popdown();
+                connect_new_network(result_ref.clone(), origEntry, entryImp.accessPoint.clone().take(), entry.text().to_string());
         }));
-    popupImp
-        .resetPopupButton
-        .connect_clicked(clone!(@weak entry as origEntry,@weak entryImp, @weak popupImp => move |_| {
+    popupImp.resetPopupButton.connect_clicked(
+        clone!(@weak entry as origEntry,@weak entryImp, @weak popupImp => move |_| {
             let entry = entryImp.resetWifiPopup.imp().resetPopupEntry.text().to_string();
-            result_ref_button.store(
-                connect_new_network(origEntry, entryImp.accessPoint.clone().take(), entry),
-                std::sync::atomic::Ordering::SeqCst,
-            );
-            entryImp.resetWifiPopup.popdown();
-        }));
+                connect_new_network(result_ref_button.clone(), origEntry, entryImp.accessPoint.clone().take(), entry);
+        }),
+    );
     entryImp.resetWifiPopup.popup();
     println!(
         "result is {}",
diff --git a/src/components/window/handleSidebarClick.rs b/src/components/window/handleSidebarClick.rs
index b59ea13..d1ee541 100644
--- a/src/components/window/handleSidebarClick.rs
+++ b/src/components/window/handleSidebarClick.rs
@@ -1,13 +1,17 @@
 use std::sync::Arc;
 
-use gtk::{FlowBox, Label};
 use crate::components::audio::audioBox::AudioBox;
-use crate::components::bluetooth::bluetoothBox::BluetoothBox;
 use crate::components::base::settingBox::SettingBox;
-use crate::components::wifi::wifiBox::{WifiBox, scanForWifi};
+use crate::components::bluetooth::bluetoothBox::BluetoothBox;
+use crate::components::wifi::wifiBox::{scanForWifi, show_stored_connections, WifiBox};
+use adw::prelude::ButtonExt;
+use glib::clone;
+use glib::subclass::types::ObjectSubclassIsExt;
+use gtk::{FlowBox, Label};
 
-pub const HANDLE_CONNECTIVITY_CLICK: fn(FlowBox) =  |resetMain: FlowBox|   {
+pub const HANDLE_CONNECTIVITY_CLICK: fn(FlowBox) = |resetMain: FlowBox| {
     let wifiBox = Arc::new(WifiBox::new());
+    show_stored_connections(wifiBox.clone());
     scanForWifi(wifiBox.clone());
     let wifiBox = SettingBox::new(&*wifiBox);
     let bluetoothBox = SettingBox::new(&BluetoothBox::new());
@@ -17,74 +21,76 @@ pub const HANDLE_CONNECTIVITY_CLICK: fn(FlowBox) =  |resetMain: FlowBox|   {
     resetMain.set_max_children_per_line(2);
 };
 
-pub const HANDLE_WIFI_CLICK: fn(FlowBox) =  |resetMain: FlowBox|   {
-    let wifiBox = SettingBox::new(&WifiBox::new());
+pub const HANDLE_WIFI_CLICK: fn(FlowBox) = |resetMain: FlowBox| {
+    let wifiBox = Arc::new(WifiBox::new());
+    scanForWifi(wifiBox.clone());
+    let wifiBox = SettingBox::new(&*wifiBox);
     resetMain.remove_all();
     resetMain.insert(&wifiBox, -1);
     resetMain.set_max_children_per_line(1);
 };
 
-pub const HANDLE_BLUETOOTH_CLICK: fn(FlowBox) =  |resetMain: FlowBox|   {
+pub const HANDLE_BLUETOOTH_CLICK: fn(FlowBox) = |resetMain: FlowBox| {
     let bluetoothBox = SettingBox::new(&BluetoothBox::new());
     resetMain.remove_all();
     resetMain.insert(&bluetoothBox, -1);
     resetMain.set_max_children_per_line(1);
 };
 
-pub const HANDLE_VPN_CLICK: fn(FlowBox) =  |resetMain: FlowBox|   {
+pub const HANDLE_VPN_CLICK: fn(FlowBox) = |resetMain: FlowBox| {
     let label = Label::new(Some("not implemented yet"));
     resetMain.remove_all();
     resetMain.insert(&label, -1);
     resetMain.set_max_children_per_line(1);
 };
 
-pub const HANDLE_AUDIO_CLICK: fn(FlowBox) =  |resetMain: FlowBox|   {
+pub const HANDLE_AUDIO_CLICK: fn(FlowBox) = |resetMain: FlowBox| {
     let audioBox = AudioBox::new();
     resetMain.remove_all();
     resetMain.insert(&audioBox, -1);
     resetMain.set_max_children_per_line(1);
 };
 
-pub const HANDLE_VOLUME_CLICK: fn(FlowBox) =  |resetMain: FlowBox|   {
+pub const HANDLE_VOLUME_CLICK: fn(FlowBox) = |resetMain: FlowBox| {
     let audioBox = AudioBox::new();
     resetMain.remove_all();
     resetMain.insert(&audioBox, -1);
     resetMain.set_max_children_per_line(1);
 };
 
-pub const HANDLE_MICROPHONE_CLICK: fn(FlowBox) =  |resetMain: FlowBox|   {
+pub const HANDLE_MICROPHONE_CLICK: fn(FlowBox) = |resetMain: FlowBox| {
     let label = Label::new(Some("not implemented yet"));
     resetMain.remove_all();
     resetMain.insert(&label, -1);
     resetMain.set_max_children_per_line(1);
 };
 
-pub const HANDLE_HOME: fn(FlowBox) =  |resetMain: FlowBox|   {
+pub const HANDLE_HOME: fn(FlowBox) = |resetMain: FlowBox| {
     resetMain.remove_all();
 };
 
-pub const HANDLE_PERIPHERALS_CLICK: fn(FlowBox) =  |resetMain: FlowBox|   {
+pub const HANDLE_PERIPHERALS_CLICK: fn(FlowBox) = |resetMain: FlowBox| {
     let label = Label::new(Some("not implemented yet"));
     resetMain.remove_all();
     resetMain.insert(&label, -1);
     resetMain.set_max_children_per_line(1);
 };
 
-pub const HANDLE_MONITOR_CLICK: fn(FlowBox) =  |resetMain: FlowBox|   {
+pub const HANDLE_MONITOR_CLICK: fn(FlowBox) = |resetMain: FlowBox| {
     let label = Label::new(Some("not implemented yet"));
     resetMain.remove_all();
     resetMain.insert(&label, -1);
     resetMain.set_max_children_per_line(1);
 };
 
-pub const HANDLE_MOUSE_CLICK: fn(FlowBox) =  |resetMain: FlowBox|   {
+pub const HANDLE_MOUSE_CLICK: fn(FlowBox) = |resetMain: FlowBox| {
     let label = Label::new(Some("not implemented yet"));
     resetMain.remove_all();
     resetMain.insert(&label, -1);
     resetMain.set_max_children_per_line(1);
 };
 
-pub const HANDLE_KEYBOARD_CLICK: fn(FlowBox) =  |resetMain: FlowBox|   {
+pub const HANDLE_KEYBOARD_CLICK: fn(FlowBox) = |resetMain: FlowBox| {
     let label = Label::new(Some("not implemented yet"));
     resetMain.remove_all();
     resetMain.insert(&label, -1);
diff --git a/src/resources/resetPopup.ui b/src/resources/resetPopup.ui
index f9461dd..ea2b49c 100644
--- a/src/resources/resetPopup.ui
+++ b/src/resources/resetPopup.ui
@@ -5,24 +5,35 @@
   <template class="resetPopup" parent="GtkPopover">
     <child>
       <object class="GtkBox">
+        <property name="homogeneous">True</property>
+        <property name="orientation">vertical</property>
         <child>
-          <object class="GtkPasswordEntry" id="resetPopupEntry">
-            <property name="activates-default">True</property>
-            <property name="margin-bottom">5</property>
-            <property name="margin-end">5</property>
-            <property name="margin-start">5</property>
-            <property name="margin-top">5</property>
-            <property name="placeholder-text">Wifi Password</property>
-            <property name="show-peek-icon">True</property>
+          <object class="GtkLabel" id="resetPopupLabel">
+            <property name="visible">False</property>
           </object>
         </child>
         <child>
-          <object class="GtkButton" id="resetPopupButton">
-            <property name="label">connect</property>
-            <property name="margin-bottom">5</property>
-            <property name="margin-end">5</property>
-            <property name="margin-start">5</property>
-            <property name="margin-top">5</property>
+          <object class="GtkBox">
+            <child>
+              <object class="GtkPasswordEntry" id="resetPopupEntry">
+                <property name="activates-default">True</property>
+                <property name="margin-bottom">5</property>
+                <property name="margin-end">5</property>
+                <property name="margin-start">5</property>
+                <property name="margin-top">5</property>
+                <property name="placeholder-text">Wifi Password</property>
+                <property name="show-peek-icon">True</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkButton" id="resetPopupButton">
+                <property name="label">connect</property>
+                <property name="margin-bottom">5</property>
+                <property name="margin-end">5</property>
+                <property name="margin-start">5</property>
+                <property name="margin-top">5</property>
+              </object>
+            </child>
           </object>
         </child>
       </object>
diff --git a/src/resources/resetSavedWifiEntry.ui b/src/resources/resetSavedWifiEntry.ui
new file mode 100644
index 0000000..5827447
--- /dev/null
+++ b/src/resources/resetSavedWifiEntry.ui
@@ -0,0 +1,23 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Created with Cambalache 0.17.0 -->
+<interface>
+  <requires lib="gtk" version="4.12"/>
+  <template class="resetSavedWifiEntry" parent="GtkBox">
+    <property name="spacing">5</property>
+    <child>
+      <object class="GtkButton" id="resetDeleteSavedWifiButton">
+        <property name="has-frame">False</property>
+        <property name="icon-name">user-trash-symbolic</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkButton" id="resetEditSavedWifiButton">
+        <property name="has-frame">False</property>
+        <property name="icon-name">document-edit-symbolic</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkLabel" id="resetSavedWifiLabel"/>
+    </child>
+  </template>
+</interface>
diff --git a/src/resources/resetUI.cmb b/src/resources/resetUI.cmb
index e7a3469..ef87236 100644
--- a/src/resources/resetUI.cmb
+++ b/src/resources/resetUI.cmb
@@ -14,7 +14,8 @@
 	(13,1,None,"resetMicSourceEntry.ui",None,None,None,None,None,None,None),
 	(14,1,None,"resetSettingBox.ui",None,None,None,None,None,None,None),
 	(15,1,None,"resetListBoxRow.ui",None,None,None,None,None,None,None),
-	(16,6,None,"resetPopup.ui",None,None,None,None,None,None,None)
+	(16,6,None,"resetPopup.ui",None,None,None,None,None,None,None),
+	(17,1,None,"resetSavedWifiEntry.ui",None,None,None,None,None,None,None)
   </ui>
   <object>
 	(3,1,"AdwApplicationWindow","resetUI",None,None,None,None,-1,"  &lt;child&gt;\n    &lt;object id=\"resetSidebarBreakpoint\" class=\"AdwBreakpoint\"&gt;\n    &lt;/object&gt;\n  &lt;/child&gt;"),
@@ -65,8 +66,6 @@
 	(4,108,"GtkLabel",None,107,None,None,None,-1,None),
 	(4,109,"GtkButton",None,107,None,None,None,1,None),
 	(4,110,"GtkBox",None,105,None,None,None,1,None),
-	(4,111,"GtkLabel",None,110,None,None,None,None,None),
-	(4,112,"GtkButton",None,110,None,None,None,1,None),
 	(4,113,"resetListBoxRow","resetWifiSwitchRow",89,None,None,None,None,None),
 	(4,114,"GtkBox",None,113,None,None,None,None,None),
 	(4,115,"GtkLabel",None,114,None,None,None,None,None),
@@ -75,6 +74,10 @@
 	(4,121,"GtkBox",None,117,None,None,None,1,None),
 	(4,122,"GtkLabel",None,121,None,None,None,None,None),
 	(4,123,"GtkImage",None,121,None,None,None,1,None),
+	(4,124,"GtkListBox","resetStoredWifiList",110,None,None,None,1,None),
+	(4,125,"GtkBox",None,110,None,None,None,None,None),
+	(4,126,"GtkLabel",None,125,None,None,None,None,None),
+	(4,127,"GtkButton",None,125,None,None,None,1,None),
 	(5,2,"GtkBox","resetWifiEntry",None,None,None,None,None,None),
 	(5,3,"GtkBox",None,2,None,None,None,None,None),
 	(5,4,"GtkImage","resetWifiStrength",3,None,None,None,None,None),
@@ -159,8 +162,14 @@
 	(15,1,"GtkListBoxRow","resetListBoxRow",None,None,None,None,None,None),
 	(16,6,"GtkPopover","resetPopup",None,None,None,None,-1,None),
 	(16,7,"GtkBox",None,6,None,None,None,None,None),
-	(16,8,"GtkPasswordEntry","resetPopupEntry",7,None,None,None,None,None),
-	(16,9,"GtkButton","resetPopupButton",7,None,None,None,1,None)
+	(16,10,"GtkBox",None,7,None,None,None,1,None),
+	(16,11,"GtkPasswordEntry","resetPopupEntry",10,None,None,None,None,None),
+	(16,12,"GtkButton","resetPopupButton",10,None,None,None,1,None),
+	(16,13,"GtkLabel","resetPopupLabel",7,None,None,None,None,None),
+	(17,1,"GtkBox","resetSavedWifiEntry",None,None,None,None,-1,None),
+	(17,2,"GtkLabel","resetSavedWifiLabel",1,None,None,None,2,None),
+	(17,3,"GtkButton","resetEditSavedWifiButton",1,None,None,None,1,None),
+	(17,4,"GtkButton","resetDeleteSavedWifiButton",1,None,None,None,None,None)
   </object>
   <object_property>
 	(3,1,"GtkWindow","default-height","500",None,None,None,None,None,None,None,None,None),
@@ -259,8 +268,6 @@
 	(4,102,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
 	(4,102,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
 	(4,102,"GtkWidget","valign","start",None,None,None,None,None,None,None,None,None),
-	(4,103,"GtkActionable","action-name","navigation.push",None,None,None,None,None,None,None,None,None),
-	(4,103,"GtkActionable","action-target","'advanced'",None,None,None,None,None,None,None,None,None),
 	(4,103,"GtkButton","label","Advanced",None,None,None,None,None,None,None,None,None),
 	(4,103,"GtkWidget","halign","start",None,None,None,None,None,None,None,None,None),
 	(4,103,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
@@ -274,13 +281,8 @@
 	(4,109,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
 	(4,109,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
 	(4,109,"GtkWidget","valign","start",None,None,None,None,None,None,None,None,None),
-	(4,111,"GtkLabel","label","saved networks",None,None,None,None,None,None,None,None,None),
-	(4,112,"GtkActionable","action-name","navigation.pop",None,None,None,None,None,None,None,None,None),
-	(4,112,"GtkButton","label","back",None,None,None,None,None,None,None,None,None),
-	(4,112,"GtkWidget","halign","start",None,None,None,None,None,None,None,None,None),
-	(4,112,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
-	(4,112,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
-	(4,112,"GtkWidget","valign","start",None,None,None,None,None,None,None,None,None),
+	(4,110,"GtkBox","homogeneous","True",None,None,None,None,None,None,None,None,None),
+	(4,110,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
 	(4,114,"GtkWidget","height-request","40",None,None,None,None,None,None,None,None,None),
 	(4,115,"GtkLabel","label","WiFi",None,None,None,None,None,None,None,None,None),
 	(4,115,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
@@ -296,6 +298,19 @@
 	(4,123,"GtkWidget","halign","end",None,None,None,None,None,None,None,None,None),
 	(4,123,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
 	(4,123,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
+	(4,124,"GtkListBox","show-separators","True",None,None,None,None,None,None,None,None,None),
+	(4,124,"GtkWidget","css-classes","boxed-list",None,None,None,None,None,None,None,None,None),
+	(4,124,"GtkWidget","margin-bottom","10",None,None,None,None,None,None,None,None,None),
+	(4,124,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
+	(4,124,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
+	(4,124,"GtkWidget","valign","start",None,None,None,None,None,None,None,None,None),
+	(4,126,"GtkLabel","label","saved networks",None,None,None,None,None,None,None,None,None),
+	(4,127,"GtkActionable","action-name","navigation.pop",None,None,None,None,None,None,None,None,None),
+	(4,127,"GtkButton","label","back",None,None,None,None,None,None,None,None,None),
+	(4,127,"GtkWidget","halign","start",None,None,None,None,None,None,None,None,None),
+	(4,127,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
+	(4,127,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
+	(4,127,"GtkWidget","valign","start",None,None,None,None,None,None,None,None,None),
 	(5,2,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
 	(5,3,"GtkWidget","width-request","35",None,None,None,None,None,None,None,None,None),
 	(5,4,"GtkImage","icon-name","network-wireless-signal-excellent-symbolic",None,None,None,None,None,None,None,None,None),
@@ -478,18 +493,26 @@
 	(14,1,"GtkWidget","width-request","500",None,None,None,None,None,None,None,None,None),
 	(15,1,"GtkListBoxRow","selectable","False",None,None,None,None,None,None,None,None,None),
 	(15,1,"GtkWidget","height-request","40",None,None,None,None,None,None,None,None,None),
-	(16,8,"GtkPasswordEntry","activates-default","True",None,None,None,None,None,None,None,None,None),
-	(16,8,"GtkPasswordEntry","placeholder-text","Wifi Password",None,None,None,None,None,None,None,None,None),
-	(16,8,"GtkPasswordEntry","show-peek-icon","True",None,None,None,None,None,None,None,None,None),
-	(16,8,"GtkWidget","margin-bottom","5",None,None,None,None,None,None,None,None,None),
-	(16,8,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
-	(16,8,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
-	(16,8,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
-	(16,9,"GtkButton","label","connect",None,None,None,None,None,None,None,None,None),
-	(16,9,"GtkWidget","margin-bottom","5",None,None,None,None,None,None,None,None,None),
-	(16,9,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
-	(16,9,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
-	(16,9,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None)
+	(16,7,"GtkBox","homogeneous","True",None,None,None,None,None,None,None,None,None),
+	(16,7,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
+	(16,11,"GtkPasswordEntry","activates-default","True",None,None,None,None,None,None,None,None,None),
+	(16,11,"GtkPasswordEntry","placeholder-text","Wifi Password",None,None,None,None,None,None,None,None,None),
+	(16,11,"GtkPasswordEntry","show-peek-icon","True",None,None,None,None,None,None,None,None,None),
+	(16,11,"GtkWidget","margin-bottom","5",None,None,None,None,None,None,None,None,None),
+	(16,11,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
+	(16,11,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
+	(16,11,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
+	(16,12,"GtkButton","label","connect",None,None,None,None,None,None,None,None,None),
+	(16,12,"GtkWidget","margin-bottom","5",None,None,None,None,None,None,None,None,None),
+	(16,12,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
+	(16,12,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
+	(16,12,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
+	(16,13,"GtkWidget","visible","False",None,None,None,None,None,None,None,None,None),
+	(17,1,"GtkBox","spacing","5",None,None,None,None,None,None,None,None,None),
+	(17,3,"GtkButton","has-frame","False",None,None,None,None,None,None,None,None,None),
+	(17,3,"GtkButton","icon-name","document-edit-symbolic",None,None,None,None,None,None,None,None,None),
+	(17,4,"GtkButton","has-frame","False",None,None,None,None,None,None,None,None,None),
+	(17,4,"GtkButton","icon-name","user-trash-symbolic",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 b7ff4e9..08e68b2 100644
--- a/src/resources/resetWiFi.ui
+++ b/src/resources/resetWiFi.ui
@@ -107,8 +107,6 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="resetWifiAdvanced">
-                    <property name="action-name">navigation.push</property>
-                    <property name="action-target">'advanced'</property>
                     <property name="halign">start</property>
                     <property name="label">Advanced</property>
                     <property name="margin-start">5</property>
@@ -149,18 +147,34 @@
             <property name="tag">saved</property>
             <child>
               <object class="GtkBox">
+                <property name="homogeneous">True</property>
+                <property name="orientation">vertical</property>
                 <child>
-                  <object class="GtkLabel">
-                    <property name="label">saved networks</property>
+                  <object class="GtkBox">
+                    <child>
+                      <object class="GtkLabel">
+                        <property name="label">saved networks</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkButton">
+                        <property name="action-name">navigation.pop</property>
+                        <property name="halign">start</property>
+                        <property name="label">back</property>
+                        <property name="margin-start">5</property>
+                        <property name="margin-top">5</property>
+                        <property name="valign">start</property>
+                      </object>
+                    </child>
                   </object>
                 </child>
                 <child>
-                  <object class="GtkButton">
-                    <property name="action-name">navigation.pop</property>
-                    <property name="halign">start</property>
-                    <property name="label">back</property>
+                  <object class="GtkListBox" id="resetStoredWifiList">
+                    <property name="css-classes">boxed-list</property>
+                    <property name="margin-bottom">10</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>
                 </child>
diff --git a/src/resources/resources.gresource.xml b/src/resources/resources.gresource.xml
index f86c757..9cb6eba 100644
--- a/src/resources/resources.gresource.xml
+++ b/src/resources/resources.gresource.xml
@@ -7,6 +7,7 @@
     <file compressed="true" preprocess="xml-stripblanks">resetListBoxRow.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">resetWiFi.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">resetWifiEntry.ui</file>
+    <file compressed="true" preprocess="xml-stripblanks">resetSavedWifiEntry.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">resetBluetooth.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">resetBluetoothEntry.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">resetAudio.ui</file>

From 59a6a9a14d7ecf173f84defdabda16616d4e83ba Mon Sep 17 00:00:00 2001
From: Fabio Lenherr / DashieTM <fabio.lenherr@gmail.com>
Date: Sun, 12 Nov 2023 12:42:06 +0100
Subject: [PATCH 4/4] chore: Update cmb file

---
 src/resources/resetAudio.ui        |  1 -
 src/resources/resetMainWindow.ui   | 30 +++++++++++++++++-------------
 src/resources/resetMicrophone.ui   |  1 -
 src/resources/resetSettingBox.ui   |  7 ++++++-
 src/resources/resetSidebarEntry.ui |  1 +
 src/resources/resetUI.cmb          | 27 ++++++++++++++++-----------
 6 files changed, 40 insertions(+), 27 deletions(-)

diff --git a/src/resources/resetAudio.ui b/src/resources/resetAudio.ui
index 9caf71a..c4286b5 100644
--- a/src/resources/resetAudio.ui
+++ b/src/resources/resetAudio.ui
@@ -4,7 +4,6 @@
   <requires lib="gtk" version="4.6"/>
   <template class="resetAudio" parent="GtkBox">
     <property name="halign">center</property>
-    <property name="margin-start">5</property>
     <property name="orientation">vertical</property>
     <property name="valign">start</property>
     <property name="width-request">400</property>
diff --git a/src/resources/resetMainWindow.ui b/src/resources/resetMainWindow.ui
index 0e51506..e7aae12 100644
--- a/src/resources/resetMainWindow.ui
+++ b/src/resources/resetMainWindow.ui
@@ -6,6 +6,8 @@
   <template class="resetUI" parent="AdwApplicationWindow">
     <property name="default-height">500</property>
     <property name="default-width">800</property>
+    <property name="height-request">200</property>
+    <property name="width-request">600</property>
     <child>
       <object class="GtkWindowHandle"/>
     </child>
@@ -13,19 +15,15 @@
       <object class="AdwOverlaySplitView" id="resetOverlaySplitView">
         <property name="content">
           <object class="GtkBox">
+            <property name="margin-end">5</property>
             <property name="margin-start">5</property>
+            <property name="margin-top">5</property>
             <property name="orientation">vertical</property>
             <child>
               <object class="GtkWindowHandle">
                 <child>
                   <object class="GtkBox">
                     <property name="valign">start</property>
-                    <child>
-                      <object class="GtkButton" id="resetSideBarToggle">
-                        <property name="icon-name">sidebar-show-symbolic</property>
-                        <property name="visible">False</property>
-                      </object>
-                    </child>
                     <child>
                       <object class="GtkButton" id="resetBack">
                         <property name="has-frame">False</property>
@@ -33,6 +31,12 @@
                         <property name="valign">start</property>
                       </object>
                     </child>
+                    <child>
+                      <object class="GtkButton" id="resetSideBarToggle">
+                        <property name="icon-name">sidebar-show-symbolic</property>
+                        <property name="visible">False</property>
+                      </object>
+                    </child>
                     <child>
                       <object class="GtkButton" id="resetForward">
                         <property name="has-frame">False</property>
@@ -89,9 +93,9 @@
                               <object class="GtkBox">
                                 <property name="orientation">vertical</property>
                                 <child>
-                                  <object class="GtkButton" id="resetPreferenceButton">
+                                  <object class="GtkButton" id="resetShortcutsButton">
                                     <property name="has-frame">False</property>
-                                    <property name="label">Preferences</property>
+                                    <property name="label">Shortcuts</property>
                                   </object>
                                 </child>
                                 <child>
@@ -101,9 +105,9 @@
                                   </object>
                                 </child>
                                 <child>
-                                  <object class="GtkButton" id="resetShortcutsButton">
+                                  <object class="GtkButton" id="resetPreferenceButton">
                                     <property name="has-frame">False</property>
-                                    <property name="label">Shortcuts</property>
+                                    <property name="label">Preferences</property>
                                   </object>
                                 </child>
                               </object>
@@ -151,13 +155,12 @@
             </child>
           </object>
         </property>
-        <property name="margin-end">5</property>
-        <property name="margin-start">5</property>
-        <property name="margin-top">5</property>
         <property name="max-sidebar-width">180.0</property>
         <property name="sidebar">
           <object class="GtkBox">
             <property name="margin-end">5</property>
+            <property name="margin-start">5</property>
+            <property name="margin-top">5</property>
             <property name="orientation">vertical</property>
             <child>
               <object class="GtkWindowHandle">
@@ -172,6 +175,7 @@
             </child>
             <child>
               <object class="GtkScrolledWindow">
+                <property name="margin-top">5</property>
                 <property name="propagate-natural-height">True</property>
                 <child>
                   <object class="GtkViewport">
diff --git a/src/resources/resetMicrophone.ui b/src/resources/resetMicrophone.ui
index cb862d2..1e5f6b4 100644
--- a/src/resources/resetMicrophone.ui
+++ b/src/resources/resetMicrophone.ui
@@ -4,7 +4,6 @@
   <requires lib="gtk" version="4.6"/>
   <template class="resetMicrophone" parent="GtkBox">
     <property name="halign">start</property>
-    <property name="margin-start">5</property>
     <property name="orientation">vertical</property>
     <property name="valign">start</property>
     <property name="width-request">400</property>
diff --git a/src/resources/resetSettingBox.ui b/src/resources/resetSettingBox.ui
index 1c51a92..0d9df5d 100644
--- a/src/resources/resetSettingBox.ui
+++ b/src/resources/resetSettingBox.ui
@@ -2,10 +2,15 @@
 <!-- Created with Cambalache 0.17.0 -->
 <interface>
   <requires lib="gtk" version="4.0"/>
-  <template class="resetSetting" parent="GtkBox">
+  <template class="resetSettingFrame" parent="GtkBox">
     <property name="halign">center</property>
     <property name="orientation">vertical</property>
     <property name="valign">start</property>
     <property name="width-request">500</property>
+    <child>
+      <object class="GtkLabel" id="resetSettingLabel">
+        <property name="css-classes">resetSettingLabel</property>
+      </object>
+    </child>
   </template>
 </interface>
diff --git a/src/resources/resetSidebarEntry.ui b/src/resources/resetSidebarEntry.ui
index 6c4cd41..9b39fe7 100644
--- a/src/resources/resetSidebarEntry.ui
+++ b/src/resources/resetSidebarEntry.ui
@@ -18,5 +18,6 @@
         </child>
       </object>
     </property>
+    <property name="css-classes">resetSidebarEntry</property>
   </template>
 </interface>
diff --git a/src/resources/resetUI.cmb b/src/resources/resetUI.cmb
index ef87236..ff656a1 100644
--- a/src/resources/resetUI.cmb
+++ b/src/resources/resetUI.cmb
@@ -27,16 +27,16 @@
 	(3,20,"GtkSearchEntry","resetSearchEntry",19,None,None,None,None,None),
 	(3,24,"GtkWindowHandle",None,3,None,None,None,None,None),
 	(3,25,"GtkBox",None,24,None,None,None,None,None),
-	(3,26,"GtkButton","resetSideBarToggle",25,None,None,None,None,None),
-	(3,27,"GtkButton","resetBack",25,None,None,None,1,None),
+	(3,26,"GtkButton","resetSideBarToggle",25,None,None,None,1,None),
+	(3,27,"GtkButton","resetBack",25,None,None,None,None,None),
 	(3,28,"GtkButton","resetForward",25,None,None,None,2,None),
 	(3,31,"GtkButton","resetClose",25,None,None,None,5,None),
 	(3,33,"GtkMenuButton",None,25,None,None,None,4,None),
 	(3,34,"GtkBox","resetPath",25,None,None,None,3,None),
 	(3,35,"GtkPopoverMenu","resetPopoverMenu",33,None,None,None,-1,None),
 	(3,36,"GtkBox",None,35,None,None,None,-1,None),
-	(3,38,"GtkButton","resetPreferenceButton",36,None,None,None,1,None),
-	(3,39,"GtkButton","resetAboutButton",36,None,None,None,2,None),
+	(3,38,"GtkButton","resetPreferenceButton",36,None,None,None,2,None),
+	(3,39,"GtkButton","resetAboutButton",36,None,None,None,1,None),
 	(3,40,"GtkScrolledWindow",None,18,None,None,None,1,None),
 	(3,41,"GtkViewport",None,40,None,None,None,None,None),
 	(3,42,"GtkListBox","resetSidebarList",41,None,None,None,None,None),
@@ -48,7 +48,7 @@
 	(3,48,"GtkButton",None,34,None,None,None,4,None),
 	(3,49,"GtkLabel",None,34,None,None,None,1,None),
 	(3,50,"GtkLabel",None,34,None,None,None,3,None),
-	(3,51,"GtkButton","resetShortcutsButton",36,None,None,None,2,None),
+	(3,51,"GtkButton","resetShortcutsButton",36,None,None,None,None,None),
 	(4,7,"GtkBox","resetWifi",None,None,None,None,None,None),
 	(4,70,"AdwNavigationView",None,7,None,None,None,-1,None),
 	(4,71,"AdwNavigationPage",None,70,None,None,None,-1,None),
@@ -158,7 +158,8 @@
 	(13,8,"GtkAdjustment",None,7,None,None,None,None,None),
 	(13,9,"GtkLabel","resetMicPercentage",5,None,None,None,2,None),
 	(13,10,"GtkProgressBar","resetMicMeter",1,None,None,None,2,None),
-	(14,1,"GtkBox","resetSetting",None,None,None,None,-1,None),
+	(14,1,"GtkBox","resetSettingFrame",None,None,None,None,-1,None),
+	(14,2,"GtkLabel","resetSettingLabel",1,None,None,None,-1,None),
 	(15,1,"GtkListBoxRow","resetListBoxRow",None,None,None,None,None,None),
 	(16,6,"GtkPopover","resetPopup",None,None,None,None,-1,None),
 	(16,7,"GtkBox",None,6,None,None,None,None,None),
@@ -172,18 +173,21 @@
 	(17,4,"GtkButton","resetDeleteSavedWifiButton",1,None,None,None,None,None)
   </object>
   <object_property>
+	(3,1,"GtkWidget","height-request","200",None,None,None,None,None,None,None,None,None),
+	(3,1,"GtkWidget","width-request","600",None,None,None,None,None,None,None,None,None),
 	(3,1,"GtkWindow","default-height","500",None,None,None,None,None,None,None,None,None),
 	(3,1,"GtkWindow","default-width","800",None,None,None,None,None,None,None,None,None),
 	(3,2,"AdwOverlaySplitView","content",None,None,None,None,None,3,None,None,None,None),
 	(3,2,"AdwOverlaySplitView","max-sidebar-width","180.0",None,None,None,None,None,None,None,None,None),
 	(3,2,"AdwOverlaySplitView","sidebar",None,None,None,None,None,18,None,None,None,None),
-	(3,2,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
-	(3,2,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
-	(3,2,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
 	(3,3,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
+	(3,3,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
 	(3,3,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
+	(3,3,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
 	(3,18,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
 	(3,18,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
+	(3,18,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
+	(3,18,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
 	(3,19,"GtkWidget","valign","start",None,None,None,None,None,None,None,None,None),
 	(3,20,"GtkSearchEntry","placeholder-text","Search",None,None,None,None,None,None,None,None,None),
 	(3,20,"GtkWidget","valign","start",None,None,None,None,None,None,None,None,None),
@@ -220,6 +224,7 @@
 	(3,39,"GtkButton","has-frame","False",None,None,None,None,None,None,None,None,None),
 	(3,39,"GtkButton","label","About",None,None,None,None,None,None,None,None,None),
 	(3,40,"GtkScrolledWindow","propagate-natural-height","True",None,None,None,None,None,None,None,None,None),
+	(3,40,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
 	(3,42,"GtkWidget","css-name","resetList",None,None,None,None,None,None,None,None,None),
 	(3,42,"GtkWidget","width-request","150",None,None,None,None,None,None,None,None,None),
 	(3,43,"GtkScrolledWindow","propagate-natural-height","True",None,None,None,None,None,None,None,None,None),
@@ -335,6 +340,7 @@
 	(5,10,"GtkWidget","halign","end",None,None,None,None,None,None,None,None,None),
 	(5,10,"GtkWidget","valign","center",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),
 	(6,2,"GtkWidget","margin-start","10",None,None,None,None,None,None,None,None,None),
 	(6,2,"GtkWidget","margin-top","10",None,None,None,None,None,None,None,None,None),
@@ -362,7 +368,6 @@
 	(7,12,"GtkWidget","width-request","40",None,None,None,None,None,None,None,None,None),
 	(8,1,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
 	(8,1,"GtkWidget","halign","center",None,None,None,None,None,None,None,None,None),
-	(8,1,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
 	(8,1,"GtkWidget","valign","start",None,None,None,None,None,None,None,None,None),
 	(8,1,"GtkWidget","width-request","400",None,None,None,None,None,None,None,None,None),
 	(8,14,"GtkWidget","height-request","40",None,None,None,None,None,None,None,None,None),
@@ -449,7 +454,6 @@
 	(11,5,"GtkButton","icon-name","emblem-system-symbolic",None,None,None,None,None,None,None,None,None),
 	(12,1,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
 	(12,1,"GtkWidget","halign","start",None,None,None,None,None,None,None,None,None),
-	(12,1,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
 	(12,1,"GtkWidget","valign","start",None,None,None,None,None,None,None,None,None),
 	(12,1,"GtkWidget","width-request","400",None,None,None,None,None,None,None,None,None),
 	(12,2,"GtkWidget","height-request","40",None,None,None,None,None,None,None,None,None),
@@ -491,6 +495,7 @@
 	(14,1,"GtkWidget","halign","center",None,None,None,None,None,None,None,None,None),
 	(14,1,"GtkWidget","valign","start",None,None,None,None,None,None,None,None,None),
 	(14,1,"GtkWidget","width-request","500",None,None,None,None,None,None,None,None,None),
+	(14,2,"GtkWidget","css-classes","resetSettingLabel",None,None,None,None,None,None,None,None,None),
 	(15,1,"GtkListBoxRow","selectable","False",None,None,None,None,None,None,None,None,None),
 	(15,1,"GtkWidget","height-request","40",None,None,None,None,None,None,None,None,None),
 	(16,7,"GtkBox","homogeneous","True",None,None,None,None,None,None,None,None,None),