[gnome-control-center/wip/cdavis/universal-access-polish: 2/7] cc-ua-panel: Use AdwPreferencesPage/AdwPreferencesGroup




commit a11b081d73fef8df4c3ced3c34fcc1a10a865826
Author: Christopher Davis <christopherdavis gnome org>
Date:   Thu Dec 30 10:51:06 2021 -0800

    cc-ua-panel: Use AdwPreferencesPage/AdwPreferencesGroup
    
    The individual groups still use their own listboxes,
    as the custom rows they use won't be added to
    AdwPreferencesGroup's list.
    
    See 
https://gnome.pages.gitlab.gnome.org/libadwaita/doc/main/class.PreferencesGroup.html#adwpreferencesgroup-as-gtkbuildable

 panels/universal-access/cc-ua-panel.c  |    8 -
 panels/universal-access/cc-ua-panel.ui | 1155 ++++++++++++++++----------------
 2 files changed, 568 insertions(+), 595 deletions(-)
---
diff --git a/panels/universal-access/cc-ua-panel.c b/panels/universal-access/cc-ua-panel.c
index 621d6a084..6518189aa 100644
--- a/panels/universal-access/cc-ua-panel.c
+++ b/panels/universal-access/cc-ua-panel.c
@@ -104,15 +104,12 @@
 #define MOUSE_PERIPHERAL_SETTINGS    "org.gnome.desktop.peripherals.mouse"
 #define KEY_DOUBLE_CLICK_DELAY       "double-click"
 
-#define SCROLL_HEIGHT 490
-
 struct _CcUaPanel
 {
   CcPanel    parent_instance;
 
   GtkLabel          *accessx_label;
   GtkListBoxRow     *accessx_row;
-  GtkBox            *box;
   GtkLabel          *click_assist_label;
   GtkListBoxRow     *click_assist_row;
   GtkLabel          *cursor_blinking_label;
@@ -136,7 +133,6 @@ struct _CcUaPanel
   GtkListBoxRow     *screen_keyboard_row;
   GtkLabel          *screen_reader_label;
   GtkListBoxRow     *screen_reader_row;
-  GtkScrolledWindow *scrolled_window;
   GtkListBox        *seeing_listbox;
   GtkSwitch         *show_status_switch;
   GtkLabel          *sound_keys_label;
@@ -199,7 +195,6 @@ cc_ua_panel_class_init (CcUaPanelClass *klass)
 
   gtk_widget_class_bind_template_child (widget_class, CcUaPanel, accessx_label);
   gtk_widget_class_bind_template_child (widget_class, CcUaPanel, accessx_row);
-  gtk_widget_class_bind_template_child (widget_class, CcUaPanel, box);
   gtk_widget_class_bind_template_child (widget_class, CcUaPanel, click_assist_label);
   gtk_widget_class_bind_template_child (widget_class, CcUaPanel, click_assist_row);
   gtk_widget_class_bind_template_child (widget_class, CcUaPanel, cursor_blinking_label);
@@ -223,7 +218,6 @@ cc_ua_panel_class_init (CcUaPanelClass *klass)
   gtk_widget_class_bind_template_child (widget_class, CcUaPanel, screen_keyboard_row);
   gtk_widget_class_bind_template_child (widget_class, CcUaPanel, screen_reader_label);
   gtk_widget_class_bind_template_child (widget_class, CcUaPanel, screen_reader_row);
-  gtk_widget_class_bind_template_child (widget_class, CcUaPanel, scrolled_window);
   gtk_widget_class_bind_template_child (widget_class, CcUaPanel, seeing_listbox);
   gtk_widget_class_bind_template_child (widget_class, CcUaPanel, show_status_switch);
   gtk_widget_class_bind_template_child (widget_class, CcUaPanel, sound_keys_label);
@@ -644,6 +638,4 @@ cc_ua_panel_init (CcUaPanel *self)
   cc_ua_panel_init_hearing (self);
   cc_ua_panel_init_keyboard (self);
   cc_ua_panel_init_mouse (self);
-
-  gtk_scrolled_window_set_min_content_height (self->scrolled_window, SCROLL_HEIGHT);
 }
diff --git a/panels/universal-access/cc-ua-panel.ui b/panels/universal-access/cc-ua-panel.ui
index de7db4310..5b84ef0aa 100644
--- a/panels/universal-access/cc-ua-panel.ui
+++ b/panels/universal-access/cc-ua-panel.ui
@@ -12,660 +12,642 @@
   <!-- interface-requires gtk+ 3.0 -->
   <template class="CcUaPanel" parent="CcPanel">
     <child>
