Touchpad settings: Added support for natural scrolling, 2 finger and 3 finger clicks

author: Clement Lefebvre <[email protected]> 2015-09-03 17:43:46 +0100
committer: Clement Lefebvre <[email protected]> 2015-09-03 17:43:46 +0100
commit: e4c68641268956ff99cef21dc5e5cb3e3b55ccdf (patch)
tree: 4bcc1c6a24ff115514529e893238962362fa143e
parent: 87e013d5c235a034a01391892eac7c888bb27871 (diff)
download: mate-control-center-e4c68641268956ff99cef21dc5e5cb3e3b55ccdf.tar.bz2
mate-control-center-e4c68641268956ff99cef21dc5e5cb3e3b55ccdf.tar.xz
2 files changed, 412 insertions, 109 deletions
diff --git a/capplets/mouse/mate-mouse-properties.c b/capplets/mouse/mate-mouse-properties.c
index 94f2a0fb..96c14185 100644
--- a/capplets/mouse/mate-mouse-properties.c
+++ b/capplets/mouse/mate-mouse-properties.c
@@ -212,6 +212,8 @@ scrollmethod_gsettings_changed_event (GSettings *settings,
 scroll_method == 2);
 gtk_widget_set_sensitive (WID ("horiz_scroll_toggle"),
 scroll_method != 0);
+ gtk_widget_set_sensitive (WID ("natural_scroll_toggle"),
+ scroll_method != 0);
 }
 
 static void
@@ -223,6 +225,9 @@ scrollmethod_clicked_event (GtkWidget *widget,
 gtk_widget_set_sensitive (WID ("horiz_scroll_toggle"),
 !gtk_toggle_button_get_active (disabled));
 
+ gtk_widget_set_sensitive (WID ("natural_scroll_toggle"),
+ !gtk_toggle_button_get_active (disabled));
+
 GSList *radio_group;
 int new_scroll_method;
 int old_scroll_method = g_settings_get_int (touchpad_settings, "scroll-method");
@@ -347,6 +352,14 @@ find_synaptics (void)
 return ret;
 }
 
+static void
+comboxbox_changed_callback (GtkWidget *combobox, void *data)
+{
+ gint value = gtk_combo_box_get_active (GTK_COMBO_BOX (combobox));
+ gchar *key = (char *) data;
+ g_settings_set_int (touchpad_settings, key, value);
+}
+
 /* Set up the property editors in the dialog. */
 static void
 setup_dialog (GtkBuilder *dialog)
@@ -405,9 +418,31 @@ setup_dialog (GtkBuilder *dialog)
 g_settings_bind (touchpad_settings, "horiz-scroll-enabled",
 WID ("horiz_scroll_toggle"), "active",
 G_SETTINGS_BIND_DEFAULT);
+ g_settings_bind (touchpad_settings, "natural-scroll",
+ WID ("natural_scroll_toggle"), "active",
+ G_SETTINGS_BIND_DEFAULT);
 
 scrollmethod_gsettings_changed_event (touchpad_settings, "scroll-method", dialog);
 
+ char * emulation_values[] = { _("Disabled"), _("Left button"), _("Middle button"), _("Right button") };
+
+ GtkWidget *two_click_comboxbox = gtk_combo_box_text_new ();
+ GtkWidget *three_click_comboxbox = gtk_combo_box_text_new ();
+ gtk_box_pack_start (GTK_BOX (WID ("hbox_two_finger_click")), two_click_comboxbox, FALSE, FALSE, 6);
+ gtk_box_pack_start (GTK_BOX (WID ("hbox_three_finger_click")), three_click_comboxbox, FALSE, FALSE, 6);
+ int i;
+ for (i=0; i<4; i++) {
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (two_click_comboxbox), emulation_values[i]); 
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (three_click_comboxbox), emulation_values[i]); 
+ }
+ 
+ gtk_combo_box_set_active (GTK_COMBO_BOX (two_click_comboxbox), g_settings_get_int (touchpad_settings, "two-finger-click"));
+ gtk_combo_box_set_active (GTK_COMBO_BOX (three_click_comboxbox), g_settings_get_int (touchpad_settings, "three-finger-click"));
+ gtk_widget_show (two_click_comboxbox);
+ gtk_widget_show (three_click_comboxbox);
+ g_signal_connect (two_click_comboxbox, "changed", G_CALLBACK (comboxbox_changed_callback), "two-finger-click");
+ g_signal_connect (three_click_comboxbox, "changed", G_CALLBACK (comboxbox_changed_callback), "three-finger-click");
+
 radio = GTK_RADIO_BUTTON (WID ("scroll_disabled_radio"));
 GSList *radio_group = gtk_radio_button_get_group (radio);
 GSList *item = NULL;
