gpointing-device-settings r255 - in trunk: . data modules modules/common modules/gnome-settings-daemon-plugins

From: hiikezoe svn gnome org
To: svn-commits-list gnome org
Subject: gpointing-device-settings r255 - in trunk: . data modules modules/common modules/gnome-settings-daemon-plugins
Date: Mon, 23 Mar 2009 11:38:01 +0000 (UTC)
Author: hiikezoe
Date: Mon Mar 23 11:38:01 2009
New Revision: 255
URL: http://svn.gnome.org/viewvc/gpointing-device-settings?rev=255&view=rev

Log:
tap move support.

Modified:
   trunk/NEWS
   trunk/TODO
   trunk/data/touchpad.ui
   trunk/modules/common/gpds-touchpad-definitions.h
   trunk/modules/gnome-settings-daemon-plugins/gsd-touchpad-manager.c
   trunk/modules/gpds-touchpad-ui.c

Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS	(original)
+++ trunk/NEWS	Mon Mar 23 11:38:01 2009
@@ -3,6 +3,7 @@
 ============================
 * Touchpad
  - Palm detection
+ - Tap move
 
 ============================
 GPointinDeviceSettings 1.2.0

Modified: trunk/TODO
==============================================================================
--- trunk/TODO	(original)
+++ trunk/TODO	Mon Mar 23 11:38:01 2009
@@ -6,7 +6,6 @@
   - edges
   - palm dimensions
  * Tapping
-  - move
   - durations
   - tap actions
  * Scrolling

Modified: trunk/data/touchpad.ui
==============================================================================
--- trunk/data/touchpad.ui	(original)
+++ trunk/data/touchpad.ui	Mon Mar 23 11:38:01 2009
@@ -1,15 +1,15 @@
 <?xml version="1.0"?>
 <!--*- mode: xml -*-->
 <interface>
-  <object class="GtkAdjustment" id="adjustment1">
-    <property name="upper">4</property>
-    <property name="lower">0</property>
-    <property name="page_increment">1</property>
-    <property name="step_increment">1</property>
+  <object class="GtkAdjustment" id="tapping_time_scale_adjustment">
+    <property name="upper">550</property>
+    <property name="lower">50</property>
+    <property name="page_increment">100</property>
+    <property name="step_increment">100</property>
     <property name="page_size">0</property>
-    <property name="value">1</property>
+    <property name="value">100</property>
   </object>
-  <object class="GtkAdjustment" id="tapping_time_scale_adjustment">
+  <object class="GtkAdjustment" id="tapping_move_scale_adjustment">
     <property name="upper">550</property>
     <property name="lower">50</property>
     <property name="page_increment">100</property>
@@ -339,6 +339,107 @@
                           </packing>
                         </child>
                         <child>
+                          <object class="GtkHBox" id="tapping_move_hbox">
+                            <property name="visible">True</property>
+                            <property name="homogeneous">False</property>
+                            <property name="spacing">6</property>
+                            <child>
+                              <object class="GtkLabel" id="tapping_move_label">
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">Tapping move: </property>
+                                <property name="use_underline">False</property>
+                                <property name="use_markup">False</property>
+                                <property name="justify">GTK_JUSTIFY_LEFT</property>
+                                <property name="wrap">False</property>
+                                <property name="selectable">False</property>
+                                <property name="xalign">0.5</property>
+                                <property name="yalign">0.5</property>
+                                <property name="xpad">0</property>
+                                <property name="ypad">0</property>
+                                <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                                <property name="width_chars">-1</property>
+                                <property name="single_line_mode">False</property>
+                                <property name="angle">0</property>
+                              </object>
+                              <packing>
+                                <property name="padding">0</property>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="tapping_move_scale_short_label">
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">&lt;i&gt;Short&lt;/i&gt;</property>
+                                <property name="use_underline">False</property>
+                                <property name="use_markup">True</property>
+                                <property name="justify">GTK_JUSTIFY_LEFT</property>
+                                <property name="wrap">False</property>
+                                <property name="selectable">False</property>
+                                <property name="xalign">0.5</property>
+                                <property name="yalign">0.5</property>
+                                <property name="xpad">0</property>
+                                <property name="ypad">0</property>
+                                <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                                <property name="width_chars">-1</property>
+                                <property name="single_line_mode">False</property>
+                                <property name="angle">0</property>
+                              </object>
+                              <packing>
+                                <property name="padding">0</property>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkHScale" id="tapping_move_scale">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="draw_value">False</property>
+                                <property name="value_pos">GTK_POS_TOP</property>
+                                <property name="digits">0</property>
+                                <property name="update_policy">GTK_UPDATE_DISCONTINUOUS</property>
+                                <property name="inverted">False</property>
+                                <property name="adjustment">tapping_move_scale_adjustment</property>
+                              </object>
+                              <packing>
+                                <property name="padding">0</property>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="tapping_move_scale_long_labe">
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">&lt;i&gt;Long&lt;/i&gt;</property>
+                                <property name="use_underline">False</property>
+                                <property name="use_markup">True</property>
+                                <property name="justify">GTK_JUSTIFY_LEFT</property>
+                                <property name="wrap">False</property>
+                                <property name="selectable">False</property>
+                                <property name="xalign">0.5</property>
+                                <property name="yalign">0.5</property>
+                                <property name="xpad">0</property>
+                                <property name="ypad">0</property>
+                                <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                                <property name="width_chars">-1</property>
+                                <property name="single_line_mode">False</property>
+                                <property name="angle">0</property>
+                              </object>
+                              <packing>
+                                <property name="padding">0</property>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="padding">0</property>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                          </packing>
+                        </child>
+                        <child>
                           <object class="GtkCheckButton" id="faster_tapping_check">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>

