revert frame back to box

merge redundant labels

src/components/base/settingBox.rs

@@ -1,21 +1,19 @@
 use crate::components::base::settingBoxImpl;
 use adw::glib;
 use adw::glib::{IsA, Object};
-use glib::subclass::prelude::ObjectSubclassIsExt;
+use gtk::prelude::BoxExt;
-use gtk::prelude::FrameExt;
 use gtk::Widget;
 
 glib::wrapper! {
     pub struct SettingBox(ObjectSubclass<settingBoxImpl::SettingBox>)
-    @extends gtk::Frame, gtk::Widget,
+    @extends gtk::Box, gtk::Widget,
     @implements gtk::Accessible, gtk::Buildable, gtk::ConstraintTarget;
 }
 
 impl SettingBox {
-    pub fn new(child: &impl IsA<Widget>, title: &str) -> Self {
+    pub fn new(child: &impl IsA<Widget>) -> Self {
         let entry: SettingBox = Object::builder().build();
-        entry.set_child(Some(child));
+        entry.append(child);
-        entry.imp().resetSettingLabel.set_text(title);
         entry
     }
 }

src/components/base/settingBoxImpl.rs

@@ -5,16 +5,13 @@ use crate::components::base::settingBox;
 #[allow(non_snake_case)]
 #[derive(Default, CompositeTemplate)]
 #[template(resource = "/org/Xetibo/ReSet/resetSettingBox.ui")]
-pub struct SettingBox {
+pub struct SettingBox {}
-    #[template_child]
-    pub resetSettingLabel: TemplateChild<Label>,
-}
 
 #[glib::object_subclass]
 impl ObjectSubclass for SettingBox {
-    const NAME: &'static str = "resetSettingFrame";
+    const NAME: &'static str = "resetSettingBox";
     type Type = settingBox::SettingBox;
-    type ParentType = gtk::Frame;
+    type ParentType = gtk::Box;
 
     fn class_init(klass: &mut Self::Class) {
         klass.bind_template();
@@ -31,7 +28,7 @@ impl ObjectImpl for SettingBox {
     }
 }
 
-impl FrameImpl for SettingBox {}
+impl BoxImpl for SettingBox {}
 
 impl WidgetImpl for SettingBox {}
 

src/components/wifi/wifiBox.rs

@@ -42,9 +42,8 @@ impl WifiBox {
 
     pub fn setupCallbacks(&self) {
         let selfImp = self.imp();
-
+        selfImp.resetSavedNetworks.set_action_name(Some("navigation.push"));
-        selfImp.resetWifiSwitchRow.set_action_name(Some("navigation.push"));
+        selfImp.resetSavedNetworks.set_action_target_value(Some(&Variant::from("saved")));
-        selfImp.resetWifiSwitchRow.set_action_target_value(Some(&Variant::from("saved")))
     }
 
     // pub fn donotdisturb() {

src/components/wifi/wifiBoxImpl.rs

@@ -8,8 +8,6 @@ use crate::components::wifi::wifiBox;
 use crate::components::wifi::wifiEntry::WifiEntry;
 use crate::components::base::listEntry::ListEntry;
 
-use super::wifiBox::scanForWifi;
-
 #[allow(non_snake_case)]
 #[derive(Default, CompositeTemplate)]
 #[template(resource = "/org/Xetibo/ReSet/resetWiFi.ui")]
@@ -17,8 +15,6 @@ pub struct WifiBox {
     #[template_child]
     pub resetWifiDetails: TemplateChild<ListBox>,
     #[template_child]
-    pub resetWifiSwitchRow: TemplateChild<ListEntry>,
-    #[template_child]
     pub resetSavedNetworks: TemplateChild<ListEntry>,
     #[template_child]
     pub resetWifiSwitch: TemplateChild<Switch>,

src/components/window/handleSidebarClick.rs

@@ -13,8 +13,8 @@ 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, "WiFi");
+    let wifiBox = SettingBox::new(&*wifiBox);
-    let bluetoothBox = SettingBox::new(&BluetoothBox::new(), "Bluetooth");
+    let bluetoothBox = SettingBox::new(&BluetoothBox::new());
     resetMain.remove_all();
     resetMain.insert(&wifiBox, -1);
     resetMain.insert(&bluetoothBox, -1);
@@ -24,14 +24,14 @@ pub const HANDLE_CONNECTIVITY_CLICK: fn(FlowBox) = |resetMain: FlowBox| {
 pub const HANDLE_WIFI_CLICK: fn(FlowBox) =  |resetMain: FlowBox|   {
     let wifiBox = Arc::new(WifiBox::new());
     scanForWifi(wifiBox.clone());
-    let wifiBox = SettingBox::new(&*wifiBox, "WiFi");
+    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|   {
-    let bluetoothBox = SettingBox::new(&BluetoothBox::new(), "Bluetooth");
+    let bluetoothBox = SettingBox::new(&BluetoothBox::new());
     resetMain.remove_all();
     resetMain.insert(&bluetoothBox, -1);
     resetMain.set_max_children_per_line(1);
@@ -45,14 +45,14 @@ pub const HANDLE_VPN_CLICK: fn(FlowBox) = |resetMain: FlowBox| {
 };
 
 pub const HANDLE_AUDIO_CLICK: fn(FlowBox) =  |resetMain: FlowBox|   {
-    let audioBox = SettingBox::new(&AudioBox::new(), "Audio");
+    let audioBox = SettingBox::new(&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|   {
-    let audioBox = SettingBox::new(&AudioBox::new(), "Audio");
+    let audioBox = SettingBox::new(&AudioBox::new());
     resetMain.remove_all();
     resetMain.insert(&audioBox, -1);
     resetMain.set_max_children_per_line(1);

src/resources/resetBluetooth.ui

@@ -6,28 +6,12 @@
   <template class="resetBluetooth" parent="GtkBox">
     <property name="orientation">vertical</property>
     <property name="valign">start</property>
-    <child>
-      <object class="AdwNavigationView">
-        <child>
-          <object class="AdwNavigationPage">
-            <property name="tag">main</property>
-            <child>
-              <object class="GtkBox">
-                <property name="orientation">vertical</property>
-                <child>
-                  <object class="GtkListBox" id="resetBluetoothDetails">
-                    <property name="css-classes">boxed-list</property>
-                    <property name="margin-bottom">10</property>
-                    <property name="margin-start">5</property>
-                    <property name="show-separators">True</property>
-                    <property name="valign">start</property>
-                    <child>
-                      <object class="resetListBoxRow" id="resetBluetoothSwitchRow">
     <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>
@@ -43,8 +27,21 @@
         </child>
       </object>
     </child>
-                      </object>
+    <child>
-                    </child>
+      <object class="AdwNavigationView">
+        <child>
+          <object class="AdwNavigationPage">
+            <property name="tag">main</property>
+            <child>
+              <object class="GtkBox">
+                <property name="orientation">vertical</property>
+                <child>
+                  <object class="GtkListBox" id="resetBluetoothDetails">
+                    <property name="css-classes">boxed-list</property>
+                    <property name="margin-bottom">10</property>
+                    <property name="margin-start">5</property>
+                    <property name="show-separators">True</property>
+                    <property name="valign">start</property>
                   </object>
                 </child>
                 <child>

src/resources/resetSettingBox.ui

@@ -2,14 +2,9 @@
 <!-- Created with Cambalache 0.17.0 -->
 <interface>
   <requires lib="gtk" version="4.0"/>
-  <template class="resetSettingFrame" parent="GtkFrame">
+  <template class="resetSettingBox" parent="GtkBox">
-    <property name="css-classes">resetSettingFrame</property>
     <property name="halign">center</property>
-    <property name="label-widget">
+    <property name="orientation">vertical</property>
-      <object class="GtkLabel" id="resetSettingLabel">
-        <property name="css-classes">resetSettingLabel</property>
-      </object>
-    </property>
     <property name="width-request">500</property>
     <child>
       <object class="GtkLabel" id="resetSettingLabel">

src/resources/resetUI.cmb

@@ -12,7 +12,7 @@
 	(11,2,None,"resetBluetoothEntry.ui",None,None,None,None,None,None,None),
 	(12,1,None,"resetMicrophone.ui",None,None,None,None,None,None,None),
 	(13,1,None,"resetMicSourceEntry.ui",None,None,None,None,None,None,None),
-	(14,2,None,"resetSettingBox.ui",None,None,None,None,None,None,None),
+	(14,3,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),
 	(17,1,None,"resetSavedWifiEntry.ui",None,None,None,None,None,None,None)
@@ -50,14 +50,10 @@
 	(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,None,None),
 	(4,155,"GtkListBox","resetWifiDetails",154,None,None,None,None,None),
-	(4,156,"resetListBoxRow","resetWifiSwitchRow",155,None,None,None,None,None),
-	(4,157,"GtkBox",None,156,None,None,None,None,None),
-	(4,158,"GtkLabel",None,157,None,None,None,None,None),
-	(4,159,"GtkSwitch","resetWifiSwitch",157,None,None,None,1,None),
 	(4,160,"resetListBoxRow","resetSavedNetworks",155,None,None,None,1,None),
 	(4,161,"GtkBox",None,160,None,None,None,None,None),
 	(4,162,"GtkLabel",None,161,None,None,None,None,None),
@@ -76,6 +72,9 @@
 	(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,"GtkBox",None,7,None,None,None,None,None),
+	(4,179,"GtkLabel",None,178,None,None,None,None,None),
+	(4,180,"GtkSwitch","resetWifiSwitch",178,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),
@@ -109,14 +108,10 @@
 	(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,None,None),
 	(10,122,"GtkListBox","resetBluetoothDetails",121,None,None,None,None,None),
-	(10,123,"resetListBoxRow","resetBluetoothSwitchRow",122,None,None,None,None,None),
-	(10,124,"GtkBox",None,123,None,None,None,None,None),
-	(10,125,"GtkLabel",None,124,None,None,None,None,None),
-	(10,126,"GtkSwitch","resetBluetoothSwitch",124,None,None,None,1,None),
 	(10,127,"GtkBox",None,121,None,None,None,1,None),
 	(10,128,"GtkLabel",None,127,None,None,None,None,None),
 	(10,129,"GtkScrolledWindow",None,127,None,None,None,1,None),
@@ -132,6 +127,9 @@
 	(10,139,"GtkBox",None,138,None,None,None,None,None),
 	(10,140,"GtkLabel",None,139,None,None,None,None,None),
 	(10,141,"GtkButton",None,139,None,None,None,1,None),
+	(10,142,"GtkBox",None,1,None,None,None,None,None),
+	(10,143,"GtkLabel",None,142,None,None,None,None,None),
+	(10,144,"GtkSwitch","resetBluetoothSwitch",142,None,None,None,1,None),
 	(11,2,"GtkBox","resetBluetoothEntry",None,None,None,None,None,None),
 	(11,3,"GtkImage","resetBluetoothDeviceType",2,None,None,None,None,None),
 	(11,4,"GtkLabel","resetBluetoothLabel",2,None,None,None,1,None),
@@ -156,8 +154,7 @@
 	(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,2,"GtkFrame","resetSettingFrame",None,None,None,None,-1,None),
+	(14,3,"GtkBox","resetSettingBox",None,None,None,None,-1,None),
-	(14,3,"GtkLabel","resetSettingLabel",2,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),
@@ -256,14 +253,6 @@
 	(4,155,"GtkWidget","margin-bottom","10",None,None,None,None,None,None,None,None,None),
 	(4,155,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
 	(4,155,"GtkWidget","valign","start",None,None,None,None,None,None,None,None,None),
-	(4,157,"GtkWidget","height-request","40",None,None,None,None,None,None,None,None,None),
-	(4,158,"GtkLabel","label","WiFi",None,None,None,None,None,None,None,None,None),
-	(4,158,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
-	(4,159,"GtkSwitch","active","True",None,None,None,None,None,None,None,None,None),
-	(4,159,"GtkWidget","halign","end",None,None,None,None,None,None,None,None,None),
-	(4,159,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
-	(4,159,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
-	(4,159,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None),
 	(4,161,"GtkWidget","height-request","40",None,None,None,None,None,None,None,None,None),
 	(4,162,"GtkLabel","label","Saved Networks",None,None,None,None,None,None,None,None,None),
 	(4,162,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
@@ -308,6 +297,15 @@
 	(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,178,"GtkWidget","height-request","40",None,None,None,None,None,None,None,None,None),
+	(4,179,"GtkLabel","label","WiFi",None,None,None,None,None,None,None,None,None),
+	(4,179,"GtkWidget","css-classes","resetSettingLabel",None,None,None,None,None,None,None,None,None),
+	(4,179,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
+	(4,180,"GtkSwitch","active","True",None,None,None,None,None,None,None,None,None),
+	(4,180,"GtkWidget","halign","end",None,None,None,None,None,None,None,None,None),
+	(4,180,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
+	(4,180,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
+	(4,180,"GtkWidget","valign","center",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),
@@ -385,14 +383,6 @@
 	(10,122,"GtkWidget","margin-bottom","10",None,None,None,None,None,None,None,None,None),
 	(10,122,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
 	(10,122,"GtkWidget","valign","start",None,None,None,None,None,None,None,None,None),
-	(10,124,"GtkWidget","height-request","40",None,None,None,None,None,None,None,None,None),
-	(10,125,"GtkLabel","label","Bluetooth",None,None,None,None,None,None,None,None,None),
-	(10,125,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
-	(10,126,"GtkSwitch","active","True",None,None,None,None,None,None,None,None,None),
-	(10,126,"GtkWidget","halign","end",None,None,None,None,None,None,None,None,None),
-	(10,126,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
-	(10,126,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
-	(10,126,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None),
 	(10,127,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
 	(10,128,"GtkLabel","justify","right",None,None,None,None,None,None,None,None,None),
 	(10,128,"GtkLabel","label","Available devices",None,None,None,None,None,None,None,None,None),
@@ -432,6 +422,15 @@
 	(10,141,"GtkWidget","halign","start",None,None,None,None,None,None,None,None,None),
 	(10,141,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
 	(10,141,"GtkWidget","valign","start",None,None,None,None,None,None,None,None,None),
+	(10,142,"GtkWidget","height-request","40",None,None,None,None,None,None,None,None,None),
+	(10,143,"GtkLabel","label","Bluetooth",None,None,None,None,None,None,None,None,None),
+	(10,143,"GtkWidget","css-classes","resetSettingLabel",None,None,None,None,None,None,None,None,None),
+	(10,143,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
+	(10,144,"GtkSwitch","active","True",None,None,None,None,None,None,None,None,None),
+	(10,144,"GtkWidget","halign","end",None,None,None,None,None,None,None,None,None),
+	(10,144,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
+	(10,144,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
+	(10,144,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None),
 	(11,2,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
 	(11,3,"GtkImage","icon-name","input-mouse-symbolic",None,None,None,None,None,None,None,None,None),
 	(11,3,"GtkWidget","margin-end","15",None,None,None,None,None,None,None,None,None),
@@ -483,11 +482,9 @@
 	(13,9,"GtkLabel","label","100%",None,None,None,None,None,None,None,None,None),
 	(13,9,"GtkLabel","lines","1",None,None,None,None,None,None,None,None,None),
 	(13,9,"GtkWidget","width-request","40",None,None,None,None,None,None,None,None,None),
-	(14,2,"GtkFrame","label-widget",None,None,None,None,None,3,None,None,None,None),
+	(14,3,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
-	(14,2,"GtkWidget","css-classes","resetSettingFrame",None,None,None,None,None,None,None,None,None),
+	(14,3,"GtkWidget","halign","center",None,None,None,None,None,None,None,None,None),
-	(14,2,"GtkWidget","halign","center",None,None,None,None,None,None,None,None,None),
+	(14,3,"GtkWidget","width-request","500",None,None,None,None,None,None,None,None,None),
-	(14,2,"GtkWidget","width-request","500",None,None,None,None,None,None,None,None,None),
-	(14,3,"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),

src/resources/resetWiFi.ui

@@ -8,28 +8,12 @@
     <property name="hexpand-set">True</property>
     <property name="orientation">vertical</property>
     <property name="valign">start</property>
-    <child>
-      <object class="AdwNavigationView">
-        <child>
-          <object class="AdwNavigationPage">
-            <property name="tag">main</property>
-            <child>
-              <object class="GtkBox">
-                <property name="orientation">vertical</property>
-                <child>
-                  <object class="GtkListBox" id="resetWifiDetails">
-                    <property name="css-classes">boxed-list</property>
-                    <property name="margin-bottom">10</property>
-                    <property name="margin-start">5</property>
-                    <property name="show-separators">True</property>
-                    <property name="valign">start</property>
-                    <child>
-                      <object class="resetListBoxRow" id="resetWifiSwitchRow">
     <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>
@@ -45,8 +29,21 @@
         </child>
       </object>
     </child>
-                      </object>
+    <child>
-                    </child>
+      <object class="AdwNavigationView">
+        <child>
+          <object class="AdwNavigationPage">
+            <property name="tag">main</property>
+            <child>
+              <object class="GtkBox">
+                <property name="orientation">vertical</property>
+                <child>
+                  <object class="GtkListBox" id="resetWifiDetails">
+                    <property name="css-classes">boxed-list</property>
+                    <property name="margin-bottom">10</property>
+                    <property name="margin-start">5</property>
+                    <property name="show-separators">True</property>
+                    <property name="valign">start</property>
                     <child>
                       <object class="resetListBoxRow" id="resetSavedNetworks">
                         <child>

src/resources/style/style.css

@@ -16,7 +16,7 @@ frame.resetSettingFrame {
     padding: 10px;
 }
 
-frame > label {
+label.resetSettingLabel {
     font-size: 32px;
     font-weight: bold;
 }