diff --git a/capplets/mouse/mate-mouse-properties.ui b/capplets/mouse/mate-mouse-properties.ui
index 19314bfa..487961c5 100644
--- a/capplets/mouse/mate-mouse-properties.ui
+++ b/capplets/mouse/mate-mouse-properties.ui
@@ -1,74 +1,112 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
+ <requires lib="gtk+" version="2.16"/>
+ <!-- interface-naming-policy toplevel-contextual -->
 <object class="GtkAdjustment" id="adjustment1">
- <property name="upper">10</property>
 <property name="lower">1</property>
- <property name="page_increment">1</property>
- <property name="step_increment">1</property>
- <property name="page_size">0</property>
+ <property name="upper">10</property>
 <property name="value">6</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">1</property>
 </object>
 <object class="GtkAdjustment" id="adjustment2">
- <property name="upper">10</property>
 <property name="lower">1</property>
- <property name="page_increment">1</property>
- <property name="step_increment">1</property>
- <property name="page_size">0</property>
+ <property name="upper">10</property>
 <property name="value">1</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">1</property>
 </object>
 <object class="GtkAdjustment" id="adjustment3">
- <property name="upper">10</property>
 <property name="lower">1</property>
- <property name="page_increment">1</property>
- <property name="step_increment">1</property>
- <property name="page_size">0</property>
+ <property name="upper">10</property>
 <property name="value">1</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">1</property>
 </object>
 <object class="GtkAdjustment" id="adjustment4">
- <property name="upper">1000</property>
 <property name="lower">100</property>
- <property name="page_increment">100</property>
- <property name="step_increment">100</property>
- <property name="page_size">0</property>
+ <property name="upper">1000</property>
 <property name="value">400</property>
+ <property name="step_increment">100</property>
+ <property name="page_increment">100</property>
 </object>
 <object class="GtkAdjustment" id="adjustment5">
- <property name="upper">3</property>
 <property name="lower">0.5</property>
- <property name="page_increment">0.10000000000000001</property>
- <property name="step_increment">0.10000000000000001</property>
- <property name="page_size">0</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="GtkAdjustment" id="adjustment6">
- <property name="upper">3</property>
 <property name="lower">0.20000000000000001</property>
- <property name="page_increment">0.10000000000000001</property>
- <property name="step_increment">0.10000000000000001</property>
- <property name="page_size">0</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="GtkAdjustment" id="adjustment7">
 <property name="upper">30</property>
- <property name="lower">0</property>
- <property name="page_increment">1</property>
- <property name="step_increment">1</property>
- <property name="page_size">0</property>
 <property name="value">15</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">1</property>
 </object>
- <!-- interface-requires gtk+ 2.16 -->
- <!-- interface-naming-policy toplevel-contextual -->
 <object class="GtkDialog" id="mouse_properties_dialog">
+ <property name="can_focus">False</property>
 <property name="border_width">5</property>
 <property name="title" translatable="yes">Mouse Preferences</property>
- <property name="type_hint">dialog</property>
 <property name="default_width">500</property>
 <property name="default_height">550</property>
