gpointing-device-settings r266 - 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 r266 - in trunk: . data modules modules/common modules/gnome-settings-daemon-plugins
- Date: Wed, 25 Mar 2009 06:52:26 +0000 (UTC)
Author: hiikezoe
Date: Wed Mar 25 06:52:26 2009
New Revision: 266
URL: http://svn.gnome.org/viewvc/gpointing-device-settings?rev=266&view=rev
Log:
locked drags support. Not test yet.
Modified:
trunk/NEWS
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 Wed Mar 25 06:52:26 2009
@@ -4,7 +4,10 @@
* Touchpad
- Palm detection
- Tap move
+ - Locked drags
- Fix invalid values for scroll distance
+* Wheel type mouse
+ - Use GtkRange for numeric values
============================
GPointinDeviceSettings 1.2.0
Modified: trunk/data/touchpad.ui
==============================================================================
--- trunk/data/touchpad.ui (original)
+++ trunk/data/touchpad.ui Wed Mar 25 06:52:26 2009
@@ -1,6 +1,13 @@
<?xml version="1.0"?>
<!--*- mode: xml -*-->
<interface>
+ <object class="GtkAdjustment" id="locked_drags_timeout_scale_adjustment">
+ <property name="lower">50</property>
+ <property name="upper">550</property>
+ <property name="step-increment">50</property>
+ <property name="page_increment">50</property>
+ <property name="page_size">0</property>
+ </object>
<object class="GtkAdjustment" id="tapping_time_scale_adjustment">
<property name="upper">550</property>
<property name="lower">50</property>
@@ -142,25 +149,25 @@
</child>
</object>
</child>
- <child>
- <object class="GtkLabel" id="label4">
- <property name="visible">True</property>
- <property name="label" translatable="yes"><b>Palm Detection</b></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="GtkLabel" id="palm_detection_label">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><b>Palm Detection</b></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="palm_detection">
<property name="visible">True</property>
@@ -173,6 +180,138 @@
<property name="fill">False</property>
</packing>
</child>
+ <child>
+ <object class="GtkLabel" id="locked_drags_label">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><b>Locked Drags</b></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="locked_drags">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Enable _locked drags</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="GtkHBox" id="locked_drags_box">
+ <property name="visible">True</property>
+ <property name="border-width">5</property>
+ <child>
+ <object class="GtkLabel" id="locked_drags_timeout_label">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">_timeout:</property>
+ <property name="mnemonic-widget">locked_drags_timeout_scale</property>
+ <property name="use_underline">True</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="locked_drags_timeout_left_label">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><i>Short</i></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="locked_drags_timeout_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">locked_drags_timeout_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="locked_drags_timeout_right_label">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><i>Long</i></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>
</object>
</child>
</object>
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:26 2009
@@ -37,6 +37,8 @@
#define GPDS_TOUCHPAD_CIRCULAR_SCROLLING_DISTANCE_KEY "circular_scrolling_distance"
#define GPDS_TOUCHPAD_CIRCULAR_SCROLLING_TRIGGER_KEY "circular_scrolling_trigger"
#define GPDS_TOUCHPAD_PALM_DETECTION_KEY "palm_detection"
+#define GPDS_TOUCHPAD_LOCKED_DRAGS_KEY "locked_drags"
+#define GPDS_TOUCHPAD_LOCKED_DRAGS_TIMEOUT_KEY "locked_drags_timeout"
#endif /* __GPDS_TOUCHPAD_GCONF_H__ */
/*
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:26 2009
@@ -57,9 +57,11 @@
}
DEFINE_SET_BOOLEAN_FUNCTION (palm_detection, GPDS_TOUCHPAD_PALM_DETECTION)
+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)
DEFINE_SET_INT_FUNCTION (touchpad_off, GPDS_TOUCHPAD_OFF)
+DEFINE_SET_INT_FUNCTION (locked_drags_timeout, GPDS_TOUCHPAD_LOCKED_DRAGS_TIMEOUT)
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)
@@ -183,6 +185,8 @@
set_touchpad_off(manager, xinput, gconf);
set_palm_detection(manager, xinput, gconf);
+ set_locked_drags(manager, xinput, gconf);
+ set_locked_drags_timeout(manager, xinput, gconf);
set_tap_fast_tap(manager, xinput, gconf);
set_tap_time(manager, xinput, gconf);
set_tap_move(manager, xinput, gconf);
@@ -234,6 +238,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_LOCKED_DRAGS_KEY)) {
+ set_locked_drags(manager, xinput, client);
} else if (!strcmp(key, GPDS_TOUCHPAD_TAP_FAST_TAP_KEY)) {
set_tap_fast_tap(manager, xinput, client);
} else if (!strcmp(key, GPDS_TOUCHPAD_CIRCULAR_SCROLLING_KEY)) {
@@ -250,6 +256,8 @@
case GCONF_VALUE_INT:
if (!strcmp(key, GPDS_TOUCHPAD_OFF_KEY)) {
set_touchpad_off(manager, xinput, client);
+ } else if (!strcmp(key, GPDS_TOUCHPAD_LOCKED_DRAGS_TIMEOUT_KEY)) {
+ set_locked_drags_timeout(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)) {
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:26 2009
@@ -168,6 +168,9 @@
GPDS_XINPUT_UI_DEFINE_TOGGLE_BUTTON_CALLBACK(palm_detection,
GPDS_TOUCHPAD_PALM_DETECTION,
NULL)
+GPDS_XINPUT_UI_DEFINE_TOGGLE_BUTTON_CALLBACK(locked_drags,
+ GPDS_TOUCHPAD_LOCKED_DRAGS,
+ "locked_drags_box")
GPDS_XINPUT_UI_DEFINE_TOGGLE_BUTTON_CALLBACK(faster_tapping_check,
GPDS_TOUCHPAD_TAP_FAST_TAP,
NULL)
@@ -175,6 +178,8 @@
GPDS_TOUCHPAD_CIRCULAR_SCROLLING,
"circular_scrolling_box")
+GPDS_XINPUT_UI_DEFINE_SCALE_VALUE_CHANGED_CALLBACK(locked_drags_timeout_scale,
+ GPDS_TOUCHPAD_LOCKED_DRAGS_TIMEOUT)
GPDS_XINPUT_UI_DEFINE_SCALE_VALUE_CHANGED_CALLBACK(tapping_time_scale,
GPDS_TOUCHPAD_TAP_TIME)
GPDS_XINPUT_UI_DEFINE_SCALE_VALUE_CHANGED_CALLBACK(tapping_move_scale,
@@ -477,6 +482,8 @@
CONNECT(touchpad_use_type, changed);
CONNECT(palm_detection, toggled);
+ CONNECT(locked_drags, toggled);
+ CONNECT(locked_drags_timeout_scale, value_changed);
CONNECT(tapping_time_scale, value_changed);
CONNECT(tapping_move_scale, value_changed);
CONNECT(faster_tapping_check, toggled);
@@ -677,6 +684,16 @@
"palm_detection");
gpds_xinput_ui_set_toggle_button_state_from_preference(
xinput_ui,
+ GPDS_TOUCHPAD_LOCKED_DRAGS,
+ GPDS_TOUCHPAD_LOCKED_DRAGS_KEY,
+ "locked_drags");
+ gpds_xinput_ui_set_widget_value_from_preference(
+ xinput_ui,
+ GPDS_TOUCHPAD_LOCKED_DRAGS_TIMEOUT,
+ GPDS_TOUCHPAD_LOCKED_DRAGS_TIMEOUT_KEY,
+ "locked_drags_timeout");
+ gpds_xinput_ui_set_toggle_button_state_from_preference(
+ xinput_ui,
GPDS_TOUCHPAD_CIRCULAR_SCROLLING,
GPDS_TOUCHPAD_CIRCULAR_SCROLLING_KEY,
"circular_scrolling");
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
