gpointing-device-settings r268 - 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 r268 - in trunk: . data modules modules/common modules/gnome-settings-daemon-plugins
Date: Wed, 25 Mar 2009 06:52:38 +0000 (UTC)
Author: hiikezoe
Date: Wed Mar 25 06:52:38 2009
New Revision: 268
URL: http://svn.gnome.org/viewvc/gpointing-device-settings?rev=268&view=rev

Log:
guest mouse off support.

Modified:
   trunk/NEWS
   trunk/data/touchpad.ui
   trunk/modules/common/gpds-touchpad-definitions.h
   trunk/modules/common/gpds-touchpad-xinput.c
   trunk/modules/common/gpds-touchpad-xinput.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	Wed Mar 25 06:52:38 2009
@@ -5,6 +5,7 @@
  - Palm detection
  - Tap move
  - Locked drags
+ - Guest mouse off
  - Fix invalid values for scroll distance
 * Wheel type mouse
  - Use GtkRange for numeric values

Modified: trunk/data/touchpad.ui
==============================================================================
--- trunk/data/touchpad.ui	(original)
+++ trunk/data/touchpad.ui	Wed Mar 25 06:52:38 2009
@@ -150,6 +150,37 @@
                           </object>
                         </child>
                         <child>
+                          <object class="GtkLabel" id="guest_mouse_label">
+                            <property name="visible">True</property>
+                            <property name="label" translatable="yes">&lt;b&gt;Guest Mouse&lt;/b&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</property>
+                            <property name="yalign">0</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>
+                        </child>
+                        <child>
+                          <object class="GtkCheckButton" id="guest_mouse_off">
+                            <property name="visible">True</property>
+                            <property name="label" translatable="yes">Set _guest mouse off</property>
+                            <property name="use_underline">True</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="palm_detection_label">
                             <property name="visible">True</property>
                             <property name="label" translatable="yes">&lt;b&gt;Palm Detection&lt;/b&gt;</property>

Modified: trunk/modules/common/gpds-touchpad-definitions.h
==============================================================================
--- trunk/modules/common/gpds-touchpad-definitions.h	(original)
+++ trunk/modules/common/gpds-touchpad-definitions.h	Wed Mar 25 06:52:38 2009
@@ -21,7 +21,7 @@
 #define __GPDS_TOUCHPAD_GCONF_H__
 
 #define GPDS_TOUCHPAD_OFF_KEY                             "off"
-#define GPDS_TOUCHPAD_GUEST_MOUSE_KEY                     "guest_mouse"
+#define GPDS_TOUCHPAD_GUEST_MOUSE_OFF_KEY                 "guest_mouse"
 #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"

Modified: trunk/modules/common/gpds-touchpad-xinput.c
==============================================================================
--- trunk/modules/common/gpds-touchpad-xinput.c	(original)
+++ trunk/modules/common/gpds-touchpad-xinput.c	Wed Mar 25 06:52:38 2009
@@ -46,7 +46,7 @@
     {GPDS_TOUCHPAD_BUTTON_SCROLLING_REPEAT,    "Synaptics Button Scrolling Repeat",     G_TYPE_INT,   8, 2},
     {GPDS_TOUCHPAD_SCROLLING_TIME,             "Synaptics Button Scrolling Time",       G_TYPE_INT,  32, 1},
     {GPDS_TOUCHPAD_OFF,                        "Synaptics Off",                         G_TYPE_INT,   8, 1},
-    {GPDS_TOUCHPAD_GUESTMOUSE_OFF,             "Synaptics Guestmouse Off",              G_TYPE_INT,   8, 1},
+    {GPDS_TOUCHPAD_GUEST_MOUSE_OFF,            "Synaptics Guestmouse Off",              G_TYPE_INT,   8, 1},
     {GPDS_TOUCHPAD_LOCKED_DRAGS,               "Synaptics Locked Drags",                G_TYPE_INT,   8, 1},
     {GPDS_TOUCHPAD_LOCKED_DRAGS_TIMEOUT,       "Synaptics Locked Drags Timeout",        G_TYPE_INT,  32, 1},
     {GPDS_TOUCHPAD_TAP_ACTION,                 "Synaptics Tap Action",                  G_TYPE_INT,   8, 1},

