From 59ccbafda096126256292517736631238f5a7bd0 Mon Sep 17 00:00:00 2001 From: monsta Date: Thu, 3 Nov 2016 14:54:52 +0300 Subject: mouse: add separate touchpad motion settings on touchpad tab requires two new keys in touchpad schema, added in https://github.com/mate-desktop/mate-settings-daemon/commit/77b1956a67bdc09fef7c76a459ca431008fde8f6 adapted from: https://git.gnome.org/browse/gnome-control-center/commit/?id=59248ed8ba5ff58248f63c0e208c133de538d046 https://git.gnome.org/browse/gnome-control-center/commit/?id=451b7edf373e9e97b9b011eb9561b36ca0e1e13f https://git.gnome.org/browse/gnome-control-center/commit/?id=007696b8fdef1aa5ca08aec8ac994064de7b89b9 --- capplets/mouse/mate-mouse-properties.c | 11 ++ capplets/mouse/mate-mouse-properties.ui | 225 ++++++++++++++++++++++++++++++++ 2 files changed, 236 insertions(+) (limited to 'capplets') diff --git a/capplets/mouse/mate-mouse-properties.c b/capplets/mouse/mate-mouse-properties.c index d8b46693..3a961530 100644 --- a/capplets/mouse/mate-mouse-properties.c +++ b/capplets/mouse/mate-mouse-properties.c @@ -348,6 +348,9 @@ setup_dialog (GtkBuilder *dialog) g_settings_bind (touchpad_settings, "touchpad-enabled", WID ("vbox_touchpad_scrolling"), "sensitive", G_SETTINGS_BIND_DEFAULT); + g_settings_bind (touchpad_settings, "touchpad-enabled", + WID ("vbox_touchpad_pointer_speed"), "sensitive", + G_SETTINGS_BIND_DEFAULT); g_settings_bind (touchpad_settings, "disable-while-typing", WID ("disable_w_typing_toggle"), "active", G_SETTINGS_BIND_DEFAULT); @@ -379,6 +382,14 @@ setup_dialog (GtkBuilder *dialog) g_signal_connect (two_click_comboxbox, "changed", G_CALLBACK (comboxbox_changed_callback), "two-finger-click"); g_signal_connect (three_click_comboxbox, "changed", G_CALLBACK (comboxbox_changed_callback), "three-finger-click"); + /* speed */ + 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); + synaptics_check_capabilities (dialog); } diff --git a/capplets/mouse/mate-mouse-properties.ui b/capplets/mouse/mate-mouse-properties.ui index acf10be9..2efb1de8 100644 --- a/capplets/mouse/mate-mouse-properties.ui +++ b/capplets/mouse/mate-mouse-properties.ui @@ -9,6 +9,13 @@ 1 1 + + 1 + 10 + 6 + 1 + 1 + 1 10 @@ -16,6 +23,13 @@ 1 1 + + 1 + 10 + 1 + 1 + 1 + 1 10 @@ -1164,6 +1178,217 @@ 2 + + + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Pointer Speed + 0 + + + + + + True + True + 0 + + + + + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 6 + 12 + + + True + False + 2 + 3 + 12 + 6 + + + True + False + _Acceleration: + True + center + touchpad_accel_scale + 0 + + + GTK_FILL + GTK_FILL + + + + + True + False + _Sensitivity: + True + center + touchpad_sensitivity_scale + 0 + + + 1 + 2 + GTK_FILL + GTK_FILL + + + + + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 6 + + + True + False + Slow + center + 1 + + + + + + + False + True + 0 + + + + + True + True + adjustment11 + False + right + + + True + True + 1 + + + + + True + False + Fast + center + 0 + + + + + + + False + True + 2 + + + + + 1 + 3 + + + + + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 6 + + + True + False + Low + center + 1 + + + + + + + False + True + 0 + + + + + True + True + adjustment22 + 0 + False + + + True + True + 1 + + + + + True + False + High + center + 0 + + + + + + + False + True + 2 + + + + + 1 + 3 + 1 + 2 + + + + + + + True + True + 1 + + + + + False + True + 3 + + 1 -- cgit v1.2.1