diff options
author | Robert Ancell <robert.ancell@canonical.com> | 2020-11-03 10:19:19 +1300 |
---|---|---|
committer | Georges Basile Stavracas Neto <georges.stavracas@gmail.com> | 2020-11-11 20:01:55 +0000 |
commit | 99d70975483c9868867f57b3716e122a0c4cd177 (patch) | |
tree | 84e977df4cd0d3112a774ea477e0b27877ac21ba | |
parent | 4ac698eabd98126872ab3c2fbd484ca1fbcf9ae8 (diff) | |
download | gnome-control-center-99d70975483c9868867f57b3716e122a0c4cd177.tar.gz |
universal-access: Rename widgets to standard names and use standard types
-rw-r--r-- | panels/universal-access/cc-ua-panel.c | 261 | ||||
-rw-r--r-- | panels/universal-access/cc-ua-panel.ui | 222 |
2 files changed, 236 insertions, 247 deletions
diff --git a/panels/universal-access/cc-ua-panel.c b/panels/universal-access/cc-ua-panel.c index 15091cabd..b3d9c0039 100644 --- a/panels/universal-access/cc-ua-panel.c +++ b/panels/universal-access/cc-ua-panel.c @@ -108,42 +108,44 @@ struct _CcUaPanel { CcPanel parent_instance; - GtkWidget *list_hearing; - GtkWidget *list_pointing; - GtkWidget *list_seeing; - GtkWidget *list_typing; - GtkWidget *mouse_keys_switch; - GtkWidget *locate_pointer_switch; - GtkListBoxRow *row_accessx; - GtkListBoxRow *row_click_assist; - GtkListBoxRow *row_cursor_blinking; - GtkListBoxRow *row_cursor_size; - GtkListBoxRow *row_highcontrast; - GtkListBoxRow *row_large_text; - GtkListBoxRow *row_mouse_keys; - GtkListBoxRow *row_repeat_keys; - GtkListBoxRow *row_screen_keyboard; - GtkListBoxRow *row_screen_reader; - GtkListBoxRow *row_sound_keys; - GtkListBoxRow *row_visual_alerts; - GtkListBoxRow *row_zoom; - GtkWidget *scale_double_click_delay; - GtkWidget *screen_keyboard_switch; - GtkWidget *section_status; - GtkWidget *switch_status; - GtkWidget *universal_access_content; - GtkWidget *universal_access_panel; - GtkWidget *value_accessx; - GtkWidget *value_click_assist; - GtkWidget *value_cursor_size; - GtkWidget *value_highcontrast; - GtkWidget *value_large_text; - GtkWidget *value_repeat_keys; - GtkWidget *value_row_cursor_blinking; - GtkWidget *value_screen_reader; - GtkWidget *value_sound_keys; - GtkWidget *value_visual_alerts; - GtkWidget *value_zoom; + GtkLabel *accessx_label; + GtkListBoxRow *accessx_row; + GtkBox *box; + GtkLabel *click_assist_label; + GtkListBoxRow *click_assist_row; + GtkLabel *cursor_blinking_label; + GtkListBoxRow *cursor_blinking_row; + GtkLabel *cursor_size_label; + GtkListBoxRow *cursor_size_row; + GtkScale *double_click_delay_scale; + GtkListBox *hearing_listbox; + GtkSwitch *highcontrast_enable_switch; + GtkListBoxRow *highcontrast_row; + GtkSwitch *large_text_enable_switch; + GtkListBoxRow *large_text_row; + GtkSwitch *locate_pointer_enable_switch; + GtkSwitch *mouse_keys_enable_switch; + GtkListBoxRow *mouse_keys_row; + GtkListBox *pointing_listbox; + GtkLabel *repeat_keys_label; + GtkListBoxRow *repeat_keys_row; + GtkSwitch *screen_keyboard_enable_switch; + GtkListBoxRow *screen_keyboard_row; + GtkLabel *screen_reader_label; + GtkListBoxRow *screen_reader_row; + GtkScrolledWindow *scrolled_window; + GtkListBox *seeing_listbox; + GtkBox *show_status_box; + GtkSwitch *show_status_switch; + GtkLabel *sound_keys_label; + GtkListBoxRow *sound_keys_row; + GtkListBox *typing_listbox; + GtkLabel *visual_alerts_label; + GtkListBoxRow *visual_alerts_row; + GtkLabel *zoom_label; + GtkListBoxRow *zoom_row; + + GtkAdjustment *focus_adjustment; GSettings *wm_settings; GSettings *a11y_settings; @@ -154,8 +156,6 @@ struct _CcUaPanel GSettings *application_settings; GSettings *gsd_mouse_settings; - GtkAdjustment *focus_adjustment; - GList *sections; GList *sections_reverse; }; @@ -201,38 +201,42 @@ cc_ua_panel_class_init (CcUaPanelClass *klass) gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/control-center/universal-access/cc-ua-panel.ui"); - gtk_widget_class_bind_template_child (widget_class, CcUaPanel, list_hearing); - gtk_widget_class_bind_template_child (widget_class, CcUaPanel, list_pointing); - gtk_widget_class_bind_template_child (widget_class, CcUaPanel, list_seeing); - gtk_widget_class_bind_template_child (widget_class, CcUaPanel, list_typing); - gtk_widget_class_bind_template_child (widget_class, CcUaPanel, mouse_keys_switch); - gtk_widget_class_bind_template_child (widget_class, CcUaPanel, locate_pointer_switch); - gtk_widget_class_bind_template_child (widget_class, CcUaPanel, row_accessx); - gtk_widget_class_bind_template_child (widget_class, CcUaPanel, row_click_assist); - gtk_widget_class_bind_template_child (widget_class, CcUaPanel, row_cursor_blinking); - gtk_widget_class_bind_template_child (widget_class, CcUaPanel, row_cursor_size); - gtk_widget_class_bind_template_child (widget_class, CcUaPanel, row_repeat_keys); - gtk_widget_class_bind_template_child (widget_class, CcUaPanel, row_screen_reader); - gtk_widget_class_bind_template_child (widget_class, CcUaPanel, row_sound_keys); - gtk_widget_class_bind_template_child (widget_class, CcUaPanel, row_visual_alerts); - gtk_widget_class_bind_template_child (widget_class, CcUaPanel, row_zoom); - gtk_widget_class_bind_template_child (widget_class, CcUaPanel, scale_double_click_delay); - gtk_widget_class_bind_template_child (widget_class, CcUaPanel, screen_keyboard_switch); - gtk_widget_class_bind_template_child (widget_class, CcUaPanel, section_status); - gtk_widget_class_bind_template_child (widget_class, CcUaPanel, switch_status); - gtk_widget_class_bind_template_child (widget_class, CcUaPanel, universal_access_content); - gtk_widget_class_bind_template_child (widget_class, CcUaPanel, universal_access_panel); - gtk_widget_class_bind_template_child (widget_class, CcUaPanel, value_accessx); - gtk_widget_class_bind_template_child (widget_class, CcUaPanel, value_click_assist); - gtk_widget_class_bind_template_child (widget_class, CcUaPanel, value_cursor_size); - gtk_widget_class_bind_template_child (widget_class, CcUaPanel, value_highcontrast); - gtk_widget_class_bind_template_child (widget_class, CcUaPanel, value_large_text); - gtk_widget_class_bind_template_child (widget_class, CcUaPanel, value_repeat_keys); - gtk_widget_class_bind_template_child (widget_class, CcUaPanel, value_row_cursor_blinking); - gtk_widget_class_bind_template_child (widget_class, CcUaPanel, value_screen_reader); - gtk_widget_class_bind_template_child (widget_class, CcUaPanel, value_sound_keys); - gtk_widget_class_bind_template_child (widget_class, CcUaPanel, value_visual_alerts); - gtk_widget_class_bind_template_child (widget_class, CcUaPanel, value_zoom); + 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); + gtk_widget_class_bind_template_child (widget_class, CcUaPanel, cursor_blinking_row); + gtk_widget_class_bind_template_child (widget_class, CcUaPanel, cursor_size_label); + gtk_widget_class_bind_template_child (widget_class, CcUaPanel, cursor_size_row); + gtk_widget_class_bind_template_child (widget_class, CcUaPanel, double_click_delay_scale); + gtk_widget_class_bind_template_child (widget_class, CcUaPanel, hearing_listbox); + gtk_widget_class_bind_template_child (widget_class, CcUaPanel, highcontrast_enable_switch); + gtk_widget_class_bind_template_child (widget_class, CcUaPanel, highcontrast_row); + gtk_widget_class_bind_template_child (widget_class, CcUaPanel, large_text_enable_switch); + gtk_widget_class_bind_template_child (widget_class, CcUaPanel, large_text_row); + gtk_widget_class_bind_template_child (widget_class, CcUaPanel, locate_pointer_enable_switch); + gtk_widget_class_bind_template_child (widget_class, CcUaPanel, mouse_keys_enable_switch); + gtk_widget_class_bind_template_child (widget_class, CcUaPanel, mouse_keys_row); + gtk_widget_class_bind_template_child (widget_class, CcUaPanel, pointing_listbox); + gtk_widget_class_bind_template_child (widget_class, CcUaPanel, repeat_keys_label); + gtk_widget_class_bind_template_child (widget_class, CcUaPanel, repeat_keys_row); + gtk_widget_class_bind_template_child (widget_class, CcUaPanel, screen_keyboard_enable_switch); + 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_box); + gtk_widget_class_bind_template_child (widget_class, CcUaPanel, show_status_switch); + gtk_widget_class_bind_template_child (widget_class, CcUaPanel, sound_keys_label); + gtk_widget_class_bind_template_child (widget_class, CcUaPanel, sound_keys_row); + gtk_widget_class_bind_template_child (widget_class, CcUaPanel, typing_listbox); + gtk_widget_class_bind_template_child (widget_class, CcUaPanel, visual_alerts_label); + gtk_widget_class_bind_template_child (widget_class, CcUaPanel, visual_alerts_row); + gtk_widget_class_bind_template_child (widget_class, CcUaPanel, zoom_label); + gtk_widget_class_bind_template_child (widget_class, CcUaPanel, zoom_row); } /* seeing section */ @@ -416,7 +420,7 @@ keynav_failed (CcUaPanel *self, GtkDirectionType direction, GtkWidget *list) } static void -add_section (GtkWidget *list, CcUaPanel *self) +add_section (GtkListBox *list, CcUaPanel *self) { g_signal_connect_object (list, "keynav-failed", G_CALLBACK (keynav_failed), self, G_CONNECT_SWAPPED); @@ -427,23 +431,20 @@ add_section (GtkWidget *list, CcUaPanel *self) static void cc_ua_panel_init_status (CcUaPanel *self) { - GtkWidget *box; - - box = GTK_WIDGET (self->section_status); - self->sections_reverse = g_list_prepend (self->sections_reverse, box); + self->sections_reverse = g_list_prepend (self->sections_reverse, self->show_status_box); g_settings_bind (self->a11y_settings, KEY_ALWAYS_SHOW_STATUS, - self->switch_status, "active", + self->show_status_switch, "active", G_SETTINGS_BIND_DEFAULT); } static void -toggle_switch (GtkWidget *sw) +toggle_switch (GtkSwitch *sw) { gboolean active; - active = gtk_switch_get_active (GTK_SWITCH (sw)); - gtk_switch_set_active (GTK_SWITCH (sw), !active); + active = gtk_switch_get_active (sw); + gtk_switch_set_active (sw, !active); } static void @@ -458,55 +459,55 @@ run_dialog (CcUaPanel *self, GtkDialog *dialog) static void activate_row (CcUaPanel *self, GtkListBoxRow *row) { - if (row == self->row_highcontrast) + if (row == self->highcontrast_row) { - toggle_switch (self->value_highcontrast); + toggle_switch (self->highcontrast_enable_switch); } - else if (row == self->row_large_text) + else if (row == self->large_text_row) { - toggle_switch (self->value_large_text); + toggle_switch (self->large_text_enable_switch); } - else if (row == self->row_screen_keyboard) + else if (row == self->screen_keyboard_row) { - toggle_switch (self->screen_keyboard_switch); + toggle_switch (self->screen_keyboard_enable_switch); } - else if (row == self->row_mouse_keys) + else if (row == self->mouse_keys_row) { - toggle_switch (self->mouse_keys_switch); + toggle_switch (self->mouse_keys_enable_switch); } - else if (row == self->row_zoom) + else if (row == self->zoom_row) { run_dialog (self, GTK_DIALOG (cc_zoom_options_dialog_new ())); } - else if (row == self->row_cursor_size) + else if (row == self->cursor_size_row) { run_dialog (self, GTK_DIALOG (cc_cursor_size_dialog_new ())); } - else if (row == self->row_screen_reader) + else if (row == self->screen_reader_row) { run_dialog (self, GTK_DIALOG (cc_screen_reader_dialog_new ())); } - else if (row == self->row_sound_keys) + else if (row == self->sound_keys_row) { run_dialog (self, GTK_DIALOG (cc_sound_keys_dialog_new ())); } - else if (row == self->row_visual_alerts) + else if (row == self->visual_alerts_row) { run_dialog (self, GTK_DIALOG (cc_visual_alerts_dialog_new ())); } - else if (row == self->row_repeat_keys) + else if (row == self->repeat_keys_row) { run_dialog (self, GTK_DIALOG (cc_repeat_keys_dialog_new ())); } - else if (row == self->row_cursor_blinking) + else if (row == self->cursor_blinking_row) { run_dialog (self, GTK_DIALOG (cc_cursor_blinking_dialog_new ())); } - else if (row == self->row_accessx) + else if (row == self->accessx_row) { run_dialog (self, GTK_DIALOG (cc_typing_dialog_new ())); } - else if (row == self->row_click_assist) + else if (row == self->click_assist_row) { run_dialog (self, GTK_DIALOG (cc_pointing_dialog_new ())); } @@ -515,15 +516,15 @@ activate_row (CcUaPanel *self, GtkListBoxRow *row) static void cc_ua_panel_init_seeing (CcUaPanel *self) { - add_section (self->list_seeing, self); + add_section (self->seeing_listbox, self); - add_separators (GTK_LIST_BOX (self->list_seeing)); + add_separators (self->seeing_listbox); - g_signal_connect_object (self->list_seeing, "row-activated", + g_signal_connect_object (self->seeing_listbox, "row-activated", G_CALLBACK (activate_row), self, G_CONNECT_SWAPPED); g_settings_bind_with_mapping (self->interface_settings, KEY_GTK_THEME, - self->value_highcontrast, + self->highcontrast_enable_switch, "active", G_SETTINGS_BIND_DEFAULT, get_contrast_mapping, set_contrast_mapping, @@ -533,7 +534,7 @@ cc_ua_panel_init_seeing (CcUaPanel *self) /* large text */ g_settings_bind_with_mapping (self->interface_settings, KEY_TEXT_SCALING_FACTOR, - self->value_large_text, + self->large_text_enable_switch, "active", G_SETTINGS_BIND_DEFAULT, get_large_text_mapping, set_large_text_mapping, @@ -543,7 +544,7 @@ cc_ua_panel_init_seeing (CcUaPanel *self) /* cursor size */ g_settings_bind_with_mapping (self->interface_settings, KEY_MOUSE_CURSOR_SIZE, // FIXME - self->value_cursor_size, + self->cursor_size_label, "label", G_SETTINGS_BIND_GET, cursor_size_label_mapping_get, NULL, NULL, NULL); @@ -551,7 +552,7 @@ cc_ua_panel_init_seeing (CcUaPanel *self) /* zoom */ g_settings_bind_with_mapping (self->application_settings, "screen-magnifier-enabled", - self->value_zoom, + self->zoom_label, "label", G_SETTINGS_BIND_GET, on_off_label_mapping_get, NULL, NULL, NULL); @@ -559,7 +560,7 @@ cc_ua_panel_init_seeing (CcUaPanel *self) /* screen reader */ g_settings_bind_with_mapping (self->application_settings, "screen-reader-enabled", - self->value_screen_reader, "label", + self->screen_reader_label, "label", G_SETTINGS_BIND_GET, on_off_label_mapping_get, NULL, NULL, NULL); @@ -567,7 +568,7 @@ cc_ua_panel_init_seeing (CcUaPanel *self) /* sound keys */ g_settings_bind_with_mapping (self->kb_settings, KEY_TOGGLEKEYS_ENABLED, - self->value_sound_keys, "label", + self->sound_keys_label, "label", G_SETTINGS_BIND_GET, on_off_label_mapping_get, NULL, NULL, NULL); @@ -578,15 +579,15 @@ cc_ua_panel_init_seeing (CcUaPanel *self) static void cc_ua_panel_init_hearing (CcUaPanel *self) { - add_section (self->list_hearing, self); + add_section (self->hearing_listbox, self); - add_separators (GTK_LIST_BOX (self->list_hearing)); + add_separators (self->hearing_listbox); - g_signal_connect_object (self->list_hearing, "row-activated", + g_signal_connect_object (self->hearing_listbox, "row-activated", G_CALLBACK (activate_row), self, G_CONNECT_SWAPPED); g_settings_bind_with_mapping (self->wm_settings, KEY_VISUAL_BELL_ENABLED, - self->value_visual_alerts, + self->visual_alerts_label, "label", G_SETTINGS_BIND_GET, on_off_label_mapping_get, NULL, NULL, NULL); @@ -600,7 +601,7 @@ on_repeat_keys_toggled (CcUaPanel *self) on = g_settings_get_boolean (self->kb_desktop_settings, KEY_REPEAT_KEYS); - gtk_label_set_text (GTK_LABEL (self->value_repeat_keys), on ? _("On") : _("Off")); + gtk_label_set_text (self->repeat_keys_label, on ? _("On") : _("Off")); } static void @@ -610,7 +611,7 @@ on_cursor_blinking_toggled (CcUaPanel *self) on = g_settings_get_boolean (self->interface_settings, KEY_CURSOR_BLINKING); - gtk_label_set_text (GTK_LABEL (self->value_row_cursor_blinking), on ? _("On") : _("Off")); + gtk_label_set_text (self->cursor_blinking_label, on ? _("On") : _("Off")); } static void @@ -622,25 +623,22 @@ update_accessx_label (CcUaPanel *self) g_settings_get_boolean (self->kb_settings, KEY_SLOWKEYS_ENABLED) || g_settings_get_boolean (self->kb_settings, KEY_BOUNCEKEYS_ENABLED); - gtk_label_set_text (GTK_LABEL (self->value_accessx), on ? _("On") : _("Off")); + gtk_label_set_text (self->accessx_label, on ? _("On") : _("Off")); } static void cc_ua_panel_init_keyboard (CcUaPanel *self) { - GtkWidget *list; - - list = self->list_typing; - add_section (list, self); + add_section (self->typing_listbox, self); - add_separators (GTK_LIST_BOX (list)); + add_separators (self->typing_listbox); - g_signal_connect_object (list, "row-activated", + g_signal_connect_object (self->typing_listbox, "row-activated", G_CALLBACK (activate_row), self, G_CONNECT_SWAPPED); /* on-screen keyboard */ g_settings_bind (self->application_settings, KEY_SCREEN_KEYBOARD_ENABLED, - self->screen_keyboard_switch, "active", + self->screen_keyboard_enable_switch, "active", G_SETTINGS_BIND_DEFAULT); /* Repeat keys */ @@ -668,29 +666,26 @@ update_click_assist_label (CcUaPanel *self) on = g_settings_get_boolean (self->mouse_settings, KEY_SECONDARY_CLICK_ENABLED) || g_settings_get_boolean (self->mouse_settings, KEY_DWELL_CLICK_ENABLED); - gtk_label_set_text (GTK_LABEL (self->value_click_assist), on ? _("On") : _("Off")); + gtk_label_set_text (self->click_assist_label, on ? _("On") : _("Off")); } static void cc_ua_panel_init_mouse (CcUaPanel *self) { - GtkWidget *list; - - list = self->list_pointing; - add_section (list, self); + add_section (self->pointing_listbox, self); - add_separators (GTK_LIST_BOX (list)); + add_separators (self->pointing_listbox); - g_signal_connect_object (list, "row-activated", + g_signal_connect_object (self->pointing_listbox, "row-activated", G_CALLBACK (activate_row), self, G_CONNECT_SWAPPED); g_settings_bind (self->kb_settings, KEY_MOUSEKEYS_ENABLED, - self->mouse_keys_switch, "active", + self->mouse_keys_enable_switch, "active", G_SETTINGS_BIND_DEFAULT); g_settings_bind (self->interface_settings, KEY_LOCATE_POINTER, - self->locate_pointer_switch, "active", + self->locate_pointer_enable_switch, "active", G_SETTINGS_BIND_DEFAULT); g_signal_connect_object (self->mouse_settings, "changed", @@ -698,10 +693,10 @@ cc_ua_panel_init_mouse (CcUaPanel *self) update_click_assist_label (self); g_settings_bind (self->gsd_mouse_settings, "double-click", - gtk_range_get_adjustment (GTK_RANGE (self->scale_double_click_delay)), "value", + gtk_range_get_adjustment (GTK_RANGE (self->double_click_delay_scale)), "value", G_SETTINGS_BIND_DEFAULT); - gtk_scale_add_mark (GTK_SCALE (self->scale_double_click_delay), 400, GTK_POS_BOTTOM, NULL); + gtk_scale_add_mark (GTK_SCALE (self->double_click_delay_scale), 400, GTK_POS_BOTTOM, NULL); } static void @@ -726,8 +721,8 @@ cc_ua_panel_init (CcUaPanel *self) cc_ua_panel_init_keyboard (self); cc_ua_panel_init_mouse (self); - gtk_scrolled_window_set_min_content_height (GTK_SCROLLED_WINDOW (self->universal_access_panel), SCROLL_HEIGHT); + gtk_scrolled_window_set_min_content_height (self->scrolled_window, SCROLL_HEIGHT); - self->focus_adjustment = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (self->universal_access_panel)); - gtk_container_set_focus_vadjustment (GTK_CONTAINER (self->universal_access_content), self->focus_adjustment); + self->focus_adjustment = gtk_scrolled_window_get_vadjustment (self->scrolled_window); + gtk_container_set_focus_vadjustment (GTK_CONTAINER (self->box), self->focus_adjustment); } diff --git a/panels/universal-access/cc-ua-panel.ui b/panels/universal-access/cc-ua-panel.ui index a1b0d4816..4aaddfa06 100644 --- a/panels/universal-access/cc-ua-panel.ui +++ b/panels/universal-access/cc-ua-panel.ui @@ -2,7 +2,7 @@ <!-- Generated with glade 3.20.0 --> <interface> <requires lib="gtk+" version="3.0"/> - <object class="GtkAdjustment" id="double-click-delay-adjustment"> + <object class="GtkAdjustment" id="double_click_delay_adjustment"> <property name="lower">100</property> <property name="upper">1000</property> <property name="value">400</property> @@ -14,13 +14,13 @@ <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="GtkScrolledWindow" id="universal_access_panel"> + <object class="GtkScrolledWindow" id="scrolled_window"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hscrollbar_policy">never</property> <property name="shadow_type">none</property> <child> - <object class="GtkViewport" id="viewport1"> + <object class="GtkViewport"> <property name="visible">True</property> <property name="can_focus">False</property> <child> @@ -38,23 +38,23 @@ <property name="margin-start">12</property> <property name="margin-end">12</property> <child> - <object class="GtkBox" id="universal_access_content"> + <object class="GtkBox" id="box"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <property name="hexpand">True</property> <child> - <object class="GtkBox" id="section_status"> + <object class="GtkBox" id="show_status_box"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_bottom">32</property> <child> - <object class="GtkLabel" id="heading_status"> + <object class="GtkLabel"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">_Always Show Accessibility Menu</property> <property name="use_underline">True</property> - <property name="mnemonic_widget">switch_status</property> + <property name="mnemonic_widget">show_status_switch</property> </object> <packing> <property name="expand">False</property> @@ -63,7 +63,7 @@ </packing> </child> <child> - <object class="GtkSwitch" id="switch_status"> + <object class="GtkSwitch" id="show_status_switch"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="halign">end</property> @@ -82,13 +82,13 @@ </packing> </child> <child> - <object class="GtkBox" id="section_seeing"> + <object class="GtkBox"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_bottom">32</property> <property name="orientation">vertical</property> <child> - <object class="GtkLabel" id="heading_seeing"> + <object class="GtkLabel" id="seeing_heading_label"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_end">12</property> @@ -99,7 +99,7 @@ <attribute name="weight" value="bold"/> </attributes> <accessibility> - <relation target="list_seeing" type="label-for"/> + <relation target="seeing_listbox" type="label-for"/> </accessibility> </object> <packing> @@ -109,30 +109,30 @@ </packing> </child> <child> - <object class="GtkFrame" id="frame_seeing"> + <object class="GtkFrame"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="label_xalign">0</property> <property name="shadow_type">in</property> <child> - <object class="GtkListBox" id="list_seeing"> + <object class="GtkListBox" id="seeing_listbox"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="selection-mode">none</property> <accessibility> - <relation target="heading_seeing" type="labelled-by"/> + <relation target="seeing_heading_label" type="labelled-by"/> </accessibility> <child> - <object class="GtkListBoxRow" id="row_highcontrast"> + <object class="GtkListBoxRow" id="highcontrast_row"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="selectable">False</property> <property name="activatable">False</property> <child> - <object class="GtkBox" id="box_highcontrast"> + <object class="GtkBox"> <property name="visible">True</property> <child> - <object class="GtkLabel" id="heading_highcontrast"> + <object class="GtkLabel"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_start">12</property> @@ -142,7 +142,7 @@ <property name="xalign">0</property> <property name="label" translatable="yes">_High Contrast</property> <property name="use_underline">True</property> - <property name="mnemonic_widget">value_highcontrast</property> + <property name="mnemonic_widget">highcontrast_enable_switch</property> </object> <packing> <property name="expand">True</property> @@ -151,7 +151,7 @@ </packing> </child> <child> - <object class="GtkSwitch" id="value_highcontrast"> + <object class="GtkSwitch" id="highcontrast_enable_switch"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="margin_start">12</property> @@ -170,16 +170,16 @@ </object> </child> <child> - <object class="GtkListBoxRow" id="row_large_text"> + <object class="GtkListBoxRow" id="large_text_row"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="selectable">False</property> <property name="activatable">False</property> <child> - <object class="GtkBox" id="box_large_text"> + <object class="GtkBox"> <property name="visible">True</property> <child> - <object class="GtkLabel" id="heading_large_text"> + <object class="GtkLabel"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_start">12</property> @@ -189,7 +189,7 @@ <property name="xalign">0</property> <property name="label" translatable="yes">_Large Text</property> <property name="use_underline">True</property> - <property name="mnemonic_widget">value_large_text</property> + <property name="mnemonic_widget">large_text_enable_switch</property> </object> <packing> <property name="expand">True</property> @@ -198,7 +198,7 @@ </packing> </child> <child> - <object class="GtkSwitch" id="value_large_text"> + <object class="GtkSwitch" id="large_text_enable_switch"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="margin_start">12</property> @@ -217,15 +217,15 @@ </object> </child> <child> - <object class="GtkListBoxRow" id="row_cursor_size"> + <object class="GtkListBoxRow" id="cursor_size_row"> <property name="visible">True</property> <property name="can_focus">True</property> <child> - <object class="GtkBox" id="box_cursor_size"> + <object class="GtkBox"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="GtkLabel" id="heading_cursor_size"> + <object class="GtkLabel"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_start">12</property> @@ -243,7 +243,7 @@ </packing> </child> <child> - <object class="GtkLabel" id="value_cursor_size"> + <object class="GtkLabel" id="cursor_size_label"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_start">12</property> @@ -264,14 +264,14 @@ </object> </child> <child> - <object class="GtkListBoxRow" id="row_zoom"> + <object class="GtkListBoxRow" id="zoom_row"> <property name="visible">True</property> <property name="can_focus">True</property> <child> - <object class="GtkBox" id="box_zoom"> + <object class="GtkBox"> <property name="visible">True</property> <child> - <object class="GtkLabel" id="heading_zoom"> + <object class="GtkLabel"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_start">12</property> @@ -289,7 +289,7 @@ </packing> </child> <child> - <object class="GtkLabel" id="value_zoom"> + <object class="GtkLabel" id="zoom_label"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_start">12</property> @@ -310,14 +310,14 @@ </object> </child> <child> - <object class="GtkListBoxRow" id="row_screen_reader"> + <object class="GtkListBoxRow" id="screen_reader_row"> <property name="visible">True</property> <property name="can_focus">True</property> <child> - <object class="GtkBox" id="box_screen_reader"> + <object class="GtkBox"> <property name="visible">True</property> <child> - <object class="GtkLabel" id="heading_screen_reader"> + <object class="GtkLabel"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_start">12</property> @@ -335,7 +335,7 @@ </packing> </child> <child> - <object class="GtkLabel" id="value_screen_reader"> + <object class="GtkLabel" id="screen_reader_label"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_start">12</property> @@ -356,14 +356,14 @@ </object> </child> <child> - <object class="GtkListBoxRow" id="row_sound_keys"> + <object class="GtkListBoxRow" id="sound_keys_row"> <property name="visible">True</property> <property name="can_focus">True</property> <child> - <object class="GtkBox" id="box_sound_keys"> + <object class="GtkBox"> <property name="visible">True</property> <child> - <object class="GtkLabel" id="heading_sound_keys"> + <object class="GtkLabel"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_start">12</property> @@ -381,7 +381,7 @@ </packing> </child> <child> - <object class="GtkLabel" id="value_sound_keys"> + <object class="GtkLabel" id="sound_keys_label"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_start">12</property> @@ -421,13 +421,13 @@ </packing> </child> <child> - <object class="GtkBox" id="section_hearing"> + <object class="GtkBox"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_bottom">32</property> <property name="orientation">vertical</property> <child> - <object class="GtkLabel" id="heading_hearing"> + <object class="GtkLabel" id="hearing_heading_label"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_end">12</property> @@ -438,7 +438,7 @@ <attribute name="weight" value="bold"/> </attributes> <accessibility> - <relation target="list_hearing" type="label-for"/> + <relation target="hearing_listbox" type="label-for"/> </accessibility> </object> <packing> @@ -448,28 +448,28 @@ </packing> </child> <child> - <object class="GtkFrame" id="frame_hearing"> + <object class="GtkFrame"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="label_xalign">0</property> <property name="shadow_type">in</property> <child> - <object class="GtkListBox" id="list_hearing"> + <object class="GtkListBox" id="hearing_listbox"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="selection-mode">none</property> <accessibility> - <relation target="heading_hearing" type="labelled-by"/> + <relation target="hearing_heading_label" type="labelled-by"/> </accessibility> <child> - <object class="GtkListBoxRow" id="row_visual_alerts"> + <object class="GtkListBoxRow" id="visual_alerts_row"> <property name="visible">True</property> <property name="can_focus">True</property> <child> - <object class="GtkBox" id="box_visual_alerts"> + <object class="GtkBox"> <property name="visible">True</property> <child> - <object class="GtkLabel" id="heading_visual_alerts"> + <object class="GtkLabel"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_start">12</property> @@ -487,7 +487,7 @@ </packing> </child> <child> - <object class="GtkLabel" id="value_visual_alerts"> + <object class="GtkLabel" id="visual_alerts_label"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_start">12</property> @@ -527,13 +527,13 @@ </packing> </child> <child> - <object class="GtkBox" id="section_typing"> + <object class="GtkBox"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_bottom">32</property> <property name="orientation">vertical</property> <child> - <object class="GtkLabel" id="heading_typing"> + <object class="GtkLabel" id="typing_heading_label"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_end">12</property> @@ -544,7 +544,7 @@ <attribute name="weight" value="bold"/> </attributes> <accessibility> - <relation target="list_typing" type="label-for"/> + <relation target="typing_listbox" type="label-for"/> </accessibility> </object> <packing> @@ -554,30 +554,30 @@ </packing> </child> <child> - <object class="GtkFrame" id="frame_typing"> + <object class="GtkFrame"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="label_xalign">0</property> <property name="shadow_type">in</property> <child> - <object class="GtkListBox" id="list_typing"> + <object class="GtkListBox" id="typing_listbox"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="selection-mode">none</property> <accessibility> - <relation target="heading_typing" type="labelled-by"/> + <relation target="typing_heading_label" type="labelled-by"/> </accessibility> <child> - <object class="GtkListBoxRow" id="row_screen_keyboard"> + <object class="GtkListBoxRow" id="screen_keyboard_row"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="selectable">False</property> <property name="activatable">False</property> <child> - <object class="GtkBox" id="box_screen_keyboard"> + <object class="GtkBox"> <property name="visible">True</property> <child> - <object class="GtkLabel" id="heading_screen_keyboard"> + <object class="GtkLabel"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_start">12</property> @@ -587,7 +587,7 @@ <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_switch</property> + <property name="mnemonic_widget">screen_keyboard_enable_switch</property> </object> <packing> <property name="expand">True</property> @@ -596,7 +596,7 @@ </packing> </child> <child> - <object class="GtkSwitch" id="screen_keyboard_switch"> + <object class="GtkSwitch" id="screen_keyboard_enable_switch"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="margin_start">12</property> @@ -615,14 +615,14 @@ </object> </child> <child> - <object class="GtkListBoxRow" id="row_repeat_keys"> + <object class="GtkListBoxRow" id="repeat_keys_row"> <property name="visible">True</property> <property name="can_focus">True</property> <child> - <object class="GtkBox" id="box_repeat_keys"> + <object class="GtkBox"> <property name="visible">True</property> <child> - <object class="GtkLabel" id="heading_repeat_keys"> + <object class="GtkLabel"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_start">12</property> @@ -640,7 +640,7 @@ </packing> </child> <child> - <object class="GtkLabel" id="value_repeat_keys"> + <object class="GtkLabel" id="repeat_keys_label"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_start">12</property> @@ -661,14 +661,14 @@ </object> </child> <child> - <object class="GtkListBoxRow" id="row_cursor_blinking"> + <object class="GtkListBoxRow" id="cursor_blinking_row"> <property name="visible">True</property> <property name="can_focus">True</property> <child> - <object class="GtkBox" id="box_row_cursor_blinking"> + <object class="GtkBox"> <property name="visible">True</property> <child> - <object class="GtkLabel" id="heading_row_cursor_blinking"> + <object class="GtkLabel"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_start">12</property> @@ -686,7 +686,7 @@ </packing> </child> <child> - <object class="GtkLabel" id="value_row_cursor_blinking"> + <object class="GtkLabel" id="cursor_blinking_label"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_start">12</property> @@ -707,14 +707,14 @@ </object> </child> <child> - <object class="GtkListBoxRow" id="row_accessx"> + <object class="GtkListBoxRow" id="accessx_row"> <property name="visible">True</property> <property name="can_focus">True</property> <child> - <object class="GtkBox" id="box_accessx"> + <object class="GtkBox"> <property name="visible">True</property> <child> - <object class="GtkLabel" id="heading_accessx"> + <object class="GtkLabel"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_start">12</property> @@ -732,7 +732,7 @@ </packing> </child> <child> - <object class="GtkLabel" id="value_accessx"> + <object class="GtkLabel" id="accessx_label"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_start">12</property> @@ -772,12 +772,12 @@ </packing> </child> <child> - <object class="GtkBox" id="section_pointing"> + <object class="GtkBox"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="GtkLabel" id="heading_pointing"> + <object class="GtkLabel" id="pointing_heading_label"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_end">12</property> @@ -788,7 +788,7 @@ <attribute name="weight" value="bold"/> </attributes> <accessibility> - <relation target="list_pointing" type="label-for"/> + <relation target="pointing_listbox" type="label-for"/> </accessibility> </object> <packing> @@ -798,30 +798,30 @@ </packing> </child> <child> - <object class="GtkFrame" id="frame_pointing"> + <object class="GtkFrame"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="label_xalign">0</property> <property name="shadow_type">in</property> <child> - <object class="GtkListBox" id="list_pointing"> + <object class="GtkListBox" id="pointing_listbox"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="selection-mode">none</property> <accessibility> - <relation target="heading_pointing" type="labelled-by"/> + <relation target="pointing_heading_label" type="labelled-by"/> </accessibility> <child> - <object class="GtkListBoxRow" id="row_mouse_keys"> + <object class="GtkListBoxRow" id="mouse_keys_row"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="selectable">False</property> <property name="activatable">False</property> <child> - <object class="GtkBox" id="box_mouse_keys"> + <object class="GtkBox"> <property name="visible">True</property> <child> - <object class="GtkLabel" id="heading_mouse_keys"> + <object class="GtkLabel"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_start">12</property> @@ -831,7 +831,7 @@ <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_switch</property> + <property name="mnemonic_widget">mouse_keys_enable_switch</property> </object> <packing> <property name="expand">True</property> @@ -840,7 +840,7 @@ </packing> </child> <child> - <object class="GtkSwitch" id="mouse_keys_switch"> + <object class="GtkSwitch" id="mouse_keys_enable_switch"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="margin_start">12</property> @@ -876,11 +876,11 @@ <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_switch</property> + <property name="mnemonic_widget">locate_pointer_enable_switch</property> </object> </child> <child> - <object class="GtkSwitch" id="locate_pointer_switch"> + <object class="GtkSwitch" id="locate_pointer_enable_switch"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="margin">12</property> @@ -891,14 +891,14 @@ </object> </child> <child> - <object class="GtkListBoxRow" id="row_click_assist"> + <object class="GtkListBoxRow" id="click_assist_row"> <property name="visible">True</property> <property name="can_focus">True</property> <child> - <object class="GtkBox" id="box_click_assist"> + <object class="GtkBox"> <property name="visible">True</property> <child> - <object class="GtkLabel" id="heading_click_assist"> + <object class="GtkLabel"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_start">12</property> @@ -916,7 +916,7 @@ </packing> </child> <child> - <object class="GtkLabel" id="value_click_assist"> + <object class="GtkLabel" id="click_assist_label"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_start">12</property> @@ -937,14 +937,14 @@ </object> </child> <child> - <object class="GtkListBoxRow" id="row_double_click_delay"> + <object class="GtkListBoxRow" id="double_click_delay_row"> <property name="visible">True</property> <property name="can_focus">True</property> <child> - <object class="GtkBox" id="box_double_click_delay"> + <object class="GtkBox"> <property name="visible">True</property> <child> - <object class="GtkLabel" id="heading_double_click_delay"> + <object class="GtkLabel"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_start">12</property> @@ -961,17 +961,17 @@ </packing> </child> <child> - <object class="GtkScale" id="scale_double_click_delay"> + <object class="GtkScale" id="double_click_delay_scale"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="adjustment">double-click-delay-adjustment</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> <child internal-child="accessible"> - <object class="AtkObject" id="double_click_scale-atkobject"> + <object class="AtkObject"> <property name="AtkObject::accessible-description" translatable="yes">Double-Click Delay</property> </object> </child> @@ -1017,26 +1017,20 @@ </object> </child> </template> - <object class="GtkAdjustment" id="text_scaling_factor_adjustment"> - <property name="lower">0.5</property> - <property name="upper">3</property> - <property name="value">1</property> - <property name="step_increment">0.1</property> - </object> - <object class="GtkSizeGroup" id="rows_sizegroup"> + <object class="GtkSizeGroup"> <property name="mode">vertical</property> <widgets> - <widget name="row_highcontrast"/> - <widget name="row_large_text"/> - <widget name="row_cursor_size"/> - <widget name="row_zoom"/> - <widget name="row_screen_reader"/> - <widget name="row_sound_keys"/> - <widget name="row_visual_alerts"/> - <widget name="row_screen_keyboard"/> - <widget name="row_accessx"/> - <widget name="row_mouse_keys"/> - <widget name="row_click_assist"/> + <widget name="highcontrast_row"/> + <widget name="large_text_row"/> + <widget name="cursor_size_row"/> + <widget name="zoom_row"/> + <widget name="screen_reader_row"/> + <widget name="sound_keys_row"/> + <widget name="visual_alerts_row"/> + <widget name="screen_keyboard_row"/> + <widget name="accessx_row"/> + <widget name="mouse_keys_row"/> + <widget name="click_assist_row"/> </widgets> </object> </interface> |