Sort preferences into sections

1 files changed, 85 insertions, 74 deletions

diff --git a/src/gtk/preferences_window.ui b/src/gtk/preferences_window.ui
index e916883..dc96e9e 100644
--- a/src/gtk/preferences_window.ui
+++ b/src/gtk/preferences_window.ui
@@ -59,38 +59,54 @@
           </object>
         </child>
         <child>
-          <object class="AdwPreferencesGroup" id="task_group">
-            <property name="title" translatable="yes">Task List</property>
+          <object class="AdwPreferencesGroup" id="timer_group">
+            <property name="title" translatable="yes">Timer</property>
             <property name="visible">True</property>
             <child>
-              <object class="AdwActionRow">
-                <property name="title" translatable="yes">_Delete confirmation</property>
+              <object class="AdwExpanderRow" id="pomodoro_expander">
+                <property name="title" translatable="yes">_Pomodoro</property>
+                <property name="subtitle" translatable="yes">Timer counts down instead of up</property>
+                <property name="show_enable_switch">True</property>
                 <property name="use_underline">True</property>
-                <property name="activatable_widget">delete_confirmation_switch</property>
                 <child>
-                  <object class="GtkSwitch" id="delete_confirmation_switch">
-                    <property name="valign">center</property>
+                  <object class="AdwActionRow">
+                    <property name="title" translatable="yes">Interval</property>
+                    <property name="subtitle" translatable="yes">Start time in minutes</property>
+                    <property name="use_underline">True</property>
+                    <child>
+                      <object class="GtkSpinButton" id="pomodoro_spin">
+                        <property name="valign">center</property>
+                        <property name="adjustment">
+                          <object class="GtkAdjustment">
+                            <property name="upper">999</property>
+                            <property name="lower">1</property>
+                            <property name="step_increment">1</property>
+                            <property name="page_increment">15</property>
+                          </object>
+                        </property>
+                        <property name="numeric">True</property>
+                      </object>
+                    </child>
                   </object>
                 </child>
               </object>
             </child>
             <child>
-              <object class="AdwExpanderRow" id="limit_tasks_expander">
-                <property name="title" translatable="yes">Limit tasks shown</property>
-                <property name="subtitle" translatable="yes">Only show X number of days in the saved tasks list</property>
+              <object class="AdwExpanderRow" id="autosave_expander">
+                <property name="title" translatable="yes">_Autosave</property>
+                <property name="subtitle" translatable="yes">Prevent losing tracked time due to improper shutdown</property>
                 <property name="show_enable_switch">True</property>
                 <property name="use_underline">True</property>
                 <child>
                   <object class="AdwActionRow">
-                    <property name="title" translatable="yes">_Days ago</property>
-                    <property name="subtitle" translatable="yes">Number of days to display in the list</property>
+                    <property name="title" translatable="yes">Autosave every X _minutes</property>
                     <property name="use_underline">True</property>
                     <child>
-                      <object class="GtkSpinButton" id="limit_days_spin">
+                      <object class="GtkSpinButton" id="autosave_spin">
                         <property name="valign">center</property>
                         <property name="adjustment">
                           <object class="GtkAdjustment">
-                            <property name="upper">365</property>
+                            <property name="upper">60</property>
                             <property name="lower">1</property>
                             <property name="step_increment">1</property>
                             <property name="page_increment">10</property>
@@ -105,68 +121,61 @@
             </child>
             <child>
               <object class="AdwActionRow">
-                <property name="title" translatable="yes">Show daily sums</property>
-                <property name="use_underline">True</property>
-                <property name="activatable_widget">show_daily_sums_switch</property>
-                <child>
-                  <object class="GtkSwitch" id="show_daily_sums_switch">
-                    <property name="valign">center</property>
-                  </object>
-                </child>
-              </object>
-            </child>
-            <child>
-              <object class="AdwActionRow">
-                <property name="title" translatable="yes">_Show seconds</property>
+                <property name="title" translatable="yes">Inclusive total time</property>
                 <property name="use_underline">True</property>
-                <property name="activatable_widget">show_seconds_switch</property>
-                <property name="subtitle" translatable="yes">Tasks list only. Seconds always show on timer</property>
+                <property name="activatable_widget">inclusive_total_switch</property>
+                <property name="subtitle" translatable="yes">Today's total time includes the ongoing timer</property>
                 <child>
-                  <object class="GtkSwitch" id="show_seconds_switch">
+                  <object class="GtkSwitch" id="inclusive_total_switch">
                     <property name="valign">center</property>
                   </object>
                 </child>
               </object>
             </child>
+          </object>
+        </child>
+      </object>
+    </child>
+    <child>
+      <object class="AdwPreferencesPage" id="tasks_page">
+        <property name="icon_name">view-list-bullet-symbolic</property>
+        <property name="title" translatable="yes" context="A page title of the preferences dialog">Tasks</property>
+        <child>
+          <object class="AdwPreferencesGroup" id="task_group">
+            <property name="title" translatable="yes">Task List</property>
+            <property name="visible">True</property>
             <child>
               <object class="AdwActionRow">
-                <property name="title" translatable="yes">Show tags</property>
+                <property name="title" translatable="yes">_Delete confirmation</property>
                 <property name="use_underline">True</property>