+ <property name="type_hint">dialog</property>
 <child internal-child="vbox">
 <object class="GtkVBox" id="dialog-vbox1">
 <property name="visible">True</property>
- <property name="orientation">vertical</property>
+ <property name="can_focus">False</property>
 <property name="spacing">2</property>
+ <child internal-child="action_area">
+ <object class="GtkHButtonBox" id="dialog-action_area1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="helpbutton1">
+ <property name="label">gtk-help</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="closebutton1">
+ <property name="label">gtk-close</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <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="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
 <child>
 <object class="GtkNotebook" id="prefs_widget">
 <property name="visible">True</property>
@@ -77,18 +115,19 @@
 <child>
 <object class="GtkVBox" id="general_vbox">
 <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="border_width">12</property>
- <property name="orientation">vertical</property>
 <property name="spacing">18</property>
 <child>
 <object class="GtkVBox" id="orientation_vbox">
 <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="orientation">vertical</property>
 <child>
 <object class="GtkLabel" id="label27">
 <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="xalign">0</property>
 <property name="label" translatable="yes">Mouse Orientation</property>
@@ -97,20 +136,23 @@
 </attributes>
 </object>
 <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
 <property name="position">0</property>
 </packing>
 </child>
 <child>
 <object class="GtkAlignment" id="alignment1">
 <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="top_padding">6</property>
 <property name="left_padding">12</property>
 <child>
 <object class="GtkVBox" id="vbox29">
 <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="orientation">vertical</property>
 <property name="spacing">6</property>
 <child>
 <object class="GtkRadioButton" id="right_handed_radio">
@@ -119,11 +161,14 @@
 <property name="can_focus">True</property>
 <property name="receives_default">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="use_action_appearance">False</property>
 <property name="use_underline">True</property>
 <property name="active">True</property>
 <property name="draw_indicator">True</property>
 </object>
 <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
 <property name="position">0</property>
 </packing>
 </child>
@@ -134,12 +179,15 @@
 <property name="can_focus">True</property>
 <property name="receives_default">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="use_action_appearance">False</property>
 <property name="use_underline">True</property>
 <property name="active">True</property>
 <property name="draw_indicator">True</property>
 <property name="group">right_handed_radio</property>
 </object>
 <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
 <property name="position">1</property>
 </packing>
 </child>
@@ -147,23 +195,27 @@
 </child>
 </object>
 <packing>
+ <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="GtkVBox" id="locate_pointer_vbox">
 <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="orientation">vertical</property>
 <child>
 <object class="GtkLabel" id="label5">
 <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="xalign">0</property>
 <property name="label" translatable="yes">Locate Pointer</property>
@@ -172,12 +224,15 @@
 </attributes>
 </object>
 <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
 <property name="position">0</property>
 </packing>
 </child>
 <child>
 <object class="GtkAlignment" id="alignment4">
 <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="top_padding">6</property>
 <property name="left_padding">12</property>
@@ -188,29 +243,34 @@
 <property name="can_focus">True</property>
 <property name="receives_default">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="use_action_appearance">False</property>
 <property name="use_underline">True</property>
 <property name="draw_indicator">True</property>
 </object>
 </child>
 </object>
 <packing>
+ <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="GtkVBox" id="pointer_speed_vbox">
 <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="orientation">vertical</property>
 <child>
 <object class="GtkLabel" id="label29">
 <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="xalign">0</property>
 <property name="label" translatable="yes">Pointer Speed</property>
@@ -219,18 +279,22 @@
 </attributes>
 </object>
 <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
 <property name="position">0</property>
 </packing>
 </child>
 <child>
 <object class="GtkAlignment" id="alignment5">
 <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="top_padding">6</property>
 <property name="left_padding">12</property>
 <child>
 <object class="GtkTable" id="table2">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="n_rows">2</property>
 <property name="n_columns">3</property>
 <property name="column_spacing">12</property>