Modified: trunk/modules/common/gpds-touchpad-definitions.h
==============================================================================
--- trunk/modules/common/gpds-touchpad-definitions.h	(original)
+++ trunk/modules/common/gpds-touchpad-definitions.h	Mon Mar 23 11:38:01 2009
@@ -24,6 +24,7 @@
 #define GPDS_TOUCHPAD_FINGER_KEY                          "finger"
 #define GPDS_TOUCHPAD_OFF_KEY                             "off"
 #define GPDS_TOUCHPAD_TAP_TIME_KEY                        "tap_time"
+#define GPDS_TOUCHPAD_TAP_MOVE_KEY                        "tap_move"
 #define GPDS_TOUCHPAD_TAP_FAST_TAP_KEY                    "tap_fast_tap"
 #define GPDS_TOUCHPAD_HORIZONTAL_SCROLLING_DISTANCE_KEY   "horizontal_scrolling_distance"
 #define GPDS_TOUCHPAD_HORIZONTAL_SCROLLING_KEY            "horizontal_scrolling"

Modified: trunk/modules/gnome-settings-daemon-plugins/gsd-touchpad-manager.c
==============================================================================
--- trunk/modules/gnome-settings-daemon-plugins/gsd-touchpad-manager.c	(original)
+++ trunk/modules/gnome-settings-daemon-plugins/gsd-touchpad-manager.c	Mon Mar 23 11:38:01 2009
@@ -61,6 +61,7 @@
 DEFINE_SET_BOOLEAN_FUNCTION (circular_scrolling, GPDS_TOUCHPAD_CIRCULAR_SCROLLING)
 DEFINE_SET_INT_FUNCTION (touchpad_off, GPDS_TOUCHPAD_OFF)
 DEFINE_SET_INT_FUNCTION (tap_time, GPDS_TOUCHPAD_TAP_TIME)
+DEFINE_SET_INT_FUNCTION (tap_move, GPDS_TOUCHPAD_TAP_MOVE)
 DEFINE_SET_INT_FUNCTION (circular_scrolling_trigger, GPDS_TOUCHPAD_CIRCULAR_SCROLLING_TRIGGER)
 
 static void
@@ -184,6 +185,7 @@
     set_palm_detection(manager, xinput, gconf);
     set_tap_fast_tap(manager, xinput, gconf);
     set_tap_time(manager, xinput, gconf);
+    set_tap_move(manager, xinput, gconf);
     set_edge_scrolling(manager, xinput, gconf);
     set_horizontal_and_vertical_scrolling_distance(manager, xinput, gconf);
     set_circular_scrolling(manager, xinput, gconf);
@@ -250,6 +252,8 @@
             set_touchpad_off(manager, xinput, client);
         } else if (!strcmp(key, GPDS_TOUCHPAD_TAP_TIME_KEY)) {
             set_tap_time(manager, xinput, client);
+        } else if (!strcmp(key, GPDS_TOUCHPAD_TAP_MOVE_KEY)) {
+            set_tap_move(manager, xinput, client);
         } else if (!strcmp(key, GPDS_TOUCHPAD_VERTICAL_SCROLLING_DISTANCE_KEY) ||
                    !strcmp(key, GPDS_TOUCHPAD_HORIZONTAL_SCROLLING_DISTANCE_KEY)) {
             set_horizontal_and_vertical_scrolling_distance(manager, xinput, client);

Modified: trunk/modules/gpds-touchpad-ui.c
==============================================================================
--- trunk/modules/gpds-touchpad-ui.c	(original)
+++ trunk/modules/gpds-touchpad-ui.c	Mon Mar 23 11:38:01 2009
@@ -290,6 +290,23 @@
 }
 
 static void
+cb_tapping_move_scale_value_changed (GtkRange *range, gpointer user_data)
+{
+    GpdsTouchpadUI *ui = GPDS_TOUCHPAD_UI(user_data);
+    gdouble distance;
+    GpdsXInput *xinput;
+
+    xinput = gpds_xinput_ui_get_xinput(GPDS_XINPUT_UI(ui));
+    if (!xinput)
+        return;
+
+    set_range_property(xinput, range, GPDS_TOUCHPAD_TAP_MOVE);
+
+    distance = gtk_range_get_value(range);
+    gpds_ui_set_gconf_int(GPDS_UI(ui), GPDS_TOUCHPAD_TAP_MOVE_KEY, (gint)distance);
+}
+
+static void
 cb_vertical_scrolling_scale_value_changed (GtkRange *range, gpointer user_data)
 {
     GpdsTouchpadUI *ui = GPDS_TOUCHPAD_UI(user_data);
@@ -531,6 +548,7 @@
     CONNECT(touchpad_use_type, changed);
     CONNECT(palm_detection, toggled);
     CONNECT(tapping_time_scale, value_changed);
+    CONNECT(tapping_move_scale, value_changed);
     CONNECT(faster_tapping_check, toggled);
     CONNECT(circular_scrolling, toggled);
     CONNECT(vertical_scrolling, toggled);
@@ -713,6 +731,11 @@
                                         GPDS_TOUCHPAD_TAP_TIME,
                                         GPDS_TOUCHPAD_TAP_TIME_KEY,
                                         "tapping_time_scale");
+    gpds_xinput_ui_set_widget_value_from_preference(
+                                        GPDS_XINPUT_UI(ui),
+                                        GPDS_TOUCHPAD_TAP_MOVE,
+                                        GPDS_TOUCHPAD_TAP_MOVE_KEY,
+                                        "tapping_move_scale");
     gpds_xinput_ui_set_toggle_button_state_from_preference(
                                         GPDS_XINPUT_UI(ui),
                                         GPDS_TOUCHPAD_TAP_FAST_TAP,
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]