[gnome-control-center] universal-access: Redesign for consistency and smallness
- From: William Jon McCann <mccann src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-control-center] universal-access: Redesign for consistency and smallness
- Date: Thu, 17 May 2012 17:30:05 +0000 (UTC)
commit 229390f1f5898c46119c51b8d5a4d31a0d733a12
Author: William Jon McCann <jmccann redhat com>
Date: Tue May 8 20:08:33 2012 -0400
universal-access: Redesign for consistency and smallness
https://bugzilla.gnome.org/show_bug.cgi?id=665588
panels/universal-access/cc-ua-panel.c | 328 +--
panels/universal-access/uap.ui | 3977 +++++++++++++++------------------
2 files changed, 1945 insertions(+), 2360 deletions(-)
---
diff --git a/panels/universal-access/cc-ua-panel.c b/panels/universal-access/cc-ua-panel.c
index 1ce8210..e05bb39 100644
--- a/panels/universal-access/cc-ua-panel.c
+++ b/panels/universal-access/cc-ua-panel.c
@@ -33,6 +33,14 @@
#define WID(b, w) (GtkWidget *) gtk_builder_get_object (b, w)
+#define DPI_FACTOR_LARGE 1.25
+#define DPI_FACTOR_NORMAL 1.0
+
+#define HIGH_CONTRAST_THEME "HighContrast"
+#define KEY_TEXT_SCALING_FACTOR "text-scaling-factor"
+#define KEY_GTK_THEME "gtk-theme"
+#define KEY_ICON_THEME "icon-theme"
+
G_DEFINE_DYNAMIC_TYPE (CcUaPanel, cc_ua_panel, CC_TYPE_PANEL)
@@ -56,9 +64,9 @@ struct _CcUaPanelPrivate
static void
cc_ua_panel_get_property (GObject *object,
- guint property_id,
- GValue *value,
- GParamSpec *pspec)
+ guint property_id,
+ GValue *value,
+ GParamSpec *pspec)
{
switch (property_id)
{
@@ -69,9 +77,9 @@ cc_ua_panel_get_property (GObject *object,
static void
cc_ua_panel_set_property (GObject *object,
- guint property_id,
- const GValue *value,
- GParamSpec *pspec)
+ guint property_id,
+ const GValue *value,
+ GParamSpec *pspec)
{
switch (property_id)
{
@@ -166,11 +174,6 @@ cc_ua_panel_class_finalize (CcUaPanelClass *klass)
{
}
-static gchar *typing_assistant_section[] = {
- "typing_assistant_preferences_button",
- NULL
-};
-
static gchar *sticky_keys_section[] = {
"typing_sticky_keys_disable_two_keys_checkbutton",
"typing_sticky_keys_beep_modifier_checkbutton",
@@ -260,180 +263,6 @@ settings_on_off_editor_new (CcUaPanelPrivate *priv,
}
/* seeing section */
-#define GTK_THEME_KEY "gtk-theme"
-#define ICON_THEME_KEY "icon-theme"
-#define CONTRAST_MODEL_THEME_COLUMN 2
-#define DPI_MODEL_FACTOR_COLUMN 2
-#define DPI_MODEL_FACTOR_CALC_COLUMN 3
-
-static void text_scaling_factor_combo_box_changed (GtkComboBox *box, CcUaPanel *panel);
-
-static void
-text_scaling_factor_notify_cb (GSettings *settings,
- const gchar *key,
- CcUaPanel *panel)
-{
- CcUaPanelPrivate *priv = panel->priv;
- GtkTreeIter iter;
- GtkTreeModel *model;
- GtkWidget *combo;
- gboolean valid;
- gdouble conf_value;
- GtkTreeIter best;
- gdouble distance;
-
- if (!g_str_equal (key, "text-scaling-factor"))
- return;
-
- conf_value = g_settings_get_double (settings, key);
-
- combo = WID (priv->builder, "seeing_text_size_combobox");
- model = gtk_combo_box_get_model (GTK_COMBO_BOX (combo));
-
- /* Recalculate the font sizes so that
- * their size is about constant when changing text size */
- valid = gtk_tree_model_get_iter_first (model, &iter);
- while (valid)
- {
- gfloat factor;
-
- gtk_tree_model_get (model, &iter,
- DPI_MODEL_FACTOR_COLUMN, &factor,
- -1);
-
- factor /= conf_value;
-
- gtk_list_store_set (GTK_LIST_STORE (model), &iter,
- DPI_MODEL_FACTOR_CALC_COLUMN, factor,
- -1);
-
- valid = gtk_tree_model_iter_next (model, &iter);
- }
-
- /* find the closest match in the combobox model */
- distance = 1e6;
- valid = gtk_tree_model_get_iter_first (model, &iter);
- while (valid)
- {
- gfloat factor;
- gdouble d;
-
- gtk_tree_model_get (model, &iter,
- DPI_MODEL_FACTOR_COLUMN, &factor,
- -1);
-
- d = fabs (conf_value - factor);
- if (d < distance)
- {
- best = iter;
- distance = d;
- }
-
- valid = gtk_tree_model_iter_next (model, &iter);
- }
-
- g_signal_handlers_block_by_func (combo, text_scaling_factor_combo_box_changed, panel);
- gtk_combo_box_set_active_iter (GTK_COMBO_BOX (combo), &best);
- g_signal_handlers_unblock_by_func (combo, text_scaling_factor_combo_box_changed, panel);
-}
-
-static void
-text_scaling_factor_combo_box_changed (GtkComboBox *box,
- CcUaPanel *panel)
-{
- CcUaPanelPrivate *priv = panel->priv;
- GtkTreeIter iter;
- gfloat factor;
-
- gtk_combo_box_get_active_iter (box, &iter);
-
- gtk_tree_model_get (gtk_combo_box_get_model (box), &iter,
- DPI_MODEL_FACTOR_COLUMN, &factor,
- -1);
-
- if (factor == 1.0)
- g_settings_reset (priv->interface_settings, "text-scaling-factor");
- else
- g_settings_set_double (priv->interface_settings, "text-scaling-factor", factor);
-}
-
-
-static void
-interface_settings_changed_cb (GSettings *settings,
- const gchar *key,
- CcUaPanel *panel)
-{
- CcUaPanelPrivate *priv = panel->priv;
-
- if (g_str_equal (key, "gtk-theme")) {
- GtkTreeIter iter;
- GtkTreeModel *model;
- GtkWidget *combo;
- gboolean valid;
- gchar *theme_value;
-
- theme_value = g_settings_get_string (settings, GTK_THEME_KEY);
-
- combo = WID (priv->builder, "seeing_contrast_combobox");
- model = gtk_combo_box_get_model (GTK_COMBO_BOX (combo));
-
- /* see if there is a matching theme name in the combobox model */
- valid = gtk_tree_model_get_iter_first (model, &iter);
- while (valid)
- {
- gchar *value;
-
- gtk_tree_model_get (model, &iter,
- CONTRAST_MODEL_THEME_COLUMN, &value,
- -1);
-
- if (!g_strcmp0 (value, theme_value))
- {
- gtk_combo_box_set_active_iter (GTK_COMBO_BOX (combo), &iter);
- g_free (value);
- break;
- }
-
- g_free (value);
- valid = gtk_tree_model_iter_next (model, &iter);
- }
-
- /* if a value for the current theme was not found in the combobox, set to the
- * "normal" option */
- if (!valid)
- {
- gtk_combo_box_set_active (GTK_COMBO_BOX (combo), 1);
- }
- }
-}
-
-static void
-contrast_combobox_changed_cb (GtkComboBox *box,
- CcUaPanel *panel)
-{
- CcUaPanelPrivate *priv = panel->priv;
- gchar *theme_name = NULL;
- GtkTreeIter iter;
-
- gtk_combo_box_get_active_iter (box, &iter);
-
- gtk_tree_model_get (gtk_combo_box_get_model (box), &iter,
- CONTRAST_MODEL_THEME_COLUMN, &theme_name,
- -1);
-
- if (g_strcmp0 (theme_name, ""))
- {
- g_settings_set_string (priv->interface_settings, GTK_THEME_KEY, theme_name);
- g_settings_set_string (priv->interface_settings, ICON_THEME_KEY, theme_name);
- }
- else
- {
- g_settings_reset (priv->interface_settings, GTK_THEME_KEY);
- g_settings_reset (priv->interface_settings, ICON_THEME_KEY);
- }
-
- g_free (theme_name);
-}
static void
cc_ua_panel_set_shortcut_label (CcUaPanel *self,
@@ -476,7 +305,8 @@ shell_vanished_cb (GDBusConnection *connection,
{
CcUaPanelPrivate *priv = self->priv;
- gtk_widget_hide (WID (priv->builder, "zoom_frame"));
+ gtk_widget_hide (WID (priv->builder, "zoom_label_box"));
+ gtk_widget_hide (WID (priv->builder, "zoom_value_box"));
}
static void
@@ -487,7 +317,80 @@ shell_appeared_cb (GDBusConnection *connection,
{
CcUaPanelPrivate *priv = self->priv;
- gtk_widget_show (WID (priv->builder, "zoom_frame"));
+ gtk_widget_show (WID (priv->builder, "zoom_label_box"));
+ gtk_widget_show (WID (priv->builder, "zoom_value_box"));
+}
+
+static gboolean
+get_large_text_mapping (GValue *value,
+ GVariant *variant,
+ gpointer user_data)
+{
+ gdouble factor;
+ gboolean large;
+
+ factor = g_variant_get_double (variant);
+ large = factor > DPI_FACTOR_NORMAL;
+ g_value_set_boolean (value, large);
+
+ return TRUE;
+}
+
+static GVariant *
+set_large_text_mapping (const GValue *value,
+ const GVariantType *expected_type,
+ gpointer user_data)
+{
+ gboolean large;
+ GSettings *settings = user_data;
+ GVariant *ret = NULL;
+
+ large = g_value_get_boolean (value);
+ if (large)
+ ret = g_variant_new_double (DPI_FACTOR_LARGE);
+ else
+ g_settings_reset (settings, KEY_TEXT_SCALING_FACTOR);
+
+ return ret;
+}
+
+static gboolean
+get_contrast_mapping (GValue *value,
+ GVariant *variant,
+ gpointer user_data)
+{
+ const char *theme;
+ gboolean hc;
+
+ theme = g_variant_get_string (variant, NULL);
+ hc = (g_strcmp0 (theme, HIGH_CONTRAST_THEME) == 0);
+ g_value_set_boolean (value, hc);
+
+ return TRUE;
+}
+
+static GVariant *
+set_contrast_mapping (const GValue *value,
+ const GVariantType *expected_type,
+ gpointer user_data)
+{
+ gboolean hc;
+ GSettings *settings = user_data;
+ GVariant *ret = NULL;
+
+ hc = g_value_get_boolean (value);
+ if (hc)
+ {
+ ret = g_variant_new_string (HIGH_CONTRAST_THEME);
+ g_settings_set_string (settings, KEY_ICON_THEME, HIGH_CONTRAST_THEME);
+ }
+ else
+ {
+ g_settings_reset (settings, KEY_GTK_THEME);
+ g_settings_reset (settings, KEY_ICON_THEME);
+ }
+
+ return ret;
}
static void
@@ -495,17 +398,23 @@ cc_ua_panel_init_seeing (CcUaPanel *self)
{
CcUaPanelPrivate *priv = self->priv;
- text_scaling_factor_notify_cb (priv->interface_settings, "text-scaling-factor", self);
- g_signal_connect (priv->interface_settings, "changed::text-scaling-factor", G_CALLBACK (text_scaling_factor_notify_cb), self);
-
- g_signal_connect (WID (priv->builder, "seeing_contrast_combobox"), "changed",
- G_CALLBACK (contrast_combobox_changed_cb), self);
-
- g_signal_connect (WID (priv->builder, "seeing_text_size_combobox"), "changed",
- G_CALLBACK (text_scaling_factor_combo_box_changed), self);
+ g_settings_bind_with_mapping (priv->interface_settings, KEY_GTK_THEME,
+ WID (priv->builder, "seeing_contrast_switch"),
+ "active", G_SETTINGS_BIND_DEFAULT,
+ get_contrast_mapping,
+ set_contrast_mapping,
+ priv->interface_settings,
+ NULL);
+ g_settings_bind_with_mapping (priv->interface_settings, KEY_TEXT_SCALING_FACTOR,
+ WID (priv->builder, "seeing_large_text_switch"),
+ "active", G_SETTINGS_BIND_DEFAULT,
+ get_large_text_mapping,
+ set_large_text_mapping,
+ priv->interface_settings,
+ NULL);
g_settings_bind (priv->kb_settings, "togglekeys-enable",
- WID (priv->builder, "seeing_enable_toggle_keys_checkbutton"), "active",
+ WID (priv->builder, "seeing_toggle_keys_switch"), "active",
G_SETTINGS_BIND_DEFAULT);
priv->shell_watch_id = g_bus_watch_name (G_BUS_TYPE_SESSION,
@@ -527,9 +436,6 @@ cc_ua_panel_init_seeing (CcUaPanel *self)
WID (priv->builder, "seeing_reader_switch"),
NULL);
- cc_ua_panel_set_shortcut_label (self, "seeing_contrast_toggle_keybinding_label", "toggle-contrast");
- cc_ua_panel_set_shortcut_label (self, "seeing_increase_size_keybinding_label", "increase-text-size");
- cc_ua_panel_set_shortcut_label (self, "seeing_decrease_size_keybinding_label", "decrease-text-size");
cc_ua_panel_set_shortcut_label (self, "seeing_zoom_enable_keybinding_label", "magnifier");
cc_ua_panel_set_shortcut_label (self, "seeing_zoom_in_keybinding_label", "magnifier-zoom-in");
cc_ua_panel_set_shortcut_label (self, "seeing_zoom_out_keybinding_label", "magnifier-zoom-out");
@@ -612,17 +518,6 @@ cc_ua_panel_init_hearing (CcUaPanel *self)
}
/* typing/keyboard section */
-static gboolean
-typing_keyboard_preferences_clicked (GtkButton *button,
- CcUaPanel *panel)
-{
- CcShell *shell;
-
- shell = cc_panel_get_shell (CC_PANEL (panel));
- cc_shell_set_active_panel_from_id (shell, "keyboard", NULL, NULL);
-
- return TRUE;
-}
static void
cc_ua_panel_init_keyboard (CcUaPanel *self)
@@ -632,10 +527,11 @@ cc_ua_panel_init_keyboard (CcUaPanel *self)
/* Typing assistant (on-screen keyboard) */
w = WID (priv->builder, "typing_assistant_switch");
- settings_on_off_editor_new (priv, priv->application_settings, "screen-keyboard-enabled", w, typing_assistant_section);
+ g_settings_bind (priv->application_settings, "screen-keyboard-enabled",
+ w, "active", G_SETTINGS_BIND_DEFAULT);
/* enable shortcuts */
- w = WID (priv->builder, "typing_keyboard_toggle_checkbox");
+ w = WID (priv->builder, "typing_keyboard_toggle_switch");
g_settings_bind (priv->kb_settings, "enable", w, "active", G_SETTINGS_BIND_DEFAULT);
/* sticky keys */
@@ -677,10 +573,6 @@ cc_ua_panel_init_keyboard (CcUaPanel *self)
w = WID (priv->builder, "typing_bounce_keys_beep_rejected_checkbutton");
g_settings_bind (priv->kb_settings, "bouncekeys-beep-reject", w, "active", G_SETTINGS_BIND_NO_SENSITIVITY);
-
- g_signal_connect (WID (priv->builder, "typing_keyboard_preferences_link"),
- "activate-link",
- G_CALLBACK (typing_keyboard_preferences_clicked), self);
}
/* mouse/pointing & clicking section */
@@ -772,10 +664,6 @@ cc_ua_panel_init (CcUaPanel *self)
}
priv->interface_settings = g_settings_new ("org.gnome.desktop.interface");
- g_signal_connect (priv->interface_settings, "changed",
- G_CALLBACK (interface_settings_changed_cb), self);
- interface_settings_changed_cb (priv->interface_settings, "gtk-theme", self);
-
priv->wm_settings = g_settings_new ("org.gnome.desktop.wm.preferences");
priv->kb_settings = g_settings_new ("org.gnome.desktop.a11y.keyboard");
priv->mouse_settings = g_settings_new ("org.gnome.desktop.a11y.mouse");
diff --git a/panels/universal-access/uap.ui b/panels/universal-access/uap.ui
index c8910c0..1343d1a 100644
--- a/panels/universal-access/uap.ui
+++ b/panels/universal-access/uap.ui
@@ -1,30 +1,104 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<interface>
- <requires lib="gtk+" version="2.16"/>
- <!-- interface-naming-policy project-wide -->
- <object class="GtkListStore" id="typing_assistant_model">
+ <!-- interface-requires gtk+ 3.0 -->
+ <object class="GtkAdjustment" id="bouncekeys_delay_adjustment">
+ <property name="upper">900</property>
+ <property name="value">0.5</property>
+ <property name="step_increment">10</property>
+ <property name="page_increment">10</property>
+ </object>
+ <object class="GtkAdjustment" id="click_delay_adjustment">
+ <property name="lower">0.5</property>
+ <property name="upper">3</property>
+ <property name="value">1.2</property>
+ <property name="step_increment">0.10000000000000001</property>
+ <property name="page_increment">0.10000000000000001</property>
+ </object>
+ <object class="GtkListStore" id="contrast_model">
<columns>
- <!-- column-name assistants -->
+ <!-- column-name contrasts -->
+ <column type="gchararray"/>
+ <!-- column-name scale -->
+ <column type="gdouble"/>
+ <!-- column-name themename -->
<column type="gchararray"/>
</columns>
<data>
<row>
- <col id="0" translatable="yes">On screen keyboard</col>
+ <col id="0" translatable="yes" context="universal access, contrast">Low</col>
+ <col id="1">1.25</col>
+ <col id="2">LowContrast</col>
</row>
<row>
- <col id="0" translatable="yes">Dasher</col>
+ <col id="0" translatable="yes" context="universal access, contrast">Normal</col>
+ <col id="1">1.25</col>
+ <col id="2"></col>
</row>
<row>
- <col id="0" translatable="yes">Nomon</col>
+ <col id="0" translatable="yes" context="universal access, contrast">High</col>
+ <col id="1">1.25</col>
+ <col id="2">HighContrast</col>
</row>
<row>
- <col id="0" translatable="yes">Caribou</col>
+ <col id="0" translatable="yes" context="universal access, contrast">High/Inverse</col>
+ <col id="1">1.25</col>
+ <col id="2">HighContrastInverse</col>
+ </row>
+ </data>
+ </object>
+ <object class="GtkAdjustment" id="dwell_threshold_adjustment">
+ <property name="upper">30</property>
+ <property name="value">15</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">1</property>
+ </object>
+ <object class="GtkAdjustment" id="dwell_time_adjustment">
+ <property name="lower">0.20000000000000001</property>
+ <property name="upper">3</property>
+ <property name="value">1.2</property>
+ <property name="step_increment">0.10000000000000001</property>
+ <property name="page_increment">0.10000000000000001</property>
+ </object>
+ <object class="GtkListStore" id="osk_model">
+ <columns>
+ <!-- column-name osks -->
+ <column type="gchararray"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0" translatable="yes">On screen keyboard</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">GOK</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">OnBoard</col>
</row>
<row>
<col id="0" translatable="yes">None</col>
</row>
</data>
</object>
+ <object class="GtkAdjustment" id="repeat_delay_adjustment">
+ <property name="lower">100</property>
+ <property name="upper">2000</property>
+ <property name="value">500</property>
+ <property name="step_increment">10</property>
+ <property name="page_increment">10</property>
+ </object>
+ <object class="GtkAdjustment" id="repeat_rate_adjustment">
+ <property name="lower">10</property>
+ <property name="upper">110</property>
+ <property name="value">30</property>
+ <property name="step_increment">10</property>
+ <property name="page_increment">10</property>
+ </object>
+ <object class="GtkAdjustment" id="slowkeys_delay_adjustment">
+ <property name="upper">500</property>
+ <property name="value">0.5</property>
+ <property name="step_increment">10</property>
+ <property name="page_increment">10</property>
+ </object>
<object class="GtkListStore" id="text_size_model">
<columns>
<!-- column-name text_sizes -->
@@ -63,9 +137,9 @@
</row>
</data>
</object>
- <object class="GtkListStore" id="osk_model">
+ <object class="GtkListStore" id="typing_assistant_model">
<columns>
- <!-- column-name osks -->
+ <!-- column-name assistants -->
<column type="gchararray"/>
</columns>
<data>
@@ -73,68 +147,25 @@
<col id="0" translatable="yes">On screen keyboard</col>
</row>
<row>
- <col id="0" translatable="yes">GOK</col>
+ <col id="0" translatable="yes">Dasher</col>
</row>
<row>
- <col id="0" translatable="yes">OnBoard</col>
+ <col id="0" translatable="yes">Nomon</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Caribou</col>
</row>
<row>
<col id="0" translatable="yes">None</col>
</row>
</data>
</object>
- <object class="GtkAdjustment" id="repeat_delay_adjustment">
- <property name="value">500</property>
- <property name="lower">100</property>
- <property name="upper">2000</property>
- <property name="step_increment">10</property>
- <property name="page_increment">10</property>
- </object>
- <object class="GtkAdjustment" id="repeat_rate_adjustment">
- <property name="value">30</property>
- <property name="lower">10</property>
- <property name="upper">110</property>
- <property name="step_increment">10</property>
- <property name="page_increment">10</property>
- </object>
- <object class="GtkAdjustment" id="slowkeys_delay_adjustment">
- <property name="value">0.5</property>
- <property name="upper">500</property>
- <property name="step_increment">10</property>
- <property name="page_increment">10</property>
- </object>
- <object class="GtkAdjustment" id="bouncekeys_delay_adjustment">
- <property name="value">0.5</property>
- <property name="upper">900</property>
- <property name="step_increment">10</property>
- <property name="page_increment">10</property>
- </object>
- <object class="GtkAdjustment" id="click_delay_adjustment">
- <property name="value">1.2</property>
- <property name="lower">0.5</property>
- <property name="upper">3</property>
- <property name="step_increment">0.10000000000000001</property>
- <property name="page_increment">0.10000000000000001</property>
- </object>
- <object class="GtkAdjustment" id="dwell_time_adjustment">
- <property name="value">1.2</property>
- <property name="lower">0.20000000000000001</property>
- <property name="upper">3</property>
- <property name="step_increment">0.10000000000000001</property>
- <property name="page_increment">0.10000000000000001</property>
- </object>
- <object class="GtkAdjustment" id="dwell_threshold_adjustment">
- <property name="value">15</property>
- <property name="upper">30</property>
- <property name="step_increment">1</property>
- <property name="page_increment">1</property>
- </object>
<object class="GtkWindow" id="universal_access_settings_window">
+ <property name="can_focus">False</property>
<child>
<object class="GtkVBox" id="universal_access_box">
<property name="visible">True</property>
- <property name="border_width">10</property>
- <property name="orientation">vertical</property>
+ <property name="can_focus">False</property>
<property name="spacing">5</property>
<child>
<object class="GtkNotebook" id="notebook">
@@ -143,709 +174,564 @@
<child>
<object class="GtkVBox" id="seeing_vbox">
<property name="visible">True</property>
- <property name="border_width">6</property>
- <property name="orientation">vertical</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">12</property>
<property name="spacing">12</property>
<child>
- <object class="GtkFrame" id="frame5">
+ <object class="GtkGrid" id="grid2">
<property name="visible">True</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="row_spacing">18</property>
+ <property name="column_spacing">24</property>
+ <child>
+ <object class="GtkBox" id="box3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">start</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkBox" id="box12">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkLabel" id="typing_sticky_label5">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">High Contrast</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSwitch" id="seeing_contrast_switch">
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="halign">end</property>
+ <property name="valign">start</property>
+ <property name="hexpand">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="typing_sticky_label8">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Beep on Caps and Num Lock</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">4</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSwitch" id="seeing_toggle_keys_switch">
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="halign">end</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">4</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
<child>
- <object class="GtkAlignment" id="alignment9">
+ <object class="GtkBox" id="box21">
<property name="visible">True</property>
- <property name="yscale">0</property>
- <property name="left_padding">12</property>
+ <property name="can_focus">False</property>
+ <property name="halign">end</property>
+ <property name="valign">start</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
<child>
- <object class="GtkVBox" id="vbox9">
+ <object class="GtkSwitch" id="seeing_reader_switch">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="halign">end</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="seeing_reader_preferences_button">
+ <property name="use_action_appearance">False</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="halign">end</property>
+ <property name="use_underline">True</property>
+ <child>
+ <object class="GtkLabel" id="seeing_speech_preferences_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Options...</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">3</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="box17">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">start</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkBox" id="box18">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkLabel" id="typing_sticky_label7">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Screen Reader</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="box19">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">start</property>
+ <property name="margin_left">10</property>
<property name="orientation">vertical</property>
- <property name="spacing">6</property>
<child>
- <object class="GtkTable" id="table2">
+ <object class="GtkHBox" id="hbox11">
<property name="visible">True</property>
- <property name="n_rows">3</property>
- <property name="n_columns">2</property>
- <property name="column_spacing">24</property>
- <property name="row_spacing">6</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property>
<child>
- <object class="GtkHBox" id="hbox7">
+ <object class="GtkLabel" id="label9">
<property name="visible">True</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkLabel" id="label17">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Change contrast:</property>
- <attributes>
- <attribute name="scale" value="1.250000"/>
- </attributes>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="seeing_contrast_toggle_keybinding_label">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label">Ctrl+Alt+0</property>
- <attributes>
- <attribute name="scale" value="1.250000"/>
- </attributes>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Turn on or off:</property>
+ <attributes>
+ <attribute name="scale" value="1"/>
+ </attributes>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
- <object class="GtkHBox" id="seeing_contrast_box">
- <property name="visible">True</property>
- <property name="spacing">12</property>
- <child>
- <object class="GtkLabel" id="seeing_contrast_label">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">_Contrast:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">seeing_contrast_combobox</property>
- <attributes>
- <attribute name="scale" value="1.250000"/>
- </attributes>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBox" id="seeing_contrast_combobox">
- <property name="visible">True</property>
- <property name="model">contrast_model</property>
- <property name="active">1</property>
- <child>
- <object class="GtkCellRendererText" id="contrast_renderer">
- <property name="font">Normal</property>
- </object>
- <attributes>
- <attribute name="scale">1</attribute>
- <attribute name="text">0</attribute>
- </attributes>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="seeing_text_size_box">
- <property name="visible">True</property>
- <property name="spacing">12</property>
- <child>
- <object class="GtkLabel" id="seeing_text_size_label">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">_Text size:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">seeing_text_size_combobox</property>
- <attributes>
- <attribute name="scale" value="1.250000"/>
- </attributes>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBox" id="seeing_text_size_combobox">
- <property name="visible">True</property>
- <property name="model">text_size_model</property>
- <property name="active">0</property>
- <child>
- <object class="GtkCellRendererText" id="text_size_renderer"/>
- <attributes>
- <attribute name="scale">3</attribute>
- <attribute name="text">1</attribute>
- </attributes>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="hbox24">
- <property name="visible">True</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkLabel" id="label5">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Increase size:</property>
- <attributes>
- <attribute name="scale" value="1.250000"/>
- </attributes>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="seeing_increase_size_keybinding_label">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label">Shift+Ctrl+Alt+=</property>
- <attributes>
- <attribute name="scale" value="1.250000"/>
- </attributes>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="hbox25">
- <property name="visible">True</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkLabel" id="label6">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Decrease size:</property>
- <attributes>
- <attribute name="scale" value="1.250000"/>
- </attributes>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="seeing_decrease_size_keybinding_label">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label">Shift+Ctrl+Alt+-</property>
- <attributes>
- <attribute name="scale" value="1.250000"/>
- </attributes>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label7">
+ <object class="GtkLabel" id="seeing_reader_enable_keybinding_label">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label">Ctrl+Alt+4</property>
+ <attributes>
+ <attribute name="scale" value="1"/>
+ </attributes>
</object>
<packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
</child>
</object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">3</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
</child>
- <child type="label">
- <object class="GtkLabel" id="label18">
- <property name="visible">True</property>
- <property name="label" translatable="yes" context="universal access, seeing" comments="Translators: this refers to theme contrast and font size">Display</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- <attribute name="scale" value="1.250000"/>
- </attributes>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkFrame" id="zoom_frame">
- <property name="visible">True</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment8">
+ <object class="GtkBox" id="zoom_label_box">
<property name="visible">True</property>
- <property name="left_padding">12</property>
+ <property name="can_focus">False</property>
+ <property name="valign">start</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
<child>
- <object class="GtkVBox" id="vbox8">
+ <object class="GtkBox" id="box15">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="orientation">vertical</property>
- <property name="spacing">6</property>
<child>
- <object class="GtkTable" id="table7">
+ <object class="GtkLabel" id="typing_sticky_label6">
<property name="visible">True</property>
- <property name="n_rows">3</property>
- <property name="n_columns">3</property>
- <property name="column_spacing">24</property>
- <child>
- <object class="GtkHBox" id="seeing_zoom_enabled_box">
- <property name="visible">True</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkSwitch" id="seeing_zoom_switch">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <accessibility>
- <relation target="zoom-section-heading" type="labelled-by"/>
- </accessibility>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="hbox20">
- <property name="visible">True</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkLabel" id="label1">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Turn on or off:</property>
- <attributes>
- <attribute name="scale" value="1.250000"/>
- </attributes>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="seeing_zoom_enable_keybinding_label">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label">Ctrl+Alt+8</property>
- <attributes>
- <attribute name="scale" value="1.250000"/>
- </attributes>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="hbox21">
- <property name="visible">True</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkLabel" id="seeing_zoom_in_label">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Zoom in:</property>
- <attributes>
- <attribute name="scale" value="1.250000"/>
- </attributes>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="seeing_zoom_in_keybinding_label">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label">Ctrl+Alt+=</property>
- <attributes>
- <attribute name="scale" value="1.250000"/>
- </attributes>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Zoom</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="box16">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">start</property>
+ <property name="margin_left">10</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkHBox" id="hbox20">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property>
<child>
- <object class="GtkHBox" id="hbox22">
+ <object class="GtkLabel" id="label1">
<property name="visible">True</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkLabel" id="seeing_zoom_out_label">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Zoom out:</property>
- <attributes>
- <attribute name="scale" value="1.250000"/>
- </attributes>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="seeing_zoom_out_keybinding_label">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label">Ctrl+Alt+-</property>
- <attributes>
- <attribute name="scale" value="1.250000"/>
- </attributes>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Turn on or off:</property>
+ <attributes>
+ <attribute name="scale" value="1"/>
+ </attributes>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="label15">
+ <object class="GtkLabel" id="seeing_zoom_enable_keybinding_label">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label">Ctrl+Alt+8</property>
+ <attributes>
+ <attribute name="scale" value="1"/>
+ </attributes>
</object>
<packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
</packing>
</child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="hbox21">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property>
<child>
- <object class="GtkButton" id="seeing_zoom_preferences_button">
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
+ <object class="GtkLabel" id="seeing_zoom_in_label">
<property name="visible">True</property>
- <child>
- <object class="GtkLabel" id="seeing_zoom_preferences_label">
- <property name="visible">True</property>
- <property name="sensitive">True</property>
- <property name="label" translatable="yes">Options...</property>
- <property name="use_markup">True</property>
- <attributes>
- <attribute name="scale" value="1.25"/>
- </attributes>
- </object>
- </child>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Zoom in:</property>
+ <attributes>
+ <attribute name="scale" value="1"/>
+ </attributes>
</object>
<packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="x_options"></property>
- <property name="y_options"></property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="label12">
+ <object class="GtkLabel" id="seeing_zoom_in_keybinding_label">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label">Ctrl+Alt+=</property>
+ <attributes>
+ <attribute name="scale" value="1"/>
+ </attributes>
</object>
<packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
</packing>
</child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="hbox22">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property>
<child>
- <object class="GtkLabel" id="label13">
+ <object class="GtkLabel" id="seeing_zoom_out_label">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Zoom out:</property>
</object>
<packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options"></property>
- <property name="y_options"></property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="label14">
+ <object class="GtkLabel" id="seeing_zoom_out_keybinding_label">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label">Ctrl+Alt+-</property>
</object>
<packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options"></property>
- <property name="y_options"></property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
</packing>
</child>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
</child>
</object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
</child>
- <child type="label">
- <object class="GtkLabel" id="zoom-section-heading">
+ <child>
+ <object class="GtkBox" id="zoom_value_box">
<property name="visible">True</property>
- <property name="label" translatable="yes" context="universal access, seeing" comments="Translators: this refers to screen magnifier">Zoom</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- <attribute name="scale" value="1.250000"/>
- </attributes>
+ <property name="can_focus">False</property>
+ <property name="halign">end</property>
+ <property name="valign">start</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkSwitch" id="seeing_zoom_switch">
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="halign">end</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="seeing_zoom_preferences_button">
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="halign">end</property>
+ <child>
+ <object class="GtkLabel" id="seeing_zoom_preferences_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Options...</property>
+ <attributes>
+ <attribute name="scale" value="1"/>
+ </attributes>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
</object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
</child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkFrame" id="seeing_reader_frame">
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
- <property name="visible">True</property>
<child>
- <object class="GtkAlignment" id="alignment5">
+ <object class="GtkBox" id="box13">
<property name="visible">True</property>
- <property name="left_padding">12</property>
+ <property name="can_focus">False</property>
+ <property name="valign">start</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
<child>
- <object class="GtkVBox" id="vbox6">
+ <object class="GtkBox" id="box22">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="orientation">vertical</property>
- <property name="spacing">6</property>
<child>
- <object class="GtkTable" id="table5">
+ <object class="GtkLabel" id="typing_sticky_label9">
<property name="visible">True</property>
- <property name="n_columns">3</property>
- <property name="column_spacing">24</property>
- <property name="row_spacing">12</property>
- <child>
- <object class="GtkHBox" id="seeing_reader_enabled_box">
- <property name="visible">True</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkSwitch" id="seeing_reader_switch">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <accessibility>
- <relation target="screen-reader-section-heading" type="labelled-by"/>
- </accessibility>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="hbox11">
- <property name="visible">True</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkLabel" id="label9">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Turn on or off:</property>
- <attributes>
- <attribute name="scale" value="1.250000"/>
- </attributes>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="seeing_reader_enable_keybinding_label">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label">Ctrl+Alt+4</property>
- <attributes>
- <attribute name="scale" value="1.250000"/>
- </attributes>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="seeing_reader_preferences_button">
- <property name="visible">False</property>
- <property name="sensitive">False</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="use_underline">True</property>
- <child>
- <object class="GtkLabel" id="seeing_speech_preferences_label">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Options...</property>
- <property name="use_markup">True</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="x_options"></property>
- <property name="y_options"></property>
- </packing>
- </child>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Large Text</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
</child>
</object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
</child>
- <child type="label">
- <object class="GtkLabel" id="screen-reader-section-heading">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Screen Reader</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- <attribute name="scale" value="1.250000"/>
- </attributes>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="seeing_enable_toggle_keys_checkbutton">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
<child>
- <object class="GtkLabel" id="seeing_enable_toggle_keys_label">
+ <object class="GtkSwitch" id="seeing_large_text_switch">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
- <property name="label" translatable="yes">Beep when Caps and Num Lock are used</property>
- <property name="use_markup">True</property>
+ <property name="can_focus">True</property>
+ <property name="halign">end</property>
+ <property name="valign">start</property>
+ <property name="hexpand">True</property>
</object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
</child>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">3</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
</packing>
</child>
</object>
@@ -856,9 +742,10 @@
<child type="tab">
<object class="GtkLabel" id="seeing_tab_label">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">Seeing</property>
<attributes>
- <attribute name="scale" value="1.000000"/>
+ <attribute name="scale" value="1"/>
</attributes>
</object>
<packing>
@@ -868,273 +755,265 @@
<child>
<object class="GtkVBox" id="hearing_vbox">
<property name="visible">True</property>
- <property name="border_width">6</property>
- <property name="orientation">vertical</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">12</property>
<property name="spacing">12</property>
<child>
- <object class="GtkFrame" id="frame11">
+ <object class="GtkGrid" id="grid3">
<property name="visible">True</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
+ <property name="can_focus">False</property>
+ <property name="row_spacing">18</property>
+ <property name="column_spacing">24</property>
<child>
- <object class="GtkAlignment" id="alignment3">
+ <object class="GtkBox" id="box23">
<property name="visible">True</property>
- <property name="yscale">0</property>
- <property name="left_padding">12</property>
+ <property name="can_focus">False</property>
+ <property name="valign">start</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
<child>
- <object class="GtkVBox" id="vbox4">
+ <object class="GtkBox" id="box24">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="orientation">vertical</property>
- <property name="spacing">6</property>
<child>
- <object class="GtkTable" id="table13">
+ <object class="GtkLabel" id="typing_sticky_label10">
<property name="visible">True</property>
- <property name="n_rows">3</property>
- <property name="n_columns">3</property>
- <property name="column_spacing">24</property>
- <child>
- <object class="GtkHBox" id="hearing_visual_alerts_enabled_box">
- <property name="visible">True</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkSwitch" id="hearing_visual_alerts_switch">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <accessibility>
- <relation target="visual-alerts-section-heading" type="labelled-by"/>
- </accessibility>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label31">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Use a visual indication when an alert sound occurs</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="hearing_test_flash_button">
- <property name="label" translatable="yes">_Test flash</property>
- <property name="use_underline">True</property>
- <property name="visible">True</property>
- <property name="sensitive">False</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkRadioButton" id="hearing_flash_window_title_button">
- <property name="label" translatable="yes">Flash the window title</property>
- <property name="visible">True</property>
- <property name="sensitive">False</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="relief">none</property>
- <property name="active">True</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkRadioButton" id="hearing_flash_screen_button">
- <property name="label" translatable="yes">Flash the entire screen</property>
- <property name="visible">True</property>
- <property name="sensitive">False</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="draw_indicator">True</property>
- <property name="group">hearing_flash_window_title_button</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label40">
- <property name="visible">True</property>
- </object>
- <packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label41">
- <property name="visible">True</property>
- </object>
- <packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label10">
- <property name="visible">True</property>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options"></property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label11">
- <property name="visible">True</property>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options"></property>
- <property name="y_options"></property>
- </packing>
- </child>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Visual Alerts</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label31">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Use a visual indication when an alert sound occurs</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="box25">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">start</property>
+ <property name="margin_left">10</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkRadioButton" id="hearing_flash_window_title_button">
+ <property name="label" translatable="yes">Flash the window title</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="relief">none</property>
+ <property name="xalign">0</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
+ <child>
+ <object class="GtkRadioButton" id="hearing_flash_screen_button">
+ <property name="label" translatable="yes">Flash the entire screen</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="xalign">0</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">hearing_flash_window_title_button</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
</child>
</object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
</child>
- <child type="label">
- <object class="GtkLabel" id="visual-alerts-section-heading">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Visual Alerts</property>
- <property name="use_markup">True</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkFrame" id="frame12">
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment2">
- <property name="visible">True</property>
- <property name="yscale">0</property>
- <property name="left_padding">12</property>
+ <object class="GtkBox" id="closed_caption_label_box">
+ <property name="can_focus">False</property>
+ <property name="valign">start</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
<child>
- <object class="GtkVBox" id="vbox3">
+ <object class="GtkBox" id="box27">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="orientation">vertical</property>
- <property name="spacing">6</property>
<child>
- <object class="GtkTable" id="table14">
+ <object class="GtkLabel" id="typing_sticky_label11">
<property name="visible">True</property>
- <property name="n_columns">2</property>
- <property name="column_spacing">24</property>
- <child>
- <object class="GtkHBox" id="hearing_captions_enabled_box">
- <property name="visible">True</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkSwitch" id="hearing_captions_switch">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label35">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Display a textual description of speech and sounds</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="y_options"></property>
- </packing>
- </child>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Closed Captioning</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
+ <child>
+ <object class="GtkLabel" id="label35">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Display a textual description of speech and sounds</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
</child>
+ <child>
+ <object class="GtkBox" id="box28">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">start</property>
+ <property name="margin_left">10</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSwitch" id="hearing_captions_switch">
+ <property name="use_action_appearance">False</property>
+ <property name="can_focus">True</property>
+ <property name="halign">end</property>
+ <property name="valign">start</property>
+ <property name="hexpand">True</property>
</object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
</child>
- <child type="label">
- <object class="GtkLabel" id="label39">
+ <child>
+ <object class="GtkBox" id="box32">
<property name="visible">True</property>
- <property name="label" translatable="yes">Closed Captioning</property>
- <property name="use_markup">True</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkSwitch" id="hearing_visual_alerts_switch">
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="halign">end</property>
+ <property name="valign">start</property>
+ <property name="hexpand">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="hearing_test_flash_button">
+ <property name="label" translatable="yes">_Test flash</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="halign">end</property>
+ <property name="valign">start</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
</object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
</child>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -1145,11 +1024,11 @@
<child>
<object class="GtkLinkButton" id="hearing_sound_preferences_link">
<property name="label" translatable="yes">Sound Settings</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="has_tooltip">True</property>
- <property name="use_action_appearance">False</property>
<property name="relief">none</property>
</object>
<packing>
@@ -1163,7 +1042,7 @@
<property name="expand">False</property>
<property name="fill">False</property>
<property name="pack_type">end</property>
- <property name="position">2</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
@@ -1175,6 +1054,7 @@
<child type="tab">
<object class="GtkLabel" id="hearing_tab_label">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">Hearing</property>
</object>
<packing>
@@ -1185,326 +1065,233 @@
<child>
<object class="GtkVBox" id="typing_vbox">
<property name="visible">True</property>
- <property name="border_width">6</property>
- <property name="orientation">vertical</property>
- <property name="spacing">12</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">12</property>
+ <property name="spacing">24</property>
<child>
- <object class="GtkFrame" id="frame13">
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
+ <object class="GtkGrid" id="grid1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">start</property>
+ <property name="orientation">vertical</property>
+ <property name="row_spacing">18</property>
+ <property name="column_spacing">24</property>
+ <child>
+ <object class="GtkLabel" id="typing_assistant_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">On Screen Keyboard</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
<child>
- <object class="GtkAlignment" id="alignment10">
+ <object class="GtkBox" id="box1">
<property name="visible">True</property>
- <property name="left_padding">12</property>
+ <property name="can_focus">False</property>
+ <property name="valign">start</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
<child>
- <object class="GtkTable" id="table4">
+ <object class="GtkBox" id="box2">
<property name="visible">True</property>
- <property name="n_columns">3</property>
- <property name="column_spacing">24</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<child>
- <object class="GtkLabel" id="typing_assistant_label">
+ <object class="GtkLabel" id="typing_sticky_label1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Screen keyboard</property>
+ <property name="label" translatable="yes">Sticky Keys</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="y_options"></property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
- <object class="GtkHBox" id="typing_assistant_enabled_box">
+ <object class="GtkLabel" id="label4">
<property name="visible">True</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkSwitch" id="typing_assistant_switch">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <accessibility>
- <relation target="typing-assistant-section-heading" type="labelled-by"/>
- </accessibility>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
- </child>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Treats a sequence of modifier keys as a key combination</property>
</object>
<packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
</packing>
</child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="box4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">start</property>
+ <property name="margin_left">10</property>
+ <property name="orientation">vertical</property>
<child>
- <object class="GtkButton" id="typing_assistant_preferences_button">
+ <object class="GtkCheckButton" id="typing_sticky_keys_disable_two_keys_checkbutton">
+ <property name="label" translatable="yes">_Disable if two keys are pressed together</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
+ <property name="sensitive">False</property>
<property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="visible">False</property>
- <child>
- <object class="GtkLabel" id="seeing_zoom_preferences_label1">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Options...</property>
- <property name="use_markup">True</property>
- </object>
- </child>
+ <property name="receives_default">False</property>
+ <property name="valign">start</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="typing_sticky_keys_beep_modifier_checkbutton">
+ <property name="label" translatable="yes">Beep when a _modifer key is pressed</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="valign">start</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
</object>
<packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
</child>
</object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
</child>
- <child type="label">
- <object class="GtkLabel" id="typing-assistant-section-heading">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Typing Assistant</property>
- <property name="use_markup">True</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="typing_keyboard_toggle_checkbox">
- <property name="label" translatable="yes">_Turn on accessibility features from the keyboard</property>
- <property name="use_underline">True</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkFrame" id="stickykeys_frame">
- <property name="visible">True</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment14">
+ <object class="GtkBox" id="box5">
<property name="visible">True</property>
- <property name="left_padding">12</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
<child>
- <object class="GtkVBox" id="vbox10">
+ <object class="GtkBox" id="box6">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="orientation">vertical</property>
- <property name="spacing">6</property>
<child>
- <object class="GtkTable" id="table3">
+ <object class="GtkLabel" id="typing_sticky_label2">
<property name="visible">True</property>
- <property name="n_rows">3</property>
- <property name="n_columns">2</property>
- <property name="column_spacing">24</property>
- <property name="row_spacing">2</property>
- <child>
- <object class="GtkHBox" id="typing_sticky_keys_enabled_box">
- <property name="visible">True</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkSwitch" id="typing_sticky_keys_switch">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <accessibility>
- <relation target="sticky-keys-section-heading" type="labelled-by"/>
- </accessibility>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label4">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Treats a sequence of modifier keys as a key combination</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="typing_sticky_keys_disable_two_keys_checkbutton">
- <property name="label" translatable="yes">_Disable if two keys are pressed together</property>
- <property name="use_underline">True</property>
- <property name="visible">True</property>
- <property name="sensitive">False</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="typing_sticky_keys_beep_modifier_checkbutton">
- <property name="label" translatable="yes">Beep when a _modifer key is pressed</property>
- <property name="use_underline">True</property>
- <property name="visible">True</property>
- <property name="sensitive">False</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label21">
- <property name="visible">True</property>
- </object>
- <packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options"></property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label22">
- <property name="visible">True</property>
- </object>
- <packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options"></property>
- <property name="y_options"></property>
- </packing>
- </child>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Slow Keys</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
<packing>
<property name="expand">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- </child>
- <child type="label">
- <object class="GtkLabel" id="sticky-keys-section-heading">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Sticky Keys</property>
- <property name="use_markup">True</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkFrame" id="slowkeys_frame">
- <property name="visible">True</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
- <child>
- <object class="GtkAlignment" id="alignment15">
- <property name="visible">True</property>
- <property name="left_padding">12</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label24">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Puts a delay between when a key is pressed and when it is accepted</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
<child>
- <object class="GtkVBox" id="vbox11">
+ <object class="GtkBox" id="box7">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">start</property>
+ <property name="margin_left">10</property>
<property name="orientation">vertical</property>
- <property name="spacing">6</property>
<child>
- <object class="GtkTable" id="table8">
+ <object class="GtkHBox" id="typing_slowkeys_delay_box">
<property name="visible">True</property>
- <property name="n_rows">3</property>
- <property name="n_columns">3</property>
- <property name="column_spacing">24</property>
- <property name="row_spacing">2</property>
- <child>
- <object class="GtkHBox" id="typing_slow_keys_enabled_box">
- <property name="visible">True</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkSwitch" id="typing_slow_keys_switch">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <accessibility>
- <relation target="slow-keys-section-heading" type="labelled-by"/>
- </accessibility>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
+ <property name="sensitive">False</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">12</property>
<child>
- <object class="GtkLabel" id="label24">
+ <object class="GtkLabel" id="typing_slowkeys_delay_label">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Puts a delay between when a key is pressed and when it is accepted</property>
+ <property name="label" translatable="yes">A_cceptance delay:</property>
+ <property name="use_underline">True</property>
+ <property name="justify">center</property>
+ <property name="mnemonic_widget">typing_slowkeys_delay_scale</property>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="y_options"></property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
- <object class="GtkHBox" id="typing_slowkeys_delay_box">
+ <object class="GtkHBox" id="hbox42">
<property name="visible">True</property>
- <property name="sensitive">False</property>
- <property name="spacing">12</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property>
<child>
- <object class="GtkLabel" id="typing_slowkeys_delay_label">
+ <object class="GtkLabel" id="typing_slowkeys_slow_label">
<property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">A_cceptance delay:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">typing_slowkeys_delay_scale</property>
- <property name="justify">center</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">1</property>
+ <property name="xpad">10</property>
+ <property name="label" translatable="yes">Short</property>
+ <attributes>
+ <attribute name="scale" value="0.82999999999999996"/>
+ </attributes>
</object>
<packing>
<property name="expand">False</property>
@@ -1513,290 +1300,234 @@
</packing>
</child>
<child>
- <object class="GtkHBox" id="hbox42">
+ <object class="GtkHScale" id="typing_slowkeys_delay_scale">
<property name="visible">True</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkLabel" id="typing_slowkeys_slow_label">
- <property name="visible">True</property>
- <property name="xalign">1</property>
- <property name="xpad">10</property>
- <property name="label" translatable="yes">Short</property>
- <attributes>
- <attribute name="scale" value="0.830000"/>
- </attributes>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkHScale" id="typing_slowkeys_delay_scale">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="adjustment">slowkeys_delay_adjustment</property>
- <property name="draw_value">False</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="typing_slowkeys_delay_scale-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes">Slow keys typing delay</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="typing_slowkeys_long_label">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Long</property>
- <attributes>
- <attribute name="scale" value="0.830000"/>
- </attributes>
+ <property name="can_focus">True</property>
+ <property name="adjustment">slowkeys_delay_adjustment</property>
+ <property name="draw_value">False</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="typing_slowkeys_delay_scale-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes">Slow keys typing delay</property>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
</child>
</object>
<packing>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="typing_slow_keys_beeb_box">
- <property name="visible">True</property>
- <property name="sensitive">False</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkLabel" id="label26">
- <property name="visible">True</property>
- <property name="label" translatable="yes" comments="This string is part of a line of checkboxes: Beep when a key is [ ] pressed [ ] accepted [ ] rejected">Beep when a key is</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="typing_slow_keys_beep_pressed_checkbutton">
- <property name="label" translatable="yes" comments="This completes the sentence "Beep when a key is"">pressed</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="active">True</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="typing_slow_keys_beep_accepted_checkbutton">
- <property name="label" translatable="yes" comments="This completes the sentence "Beep when a key is"">accepted</property>
+ <object class="GtkLabel" id="typing_slowkeys_long_label">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="active">True</property>
- <property name="draw_indicator">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Long</property>
+ <attributes>
+ <attribute name="scale" value="0.82999999999999996"/>
+ </attributes>
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">2</property>
</packing>
</child>
- <child>
- <object class="GtkCheckButton" id="typing_slow_keys_beep_rejected_checkbutton">
- <property name="label" translatable="yes" comments="This completes the sentence "Beep when a key is"">rejected</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">3</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label44">
- <property name="visible">True</property>
</object>
<packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options"></property>
- <property name="y_options"></property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
</packing>
</child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="typing_slow_keys_beeb_box">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property>
<child>
- <object class="GtkLabel" id="label45">
+ <object class="GtkLabel" id="label26">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes" comments="This string is part of a line of checkboxes: Beep when a key is [ ] pressed [ ] accepted [ ] rejected">Beep when a key is</property>
</object>
<packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options"></property>
- <property name="y_options"></property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="typing_slow_keys_spacer_label">
+ <object class="GtkCheckButton" id="typing_slow_keys_beep_pressed_checkbutton">
+ <property name="label" translatable="yes" comments="This completes the sentence "Beep when a key is"">pressed</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="xalign">0</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
</object>
<packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="x_options"></property>
- <property name="y_options"></property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="label52">
+ <object class="GtkCheckButton" id="typing_slow_keys_beep_accepted_checkbutton">
+ <property name="label" translatable="yes" comments="This completes the sentence "Beep when a key is"">accepted</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="xalign">0</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
</object>
<packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options"></property>
- <property name="y_options"></property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="label53">
+ <object class="GtkCheckButton" id="typing_slow_keys_beep_rejected_checkbutton">
+ <property name="label" translatable="yes" comments="This completes the sentence "Beep when a key is"">rejected</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
</object>
<packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options"></property>
- <property name="y_options"></property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">3</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
</child>
</object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
</child>
- <child type="label">
- <object class="GtkLabel" id="slow-keys-section-heading">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Slow Keys</property>
- <property name="use_markup">True</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkFrame" id="bouncekeys_frame">
- <property name="visible">True</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment12">
+ <object class="GtkBox" id="box8">
<property name="visible">True</property>
- <property name="left_padding">12</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
<child>
- <object class="GtkVBox" id="vbox12">
+ <object class="GtkBox" id="box9">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="orientation">vertical</property>
- <property name="spacing">6</property>
<child>
- <object class="GtkTable" id="table9">
+ <object class="GtkLabel" id="typing_sticky_label3">
<property name="visible">True</property>
- <property name="n_rows">3</property>
- <property name="n_columns">3</property>
- <property name="column_spacing">24</property>
- <property name="row_spacing">2</property>
- <child>
- <object class="GtkHBox" id="typing_bounce_keys_enabled_box">
- <property name="visible">True</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkSwitch" id="typing_bounce_keys_switch">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <accessibility>
- <relation target="bounce-keys-section-heading" type="labelled-by"/>
- </accessibility>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Bounce Keys</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label27">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Ignores fast duplicate keypresses</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="box10">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">start</property>
+ <property name="margin_left">10</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkHBox" id="typing_bouncekeys_delay_box">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">12</property>
<child>
- <object class="GtkLabel" id="label27">
+ <object class="GtkLabel" id="typing_bouncekeys_delay_label">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Ignores fast duplicate keypresses</property>
+ <property name="label" translatable="yes">Acc_eptance delay:</property>
+ <property name="use_underline">True</property>
+ <property name="justify">center</property>
+ <property name="mnemonic_widget">typing_bouncekeys_delay_scale</property>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="y_options"></property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
- <object class="GtkHBox" id="typing_bouncekeys_delay_box">
+ <object class="GtkHBox" id="hbox44">
<property name="visible">True</property>
- <property name="sensitive">False</property>
- <property name="spacing">12</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property>
<child>
- <object class="GtkLabel" id="typing_bouncekeys_delay_label">
+ <object class="GtkLabel" id="typing_bouncekeys_short_label">
<property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Acc_eptance delay:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">typing_bouncekeys_delay_scale</property>
- <property name="justify">center</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">1</property>
+ <property name="xpad">10</property>
+ <property name="label" translatable="yes">Short</property>
+ <attributes>
+ <attribute name="scale" value="0.82999999999999996"/>
+ </attributes>
</object>
<packing>
<property name="expand">False</property>
@@ -1805,211 +1536,212 @@
</packing>
</child>
<child>
- <object class="GtkHBox" id="hbox44">
+ <object class="GtkHScale" id="typing_bouncekeys_delay_scale">
<property name="visible">True</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkLabel" id="typing_bouncekeys_short_label">
- <property name="visible">True</property>
- <property name="xalign">1</property>
- <property name="xpad">10</property>
- <property name="label" translatable="yes">Short</property>
- <attributes>
- <attribute name="scale" value="0.830000"/>
- </attributes>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkHScale" id="typing_bouncekeys_delay_scale">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="adjustment">bouncekeys_delay_adjustment</property>
- <property name="draw_value">False</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="typing_bouncekeys_delay_scale-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes">Bounce keys typing delay</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="typing_bouncekeys_long_label">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Long</property>
- <attributes>
- <attribute name="scale" value="0.830000"/>
- </attributes>
+ <property name="can_focus">True</property>
+ <property name="adjustment">bouncekeys_delay_adjustment</property>
+ <property name="draw_value">False</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="typing_bouncekeys_delay_scale-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes">Bounce keys typing delay</property>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
+ <child>
+ <object class="GtkLabel" id="typing_bouncekeys_long_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Long</property>
+ <attributes>
+ <attribute name="scale" value="0.82999999999999996"/>
+ </attributes>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="typing_bounce_keys_beep_rejected_checkbutton">
- <property name="label" translatable="yes">Beep when a key is _rejected</property>
- <property name="use_underline">True</property>
- <property name="visible">True</property>
- <property name="sensitive">False</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label46">
- <property name="visible">True</property>
- </object>
- <packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options"></property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label47">
- <property name="visible">True</property>
- </object>
- <packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options"></property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="typing_bounce_keys_spacer_label">
- <property name="visible">True</property>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="x_options"></property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label55">
- <property name="visible">True</property>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options"></property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label56">
- <property name="visible">True</property>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options"></property>
- <property name="y_options"></property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
+ <child>
+ <object class="GtkCheckButton" id="typing_bounce_keys_beep_rejected_checkbutton">
+ <property name="label" translatable="yes">Beep when a key is _rejected</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">3</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="box11">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkLabel" id="typing_sticky_label4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Enable by Keyboard</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Turn accessibility features on and off using the keyboard</property>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
</child>
</object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">4</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
</child>
- <child type="label">
- <object class="GtkLabel" id="bounce-keys-section-heading">
+ <child>
+ <object class="GtkSwitch" id="typing_assistant_switch">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
- <property name="label" translatable="yes">Bounce Keys</property>
- <property name="use_markup">True</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
+ <property name="can_focus">True</property>
+ <property name="halign">end</property>
+ <property name="hexpand">True</property>
</object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
</child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">4</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="typing_test_hbox">
- <property name="visible">True</property>
- <property name="spacing">12</property>
<child>
- <object class="GtkEntry" id="typing_test_entry">
+ <object class="GtkSwitch" id="typing_sticky_keys_switch">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="invisible_char">●</property>
- <property name="text" translatable="yes">Type here to test settings</property>
+ <property name="halign">end</property>
+ <property name="valign">start</property>
+ <property name="hexpand">True</property>
</object>
<packing>
- <property name="position">0</property>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
- <object class="GtkLinkButton" id="typing_keyboard_preferences_link">
- <property name="label" translatable="yes">Keyboard Settings</property>
+ <object class="GtkSwitch" id="typing_slow_keys_switch">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="has_tooltip">True</property>
+ <property name="halign">end</property>
+ <property name="valign">start</property>
+ <property name="hexpand">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSwitch" id="typing_bounce_keys_switch">
<property name="use_action_appearance">False</property>
- <property name="relief">none</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="halign">end</property>
+ <property name="valign">start</property>
+ <property name="hexpand">True</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="pack_type">end</property>
- <property name="position">1</property>
+ <property name="left_attach">1</property>
+ <property name="top_attach">3</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSwitch" id="typing_keyboard_toggle_switch">
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="halign">end</property>
+ <property name="valign">start</property>
+ <property name="hexpand">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">4</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="pack_type">end</property>
- <property name="position">5</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
</packing>
</child>
</object>
@@ -2021,6 +1753,7 @@
<child type="tab">
<object class="GtkLabel" id="typing_tab_label">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">Typing</property>
</object>
<packing>
@@ -2031,296 +1764,304 @@
<child>
<object class="GtkVBox" id="pointing_and_clicking_vbox">
<property name="visible">True</property>
- <property name="border_width">6</property>
- <property name="orientation">vertical</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">12</property>
<property name="spacing">12</property>
<child>
- <object class="GtkFrame" id="frame7">
+ <object class="GtkGrid" id="grid4">
<property name="visible">True</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
+ <property name="can_focus">False</property>
+ <property name="row_spacing">18</property>
+ <property name="column_spacing">24</property>
<child>
- <object class="GtkAlignment" id="alignment13">
+ <object class="GtkBox" id="box29">
<property name="visible">True</property>
- <property name="left_padding">12</property>
+ <property name="can_focus">False</property>
+ <property name="valign">start</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
<child>
- <object class="GtkVBox" id="vbox13">
+ <object class="GtkBox" id="box30">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="orientation">vertical</property>
- <property name="spacing">6</property>
<child>
- <object class="GtkTable" id="table1">
+ <object class="GtkLabel" id="typing_sticky_label12">
<property name="visible">True</property>
- <property name="n_columns">3</property>
- <property name="column_spacing">24</property>
- <property name="row_spacing">6</property>
- <child>
- <object class="GtkHBox" id="pointing_mouse_keys_enabled_box">
- <property name="visible">True</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkSwitch" id="pointing_mouse_keys_switch">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <accessibility>
- <relation target="mouse-keys-section-heading" type="labelled-by"/>
- </accessibility>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="pointing_mouse_keys_desc_label">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Control the pointer using the keypad</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="pointing_mouse_keys_settings_button">
- <property name="label" translatable="yes">Options...</property>
- <property name="sensitive">False</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <signal name="activate" handler="show_mousekeys_preferences"/>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Mouse Keys</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
+ <child>
+ <object class="GtkLabel" id="pointing_mouse_keys_desc_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Control the pointer using the keypad</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="box31">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">start</property>
+ <property name="margin_left">10</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
</child>
</object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
</child>
- <child type="label">
- <object class="GtkLabel" id="mouse-keys-section-heading">
+ <child>
+ <object class="GtkBox" id="box33">
<property name="visible">True</property>
- <property name="label" translatable="yes">Mouse Keys</property>
- <property name="use_markup">True</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkSwitch" id="pointing_mouse_keys_switch">
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="halign">end</property>
+ <property name="valign">start</property>
+ <property name="hexpand">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="pointing_mouse_keys_settings_button">
+ <property name="label" translatable="yes">Options...</property>
+ <property name="use_action_appearance">False</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="halign">end</property>
+ <property name="valign">start</property>
+ <property name="hexpand">True</property>
+ <signal name="activate" handler="show_mousekeys_preferences" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
</object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
</child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkFrame" id="frame9">
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment11">
- <property name="visible">True</property>
- <property name="left_padding">12</property>
+ <object class="GtkBox" id="pointing_video_mouse_label_box">
+ <property name="can_focus">False</property>
+ <property name="valign">start</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
<child>
- <object class="GtkVBox" id="vbox14">
+ <object class="GtkBox" id="box35">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="orientation">vertical</property>
- <property name="spacing">6</property>
<child>
- <object class="GtkTable" id="table11">
+ <object class="GtkLabel" id="typing_sticky_label13">
<property name="visible">True</property>
- <property name="n_columns">3</property>
- <property name="column_spacing">24</property>
- <property name="row_spacing">6</property>
- <child>
- <object class="GtkHBox" id="pointing_video_mouse_enabled_box">
- <property name="visible">True</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkSwitch" id="pointing_video_mouse_switch">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="pointing_video_mouse_desc_label">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Control the pointer using the video camera.</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="pointing_video_mouse_settings_button">
- <property name="label" translatable="yes">Options...</property>
- <property name="visible">True</property>
- <property name="sensitive">False</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Video Mouse</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
+ <child>
+ <object class="GtkLabel" id="pointing_video_mouse_desc_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Control the pointer using the video camera.</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="box36">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">start</property>
+ <property name="margin_left">10</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
</child>
</object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
</child>
- <child type="label">
- <object class="GtkLabel" id="label34">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Video Mouse</property>
- <property name="use_markup">True</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkFrame" id="frame8">
- <property name="visible">True</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment4">
+ <object class="GtkBox" id="box37">
<property name="visible">True</property>
- <property name="left_padding">12</property>
+ <property name="can_focus">False</property>
+ <property name="valign">start</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
<child>
- <object class="GtkVBox" id="vbox5">
+ <object class="GtkBox" id="box38">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="orientation">vertical</property>
- <property name="spacing">6</property>
<child>
- <object class="GtkTable" id="table10">
+ <object class="GtkLabel" id="typing_sticky_label14">
<property name="visible">True</property>
- <property name="n_rows">2</property>
- <property name="n_columns">3</property>
- <property name="column_spacing">24</property>
- <property name="row_spacing">6</property>
- <child>
- <object class="GtkHBox" id="pointing_second_click_enabled_box">
- <property name="visible">True</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkSwitch" id="pointing_second_click_switch">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <accessibility>
- <relation target="second-click-section-heading" type="labelled-by"/>
- </accessibility>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Simulated Secondary Click</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="pointing_secondary_click_desc_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Trigger a secondary click by holding down the primary button</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="box39">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">start</property>
+ <property name="margin_left">10</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkHBox" id="pointing_secondary_click_scale_box">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">12</property>
<child>
- <object class="GtkLabel" id="pointing_secondary_click_desc_label">
+ <object class="GtkLabel" id="pointing_secondary_click_delay_label">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Trigger a secondary click by holding down the primary button</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label28">
- <property name="visible">True</property>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="pointing_secondary_click_spacer_label">
- <property name="visible">True</property>
+ <property name="label" translatable="yes">A_cceptance delay:</property>
+ <property name="use_underline">True</property>
+ <property name="justify">center</property>
+ <property name="mnemonic_widget">pointing_secondary_click_delay_scale</property>
</object>
<packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
- <object class="GtkHBox" id="pointing_secondary_click_scale_box">
+ <object class="GtkHBox" id="hbox1">
<property name="visible">True</property>
- <property name="spacing">12</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property>
<child>
- <object class="GtkLabel" id="pointing_secondary_click_delay_label">
+ <object class="GtkLabel" id="pointing_secondary_click_delay_short_label">
<property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">A_cceptance delay:</property>
- <property name="use_underline">True</property>
- <property name="justify">center</property>
- <property name="mnemonic_widget">pointing_secondary_click_delay_scale</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">1</property>
+ <property name="yalign">0.4699999988079071</property>
+ <property name="label" translatable="yes" comments="short delay">Short</property>
+ <attributes>
+ <attribute name="scale" value="0.82999999999999996"/>
+ </attributes>
</object>
<packing>
<property name="expand">False</property>
@@ -2329,427 +2070,445 @@
</packing>
</child>
<child>
- <object class="GtkHBox" id="hbox1">
+ <object class="GtkHScale" id="pointing_secondary_click_delay_scale">
<property name="visible">True</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkLabel" id="pointing_secondary_click_delay_short_label">
- <property name="visible">True</property>
- <property name="xalign">1</property>
- <property name="yalign">0.4699999988079071</property>
- <property name="label" translatable="yes" comments="short delay">Short</property>
- <attributes>
- <attribute name="scale" value="0.830000"/>
- </attributes>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkHScale" id="pointing_secondary_click_delay_scale">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="adjustment">click_delay_adjustment</property>
- <property name="draw_value">False</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="pointing_secondary_click_delay_scale-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes">Secondary click delay</property>
- </object>
- </child>
- <signal name="value_changed" handler="integer_changed"/>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="pointing_secondary_click_delay_long_label">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes" comments="long delay">Long</property>
- <attributes>
- <attribute name="scale" value="0.830000"/>
- </attributes>
+ <property name="can_focus">True</property>
+ <property name="adjustment">click_delay_adjustment</property>
+ <property name="draw_value">False</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="pointing_secondary_click_delay_scale-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes">Secondary click delay</property>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
</child>
+ <signal name="value-changed" handler="integer_changed" swapped="no"/>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
+ <child>
+ <object class="GtkLabel" id="pointing_secondary_click_delay_long_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes" comments="long delay">Long</property>
+ <attributes>
+ <attribute name="scale" value="0.82999999999999996"/>
+ </attributes>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label48">
- <property name="visible">True</property>
- </object>
- <packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options"></property>
- <property name="y_options"></property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
+ <child>
+ <placeholder/>
+ </child>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
</child>
</object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
</child>
- <child type="label">
- <object class="GtkLabel" id="second-click-section-heading">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Simulated Secondary Click</property>
- <property name="use_markup">True</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkFrame" id="frame10">
- <property name="visible">True</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment6">
+ <object class="GtkBox" id="box40">
<property name="visible">True</property>
- <property name="left_padding">12</property>
+ <property name="can_focus">False</property>
+ <property name="valign">start</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkBox" id="box41">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkLabel" id="typing_sticky_label15">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Hover Click </property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="pointing_hover_click_desc_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Trigger a click when the pointer hovers</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
<child>
- <object class="GtkVBox" id="vbox7">
+ <object class="GtkBox" id="box42">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">start</property>
+ <property name="margin_left">10</property>
<property name="orientation">vertical</property>
- <property name="spacing">6</property>
<child>
- <object class="GtkTable" id="table12">
+ <object class="GtkHBox" id="pointing_hover_click_delay_scale_box">
<property name="visible">True</property>
- <property name="n_rows">3</property>
- <property name="n_columns">3</property>
- <property name="column_spacing">24</property>
- <property name="row_spacing">6</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkLabel" id="pointing_dwell_delay_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">D_elay:</property>
+ <property name="use_underline">True</property>
+ <property name="justify">center</property>
+ <property name="mnemonic_widget">pointing_dwell_delay_scale</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
<child>
- <object class="GtkHBox" id="pointing_hover_click_enabled_box">
+ <object class="GtkHBox" id="hbox2">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="spacing">6</property>
<child>
- <object class="GtkSwitch" id="pointing_hover_click_switch">
+ <object class="GtkLabel" id="pointing_dwell_delay_short_label">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <accessibility>
- <relation target="hover-click-section-heading" type="labelled-by"/>
- </accessibility>
+ <property name="can_focus">False</property>
+ <property name="xalign">1</property>
+ <property name="label" translatable="yes" comments="short delay">Short</property>
+ <property name="justify">center</property>
+ <attributes>
+ <attribute name="scale" value="0.82999999999999996"/>
+ </attributes>
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
+ <child>
+ <object class="GtkHScale" id="pointing_dwell_delay_scale">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="adjustment">dwell_time_adjustment</property>
+ <property name="draw_value">False</property>
+ <property name="value_pos">right</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="pointing_dwell_delay_long_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes" comments="long delay">Long</property>
+ <property name="justify">center</property>
+ <attributes>
+ <attribute name="scale" value="0.82999999999999996"/>
+ </attributes>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
</object>
<packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
</packing>
</child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="pointing_hover_click_threshold_scale_box">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">12</property>
<child>
- <object class="GtkLabel" id="pointing_hover_click_desc_label">
+ <object class="GtkLabel" id="pointing_dwell_threshold_label">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Trigger a click when the pointer hovers</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="pointing_hover_click_settings_button">
- <property name="label" translatable="yes">Options...</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label37">
- <property name="visible">True</property>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label38">
- <property name="visible">True</property>
+ <property name="label" translatable="yes">Motion _threshold:</property>
+ <property name="use_underline">True</property>
+ <property name="justify">center</property>
+ <property name="mnemonic_widget">pointing_dwell_threshold_scale</property>
</object>
<packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
- <object class="GtkHBox" id="pointing_hover_click_delay_scale_box">
+ <object class="GtkHBox" id="hbox3">
<property name="visible">True</property>
- <property name="spacing">12</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="spacing">6</property>
<child>
- <object class="GtkLabel" id="pointing_dwell_delay_label">
+ <object class="GtkLabel" id="pointing_dwell_threshold_small_label">
<property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">D_elay:</property>
- <property name="use_underline">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">1</property>
+ <property name="label" translatable="yes" comments="small threshold">Small</property>
<property name="justify">center</property>
- <property name="mnemonic_widget">pointing_dwell_delay_scale</property>
+ <attributes>
+ <attribute name="scale" value="0.82999999999999996"/>
+ </attributes>
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
- <object class="GtkHBox" id="hbox2">
+ <object class="GtkHScale" id="pointing_dwell_threshold_scale">
<property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkLabel" id="pointing_dwell_delay_short_label">
- <property name="visible">True</property>
- <property name="xalign">1</property>
- <property name="label" translatable="yes" comments="short delay">Short</property>
- <property name="justify">center</property>
- <attributes>
- <attribute name="scale" value="0.830000"/>
- </attributes>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkHScale" id="pointing_dwell_delay_scale">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="adjustment">dwell_time_adjustment</property>
- <property name="draw_value">False</property>
- <property name="value_pos">right</property>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="pointing_dwell_delay_long_label">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes" comments="long delay">Long</property>
- <property name="justify">center</property>
- <attributes>
- <attribute name="scale" value="0.830000"/>
- </attributes>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">2</property>
- </packing>
- </child>
+ <property name="can_focus">True</property>
+ <property name="adjustment">dwell_threshold_adjustment</property>
+ <property name="digits">0</property>
+ <property name="draw_value">False</property>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="pointing_hover_click_threshold_scale_box">
- <property name="visible">True</property>
- <property name="spacing">12</property>
<child>
- <object class="GtkLabel" id="pointing_dwell_threshold_label">
+ <object class="GtkLabel" id="pointing_dwell_threshold_large_label">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Motion _threshold:</property>
- <property name="use_underline">True</property>
+ <property name="label" translatable="yes" comments="large threshold">Large</property>
<property name="justify">center</property>
- <property name="mnemonic_widget">pointing_dwell_threshold_scale</property>
+ <attributes>
+ <attribute name="scale" value="0.82999999999999996"/>
+ </attributes>
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="hbox3">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkLabel" id="pointing_dwell_threshold_small_label">
- <property name="visible">True</property>
- <property name="xalign">1</property>
- <property name="label" translatable="yes" comments="small threshold">Small</property>
- <property name="justify">center</property>
- <attributes>
- <attribute name="scale" value="0.830000"/>
- </attributes>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkHScale" id="pointing_dwell_threshold_scale">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="adjustment">dwell_threshold_adjustment</property>
- <property name="digits">0</property>
- <property name="draw_value">False</property>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="pointing_dwell_threshold_large_label">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes" comments="large threshold">Large</property>
- <property name="justify">center</property>
- <attributes>
- <attribute name="scale" value="0.830000"/>
- </attributes>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="position">1</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
</packing>
</child>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label49">
- <property name="visible">True</property>
- </object>
- <packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options"></property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label50">
- <property name="visible">True</property>
- </object>
- <packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options"></property>
- <property name="y_options"></property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
</child>
</object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">3</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
</child>
- <child type="label">
- <object class="GtkLabel" id="hover-click-section-heading">
+ <child>
+ <object class="GtkBox" id="box43">
<property name="visible">True</property>
- <property name="label" translatable="yes">Hover Click</property>
- <property name="use_markup">True</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkSwitch" id="pointing_hover_click_switch">
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="halign">end</property>
+ <property name="valign">start</property>
+ <property name="hexpand">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="pointing_hover_click_settings_button">
+ <property name="label" translatable="yes">Options...</property>
+ <property name="use_action_appearance">False</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="halign">end</property>
+ <property name="valign">start</property>
+ <property name="hexpand">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">3</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSwitch" id="pointing_second_click_switch">
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="halign">end</property>
+ <property name="valign">start</property>
+ <property name="hexpand">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="pointing_video_mouse_value_box">
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkSwitch" id="pointing_video_mouse_switch">
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="halign">end</property>
+ <property name="valign">start</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="pointing_video_mouse_settings_button">
+ <property name="label" translatable="yes">Options...</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="halign">end</property>
+ <property name="valign">start</property>
+ <property name="hexpand">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
</object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
</child>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">3</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkHBox" id="hbox13">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
<object class="GtkLinkButton" id="pointing_mouse_preferences_link">
<property name="label" translatable="yes">Mouse Settings</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="has_tooltip">True</property>
- <property name="use_action_appearance">False</property>
<property name="relief">none</property>
</object>
<packing>
@@ -2776,6 +2535,7 @@
<child type="tab">
<object class="GtkLabel" id="pointing_and_clicking_tab_label">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">Pointing and Clicking</property>
</object>
<packing>
@@ -2793,65 +2553,12 @@
</object>
</child>
</object>
- <object class="GtkSizeGroup" id="seeing_sizegroup">
- <widgets>
- <widget name="seeing_reader_enabled_box"/>
- <widget name="seeing_zoom_enabled_box"/>
- <widget name="seeing_text_size_box"/>
- <widget name="seeing_contrast_box"/>
- </widgets>
- </object>
- <object class="GtkListStore" id="contrast_model">
- <columns>
- <!-- column-name contrasts -->
- <column type="gchararray"/>
- <!-- column-name scale -->
- <column type="gdouble"/>
- <!-- column-name themename -->
- <column type="gchararray"/>
- </columns>
- <data>
- <row>
- <col id="0" translatable="yes" context="universal access, contrast">Low</col>
- <col id="1">1.25</col>
- <col id="2">LowContrast</col>
- </row>
- <row>
- <col id="0" translatable="yes" context="universal access, contrast">Normal</col>
- <col id="1">1.25</col>
- <col id="2"></col>
- </row>
- <row>
- <col id="0" translatable="yes" context="universal access, contrast">High</col>
- <col id="1">1.25</col>
- <col id="2">HighContrast</col>
- </row>
- <row>
- <col id="0" translatable="yes" context="universal access, contrast">High/Inverse</col>
- <col id="1">1.25</col>
- <col id="2">HighContrastInverse</col>
- </row>
- </data>
- </object>
- <object class="GtkSizeGroup" id="typing_sizegroup">
- <widgets>
- <widget name="typing_bouncekeys_delay_label"/>
- <widget name="typing_bounce_keys_enabled_box"/>
- <widget name="typing_slowkeys_delay_label"/>
- <widget name="typing_slow_keys_enabled_box"/>
- <widget name="typing_sticky_keys_enabled_box"/>
- <widget name="typing_assistant_enabled_box"/>
- </widgets>
- </object>
- <object class="GtkSizeGroup" id="pointing_sizegroup">
+ <object class="GtkSizeGroup" id="hearing_sizegroup"/>
+ <object class="GtkSizeGroup" id="hover_click_sizegroup">
<widgets>
<widget name="pointing_dwell_threshold_label"/>
<widget name="pointing_dwell_delay_label"/>
- <widget name="pointing_hover_click_enabled_box"/>
<widget name="pointing_secondary_click_delay_label"/>
- <widget name="pointing_second_click_enabled_box"/>
- <widget name="pointing_video_mouse_enabled_box"/>
- <widget name="pointing_mouse_keys_enabled_box"/>
</widgets>
</object>
<object class="GtkSizeGroup" id="pointing_scale_sizegroup">
@@ -2862,26 +2569,16 @@
<widget name="pointing_secondary_click_delay_scale"/>
</widgets>
</object>
- <object class="GtkSizeGroup" id="sizegroup1">
- <property name="ignore_hidden">True</property>
- <widgets>
- <widget name="pointing_hover_click_settings_button"/>
- <widget name="pointing_secondary_click_spacer_label"/>
- <widget name="pointing_video_mouse_settings_button"/>
- <widget name="pointing_mouse_keys_settings_button"/>
- </widgets>
- </object>
- <object class="GtkSizeGroup" id="hearing_sizegroup">
- <widgets>
- <widget name="hearing_captions_enabled_box"/>
- <widget name="hearing_visual_alerts_enabled_box"/>
- </widgets>
- </object>
- <object class="GtkSizeGroup" id="hover_click_sizegroup">
+ <object class="GtkSizeGroup" id="pointing_sizegroup">
<widgets>
<widget name="pointing_dwell_threshold_label"/>
<widget name="pointing_dwell_delay_label"/>
<widget name="pointing_secondary_click_delay_label"/>
</widgets>
</object>
+ <object class="GtkSizeGroup" id="seeing_sizegroup"/>
+ <object class="GtkSizeGroup" id="sizegroup1">
+ <property name="ignore_hidden">True</property>
+ </object>
+ <object class="GtkSizeGroup" id="typing_sizegroup"/>
</interface>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
