From b95ec25dd8414efbcef53a5e0f21ffecc229a2dc Mon Sep 17 00:00:00 2001
From: Philipp Unger <philipp.unger.1988@gmail.com>
Date: Sat, 9 Apr 2022 16:17:47 +0200
Subject: [PATCH] migrate box scroll panel options  to adw preferences group

---
 ui/BoxScrollPanelOptions.ui | 149 +++++++-----------------------------
 1 file changed, 26 insertions(+), 123 deletions(-)

diff --git a/ui/BoxScrollPanelOptions.ui b/ui/BoxScrollPanelOptions.ui
index 95c7fd5..2354b76 100644
--- a/ui/BoxScrollPanelOptions.ui
+++ b/ui/BoxScrollPanelOptions.ui
@@ -9,143 +9,46 @@
   </object>
 
   <object class="GtkBox" id="scroll_panel_options_box">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
     <property name="orientation">vertical</property>
-    <property name="hexpand">1</property>
-    <property name="vexpand">1</property>
+    <property name="width-request">600</property>
+    <property name="spacing">24</property>
+    <property name="margin-top">32</property>
+    <property name="margin-bottom">32</property>
+    <property name="margin-start">32</property>
+    <property name="margin-end">32</property>
+
     <child>
-      <object class="GtkListBox" id="scroll_panel_options_listbox">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="selection_mode">none</property>
+      <object class="AdwPreferencesGroup">
+
         <child>
-          <object class="GtkListBoxRow" id="listboxrow_scroll_panel_options_delay">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
+          <object class="AdwActionRow">
+            <property name="title" translatable="yes">Delay between mouse scroll events (ms)</property>
+            <property name="subtitle" translatable="yes">Use this value to limit the number of captured mouse scroll events.</property>
             <child>
-              <object class="GtkGrid" id="grid_scroll_panel_options_delay">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="margin_start">12</property>
-                <property name="margin_end">12</property>
-                <property name="margin_top">12</property>
-                <property name="margin_bottom">12</property>
-                <property name="column_spacing">32</property>
-                <child>
-                  <object class="GtkSpinButton" id="scroll_panel_options_delay_spinbutton">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="halign">end</property>
-                    <property name="valign">center</property>
-                    <property name="width_chars">4</property>
-                    <property name="text">50</property>
-                    <property name="adjustment">scroll_panel_options_delay_adjustment</property>
-                    <property name="numeric">True</property>
-                    <property name="value">50</property>
-                    <layout>
-                      <property name="row">0</property>
-                      <property name="column">1</property>
-                      <property name="row-span">2</property>
-                    </layout>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="scroll_panel_options_delay_label">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="hexpand">True</property>
-                    <property name="label" translatable="yes">Delay between mouse scroll events (ms)</property>
-                    <property name="use_markup">True</property>
-                    <property name="xalign">0</property>
-                    <layout>
-                      <property name="row">0</property>
-                      <property name="column">0</property>
-                    </layout>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="scroll_panel_options_delay_description">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="hexpand">True</property>
-                    <property name="label" translatable="yes">Use this value to limit the number of captured mouse scroll events.</property>
-                    <property name="wrap">True</property>
-                    <property name="xalign">0</property>
-                    <style>
-                      <class name="dim-label"/>
-                    </style>
-                    <layout>
-                      <property name="row">1</property>
-                      <property name="column">0</property>
-                    </layout>
-                  </object>
-                </child>
+              <object class="GtkSpinButton" id="scroll_panel_options_delay_spinbutton">
+                <property name="valign">center</property>
+                <property name="width_chars">4</property>
+                <property name="text">50</property>
+                <property name="adjustment">scroll_panel_options_delay_adjustment</property>
+                <property name="numeric">True</property>
+                <property name="value">50</property>
               </object>
             </child>
           </object>
         </child>
+
         <child>
-          <object class="GtkListBoxRow" id="listboxrow_scroll_panel_options_show_ws_popup">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
+          <object class="AdwActionRow">
+            <property name="title" translatable="yes">Show popup when changing workspace</property>
+            <property name="subtitle" translatable="yes">This affects workspace popup when scrolling on the panel only.</property>
             <child>
-              <object class="GtkGrid" id="grid_scroll_panel_options_show_ws_popup">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="margin_start">12</property>
-                <property name="margin_end">12</property>
-                <property name="margin_top">12</property>
-                <property name="margin_bottom">12</property>
-                <property name="column_spacing">32</property>
-                <child>
-                  <object class="GtkLabel" id="scroll_panel_options_show_ws_popup_label">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="hexpand">True</property>
-                    <property name="label" translatable="yes">Show popup when changing workspace</property>
-                    <property name="use_markup">True</property>
-                    <property name="xalign">0</property>
-                    <layout>
-                      <property name="row">0</property>
-                      <property name="column">0</property>
-                    </layout>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="scroll_panel_options_show_ws_popup_description">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="hexpand">True</property>
-                    <property name="label" translatable="yes">This affects workspace popup when scrolling on the panel only.</property>
-                    <property name="wrap">True</property>
-                    <property name="xalign">0</property>
-                    <style>
-                      <class name="dim-label"/>
-                    </style>
-                    <layout>
-                      <property name="row">1</property>
-                      <property name="column">0</property>
-                    </layout>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkSwitch" id="scroll_panel_options_show_ws_popup_switch">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="halign">end</property>
-                    <property name="valign">center</property>
-                    <layout>
-                      <property name="row">0</property>
-                      <property name="column">1</property>
-                      <property name="row-span">2</property>
-                    </layout>
-                  </object>
-                </child>
+              <object class="GtkSwitch" id="scroll_panel_options_show_ws_popup_switch">
+                <property name="valign">center</property>
               </object>
             </child>
           </object>
         </child>
+
       </object>
     </child>
   </object>