-      <object class="GtkScrolledWindow" id="scrolled_window">
-        <property name="hscrollbar_policy">never</property>
+      <object class="AdwPreferencesPage">
         <child>
-          <object class="GtkViewport">
-            <property name="scroll-to-focus">True</property>
+          <object class="AdwPreferencesGroup">
+            <child>
+              <object class="AdwActionRow">
+                <property name="title" translatable="yes">_Always Show Accessibility Menu</property>
+                <property name="use-underline">True</property>
+                <property name="activatable-widget">show_status_switch</property>
+                <child type="suffix">
+                  <object class="GtkSwitch" id="show_status_switch">
+                    <property name="valign">center</property>
+                  </object>
+                </child>
+              </object>
+            </child>
+          </object>
+        </child>
+        <child>
+          <object class="AdwPreferencesGroup">
             <child>
               <object class="GtkBox">
-                <property name="hexpand">True</property>
-
-                <!-- Content -->
+                <property name="orientation">vertical</property>
+                <child>
+                  <object class="GtkLabel" id="seeing_heading_label">
+                    <property name="margin_end">12</property>
+                    <property name="margin_bottom">12</property>
+                    <property name="xalign">0</property>
+                    <property name="label" translatable="yes">Seeing</property>
+                    <attributes>
+                      <attribute name="weight" value="bold"/>
+                    </attributes>
+                  </object>
+                </child>
                 <child>
-                  <object class="AdwClamp">
-                    <property name="margin-top">32</property>
-                    <property name="margin-bottom">32</property>
-                    <property name="margin-start">12</property>
-                    <property name="margin-end">12</property>
+                  <object class="GtkListBox" id="seeing_listbox">
+                    <property name="selection-mode">none</property>
+                    <style>
+                      <class name="boxed-list" />
+                    </style>
+                    <accessibility>
+                      <relation name="labelled-by">seeing_heading_label</relation>
+                    </accessibility>
                     <child>
-                      <object class="GtkBox" id="box">
-                        <property name="orientation">vertical</property>
-                        <property name="hexpand">True</property>
+                      <object class="GtkListBoxRow" id="highcontrast_row">
+                        <property name="selectable">False</property>
+                        <property name="activatable">False</property>
                         <child>
-                          <object class="GtkBox" id="show_status_box">
-                            <property name="margin_bottom">32</property>
+                          <object class="GtkBox">
                             <child>
                               <object class="GtkLabel">
                                 <property name="hexpand">True</property>
-                                <property name="label" translatable="yes">_Always Show Accessibility 
Menu</property>
+                                <property name="vexpand">True</property>
+                                <property name="margin_start">12</property>
+                                <property name="margin_end">12</property>
+                                <property name="margin_top">6</property>
+                                <property name="margin_bottom">6</property>
                                 <property name="xalign">0</property>
+                                <property name="label" translatable="yes">_High Contrast</property>
                                 <property name="use_underline">True</property>
-                                <property name="mnemonic_widget">show_status_switch</property>
+                                <property name="mnemonic_widget">highcontrast_enable_switch</property>
                               </object>
                             </child>
                             <child>
-                              <object class="GtkSwitch" id="show_status_switch">
-                                <property name="margin-end">15</property>
-                                <property name="halign">end</property>
+                              <object class="GtkSwitch" id="highcontrast_enable_switch">
+                                <property name="margin_start">12</property>
+                                <property name="margin_end">12</property>
+                                <property name="margin_top">12</property>
+                                <property name="margin_bottom">12</property>
                               </object>
                             </child>
                           </object>
                         </child>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkListBoxRow" id="large_text_row">
+                        <property name="selectable">False</property>
+                        <property name="activatable">False</property>
                         <child>
                           <object class="GtkBox">
-                            <property name="margin_bottom">32</property>
-                            <property name="orientation">vertical</property>
                             <child>
-                              <object class="GtkLabel" id="seeing_heading_label">
+                              <object class="GtkLabel">
+                                <property name="hexpand">True</property>
+                                <property name="vexpand">True</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="xalign">0</property>
-                                <property name="label" translatable="yes">Seeing</property>
-                                <attributes>
-                                  <attribute name="weight" value="bold"/>
-                                </attributes>
+                                <property name="label" translatable="yes">_Large Text</property>
+                                <property name="use_underline">True</property>
+                                <property name="mnemonic_widget">large_text_enable_switch</property>
                               </object>
                             </child>
                             <child>
