gpointing-device-settings r47 - in trunk: data modules

[hiikezoe svn gnome org]

Author: hiikezoe
Date: Fri Feb 27 12:41:43 2009
New Revision: 47
URL: http://svn.gnome.org/viewvc/gpointing-device-settings?rev=47&view=rev

Log:
wheel emulation inertia.

Modified:
   trunk/data/trackpoint.ui.in
   trunk/modules/gpds-trackpoint-ui.c

Modified: trunk/data/trackpoint.ui.in
==============================================================================
--- trunk/data/trackpoint.ui.in	(original)
+++ trunk/data/trackpoint.ui.in	Fri Feb 27 12:41:43 2009
@@ -93,6 +93,35 @@
         </object>
       </child>
       <child>
+        <object class="GtkHBox" id="hbox3">
+        <property name="visible">True</property>
+        <child>
+          <object class="GtkLabel" id="wheel_emulation_inertia_label">
+            <property name="visible">True</property>
+            <property name="label" translatable="yes">Wheel emulation inertia</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkAdjustment" id="wheel_emulation_inertia_adjustment">
+            <property name="lower">50</property>
+            <property name="upper">10000</property>
+            <property name="step-increment">50</property>
+          </object>
+          <object class="GtkSpinButton" id="wheel_emulation_inertia">
+            <property name="numeric">True</property>
+            <property name="visible">True</property>
+            <property name="adjustment">wheel_emulation_inertia_adjustment</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkLabel" id="wheel_emulation_inertia_unit">
+            <property name="visible">True</property>
+            <property name="label" translatable="yes">(ms)</property>
+          </object>
+        </child>
+        </object>
+      </child>
+      <child>
         <object class="GtkCheckButton" id="wheel_emulation_vertical">
           <property name="visible">True</property>
           <property name="label" translatable="yes">Enable vertical scroll</property>

Modified: trunk/modules/gpds-trackpoint-ui.c
==============================================================================
--- trunk/modules/gpds-trackpoint-ui.c	(original)
+++ trunk/modules/gpds-trackpoint-ui.c	Fri Feb 27 12:41:43 2009
@@ -298,6 +298,13 @@
 }
 
 static void
+cb_wheel_emulation_inertia_value_changed (GtkSpinButton *button, gpointer user_data)
+{
+    GpdsTrackPointUI *ui = GPDS_TRACK_POINT_UI(user_data);
+    set_spin_property(ui->xinput, button, WHEEL_EMULATION_INERTIA);
+}
+
+static void
 cb_middle_button_timeout_value_changed (GtkSpinButton *button, gpointer user_data)
 {
     GpdsTrackPointUI *ui = GPDS_TRACK_POINT_UI(user_data);
@@ -319,6 +326,7 @@
     CONNECT(middle_button_timeout, value_changed);
     CONNECT(wheel_emulation, toggled);
     CONNECT(wheel_emulation_timeout, value_changed);
+    CONNECT(wheel_emulation_inertia, value_changed);
     CONNECT(wheel_emulation_vertical, toggled);
     CONNECT(wheel_emulation_horizontal, toggled);
 
@@ -417,6 +425,8 @@
                          builder, "middle_button_timeout");
     set_integer_property(track_point_ui->xinput, WHEEL_EMULATION_TIMEOUT,
                          builder, "wheel_emulation_timeout");
+    set_integer_property(track_point_ui->xinput, WHEEL_EMULATION_INERTIA,
+                         builder, "wheel_emulation_inertia");
 
     set_scroll_property(track_point_ui->xinput, WHEEL_EMULATION_Y_AXIS,
                         builder, "wheel_emulation_vertical");