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] 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),