-                              <object class="GtkListBox" id="seeing_listbox">
-                                <property name="selection-mode">none</property>
-                                <style>
-                                  <class name="boxed-list" />
-                                </style>
-                                <accessibility>
-                                  <relation name="labelled-by">seeing_heading_label</relation>
-                                </accessibility>
-                                <child>
-                                  <object class="GtkListBoxRow" id="highcontrast_row">
-                                    <property name="selectable">False</property>
-                                    <property name="activatable">False</property>
-                                    <child>
-                                      <object class="GtkBox">
-                                        <child>
-                                          <object class="GtkLabel">
-                                            <property name="hexpand">True</property>
-                                            <property name="vexpand">True</property>
-                                            <property name="margin_start">12</property>
-                                            <property name="margin_end">12</property>
-                                            <property name="margin_top">6</property>
-                                            <property name="margin_bottom">6</property>
-                                            <property name="xalign">0</property>
-                                            <property name="label" translatable="yes">_High 
Contrast</property>
-                                            <property name="use_underline">True</property>
-                                            <property 
name="mnemonic_widget">highcontrast_enable_switch</property>
-                                          </object>
-                                        </child>
-                                        <child>
-                                          <object class="GtkSwitch" id="highcontrast_enable_switch">
-                                            <property name="margin_start">12</property>
-                                            <property name="margin_end">12</property>
-                                            <property name="margin_top">12</property>
-                                            <property name="margin_bottom">12</property>
-                                          </object>
-                                        </child>
-                                      </object>
-                                    </child>
-                                  </object>
-                                </child>
-                                <child>
-                                  <object class="GtkListBoxRow" id="large_text_row">
-                                    <property name="selectable">False</property>
-                                    <property name="activatable">False</property>
-                                    <child>
-                                      <object class="GtkBox">
-                                        <child>
-                                          <object class="GtkLabel">
-                                            <property name="hexpand">True</property>
-                                            <property name="vexpand">True</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="xalign">0</property>
-                                            <property name="label" translatable="yes">_Large Text</property>
-                                            <property name="use_underline">True</property>
-                                            <property 
name="mnemonic_widget">large_text_enable_switch</property>
-                                          </object>
-                                        </child>
-                                        <child>
-                                          <object class="GtkSwitch" id="large_text_enable_switch">
-                                            <property name="margin_start">12</property>
-                                            <property name="margin_end">12</property>
-                                            <property name="margin_top">12</property>
-                                            <property name="margin_bottom">12</property>
-                                          </object>
-                                        </child>
-                                      </object>
-                                    </child>
-                                  </object>
-                                </child>
-                                <child>
-                                  <object class="GtkListBoxRow" id="enable_animations_row">
-                                    <property name="selectable">False</property>
-                                    <property name="activatable">False</property>
-                                    <child>
-                                      <object class="GtkBox">
-                                        <child>
-                                          <object class="GtkLabel">
-                                            <property name="hexpand">True</property>
-                                            <property name="vexpand">True</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="xalign">0</property>
-                                            <property name="hexpand">True</property>
-                                            <property name="label" translatable="yes">Enable 
A_nimations</property>
-                                            <property name="use_underline">True</property>
-                                            <property 
name="mnemonic_widget">enable_animations_switch</property>
-                                          </object>
-                                        </child>
-                                        <child>
-                                          <object class="GtkSwitch" id="enable_animations_switch">
-                                            <property name="margin_start">12</property>
-                                            <property name="margin_end">12</property>
-                                            <property name="margin_top">12</property>
-                                            <property name="margin_bottom">12</property>
-                                          </object>
-                                        </child>
-                                      </object>
-                                    </child>
-                                  </object>
-                                </child>
-                                <child>
-                                  <object class="GtkListBoxRow" id="cursor_size_row">
-                                    <child>
-                                      <object class="GtkBox">
-                                        <child>
-                                          <object class="GtkLabel">
-                                            <property name="hexpand">True</property>
-                                            <property name="vexpand">True</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="label" translatable="yes">C_ursor Size</property>
-                                            <property name="use_underline">True</property>
-                                            <property name="xalign">0</property>
-                                          </object>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel" id="cursor_size_label">
-                                            <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="label">24 pixels</property>
-                                            <property name="xalign">1</property>
-                                          </object>
-                                        </child>
-                                      </object>
-                                    </child>
-                                  </object>
-                                </child>
-                                <child>
-                                  <object class="GtkListBoxRow" id="zoom_row">
-                                    <child>
-                                      <object class="GtkBox">
-                                        <child>
-                                          <object class="GtkLabel">
-                                            <property name="hexpand">True</property>
-                                            <property name="vexpand">True</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="xalign">0</property>
-                                            <property name="label" translatable="yes">_Zoom</property>
-                                            <property name="use_underline">True</property>
-                                          </object>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel" id="zoom_label">
-                                            <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="xalign">1</property>
-                                            <property name="label" translatable="yes">Off</property>
-                                          </object>
-                                        </child>
-                                      </object>
-                                    </child>
-                                  </object>
-                                </child>
-                                <child>
-                                  <object class="GtkListBoxRow" id="screen_reader_row">
-                                    <child>
-                                      <object class="GtkBox">
-                                        <child>
-                                          <object class="GtkLabel">
-                                            <property name="hexpand">True</property>
-                                            <property name="vexpand">True</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="xalign">0</property>
-                                            <property name="label" translatable="yes">Screen 
_Reader</property>
-                                            <property name="use_underline">True</property>
-                                          </object>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel" id="screen_reader_label">
-                                            <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="xalign">1</property>
-                                            <property name="label" translatable="yes">Off</property>
-                                          </object>
-                                        </child>
-                                      </object>
-                                    </child>
-                                  </object>
-                                </child>
-                                <child>
-                                  <object class="GtkListBoxRow" id="sound_keys_row">
-                                    <child>
-                                      <object class="GtkBox">
-                                        <child>
-                                          <object class="GtkLabel">
-                                            <property name="hexpand">True</property>
-                                            <property name="vexpand">True</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="xalign">0</property>
-                                            <property name="label" translatable="yes">_Sound Keys</property>
-                                            <property name="use_underline">True</property>
-                                          </object>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel" id="sound_keys_label">
-                                            <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="xalign">1</property>
-                                            <property name="label" translatable="yes">Off</property>
-                                          </object>
-                                        </child>
-                                      </object>
-                                    </child>
-                                  </object>
-                                </child>
+                              <object class="GtkSwitch" id="large_text_enable_switch">
+                                <property name="margin_start">12</property>
+                                <property name="margin_end">12</property>
+                                <property name="margin_top">12</property>
+                                <property name="margin_bottom">12</property>
                               </object>
                             </child>
                           </object>
                         </child>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkListBoxRow" id="enable_animations_row">
