Merge branch 'ina' into detached

src/resources/resetBluetooth.ui

@@ -6,6 +6,27 @@
   <template class="resetBluetooth" parent="GtkBox">
     <property name="orientation">vertical</property>
     <property name="valign">start</property>
+    <child>
+      <object class="GtkBox">
+        <property name="height-request">40</property>
+        <child>
+          <object class="GtkLabel">
+            <property name="css-classes">resetSettingLabel</property>
+            <property name="label">Bluetooth</property>
+            <property name="margin-start">5</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkSwitch" id="resetBluetoothSwitch">
+            <property name="active">True</property>
+            <property name="halign">end</property>
+            <property name="hexpand">True</property>
+            <property name="margin-end">5</property>
+            <property name="valign">center</property>
+          </object>
+        </child>
+      </object>
+    </child>
     <child>
       <object class="AdwNavigationView">
         <child>

src/resources/resetUI.cmb

@@ -50,7 +50,7 @@
 	(3,50,"GtkLabel",None,34,None,None,None,3,None),
 	(3,51,"GtkButton","resetShortcutsButton",36,None,None,None,None,None),
 	(4,7,"GtkBox","resetWifi",None,None,None,None,None,None),
-	(4,152,"AdwNavigationView",None,7,None,None,None,2,None),
+	(4,152,"AdwNavigationView",None,7,None,None,None,1,None),
 	(4,153,"AdwNavigationPage",None,152,None,None,None,None,None),
 	(4,154,"GtkBox",None,153,None,None,None,1,None),
 	(4,155,"GtkListBox","resetWifiDetails",154,None,None,None,1,None),
@@ -105,7 +105,7 @@
 	(8,41,"GtkSeparator",None,1,None,None,None,4,None),
 	(8,42,"resetAudioSourceEntry","asdf",1,None,None,None,5,None),
 	(10,1,"GtkBox","resetBluetooth",None,None,None,None,None,None),
-	(10,119,"AdwNavigationView",None,1,None,None,None,2,None),
+	(10,119,"AdwNavigationView",None,1,None,None,None,1,None),
 	(10,120,"AdwNavigationPage",None,119,None,None,None,None,None),
 	(10,121,"GtkBox",None,120,None,None,None,1,None),
 	(10,122,"GtkListBox","resetBluetoothDetails",121,None,None,None,1,None),
@@ -227,7 +227,7 @@
 	(3,45,"GtkWidget","halign","center",None,None,None,None,None,None,None,None,None),
 	(3,45,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
 	(3,45,"GtkWidget","hexpand-set","True",None,None,None,None,None,None,None,None,None),
-	(3,45,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
+	(3,45,"GtkWidget","margin-top","5",None,None,Nonmergee,None,None,None,None,None,None),
 	(3,45,"GtkWidget","valign","start",None,None,None,None,None,None,None,None,None),
 	(3,46,"GtkButton","has-frame","False",None,None,None,None,None,None,None,None,None),
 	(3,46,"GtkButton","label","Home",None,None,None,None,None,None,None,None,None),
@@ -297,7 +297,7 @@
 	(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),
-	(5,5,"GtkImage","icon-name","system-lock-screen-symbolic",None,None,None,None,None,None,None,None,None),
+	(5,5,"GtkImage","icon-name","system-lock-screen-symbolic",None,None,mergeNone,None,None,None,None,None,None),
 	(5,5,"GtkImage","pixel-size","9",None,None,None,None,None,None,None,None,None),
 	(5,5,"GtkWidget","halign","start",None,None,None,None,None,None,None,None,None),
 	(5,5,"GtkWidget","margin-bottom","6",None,None,None,None,None,None,None,None,None),

src/resources/resetWiFi.ui

@@ -8,6 +8,27 @@
     <property name="hexpand-set">True</property>
     <property name="orientation">vertical</property>
     <property name="valign">start</property>
+    <child>
+      <object class="GtkBox">
+        <property name="height-request">40</property>
+        <child>
+          <object class="GtkLabel">
+            <property name="css-classes">resetSettingLabel</property>
+            <property name="label">WiFi</property>
+            <property name="margin-start">5</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkSwitch" id="resetWifiSwitch">
+            <property name="active">True</property>
+            <property name="halign">end</property>
+            <property name="hexpand">True</property>
+            <property name="margin-end">5</property>
+            <property name="valign">center</property>
+          </object>
+        </child>
+      </object>
+    </child>
     <child>
       <object class="AdwNavigationView">
         <child>