@@ -238,6 +302,7 @@
 <child>
 <object class="GtkLabel" id="acceleration_label">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="xalign">0</property>
 <property name="label" translatable="yes">_Acceleration:</property>
 <property name="use_underline">True</property>
@@ -252,6 +317,7 @@
 <child>
 <object class="GtkLabel" id="sensitivity_label">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="xalign">0</property>
 <property name="label" translatable="yes">_Sensitivity:</property>
 <property name="use_underline">True</property>
@@ -268,21 +334,24 @@
 <child>
 <object class="GtkHBox" id="hbox1">
 <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="GtkLabel" id="acceleration_slow_label">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="xalign">1</property>
- <property comments="slow acceleration" name="label" translatable="yes">Slow</property>
+ <property name="label" translatable="yes" comments="slow acceleration">Slow</property>
 <property name="justify">center</property>
 <attributes>
 <attribute name="style" value="italic"/>
- <attribute name="scale" value="0.83"/>
+ <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>
@@ -295,22 +364,26 @@
 <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="acceleration_fast_label">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="xalign">0</property>
- <property name="label" comments="fast acceleration" translatable="yes">Fast</property>
+ <property name="label" translatable="yes" comments="fast acceleration">Fast</property>
 <property name="justify">center</property>
 <attributes>
 <attribute name="style" value="italic"/>
- <attribute name="scale" value="0.83"/>
+ <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>
@@ -323,21 +396,24 @@
 <child>
 <object class="GtkHBox" id="hbox3">
 <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="GtkLabel" id="sensitivity_low_label">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="xalign">1</property>
- <property comments="low sensitivity" name="label" translatable="yes">Low</property>
+ <property name="label" translatable="yes" comments="low sensitivity">Low</property>
 <property name="justify">center</property>
 <attributes>
 <attribute name="style" value="italic"/>
- <attribute name="scale" value="0.83"/>
+ <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>
@@ -350,22 +426,26 @@
 <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>
 <child>
 <object class="GtkLabel" id="sensitivity_high_label">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="xalign">0</property>
- <property comments="high sensitivity" name="label" translatable="yes">High</property>
+ <property name="label" translatable="yes" comments="high sensitivity">High</property>
 <property name="justify">center</property>
 <attributes>
 <attribute name="style" value="italic"/>
- <attribute name="scale" value="0.83"/>
+ <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>
@@ -381,23 +461,27 @@
 </child>
 </object>
 <packing>
+ <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">2</property>
 </packing>
 </child>
 <child>
 <object class="GtkVBox" id="dnd_vbox">
 <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="orientation">vertical</property>
 <child>
 <object class="GtkLabel" id="label8">
 <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="xalign">0</property>
 <property name="label" translatable="yes">Drag and Drop</property>
@@ -406,28 +490,33 @@
 </attributes>
 </object>
 <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
 <property name="position">0</property>
 </packing>
 </child>
 <child>
 <object class="GtkAlignment" id="alignment6">
 <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="top_padding">6</property>
 <property name="left_padding">12</property>
 <child>
 <object class="GtkVBox" id="vbox7">
 <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="orientation">vertical</property>
 <property name="spacing">12</property>
 <child>
 <object class="GtkHBox" id="cursor_hbox2">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="spacing">12</property>
 <child>
 <object class="GtkLabel" id="threshold_label">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="xalign">0</property>
 <property name="label" translatable="yes">Thr_eshold:</property>
 <property name="use_underline">True</property>
@@ -443,16 +532,18 @@
 <child>
 <object class="GtkHBox" id="hbox9">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="spacing">6</property>
 <child>
 <object class="GtkLabel" id="threshold_small_label">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="xalign">1</property>
- <property comments="small threshold" name="label" translatable="yes">Small</property>
+ <property name="label" translatable="yes" comments="small threshold">Small</property>
 <property name="justify">center</property>
 <attributes>
 <attribute name="style" value="italic"/>