+                        <property name="selectable">False</property>
+                        <property name="activatable">False</property>
                         <child>
                           <object class="GtkBox">
-                            <property name="margin_bottom">32</property>
-                            <property name="orientation">vertical</property>
                             <child>
-                              <object class="GtkLabel" id="hearing_heading_label">
+                              <object class="GtkLabel">
+                                <property name="hexpand">True</property>
+                                <property name="vexpand">True</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="xalign">0</property>
-                                <property name="label" translatable="yes">Hearing</property>
-                                <attributes>
-                                  <attribute name="weight" value="bold"/>
-                                </attributes>
+                                <property name="hexpand">True</property>
+                                <property name="label" translatable="yes">Enable A_nimations</property>
+                                <property name="use_underline">True</property>
+                                <property name="mnemonic_widget">enable_animations_switch</property>
                               </object>
                             </child>
                             <child>
-                              <object class="GtkListBox" id="hearing_listbox">
-                                <property name="selection-mode">none</property>
-                                <style>
-                                  <class name="boxed-list" />
-                                </style>
-                                <accessibility>
-                                  <relation name="labelled-by">hearing_heading_label</relation>
-                                </accessibility>
-                                <child>
-                                  <object class="GtkListBoxRow" id="visual_alerts_row">
-                                    <child>
-                                      <object class="GtkBox">
-                                        <child>
-                                          <object class="GtkLabel">
-                                            <property name="hexpand">True</property>
-                                            <property name="vexpand">True</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="xalign">0</property>
-                                            <property name="label" translatable="yes">_Visual 
Alerts</property>
-                                            <property name="use_underline">True</property>
-                                          </object>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel" id="visual_alerts_label">
-                                            <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="xalign">1</property>
-                                            <property name="label" translatable="yes">Off</property>
-                                          </object>
-                                        </child>
-                                      </object>
-                                    </child>
-                                  </object>
-                                </child>
+                              <object class="GtkSwitch" id="enable_animations_switch">
+                                <property name="margin_start">12</property>
+                                <property name="margin_end">12</property>
+                                <property name="margin_top">12</property>
+                                <property name="margin_bottom">12</property>
                               </object>
                             </child>
                           </object>
                         </child>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkListBoxRow" id="cursor_size_row">
                         <child>
                           <object class="GtkBox">
-                            <property name="margin_bottom">32</property>
-                            <property name="orientation">vertical</property>
                             <child>
-                              <object class="GtkLabel" id="typing_heading_label">
+                              <object class="GtkLabel">
+                                <property name="hexpand">True</property>
+                                <property name="vexpand">True</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="label" translatable="yes">C_ursor Size</property>
+                                <property name="use_underline">True</property>
                                 <property name="xalign">0</property>
