[gnome-control-center] mouse: Add motion acceleration and threshold UI for touchpad settings



commit 59248ed8ba5ff58248f63c0e208c133de538d046
Author: Rodrigo Moya <rodrigo gnome-db org>
Date:   Wed Oct 20 16:07:56 2010 +0200

    mouse: Add motion acceleration and threshold UI for touchpad settings

 panels/mouse/gnome-mouse-properties.c  |   13 +-
 panels/mouse/gnome-mouse-properties.ui |  347 +++++++++++++++++++++++---------
 2 files changed, 256 insertions(+), 104 deletions(-)
---
diff --git a/panels/mouse/gnome-mouse-properties.c b/panels/mouse/gnome-mouse-properties.c
index 087983e..8b8452d 100644
--- a/panels/mouse/gnome-mouse-properties.c
+++ b/panels/mouse/gnome-mouse-properties.c
@@ -341,16 +341,9 @@ setup_dialog (GtkBuilder *dialog)
 	g_settings_bind (mouse_settings, "motion-acceleration",
 			 gtk_range_get_adjustment (GTK_RANGE (WID ("accel_scale"))), "value",
 			 G_SETTINGS_BIND_DEFAULT);
-	g_settings_bind (touchpad_settings, "motion-acceleration",
-			 gtk_range_get_adjustment (GTK_RANGE (WID ("accel_scale"))), "value",
-			 G_SETTINGS_BIND_DEFAULT);
-
 	g_settings_bind (mouse_settings, "motion-threshold",
 			 gtk_range_get_adjustment (GTK_RANGE (WID ("sensitivity_scale"))), "value",
 			 G_SETTINGS_BIND_DEFAULT);
-	g_settings_bind (touchpad_settings, "motion-threshold",
-			 gtk_range_get_adjustment (GTK_RANGE (WID ("sensitivity_scale"))), "value",
-			 G_SETTINGS_BIND_DEFAULT);
 
 	/* DnD threshold */
 	g_settings_bind (mouse_settings, "drag-threshold",
@@ -370,6 +363,12 @@ 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, "motion-acceleration",
+				 gtk_range_get_adjustment (GTK_RANGE (WID ("touchpad_accel_scale"))), "value",
+				 G_SETTINGS_BIND_DEFAULT);
+		g_settings_bind (touchpad_settings, "motion-threshold",
+				 gtk_range_get_adjustment (GTK_RANGE (WID ("touchpad_sensitivity_scale"))), "value",
+				 G_SETTINGS_BIND_DEFAULT);
 
 		g_signal_connect (WID ("scroll_disabled_radio"), "toggled",
 				  G_CALLBACK (scrollmethod_changed_event), dialog);
diff --git a/panels/mouse/gnome-mouse-properties.ui b/panels/mouse/gnome-mouse-properties.ui
index 6900c18..b70ddf1 100644
--- a/panels/mouse/gnome-mouse-properties.ui
+++ b/panels/mouse/gnome-mouse-properties.ui
@@ -1,72 +1,62 @@
-<?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="value">6</property>
     <property name="lower">1</property>
-    <property name="page_increment">1</property>
+    <property name="upper">10</property>
     <property name="step_increment">1</property>
-    <property name="page_size">0</property>
-    <property name="value">6</property>
+    <property name="page_increment">1</property>
   </object>
   <object class="GtkAdjustment" id="adjustment2">
-    <property name="upper">10</property>
+    <property name="value">1</property>
     <property name="lower">1</property>
-    <property name="page_increment">1</property>
+    <property name="upper">10</property>
     <property name="step_increment">1</property>
-    <property name="page_size">0</property>
-    <property name="value">1</property>
+    <property name="page_increment">1</property>
   </object>
   <object class="GtkAdjustment" id="adjustment3">
-    <property name="upper">10</property>
+    <property name="value">1</property>
     <property name="lower">1</property>
-    <property name="page_increment">1</property>
+    <property name="upper">10</property>
     <property name="step_increment">1</property>
-    <property name="page_size">0</property>
-    <property name="value">1</property>
+    <property name="page_increment">1</property>
   </object>
   <object class="GtkAdjustment" id="adjustment4">
-    <property name="upper">1000</property>
+    <property name="value">400</property>
     <property name="lower">100</property>
-    <property name="page_increment">100</property>
+    <property name="upper">1000</property>
     <property name="step_increment">100</property>