- <attribute name="scale" value="0.83"/>
+ <attribute name="scale" value="0.82999999999999996"/>
 </attributes>
 </object>
 <packing>
@@ -468,27 +559,27 @@
 <property name="adjustment">adjustment3</property>
 <property name="digits">0</property>
 <property name="draw_value">False</property>
- <accessibility>
- 
- </accessibility>
 <child internal-child="accessible">
- <object class="AtkObject" id="a11y-drag_threshold_scale1">
+ <object class="AtkObject" id="drag_threshold_scale-atkobject">
 <property name="AtkObject::accessible-description" translatable="yes">Cursor blinks speed</property>
 </object>
 </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="threshold_large_label">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="xalign">0</property>
- <property comments="large threshold" name="label" translatable="yes">Large</property>
+ <property name="label" translatable="yes" comments="large threshold">Large</property>
 <attributes>
 <attribute name="style" value="italic"/>
- <attribute name="scale" value="0.83"/>
+ <attribute name="scale" value="0.82999999999999996"/>
 </attributes>
 </object>
 <packing>
@@ -499,11 +590,15 @@
 </child>
 </object>
 <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
 <property name="position">1</property>
 </packing>
 </child>
 </object>
 <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
 <property name="position">0</property>
 </packing>
 </child>
@@ -511,23 +606,27 @@
 </child>
 </object>
 <packing>
+ <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">3</property>
 </packing>
 </child>
 <child>
 <object class="GtkVBox" id="double_click_timeout_vbox">
 <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="orientation">vertical</property>
 <child>
 <object class="GtkLabel" id="label31">
 <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="xalign">0</property>
 <property name="label" translatable="yes">Double-Click Timeout</property>
@@ -536,28 +635,33 @@
 </attributes>
 </object>
 <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
 <property name="position">0</property>
 </packing>
 </child>
 <child>
 <object class="GtkAlignment" id="alignment7">
 <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="top_padding">6</property>
 <property name="left_padding">12</property>
 <child>
 <object class="GtkVBox" id="vbox32">
 <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="orientation">vertical</property>
 <property name="spacing">12</property>
 <child>
 <object class="GtkHBox" id="cursor_hbox4">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="spacing">12</property>
 <child>
 <object class="GtkLabel" id="timeout_label">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="xalign">0</property>
 <property name="label" translatable="yes">_Timeout:</property>
 <property name="use_underline">True</property>
@@ -573,15 +677,17 @@
 <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="GtkLabel" id="timeout_short_label">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="xalign">1</property>
 <property name="label" translatable="yes">Short</property>
 <attributes>
 <attribute name="style" value="italic"/>
- <attribute name="scale" value="0.83"/>
+ <attribute name="scale" value="0.82999999999999996"/>
 </attributes>
 </object>
 <packing>
@@ -596,27 +702,27 @@
 <property name="can_focus">True</property>
 <property name="adjustment">adjustment4</property>
 <property name="draw_value">False</property>
- <accessibility>
- 
- </accessibility>
 <child internal-child="accessible">
- <object class="AtkObject" id="a11y-delay_scale1">
+ <object class="AtkObject" id="delay_scale-atkobject">
 <property name="AtkObject::accessible-description" translatable="yes">Cursor blinks speed</property>
 </object>
 </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="timeout_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="style" value="italic"/>
- <attribute name="scale" value="0.83"/>
+ <attribute name="scale" value="0.82999999999999996"/>
 </attributes>
 </object>
 <packing>
@@ -627,23 +733,29 @@
 </child>
 </object>
 <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
 <property name="position">1</property>
 </packing>
 </child>
 </object>
 <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
 <property name="position">0</property>
 </packing>
 </child>
 <child>
 <object class="GtkHBox" id="hbox22">
 <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">12</property>
 <child>
 <object class="GtkLabel" id="label33">
 <property name="width_request">180</property>
 <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="xalign">0</property>
 <property name="label" translatable="yes">To test your double-click settings, try to double-click on the light bulb.</property>