-                                <property name="label" translatable="yes">Typing</property>
-                                <attributes>
-                                  <attribute name="weight" value="bold"/>
-                                </attributes>
                               </object>
                             </child>
                             <child>
-                              <object class="GtkListBox" id="typing_listbox">
-                                <property name="selection-mode">none</property>
-                                <style>
-                                  <class name="boxed-list" />
-                                </style>
-                                <accessibility>
-                                  <relation name="labelled-by">typing_heading_label</relation>
-                                </accessibility>
-                                <child>
-                                  <object class="GtkListBoxRow" id="screen_keyboard_row">
-                                    <property name="selectable">False</property>
-                                    <property name="activatable">False</property>
-                                    <child>
-                                      <object class="GtkBox">
-                                        <child>
-                                          <object class="GtkLabel">
-                                            <property name="hexpand">True</property>
-                                            <property name="vexpand">True</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="xalign">0</property>
-                                            <property name="label" translatable="yes">Screen 
_Keyboard</property>
-                                            <property name="use_underline">True</property>
-                                            <property 
name="mnemonic_widget">screen_keyboard_enable_switch</property>
-                                          </object>
-                                        </child>
-                                        <child>
-                                          <object class="GtkSwitch" id="screen_keyboard_enable_switch">
-                                            <property name="margin_start">12</property>
-                                            <property name="margin_end">12</property>
-                                            <property name="margin_top">12</property>
-                                            <property name="margin_bottom">12</property>
-                                          </object>
-                                        </child>
-                                      </object>
-                                    </child>
-                                  </object>
-                                </child>
-                                <child>
-                                  <object class="GtkListBoxRow" id="repeat_keys_row">
-                                    <child>
-                                      <object class="GtkBox">
-                                        <child>
-                                          <object class="GtkLabel">
-                                            <property name="hexpand">True</property>
-                                            <property name="vexpand">True</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="xalign">0</property>
-                                            <property name="label" translatable="yes">R_epeat Keys</property>
-                                            <property name="use_underline">True</property>
-                                          </object>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel" id="repeat_keys_label">
-                                            <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="xalign">1</property>
-                                            <property name="label" translatable="yes">Off</property>
-                                          </object>
-                                        </child>
-                                      </object>
-                                    </child>
-                                  </object>
-                                </child>
-                                <child>
-                                  <object class="GtkListBoxRow" id="cursor_blinking_row">
-                                    <child>
-                                      <object class="GtkBox">
-                                        <child>
-                                          <object class="GtkLabel">
-                                            <property name="hexpand">True</property>
-                                            <property name="vexpand">True</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="xalign">0</property>
-                                            <property name="label" translatable="yes">Cursor 
_Blinking</property>
-                                            <property name="use_underline">True</property>
-                                          </object>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel" id="cursor_blinking_label">
-                                            <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="xalign">1</property>
-                                            <property name="label" translatable="yes">Off</property>
-                                          </object>
-                                        </child>
-                                      </object>
-                                    </child>
-                                  </object>
-                                </child>
-                                <child>
-                                  <object class="GtkListBoxRow" id="accessx_row">
-                                    <child>
-                                      <object class="GtkBox">
-                                        <child>
-                                          <object class="GtkLabel">
-                                            <property name="hexpand">True</property>
-                                            <property name="vexpand">True</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="xalign">0</property>
-                                            <property name="label" translatable="yes">_Typing Assist 
(AccessX)</property>
-                                            <property name="use_underline">True</property>
-                                          </object>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel" id="accessx_label">
-                                            <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="xalign">1</property>
-                                            <property name="label" translatable="yes">Off</property>
-                                          </object>
-                                        </child>
-                                      </object>
-                                    </child>
-                                  </object>
-                                </child>
+                              <object class="GtkLabel" id="cursor_size_label">
+                                <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="label">24 pixels</property>
+                                <property name="xalign">1</property>
+                              </object>
+                            </child>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkListBoxRow" id="zoom_row">
+                        <child>
+                          <object class="GtkBox">
+                            <child>
+                              <object class="GtkLabel">
+                                <property name="hexpand">True</property>
+                                <property name="vexpand">True</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="xalign">0</property>
+                                <property name="label" translatable="yes">_Zoom</property>
+                                <property name="use_underline">True</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="zoom_label">
+                                <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="xalign">1</property>
+                                <property name="label" translatable="yes">Off</property>
+                              </object>
+                            </child>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkListBoxRow" id="screen_reader_row">
+                        <child>
+                          <object class="GtkBox">
+                            <child>
+                              <object class="GtkLabel">
+                                <property name="hexpand">True</property>
+                                <property name="vexpand">True</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="xalign">0</property>
+                                <property name="label" translatable="yes">Screen _Reader</property>
+                                <property name="use_underline">True</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="screen_reader_label">
+                                <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="xalign">1</property>
+                                <property name="label" translatable="yes">Off</property>
+                              </object>
+                            </child>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkListBoxRow" id="sound_keys_row">
+                        <child>
+                          <object class="GtkBox">
+                            <child>
+                              <object class="GtkLabel">
+                                <property name="hexpand">True</property>
+                                <property name="vexpand">True</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="xalign">0</property>
+                                <property name="label" translatable="yes">_Sound Keys</property>
+                                <property name="use_underline">True</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="sound_keys_label">
+                                <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="xalign">1</property>
+                                <property name="label" translatable="yes">Off</property>
+                              </object>
+                            </child>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+              </object>
+            </child>
+          </object>
+        </child>
+        <child>
+          <object class="AdwPreferencesGroup">
+            <child>
+              <object class="GtkBox">
+                <property name="orientation">vertical</property>
+                <child>
+                  <object class="GtkLabel" id="hearing_heading_label">
+                    <property name="margin_end">12</property>
+                    <property name="margin_bottom">12</property>
+                    <property name="xalign">0</property>
+                    <property name="label" translatable="yes">Hearing</property>
+                    <attributes>
+                      <attribute name="weight" value="bold"/>
+                    </attributes>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkListBox" id="hearing_listbox">
+                    <property name="selection-mode">none</property>
+                    <style>
+                      <class name="boxed-list" />
+                    </style>
+                    <accessibility>
+                      <relation name="labelled-by">hearing_heading_label</relation>
+                    </accessibility>
+                    <child>
+                      <object class="GtkListBoxRow" id="visual_alerts_row">
+                        <child>
+                          <object class="GtkBox">
+                            <child>
+                              <object class="GtkLabel">
+                                <property name="hexpand">True</property>
+                                <property name="vexpand">True</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="xalign">0</property>
+                                <property name="label" translatable="yes">_Visual Alerts</property>
+                                <property name="use_underline">True</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="visual_alerts_label">
+                                <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="xalign">1</property>
+                                <property name="label" translatable="yes">Off</property>
+                              </object>
+                            </child>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+              </object>
+            </child>
+          </object>
+        </child>
+        <child>
+          <object class="AdwPreferencesGroup">
+            <child>
+              <object class="GtkBox">
+                <property name="orientation">vertical</property>
+                <child>
+                  <object class="GtkLabel" id="typing_heading_label">
+                    <property name="margin_end">12</property>
+                    <property name="margin_bottom">12</property>
+                    <property name="xalign">0</property>
+                    <property name="label" translatable="yes">Typing</property>
+                    <attributes>
+                      <attribute name="weight" value="bold"/>
+                    </attributes>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkListBox" id="typing_listbox">
+                    <property name="selection-mode">none</property>
+                    <style>
+                      <class name="boxed-list" />
+                    </style>
+                    <accessibility>
+                      <relation name="labelled-by">typing_heading_label</relation>
+                    </accessibility>
+                    <child>
+                      <object class="GtkListBoxRow" id="screen_keyboard_row">
+                        <property name="selectable">False</property>
+                        <property name="activatable">False</property>
+                        <child>
+                          <object class="GtkBox">
+                            <child>
+                              <object class="GtkLabel">
+                                <property name="hexpand">True</property>
+                                <property name="vexpand">True</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="xalign">0</property>
+                                <property name="label" translatable="yes">Screen _Keyboard</property>
+                                <property name="use_underline">True</property>
+                                <property name="mnemonic_widget">screen_keyboard_enable_switch</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkSwitch" id="screen_keyboard_enable_switch">
+                                <property name="margin_start">12</property>
+                                <property name="margin_end">12</property>
+                                <property name="margin_top">12</property>
+                                <property name="margin_bottom">12</property>
+                              </object>
+                            </child>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkListBoxRow" id="repeat_keys_row">
+                        <child>
+                          <object class="GtkBox">
+                            <child>
+                              <object class="GtkLabel">
+                                <property name="hexpand">True</property>
+                                <property name="vexpand">True</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="xalign">0</property>
+                                <property name="label" translatable="yes">R_epeat Keys</property>
+                                <property name="use_underline">True</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="repeat_keys_label">
+                                <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="xalign">1</property>
+                                <property name="label" translatable="yes">Off</property>
+                              </object>
+                            </child>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkListBoxRow" id="cursor_blinking_row">
+                        <child>
+                          <object class="GtkBox">
+                            <child>
+                              <object class="GtkLabel">
+                                <property name="hexpand">True</property>
+                                <property name="vexpand">True</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="xalign">0</property>
+                                <property name="label" translatable="yes">Cursor _Blinking</property>
+                                <property name="use_underline">True</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="cursor_blinking_label">
+                                <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="xalign">1</property>
+                                <property name="label" translatable="yes">Off</property>
+                              </object>
+                            </child>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkListBoxRow" id="accessx_row">
+                        <child>
+                          <object class="GtkBox">
+                            <child>
+                              <object class="GtkLabel">
+                                <property name="hexpand">True</property>
+                                <property name="vexpand">True</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="xalign">0</property>
+                                <property name="label" translatable="yes">_Typing Assist (AccessX)</property>
+                                <property name="use_underline">True</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="accessx_label">
+                                <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="xalign">1</property>
+                                <property name="label" translatable="yes">Off</property>
+                              </object>
+                            </child>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+              </object>
+            </child>
+          </object>
+        </child>
+        <child>
+          <object class="AdwPreferencesGroup">
+            <child>
+              <object class="GtkBox">
+                <property name="orientation">vertical</property>
+                <child>
+                  <object class="GtkLabel" id="pointing_heading_label">
+                    <property name="margin_end">12</property>
+                    <property name="margin_bottom">12</property>
+                    <property name="xalign">0</property>
+                    <property name="label" translatable="yes">Pointing &amp; Clicking</property>
+                    <attributes>
+                      <attribute name="weight" value="bold"/>
+                    </attributes>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkListBox" id="pointing_listbox">
+                    <property name="selection-mode">none</property>
+                    <style>
+                      <class name="boxed-list" />
+                    </style>
+                    <accessibility>
+                      <relation name="labelled-by">pointing_heading_label</relation>
+                    </accessibility>
+                    <child>
+                      <object class="GtkListBoxRow" id="mouse_keys_row">
+                        <property name="selectable">False</property>
+                        <property name="activatable">False</property>
+                        <child>
+                          <object class="GtkBox">
+                            <child>
+                              <object class="GtkLabel">
+                                <property name="hexpand">True</property>
+                                <property name="vexpand">True</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="xalign">0</property>
+                                <property name="label" translatable="yes">_Mouse Keys</property>
+                                <property name="use_underline">True</property>
+                                <property name="mnemonic_widget">mouse_keys_enable_switch</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkSwitch" id="mouse_keys_enable_switch">
+                                <property name="margin_start">12</property>
+                                <property name="margin_end">12</property>
+                                <property name="margin_top">12</property>
+                                <property name="margin_bottom">12</property>
                               </object>
                             </child>
                           </object>
                         </child>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkListBoxRow">