Modified: trunk/modules/common/gpds-touchpad-xinput.h
==============================================================================
--- trunk/modules/common/gpds-touchpad-xinput.h	(original)
+++ trunk/modules/common/gpds-touchpad-xinput.h	Wed Mar 25 06:52:38 2009
@@ -42,7 +42,7 @@
     GPDS_TOUCHPAD_BUTTON_SCROLLING_REPEAT,
     GPDS_TOUCHPAD_SCROLLING_TIME,
     GPDS_TOUCHPAD_OFF,
-    GPDS_TOUCHPAD_GUESTMOUSE_OFF,
+    GPDS_TOUCHPAD_GUEST_MOUSE_OFF,
     GPDS_TOUCHPAD_LOCKED_DRAGS,
     GPDS_TOUCHPAD_LOCKED_DRAGS_TIMEOUT,
     GPDS_TOUCHPAD_TAP_ACTION,

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	Wed Mar 25 06:52:38 2009
@@ -57,6 +57,7 @@
 }
 
 DEFINE_SET_BOOLEAN_FUNCTION (palm_detection, GPDS_TOUCHPAD_PALM_DETECTION)
+DEFINE_SET_BOOLEAN_FUNCTION (guest_mouse_off, GPDS_TOUCHPAD_GUEST_MOUSE_OFF)
 DEFINE_SET_BOOLEAN_FUNCTION (locked_drags, GPDS_TOUCHPAD_LOCKED_DRAGS)
 DEFINE_SET_BOOLEAN_FUNCTION (tap_fast_tap, GPDS_TOUCHPAD_TAP_FAST_TAP)
 DEFINE_SET_BOOLEAN_FUNCTION (circular_scrolling, GPDS_TOUCHPAD_CIRCULAR_SCROLLING)
@@ -134,6 +135,7 @@
     }
 
     set_touchpad_off(manager, xinput, gconf);
+    set_guest_mouse_off(manager, xinput, gconf);
     set_palm_detection(manager, xinput, gconf);
     set_locked_drags(manager, xinput, gconf);
     set_locked_drags_timeout(manager, xinput, gconf);
@@ -188,6 +190,8 @@
     case GCONF_VALUE_BOOL:
         if (!strcmp(key, GPDS_TOUCHPAD_PALM_DETECTION_KEY)) {
             set_palm_detection(manager, xinput, client);
+        } else if (!strcmp(key, GPDS_TOUCHPAD_GUEST_MOUSE_OFF_KEY)) {
+            set_guest_mouse_off(manager, xinput, client);
         } else if (!strcmp(key, GPDS_TOUCHPAD_LOCKED_DRAGS_KEY)) {
             set_locked_drags(manager, xinput, client);
         } else if (!strcmp(key, GPDS_TOUCHPAD_TAP_FAST_TAP_KEY)) {

Modified: trunk/modules/gpds-touchpad-ui.c
==============================================================================
--- trunk/modules/gpds-touchpad-ui.c	(original)
+++ trunk/modules/gpds-touchpad-ui.c	Wed Mar 25 06:52:38 2009
@@ -165,6 +165,9 @@
     }
 }
 
+GPDS_XINPUT_UI_DEFINE_TOGGLE_BUTTON_CALLBACK(guest_mouse_off,
+                                             GPDS_TOUCHPAD_GUEST_MOUSE_OFF,
+                                             NULL)
 GPDS_XINPUT_UI_DEFINE_TOGGLE_BUTTON_CALLBACK(palm_detection,
                                              GPDS_TOUCHPAD_PALM_DETECTION,
                                              NULL)
@@ -481,6 +484,7 @@
                      ui)
 
     CONNECT(touchpad_use_type, changed);
+    CONNECT(guest_mouse_off, toggled);
     CONNECT(palm_detection, toggled);
     CONNECT(locked_drags, toggled);
     CONNECT(locked_drags_timeout_scale, value_changed);
@@ -679,6 +683,11 @@
                                         "faster_tapping_check");
     gpds_xinput_ui_set_toggle_button_state_from_preference(
                                         xinput_ui,
+                                        GPDS_TOUCHPAD_GUEST_MOUSE_OFF, 
+                                        GPDS_TOUCHPAD_GUEST_MOUSE_OFF_KEY,
+                                        "guest_mouse_off");
+    gpds_xinput_ui_set_toggle_button_state_from_preference(
+                                        xinput_ui,
                                         GPDS_TOUCHPAD_PALM_DETECTION, 
                                         GPDS_TOUCHPAD_PALM_DETECTION_KEY,
                                         "palm_detection");
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]