-    <property name="page_size">0</property>
-    <property name="value">400</property>
+    <property name="page_increment">100</property>
   </object>
   <object class="GtkAdjustment" id="adjustment5">
-    <property name="upper">3</property>
+    <property name="value">1.2</property>
     <property name="lower">0.5</property>
-    <property name="page_increment">0.10000000000000001</property>
+    <property name="upper">3</property>
     <property name="step_increment">0.10000000000000001</property>
-    <property name="page_size">0</property>
-    <property name="value">1.2</property>
+    <property name="page_increment">0.10000000000000001</property>
   </object>
   <object class="GtkAdjustment" id="adjustment6">
-    <property name="upper">3</property>
+    <property name="value">1.2</property>
     <property name="lower">0.20000000000000001</property>
-    <property name="page_increment">0.10000000000000001</property>
+    <property name="upper">3</property>
     <property name="step_increment">0.10000000000000001</property>
-    <property name="page_size">0</property>
-    <property name="value">1.2</property>
+    <property name="page_increment">0.10000000000000001</property>
   </object>
   <object class="GtkAdjustment" id="adjustment7">
+    <property name="value">15</property>
     <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="page_increment">1</property>
   </object>
-  <!-- interface-requires gtk+ 2.16 -->
-  <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkDialog" id="mouse_properties_dialog">
     <property name="border_width">5</property>
     <property name="title" translatable="yes">Mouse Preferences</property>
     <property name="type_hint">dialog</property>
-    <property name="has_separator">False</property>
     <child internal-child="vbox">
       <object class="GtkVBox" id="dialog-vbox1">
         <property name="visible">True</property>
-        <property name="orientation">vertical</property>
         <property name="spacing">2</property>
         <child>
           <object class="GtkNotebook" id="prefs_widget">
@@ -78,13 +68,11 @@
                 <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="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="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>
@@ -109,7 +97,6 @@
                           <object class="GtkVBox" id="vbox29">
                             <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="orientation">vertical</property>
                             <property name="spacing">6</property>
                             <child>
                               <object class="GtkRadioButton" id="right_handed_radio">
@@ -159,7 +146,6 @@
                   <object class="GtkVBox" id="locate_pointer_vbox">
                     <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="orientation">vertical</property>
                     <child>
                       <object class="GtkLabel" id="label5">
                         <property name="visible">True</property>
@@ -206,7 +192,6 @@
                   <object class="GtkVBox" id="pointer_speed_vbox">
                     <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="orientation">vertical</property>
                     <child>
                       <object class="GtkLabel" id="label29">
                         <property name="visible">True</property>
@@ -273,11 +258,11 @@
                                   <object class="GtkLabel" id="acceleration_slow_label">
                                     <property name="visible">True</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.830000"/>
                                     </attributes>
                                   </object>
                                   <packing>
@@ -302,11 +287,11 @@
                                   <object class="GtkLabel" id="acceleration_fast_label">
                                     <property name="visible">True</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.830000"/>
                                     </attributes>
                                   </object>
                                   <packing>
@@ -329,11 +314,11 @@
                                   <object class="GtkLabel" id="sensitivity_low_label">
                                     <property name="visible">True</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.830000"/>
                                     </attributes>
                                   </object>
                                   <packing>
@@ -358,11 +343,11 @@
                                   <object class="GtkLabel" id="sensitivity_high_label">
                                     <property name="visible">True</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.830000"/>
                                     </attributes>
                                   </object>
                                   <packing>
@@ -395,7 +380,6 @@
                   <object class="GtkVBox" id="dnd_vbox">
                     <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="orientation">vertical</property>
                     <child>
                       <object class="GtkLabel" id="label8">
                         <property name="visible">True</property>
@@ -420,7 +404,6 @@
                           <object class="GtkVBox" id="vbox7">
                             <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="orientation">vertical</property>
                             <property name="spacing">12</property>
                             <child>
                               <object class="GtkHBox" id="cursor_hbox2">
@@ -449,11 +432,11 @@
                                       <object class="GtkLabel" id="threshold_small_label">
                                         <property name="visible">True</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.830000"/>
                                         </attributes>
                                       </object>
                                       <packing>
@@ -470,11 +453,8 @@
                                         <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>
