From d07180e2c76a5ef0e9101555df7e9f0c42376027 Mon Sep 17 00:00:00 2001
From: Fabio Lenherr / DashieTM <fabio.lenherr@gmail.com>
Date: Sun, 12 Nov 2023 13:17:19 +0100
Subject: [PATCH] fix: Merge

---
 src/components/wifi/wifiBox.rs              |  4 +-
 src/components/wifi/wifiBoxImpl.rs          |  2 -
 src/components/window/handleSidebarClick.rs |  4 --
 src/resources/resetMainWindow.ui            | 12 +++---
 src/resources/resetSettingBox.ui            |  5 ---
 src/resources/resetUI.cmb                   | 48 ++++++++-------------
 src/resources/resetWiFi.ui                  | 34 ---------------
 7 files changed, 26 insertions(+), 83 deletions(-)

diff --git a/src/components/wifi/wifiBox.rs b/src/components/wifi/wifiBox.rs
index 24b063e..9559042 100644
--- a/src/components/wifi/wifiBox.rs
+++ b/src/components/wifi/wifiBox.rs
@@ -43,8 +43,8 @@ impl WifiBox {
     pub fn setupCallbacks(&self) {
         let selfImp = self.imp();
 
-        selfImp.resetWifiSwitchRow.set_action_name(Some("navigation.push"));
-        selfImp.resetWifiSwitchRow.set_action_target_value(Some(&Variant::from("saved")))
+        selfImp.resetSavedNetworks.set_action_name(Some("navigation.push"));
+        selfImp.resetSavedNetworks.set_action_target_value(Some(&Variant::from("saved")))
     }
 
     // pub fn donotdisturb() {
diff --git a/src/components/wifi/wifiBoxImpl.rs b/src/components/wifi/wifiBoxImpl.rs
index ebb1d67..377b1c3 100644
--- a/src/components/wifi/wifiBoxImpl.rs
+++ b/src/components/wifi/wifiBoxImpl.rs
@@ -25,8 +25,6 @@ pub struct WifiBox {
     #[template_child]
     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>>>,
diff --git a/src/components/window/handleSidebarClick.rs b/src/components/window/handleSidebarClick.rs
index a1766ca..cd44978 100644
--- a/src/components/window/handleSidebarClick.rs
+++ b/src/components/window/handleSidebarClick.rs
@@ -65,10 +65,6 @@ pub const HANDLE_MICROPHONE_CLICK: fn(FlowBox) = |resetMain: FlowBox| {
     resetMain.set_max_children_per_line(1);
 };
 
-pub const HANDLE_HOME: fn(FlowBox) = |resetMain: FlowBox| {
-    resetMain.remove_all();
-};
-
 pub const HANDLE_PERIPHERALS_CLICK: fn(FlowBox) = |resetMain: FlowBox| {
     let label = Label::new(Some("not implemented yet"));
     resetMain.remove_all();
diff --git a/src/resources/resetMainWindow.ui b/src/resources/resetMainWindow.ui
index 779ed80..e7aae12 100644
--- a/src/resources/resetMainWindow.ui
+++ b/src/resources/resetMainWindow.ui
@@ -98,18 +98,18 @@
                                     <property name="label">Shortcuts</property>
                                   </object>
                                 </child>
-                                <child>
-                                  <object class="GtkButton" id="resetPreferenceButton">
-                                    <property name="has-frame">False</property>
-                                    <property name="label">Preferences</property>
-                                  </object>
-                                </child>
                                 <child>
                                   <object class="GtkButton" id="resetAboutButton">
                                     <property name="has-frame">False</property>
                                     <property name="label">About</property>
                                   </object>
                                 </child>
+                                <child>
+                                  <object class="GtkButton" id="resetPreferenceButton">
+                                    <property name="has-frame">False</property>
+                                    <property name="label">Preferences</property>
+                                  </object>
+                                </child>
                               </object>
                             </property>
                           </object>
diff --git a/src/resources/resetSettingBox.ui b/src/resources/resetSettingBox.ui
index 2fa73fb..44c5edb 100644
--- a/src/resources/resetSettingBox.ui
+++ b/src/resources/resetSettingBox.ui
@@ -11,10 +11,5 @@
       </object>
     </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/resetUI.cmb b/src/resources/resetUI.cmb
index a980c51..e4d4749 100644
--- a/src/resources/resetUI.cmb
+++ b/src/resources/resetUI.cmb
@@ -67,15 +67,12 @@
 	(4,166,"GtkScrolledWindow",None,164,None,None,None,1,None),
 	(4,167,"GtkViewport",None,166,None,None,None,None,None),
 	(4,168,"GtkListBox","resetWifiList",167,None,None,None,None,None),
-	(4,169,"GtkButton","resetWifiAdvanced",154,None,None,None,2,None),
-	(4,170,"AdwNavigationPage",None,152,None,None,None,1,None),
-	(4,171,"GtkBox",None,170,None,None,None,None,None),
-	(4,172,"GtkLabel",None,171,None,None,None,None,None),
-	(4,173,"GtkButton",None,171,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,176,"GtkLabel",None,175,None,None,None,None,None),
-	(4,177,"GtkButton",None,175,None,None,None,1,None),
+	(4,178,"GtkListBox","resetStoredWifiList",175,None,None,None,3,None),
+	(4,179,"GtkBox",None,175,None,None,None,None,None),
+	(4,180,"GtkLabel",None,179,None,None,None,None,None),
+	(4,181,"GtkButton",None,179,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),
@@ -284,30 +281,21 @@
 	(4,168,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
 	(4,168,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
 	(4,168,"GtkWidget","valign","start",None,None,None,None,None,None,None,None,None),
-	(4,169,"GtkActionable","action-name","navigation.push",None,None,None,None,None,None,None,None,None),
-	(4,169,"GtkActionable","action-target","'advanced'",None,None,None,None,None,None,None,None,None),
-	(4,169,"GtkButton","label","Advanced",None,None,None,None,None,None,None,None,None),
-	(4,169,"GtkWidget","halign","start",None,None,None,None,None,None,None,None,None),
-	(4,169,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
-	(4,169,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
-	(4,169,"GtkWidget","valign","start",None,None,None,None,None,None,None,None,None),
-	(4,170,"AdwNavigationPage","child",None,None,None,None,None,171,None,None,None,None),
-	(4,170,"AdwNavigationPage","tag","advanced",None,None,None,None,None,None,None,None,None),
-	(4,172,"GtkLabel","label","advanced page",None,None,None,None,None,None,None,None,None),
-	(4,173,"GtkActionable","action-name","navigation.pop",None,None,None,None,None,None,None,None,None),
-	(4,173,"GtkButton","label","back",None,None,None,None,None,None,None,None,None),
-	(4,173,"GtkWidget","halign","start",None,None,None,None,None,None,None,None,None),
-	(4,173,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
-	(4,173,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
-	(4,173,"GtkWidget","valign","start",None,None,None,None,None,None,None,None,None),
 	(4,174,"AdwNavigationPage","tag","saved",None,None,None,None,None,None,None,None,None),
-	(4,176,"GtkLabel","label","saved networks",None,None,None,None,None,None,None,None,None),
-	(4,177,"GtkActionable","action-name","navigation.pop",None,None,None,None,None,None,None,None,None),
-	(4,177,"GtkButton","label","back",None,None,None,None,None,None,None,None,None),
-	(4,177,"GtkWidget","halign","start",None,None,None,None,None,None,None,None,None),
-	(4,177,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
-	(4,177,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
-	(4,177,"GtkWidget","valign","start",None,None,None,None,None,None,None,None,None),
+	(4,175,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
+	(4,178,"GtkListBox","show-separators","True",None,None,None,None,None,None,None,None,None),
+	(4,178,"GtkWidget","css-classes","boxed-list",None,None,None,None,None,None,None,None,None),
+	(4,178,"GtkWidget","margin-bottom","10",None,None,None,None,None,None,None,None,None),
+	(4,178,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
+	(4,178,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
+	(4,178,"GtkWidget","valign","start",None,None,None,None,None,None,None,None,None),
+	(4,180,"GtkLabel","label","saved networks",None,None,None,None,None,None,None,None,None),
+	(4,181,"GtkActionable","action-name","navigation.pop",None,None,None,None,None,None,None,None,None),
+	(4,181,"GtkButton","label","back",None,None,None,None,None,None,None,None,None),
+	(4,181,"GtkWidget","halign","start",None,None,None,None,None,None,None,None,None),
+	(4,181,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
+	(4,181,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
+	(4,181,"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),
diff --git a/src/resources/resetWiFi.ui b/src/resources/resetWiFi.ui
index 08e68b2..9bcda9d 100644
--- a/src/resources/resetWiFi.ui
+++ b/src/resources/resetWiFi.ui
@@ -105,49 +105,15 @@
                     </child>
                   </object>
                 </child>
-                <child>
-                  <object class="GtkButton" id="resetWifiAdvanced">
-                    <property name="halign">start</property>
-                    <property name="label">Advanced</property>
-                    <property name="margin-start">5</property>
-                    <property name="margin-top">5</property>
-                    <property name="valign">start</property>
-                  </object>
-                </child>
               </object>
             </child>
           </object>
         </child>
-        <child>
-          <object class="AdwNavigationPage">
-            <property name="child">
-              <object class="GtkBox">
-                <child>
-                  <object class="GtkLabel">
-                    <property name="label">advanced page</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>
-            </property>
-            <property name="tag">advanced</property>
-          </object>
-        </child>
         <child>
           <object class="AdwNavigationPage">
             <property name="tag">saved</property>
             <child>
               <object class="GtkBox">
-                <property name="homogeneous">True</property>
                 <property name="orientation">vertical</property>
                 <child>
                   <object class="GtkBox">