+                        <property name="selectable">False</property>
+                        <property name="activatable">False</property>
                         <child>
                           <object class="GtkBox">
-                            <property name="orientation">vertical</property>
                             <child>
-                              <object class="GtkLabel" id="pointing_heading_label">
+                              <object class="GtkLabel">
+                                <property name="hexpand">True</property>
+                                <property name="vexpand">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="xalign">0</property>
-                                <property name="label" translatable="yes">Pointing &amp; Clicking</property>
-                                <attributes>
-                                  <attribute name="weight" value="bold"/>
-                                </attributes>
+                                <property name="label" translatable="yes">_Locate Pointer</property>
+                                <property name="use_underline">True</property>
+                                <property name="mnemonic_widget">locate_pointer_enable_switch</property>
                               </object>
                             </child>
                             <child>
-                              <object class="GtkListBox" id="pointing_listbox">
-                                <property name="selection-mode">none</property>
-                                <style>
-                                  <class name="boxed-list" />
-                                </style>
+                              <object class="GtkSwitch" id="locate_pointer_enable_switch">
+                                <property name="margin_start">12</property>
+                                <property name="margin_end">12</property>
+                                <property name="margin_top">12</property>
+                                <property name="margin_bottom">12</property>
+                              </object>
+                            </child>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkListBoxRow" id="click_assist_row">
+                        <child>
+                          <object class="GtkBox">
+                            <child>
+                              <object class="GtkLabel">
+                                <property name="hexpand">True</property>
+                                <property name="vexpand">True</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="xalign">0</property>
+                                <property name="label" translatable="yes">_Click Assist</property>
+                                <property name="use_underline">True</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="click_assist_label">
+                                <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="xalign">1</property>
+                                <property name="label" translatable="yes">Off</property>
+                              </object>
+                            </child>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkListBoxRow" id="double_click_delay_row">
+                        <child>
+                          <object class="GtkBox">
+                            <child>
+                              <object class="GtkLabel">
+                                <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="xalign">0</property>
+                                <property name="label" translatable="yes">_Double-Click Delay</property>
+                                <property name="use_underline">True</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkScale" id="double_click_delay_scale">
+                                <property name="hexpand">True</property>
+                                <property name="vexpand">True</property>
+                                <property name="adjustment">double_click_delay_adjustment</property>
+                                <property name="draw_value">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>
                                 <accessibility>