@@ -653,28 +765,36 @@
 </attributes>
 </object>
 <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
 <property name="position">0</property>
 </packing>
 </child>
 <child>
 <object class="GtkEventBox" id="double_click_eventbox">
 <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="visible_window">False</property>
 <child>
 <object class="GtkImage" id="double_click_image">
 <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="stock">gtk-missing-image</property>
 </object>
 </child>
 </object>
 <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
 <property name="position">1</property>
 </packing>
 </child>
 </object>
 <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
 <property name="position">1</property>
 </packing>
 </child>
@@ -682,12 +802,15 @@
 </child>
 </object>
 <packing>
+ <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">4</property>
 </packing>
 </child>
@@ -696,6 +819,7 @@
 <child type="tab">
 <object class="GtkLabel" id="label1">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label" translatable="yes">General</property>
 <property name="justify">center</property>
 </object>
@@ -706,19 +830,20 @@
 <child>
 <object class="GtkVBox" id="vbox3">
 <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="border_width">12</property>
- <property name="orientation">vertical</property>
 <property name="spacing">18</property>
 <child>
 <object class="GtkVBox" id="vbox15">
 <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="orientation">vertical</property>
 <property name="spacing">6</property>
 <child>
 <object class="GtkLabel" id="label18">
 <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="xalign">0</property>
 <property name="yalign">0</property>
@@ -736,10 +861,12 @@
 <child>
 <object class="GtkHBox" id="hbox6">
 <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>
 <child>
 <object class="GtkLabel" id="label19">
 <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="xalign">0</property>
 <property name="yalign">0</property>
@@ -758,11 +885,14 @@
 <property name="can_focus">True</property>
 <property name="receives_default">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="use_action_appearance">False</property>
 <property name="use_underline">True</property>
 <property name="active">True</property>
 <property name="draw_indicator">True</property>
 </object>
 <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
 <property name="position">1</property>
 </packing>
 </child>
@@ -776,10 +906,12 @@
 <child>
 <object class="GtkHBox" id="hbox11">
 <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>
 <child>
 <object class="GtkLabel" id="label22">
 <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="xalign">0</property>
 <property name="yalign">0</property>
@@ -798,11 +930,14 @@
 <property name="can_focus">True</property>
 <property name="receives_default">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="use_action_appearance">False</property>
 <property name="use_underline">True</property>
 <property name="active">True</property>
 <property name="draw_indicator">True</property>
 </object>
 <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
 <property name="position">1</property>
 </packing>
 </child>
@@ -813,6 +948,116 @@
 <property name="position">2</property>
 </packing>
 </child>
+ <child>
+ <object class="GtkHBox" id="hbox4">
+ <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>
+ <child>
+ <object class="GtkLabel" id="label3">
+ <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="xalign">0</property>
+ <property name="yalign">0</property>
+ <property name="label"> </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="hbox_two_finger_click">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="label6">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Two-finger click emulation:</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ <packing>
+ <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">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="hbox7">
+ <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>
+ <child>
+ <object class="GtkLabel" id="label7">
+ <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="xalign">0</property>
+ <property name="yalign">0</property>
+ <property name="label"> </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="hbox_three_finger_click">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="label9">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Three-finger click emulation:</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ <packing>
+ <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">4</property>
+ </packing>
+ </child>
 </object>
 <packing>
 <property name="expand">False</property>
@@ -823,12 +1068,13 @@
 <child>
 <object class="GtkVBox" id="vbox19">
 <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="orientation">vertical</property>
 <property name="spacing">6</property>
 <child>
 <object class="GtkLabel" id="label34">
 <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="xalign">0</property>
 <property name="yalign">0</property>
@@ -846,10 +1092,12 @@
 <child>
 <object class="GtkHBox" id="hbox15">
 <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>
 <child>
 <object class="GtkLabel" id="label35">
 <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="xalign">0</property>
 <property name="yalign">0</property>