@@ -487,10 +467,10 @@
                                       <object class="GtkLabel" id="threshold_large_label">
                                         <property name="visible">True</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.830000"/>
                                         </attributes>
                                       </object>
                                       <packing>
@@ -526,7 +506,6 @@
                   <object class="GtkVBox" id="double_click_timeout_vbox">
                     <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="orientation">vertical</property>
                     <child>
                       <object class="GtkLabel" id="label31">
                         <property name="visible">True</property>
@@ -551,7 +530,6 @@
                           <object class="GtkVBox" id="vbox32">
                             <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="orientation">vertical</property>
                             <property name="spacing">12</property>
                             <child>
                               <object class="GtkHBox" id="cursor_hbox4">
@@ -583,7 +561,7 @@
                                         <property name="label" translatable="yes">Short</property>
                                         <attributes>
                                           <attribute name="style" value="italic"/>
-                                          <attribute name="scale" value="0.83"/>
+                                          <attribute name="scale" value="0.830000"/>
                                         </attributes>
                                       </object>
                                       <packing>
@@ -599,11 +577,8 @@
                                         <property name="update_policy">discontinuous</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>
@@ -619,7 +594,7 @@
                                         <property name="label" translatable="yes">Long</property>
                                         <attributes>
                                           <attribute name="style" value="italic"/>
-                                          <attribute name="scale" value="0.83"/>
+                                          <attribute name="scale" value="0.830000"/>
                                         </attributes>
                                       </object>
                                       <packing>
@@ -710,13 +685,11 @@
               <object class="GtkVBox" id="accessibility_vbox">
                 <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="simulated_secondary_vbox">
                     <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="orientation">vertical</property>
                     <child>
                       <object class="GtkLabel" id="label21">
                         <property name="visible">True</property>
@@ -741,7 +714,6 @@
                           <object class="GtkVBox" id="vbox18">
                             <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="orientation">vertical</property>
                             <property name="spacing">6</property>
                             <child>
                               <object class="GtkCheckButton" id="delay_enable">
@@ -790,10 +762,10 @@
                                             <property name="visible">True</property>
                                             <property name="xalign">1</property>
                                             <property name="yalign">0.4699999988079071</property>
-                                            <property comments="short delay" name="label" translatable="yes">Short</property>
+                                            <property name="label" translatable="yes" comments="short delay">Short</property>
                                             <attributes>
                                               <attribute name="style" value="italic"/>
-                                              <attribute name="scale" value="0.83"/>
+                                              <attribute name="scale" value="0.830000"/>
                                             </attributes>
                                           </object>
                                           <packing>
@@ -809,11 +781,8 @@
                                             <property name="update_policy">discontinuous</property>
                                             <property name="adjustment">adjustment5</property>
                                             <property name="draw_value">False</property>
-                                            <accessibility>
-                                              
-                                            </accessibility>
                                             <child internal-child="accessible">
-                                              <object class="AtkObject" id="a11y-delay_time1">
+                                              <object class="AtkObject" id="delay_time-atkobject">
                                                 <property name="AtkObject::accessible-description" translatable="yes">Cursor blinks speed</property>
                                               </object>
                                             </child>
@@ -826,10 +795,10 @@
                                           <object class="GtkLabel" id="simulated_delay_long_label">
                                             <property name="visible">True</property>
                                             <property name="xalign">0</property>
-                                            <property comments="long delay" name="label" translatable="yes">Long</property>
+                                            <property name="label" translatable="yes" comments="long delay">Long</property>
                                             <attributes>
                                               <attribute name="style" value="italic"/>
-                                              <attribute name="scale" value="0.83"/>
+                                              <attribute name="scale" value="0.830000"/>
                                             </attributes>
                                           </object>
                                           <packing>
@@ -867,13 +836,12 @@
                   <object class="GtkVBox" id="dwell_secondary_vbox">
                     <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="orientation">vertical</property>
                     <child>
                       <object class="GtkLabel" id="label16">
                         <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="xalign">0</property>
-                        <property comments="Dwell Click = Clicking without hardware buttons (by letting the pointer sit on the click target for a certain amount of time)" name="label" translatable="yes">Dwell Click</property>
+                        <property name="label" translatable="yes" comments="Dwell Click = Clicking without hardware buttons (by letting the pointer sit on the click target for a certain amount of time)">Dwell Click</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
@@ -892,7 +860,6 @@
                           <object class="GtkVBox" id="vbox4">
                             <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="orientation">vertical</property>
                             <property name="spacing">6</property>
                             <child>
                               <object class="GtkCheckButton" id="dwell_enable">