-                                  <relation name="labelled-by">pointing_heading_label</relation>
+                                  <property name="label" translatable="yes">Double-Click Delay</property>
                                 </accessibility>
-                                <child>
-                                  <object class="GtkListBoxRow" id="mouse_keys_row">
-                                    <property name="selectable">False</property>
-                                    <property name="activatable">False</property>
-                                    <child>
-                                      <object class="GtkBox">
-                                        <child>
-                                          <object class="GtkLabel">
-                                            <property name="hexpand">True</property>
-                                            <property name="vexpand">True</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="xalign">0</property>
-                                            <property name="label" translatable="yes">_Mouse Keys</property>
-                                            <property name="use_underline">True</property>
-                                            <property 
name="mnemonic_widget">mouse_keys_enable_switch</property>
-                                          </object>
-                                        </child>
-                                        <child>
-                                          <object class="GtkSwitch" id="mouse_keys_enable_switch">
-                                            <property name="margin_start">12</property>
-                                            <property name="margin_end">12</property>
-                                            <property name="margin_top">12</property>
-                                            <property name="margin_bottom">12</property>
-                                          </object>
-                                        </child>
-                                      </object>
-                                    </child>
-                                  </object>
-                                </child>
-                                <child>
-                                  <object class="GtkListBoxRow">
-                                    <property name="selectable">False</property>
-                                    <property name="activatable">False</property>
-                                    <child>
-                                      <object class="GtkBox">
-                                        <child>
-                                          <object class="GtkLabel">
-                                            <property name="hexpand">True</property>
-                                            <property name="vexpand">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="xalign">0</property>
-                                            <property name="label" translatable="yes">_Locate 
Pointer</property>
-                                            <property name="use_underline">True</property>
-                                            <property 
name="mnemonic_widget">locate_pointer_enable_switch</property>
-                                          </object>
-                                        </child>
-                                        <child>
-                                          <object class="GtkSwitch" id="locate_pointer_enable_switch">
-                                            <property name="margin_start">12</property>
-                                            <property name="margin_end">12</property>
-                                            <property name="margin_top">12</property>
-                                            <property name="margin_bottom">12</property>
-                                          </object>
-                                        </child>
-                                      </object>
-                                    </child>
-                                  </object>
-                                </child>
-                                <child>
-                                  <object class="GtkListBoxRow" id="click_assist_row">
-                                    <child>
-                                      <object class="GtkBox">
-                                        <child>
-                                          <object class="GtkLabel">
-                                            <property name="hexpand">True</property>
-                                            <property name="vexpand">True</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="xalign">0</property>
-                                            <property name="label" translatable="yes">_Click 
Assist</property>
-                                            <property name="use_underline">True</property>
-                                          </object>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel" id="click_assist_label">
-                                            <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="xalign">1</property>
-                                            <property name="label" translatable="yes">Off</property>
-                                          </object>
-                                        </child>
-                                      </object>
-                                    </child>
-                                  </object>
-                                </child>
-                                <child>
-                                  <object class="GtkListBoxRow" id="double_click_delay_row">
-                                    <child>
-                                      <object class="GtkBox">
-                                        <child>
-                                          <object class="GtkLabel">
-                                            <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="xalign">0</property>
-                                            <property name="label" translatable="yes">_Double-Click 
Delay</property>
-                                            <property name="use_underline">True</property>
-                                          </object>
-                                        </child>
-                                        <child>
-                                          <object class="GtkScale" id="double_click_delay_scale">
-                                            <property name="hexpand">True</property>
-                                            <property name="vexpand">True</property>
-                                            <property 
name="adjustment">double_click_delay_adjustment</property>
-                                            <property name="draw_value">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>
-                                            <accessibility>
-                                              <property name="label" translatable="yes">Double-Click 
Delay</property>
-                                            </accessibility>
-                                          </object>
-                                        </child>
-                                      </object>
-                                    </child>
-                                  </object>
-                                </child>
                               </object>
                             </child>
                           </object>
@@ -674,7 +656,6 @@
                     </child>
                   </object>
                 </child>
-
               </object>
             </child>
           </object>


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]