-                <property name="activatable_widget">show_tags_switch</property>
-                <property name="subtitle" translatable="yes">Tags are saved, just not shown</property>
+                <property name="activatable_widget">delete_confirmation_switch</property>
                 <child>
-                  <object class="GtkSwitch" id="show_tags_switch">
+                  <object class="GtkSwitch" id="delete_confirmation_switch">
                     <property name="valign">center</property>
                   </object>
                 </child>
               </object>
             </child>
-          </object>
-        </child>
-        <child>
-          <object class="AdwPreferencesGroup" id="timer_group">
-            <property name="title" translatable="yes">Timer</property>
-            <property name="visible">True</property>
             <child>
-              <object class="AdwExpanderRow" id="pomodoro_expander">
-                <property name="title" translatable="yes">_Pomodoro</property>
-                <property name="subtitle" translatable="yes">Timer counts down instead of up</property>
+              <object class="AdwExpanderRow" id="limit_tasks_expander">
+                <property name="title" translatable="yes">Limit tasks shown</property>
+                <property name="subtitle" translatable="yes">Only show X number of days in the saved tasks list</property>
                 <property name="show_enable_switch">True</property>
                 <property name="use_underline">True</property>
                 <child>
                   <object class="AdwActionRow">
-                    <property name="title" translatable="yes">Interval</property>
-                    <property name="subtitle" translatable="yes">Start time in minutes</property>
+                    <property name="title" translatable="yes">_Days ago</property>
+                    <property name="subtitle" translatable="yes">Number of days to display in the list</property>
                     <property name="use_underline">True</property>
                     <child>
-                      <object class="GtkSpinButton" id="pomodoro_spin">
+                      <object class="GtkSpinButton" id="limit_days_spin">
                         <property name="valign">center</property>
                         <property name="adjustment">
                           <object class="GtkAdjustment">
-                            <property name="upper">999</property>
+                            <property name="upper">365</property>
                             <property name="lower">1</property>
                             <property name="step_increment">1</property>
-                            <property name="page_increment">15</property>
+                            <property name="page_increment">10</property>
                           </object>
                         </property>
                         <property name="numeric">True</property>
@@ -177,42 +186,38 @@
               </object>
             </child>
             <child>
-              <object class="AdwExpanderRow" id="autosave_expander">
-                <property name="title" translatable="yes">_Autosave</property>
-                <property name="subtitle" translatable="yes">Prevent losing tracked time due to improper shutdown</property>
-                <property name="show_enable_switch">True</property>
+              <object class="AdwActionRow">
+                <property name="title" translatable="yes">Show daily sums</property>
                 <property name="use_underline">True</property>
+                <property name="activatable_widget">show_daily_sums_switch</property>
                 <child>
-                  <object class="AdwActionRow">
-                    <property name="title" translatable="yes">Autosave every X _minutes</property>
-                    <property name="use_underline">True</property>
-                    <child>
-                      <object class="GtkSpinButton" id="autosave_spin">
-                        <property name="valign">center</property>
-                        <property name="adjustment">
-                          <object class="GtkAdjustment">
-                            <property name="upper">60</property>
-                            <property name="lower">1</property>
-                            <property name="step_increment">1</property>
-                            <property name="page_increment">10</property>
-                          </object>
-                        </property>
-                        <property name="numeric">True</property>
-                      </object>
-                    </child>
+                  <object class="GtkSwitch" id="show_daily_sums_switch">
+                    <property name="valign">center</property>
                   </object>
                 </child>
               </object>
             </child>
-
             <child>
               <object class="AdwActionRow">
-                <property name="title" translatable="yes">Inclusive total time</property>
+                <property name="title" translatable="yes">_Show seconds</property>
                 <property name="use_underline">True</property>
-                <property name="activatable_widget">inclusive_total_switch</property>
-                <property name="subtitle" translatable="yes">Today's total time includes the ongoing timer</property>
+                <property name="activatable_widget">show_seconds_switch</property>
+                <property name="subtitle" translatable="yes">Tasks list only. Seconds always show on timer</property>
                 <child>
-                  <object class="GtkSwitch" id="inclusive_total_switch">
+                  <object class="GtkSwitch" id="show_seconds_switch">
+                    <property name="valign">center</property>
+                  </object>
+                </child>
+              </object>
+            </child>
+            <child>
+              <object class="AdwActionRow">
+                <property name="title" translatable="yes">Show tags</property>
+                <property name="use_underline">True</property>
+                <property name="activatable_widget">show_tags_switch</property>
+                <property name="subtitle" translatable="yes">Tags are saved, just not shown</property>
+                <child>
+                  <object class="GtkSwitch" id="show_tags_switch">
                     <property name="valign">center</property>
                   </object>
                 </child>
@@ -220,6 +225,12 @@
             </child>
           </object>
         </child>
+      </object>
+    </child>
+    <child>
+      <object class="AdwPreferencesPage" id="data_page">
+        <property name="icon_name">drive-harddisk-symbolic</property>
+        <property name="title" translatable="yes" context="A page title of the preferences dialog">Data</property>
         <child>
           <object class="AdwPreferencesGroup" id="reports_group">
             <property name="title" translatable="yes">Reports</property>