@@ -917,7 +884,6 @@
                                   <object class="GtkVBox" id="dwell_box">
                                     <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="orientation">vertical</property>
                                     <property name="spacing">6</property>
                                     <child>
                                       <object class="GtkTable" id="table4">
@@ -965,11 +931,11 @@
                                               <object class="GtkLabel" id="dwell_delay_short_label">
                                                 <property name="visible">True</property>
                                                 <property name="xalign">1</property>
-                                                <property comments="short delay" name="label" translatable="yes">Short</property>
+                                                <property name="label" translatable="yes" comments="short delay">Short</property>
                                                 <property name="justify">center</property>
                                                 <attributes>
                                                   <attribute name="style" value="italic"/>
-                                                  <attribute name="scale" value="0.83"/>
+                                                  <attribute name="scale" value="0.830000"/>
                                                 </attributes>
                                               </object>
                                               <packing>
@@ -994,11 +960,11 @@
                                               <object class="GtkLabel" id="dwell_delay_long_label">
                                                 <property name="visible">True</property>
                                                 <property name="xalign">0</property>
-                                                <property comments="long delay" name="label" translatable="yes">Long</property>
+                                                <property name="label" translatable="yes" comments="long delay">Long</property>
                                                 <property name="justify">center</property>
                                                 <attributes>
                                                   <attribute name="style" value="italic"/>
-                                                  <attribute name="scale" value="0.83"/>
+                                                  <attribute name="scale" value="0.830000"/>
                                                 </attributes>
                                               </object>
                                               <packing>
@@ -1021,11 +987,11 @@
                                               <object class="GtkLabel" id="dwell_threshold_small_label">
                                                 <property name="visible">True</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.830000"/>
                                                 </attributes>
                                               </object>
                                               <packing>
@@ -1050,11 +1016,11 @@
                                               <object class="GtkLabel" id="dwell_threshold_large_label">
                                                 <property name="visible">True</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>
                                                 <property name="justify">center</property>
                                                 <attributes>
                                                   <attribute name="style" value="italic"/>
-                                                  <attribute name="scale" value="0.83"/>
+                                                  <attribute name="scale" value="0.830000"/>
                                                 </attributes>
                                               </object>
                                               <packing>
@@ -1079,13 +1045,11 @@
                                       <object class="GtkVBox" id="vbox5">
                                         <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="orientation">vertical</property>
                                         <property name="spacing">6</property>
                                         <child>
                                           <object class="GtkVBox" id="vbox9">
                                             <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="orientation">vertical</property>
                                             <property name="spacing">6</property>
                                             <child>
                                               <object class="GtkRadioButton" id="dwell_mode_ctw">
@@ -1111,7 +1075,6 @@
                                                   <object class="GtkVBox" id="box_ctw">
                                                     <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="orientation">vertical</property>
                                                     <property name="spacing">6</property>
                                                     <child>
                                                       <object class="GtkCheckButton" id="dwell_show_ctw">
@@ -1149,10 +1112,10 @@
                                                             <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="xalign">0</property>
-                                                            <property comments="Dwell Click = Clicking without hardware buttons (by letting the pointer sit on the click target for a certain amount of time)" name="label" translatable="yes">You can also use the Dwell Click panel applet to choose the click type.</property>
+                                                            <property name="label" translatable="yes" comments="Dwell Click = Clicking without hardware buttons (by letting the pointer sit on the click target for a certain amount of time)">You can also use the Dwell Click panel applet to choose the click type.</property>
                                                             <property name="wrap">True</property>
                                                             <attributes>
-                                                              <attribute name="style" value="italic"/>
+                                                            <attribute name="style" value="italic"/>
                                                             </attributes>
                                                           </object>
                                                           <packing>
@@ -1181,7 +1144,6 @@
                                           <object class="GtkVBox" id="vbox13">
                                             <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="orientation">vertical</property>
                                             <property name="spacing">6</property>
                                             <child>
                                               <object class="GtkRadioButton" id="dwell_mode_gesture">
@@ -1279,7 +1241,7 @@
                                                         <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="xalign">0</property>
