From 0595d8ff47f34fae27b35865f7fcc51ee756ae7f Mon Sep 17 00:00:00 2001
From: takotori <tranfelix99@gmail.com>
Date: Thu, 14 Dec 2023 16:34:13 +0100
Subject: [PATCH] improve wifi ui

---
 src/components/window/reset_window.rs  | 15 ++++++++++-----
 src/resources/resetUI.cmb              |  6 ++++--
 src/resources/resetWifiAddressEntry.ui |  3 ++-
 src/resources/resetWifiRouteEntry.ui   |  3 ++-
 src/resources/style/style.css          |  2 +-
 5 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/src/components/window/reset_window.rs b/src/components/window/reset_window.rs
index 50d5c6a..4bfa231 100644
--- a/src/components/window/reset_window.rs
+++ b/src/components/window/reset_window.rs
@@ -322,12 +322,17 @@ impl ReSetWindow {
                 .margin_bottom(3)
                 .margin_top(3)
                 .orientation(Orientation::Horizontal)
+                .accessible_role(AccessibleRole::Separator)
+                .can_focus(false)
+                .build();
+            let separator_row = ListBoxRow::builder()
+                .child(&separator)
+                .selectable(false)
+                .activatable(false)
+                .can_target(false)
+                .focusable(false)
+                .accessible_role(AccessibleRole::Separator)
                 .build();
-            let separator_row = ListBoxRow::new();
-            separator_row.set_child(Some(&separator));
-            separator_row.set_selectable(false);
-            separator_row.set_activatable(false);
-            separator_row.set_can_target(false);
             // TODO how to simply skip this ?
             self_imp.reset_sidebar_list.append(&separator_row);
         }
diff --git a/src/resources/resetUI.cmb b/src/resources/resetUI.cmb
index c02086d..5f0f46b 100644
--- a/src/resources/resetUI.cmb
+++ b/src/resources/resetUI.cmb
@@ -827,7 +827,8 @@
 	(22,1,"GtkWidget","margin-bottom","2",None,None,None,None,None,None,None,None,None),
 	(22,1,"GtkWidget","margin-top","2",None,None,None,None,None,None,None,None,None),
 	(22,5,"GtkButton","icon-name","edit-delete-symbolic",None,None,None,None,None,None,None,None,None),
-	(22,5,"GtkWidget","height-request","55",None,None,None,None,None,None,None,None,None),
+	(22,5,"GtkWidget","margin-start","10",None,None,None,None,None,None,None,None,None),
+	(22,5,"GtkWidget","margin-top","10",None,None,None,None,None,None,None,None,None),
 	(22,5,"GtkWidget","valign","start",None,None,None,None,None,None,None,None,None),
 	(22,10,"AdwPreferencesRow","title","Add new Address",None,None,None,None,None,None,None,None,None),
 	(22,10,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
@@ -836,7 +837,8 @@
 	(22,13,"AdwPreferencesRow","title","Prefix",None,None,None,None,None,None,None,None,None),
 	(22,13,"GtkEditable","max-width-chars","5",None,None,None,None,None,None,None,None,None),
 	(23,5,"GtkButton","icon-name","edit-delete-symbolic",None,None,None,None,None,None,None,None,None),
-	(23,5,"GtkWidget","height-request","55",None,None,None,None,None,None,None,None,None),
+	(23,5,"GtkWidget","margin-start","10",None,None,None,None,None,None,None,None,None),
+	(23,5,"GtkWidget","margin-top","10",None,None,None,None,None,None,None,None,None),
 	(23,5,"GtkWidget","valign","start",None,None,None,None,None,None,None,None,None),
 	(23,13,"AdwPreferencesRow","title","Add new Route",None,None,None,None,None,None,None,None,None),
 	(23,13,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
diff --git a/src/resources/resetWifiAddressEntry.ui b/src/resources/resetWifiAddressEntry.ui
index 6c48d98..ea76aa3 100644
--- a/src/resources/resetWifiAddressEntry.ui
+++ b/src/resources/resetWifiAddressEntry.ui
@@ -34,8 +34,9 @@
     </child>
     <child>
       <object class="GtkButton" id="reset_address_remove">
-        <property name="height-request">55</property>
         <property name="icon-name">edit-delete-symbolic</property>
+        <property name="margin-start">10</property>
+        <property name="margin-top">10</property>
         <property name="valign">start</property>
       </object>
     </child>
diff --git a/src/resources/resetWifiRouteEntry.ui b/src/resources/resetWifiRouteEntry.ui
index 9ca3675..4cfc097 100644
--- a/src/resources/resetWifiRouteEntry.ui
+++ b/src/resources/resetWifiRouteEntry.ui
@@ -48,8 +48,9 @@
     </child>
     <child>
       <object class="GtkButton" id="reset_route_remove">
-        <property name="height-request">55</property>
         <property name="icon-name">edit-delete-symbolic</property>
+        <property name="margin-start">10</property>
+        <property name="margin-top">10</property>
         <property name="valign">start</property>
       </object>
     </child>
diff --git a/src/resources/style/style.css b/src/resources/style/style.css
index e649053..c7df5b7 100644
--- a/src/resources/style/style.css
+++ b/src/resources/style/style.css
@@ -27,4 +27,4 @@ row.audioRow  {
 
 notebook > stack > box, notebook > stack {
     background-color: @window_bg_color;
-}
+}
\ No newline at end of file