@@ -864,12 +1112,14 @@
 <child>
 <object class="GtkHBox" id="hbox23">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
 <object class="GtkRadioButton" id="scroll_disabled_radio">
 <property name="label" translatable="yes">_Disabled</property>
 <property name="visible">True</property>
 <property name="can_focus">True</property>
 <property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
 <property name="use_underline">True</property>
 <property name="draw_indicator">True</property>
 </object>
@@ -885,6 +1135,7 @@
 <property name="visible">True</property>
 <property name="can_focus">True</property>
 <property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
 <property name="use_underline">True</property>
 <property name="draw_indicator">True</property>
 <property name="group">scroll_disabled_radio</property>
@@ -901,6 +1152,7 @@
 <property name="visible">True</property>
 <property name="can_focus">True</property>
 <property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
 <property name="use_underline">True</property>
 <property name="draw_indicator">True</property>
 <property name="group">scroll_disabled_radio</property>
@@ -913,6 +1165,8 @@
 </child>
 </object>
 <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
 <property name="position">1</property>
 </packing>
 </child>
@@ -924,12 +1178,58 @@
 </packing>
 </child>
 <child>
+ <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>
+ <child>
+ <object class="GtkLabel" id="label2">
+ <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="xalign">0</property>
+ <property name="yalign">0</property>
+ <property name="label"> </property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="natural_scroll_toggle">
+ <property name="label" translatable="yes">Enable n_atural scrolling</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">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="use_action_appearance">False</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <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">2</property>
+ </packing>
+ </child>
+ <child>
 <object class="GtkHBox" id="hbox16">
 <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>
 <child>
 <object class="GtkLabel" id="label36">
 <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="xalign">0</property>
 <property name="yalign">0</property>
@@ -948,10 +1248,13 @@
 <property name="can_focus">True</property>
 <property name="receives_default">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="use_action_appearance">False</property>
 <property name="use_underline">True</property>
 <property name="draw_indicator">True</property>
 </object>
 <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
 <property name="position">1</property>
 </packing>
 </child>
@@ -959,7 +1262,7 @@
 <packing>
 <property name="expand">False</property>
 <property name="fill">False</property>
- <property name="position">2</property>
+ <property name="position">3</property>
 </packing>
 </child>
 </object>
@@ -970,10 +1273,14 @@
 </packing>
 </child>
 </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
 </child>
 <child type="tab">
 <object class="GtkLabel" id="label4">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label" translatable="yes">Touchpad</property>
 <property name="justify">center</property>
 </object>
@@ -984,50 +1291,11 @@
 </child>
 </object>
 <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
 <property name="position">1</property>
 </packing>
 </child>
- <child internal-child="action_area">
- <object class="GtkHButtonBox" id="dialog-action_area1">
- <property name="visible">True</property>
- <property name="layout_style">end</property>
- <child>
- <object class="GtkButton" id="helpbutton1">
- <property name="label">gtk-help</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">False</property>
- <property name="use_stock">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="closebutton1">
- <property name="label">gtk-close</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">False</property>
- <property name="use_stock">True</property>
- </object>
- <packing>
- <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="pack_type">end</property>
- <property name="position">0</property>
- </packing>
- </child>
 </object>
 </child>
 <action-widgets>
author	Clement Lefebvre <[email protected]>	2015-09-03 17:43:46 +0100
committer	Clement Lefebvre <[email protected]>	2015-09-03 17:43:46 +0100
commit	e4c68641268956ff99cef21dc5e5cb3e3b55ccdf (patch)
tree	4bcc1c6a24ff115514529e893238962362fa143e
parent	87e013d5c235a034a01391892eac7c888bb27871 (diff)
download	mate-control-center-e4c68641268956ff99cef21dc5e5cb3e3b55ccdf.tar.bz2 mate-control-center-e4c68641268956ff99cef21dc5e5cb3e3b55ccdf.tar.xz