-                                                        <property comments="click to initiate drag-and-drop (like normally click and hold)" name="label" translatable="yes">D_rag click:</property>
+                                                        <property name="label" translatable="yes" comments="click to initiate drag-and-drop (like normally click and hold)">D_rag click:</property>
                                                         <property name="use_underline">True</property>
                                                         <property name="mnemonic_widget">dwell_gest_drag</property>
                                                       </object>
@@ -1359,6 +1321,9 @@
                   </packing>
                 </child>
               </object>
+              <packing>
+                <property name="position">1</property>
+              </packing>
             </child>
             <child type="tab">
               <object class="GtkLabel" id="label3">
@@ -1376,13 +1341,11 @@
                 <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="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="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">
@@ -1492,7 +1455,6 @@
                   <object class="GtkVBox" id="vbox19">
                     <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="orientation">vertical</property>
                     <property name="spacing">6</property>
                     <child>
                       <object class="GtkLabel" id="label34">
@@ -1637,7 +1599,198 @@
                     <property name="position">1</property>
                   </packing>
                 </child>
+                <child>
+                  <object class="GtkVBox" id="pointer_speed_vbox1">
+                    <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>
+                    <child>
+                      <object class="GtkLabel" id="label6">
+                        <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="xalign">0</property>
+                        <property name="label" translatable="yes">Pointer Speed</property>
+                        <attributes>
+                          <attribute name="weight" value="bold"/>
+                        </attributes>
+                      </object>
+                      <packing>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkAlignment" id="alignment2">
+                        <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="top_padding">6</property>
+                        <property name="left_padding">12</property>
+                        <child>
+                          <object class="GtkTable" id="table1">
+                            <property name="visible">True</property>
+                            <property name="n_rows">2</property>
+                            <property name="n_columns">3</property>
+                            <property name="column_spacing">12</property>
+                            <property name="row_spacing">6</property>
+                            <child>
+                              <object class="GtkLabel" id="touchpad_acceleration_label">
+                                <property name="visible">True</property>
+                                <property name="xalign">0</property>
+                                <property name="label" translatable="yes">_Acceleration:</property>
+                                <property name="use_underline">True</property>
+                                <property name="justify">center</property>
+                                <property name="mnemonic_widget">accel_scale</property>
+                              </object>
+                              <packing>
+                                <property name="x_options">GTK_FILL</property>
+                                <property name="y_options">GTK_FILL</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="touchpad_sensitivity_label">
+                                <property name="visible">True</property>
+                                <property name="xalign">0</property>
+                                <property name="label" translatable="yes">_Sensitivity:</property>
+                                <property name="use_underline">True</property>
+                                <property name="justify">center</property>
+                                <property name="mnemonic_widget">sensitivity_scale</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">GTK_FILL</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkHBox" id="hbox7">
+                                <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="touchpad_acceleration_slow_label">
+                                    <property name="visible">True</property>
+                                    <property name="xalign">1</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.830000"/>
+                                    </attributes>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="position">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkHScale" id="touchpad_accel_scale">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="update_policy">discontinuous</property>
+                                    <property name="adjustment">adjustment1</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="touchpad_acceleration_fast_label">
+                                    <property name="visible">True</property>
+                                    <property name="xalign">0</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.830000"/>
+                                    </attributes>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="position">2</property>
+                                  </packing>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="left_attach">1</property>
+                                <property name="right_attach">3</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkHBox" id="hbox8">
+                                <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="touchpad_sensitivity_low_label">
+                                    <property name="visible">True</property>
+                                    <property name="xalign">1</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.830000"/>
+                                    </attributes>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="position">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkHScale" id="touchpad_sensitivity_scale">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="update_policy">discontinuous</property>
+                                    <property name="adjustment">adjustment2</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="touchpad_sensitivity_high_label">
+                                    <property name="visible">True</property>
+                                    <property name="xalign">0</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.830000"/>
+                                    </attributes>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="position">2</property>
+                                  </packing>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="left_attach">1</property>
+                                <property name="right_attach">3</property>
+                                <property name="top_attach">1</property>
+                                <property name="bottom_attach">2</property>
+                              </packing>
+                            </child>
+                          </object>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
               </object>
+              <packing>
+                <property name="position">2</property>
+              </packing>
             </child>
             <child type="tab">
               <object class="GtkLabel" id="label4">



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