From a2d76a4dac46aa6d4ceee00081910d7f6243d36b Mon Sep 17 00:00:00 2001 From: monsta Date: Wed, 28 Oct 2015 17:19:40 +0300 Subject: touchpad settings: add option to enable/disable touchpad fixes https://github.com/mate-desktop/mate-desktop/issues/178 --- capplets/mouse/mate-mouse-properties.c | 9 +++++++++ capplets/mouse/mate-mouse-properties.ui | 26 +++++++++++++++++++++----- 2 files changed, 30 insertions(+), 5 deletions(-) (limited to 'capplets/mouse') diff --git a/capplets/mouse/mate-mouse-properties.c b/capplets/mouse/mate-mouse-properties.c index 4db0e576..2896ca18 100644 --- a/capplets/mouse/mate-mouse-properties.c +++ b/capplets/mouse/mate-mouse-properties.c @@ -408,6 +408,15 @@ setup_dialog (GtkBuilder *dialog) if (find_synaptics () == FALSE) gtk_notebook_remove_page (GTK_NOTEBOOK (WID ("prefs_widget")), -1); else { + g_settings_bind (touchpad_settings, "touchpad-enabled", + WID ("touchpad_enable"), "active", + G_SETTINGS_BIND_DEFAULT); + g_settings_bind (touchpad_settings, "touchpad-enabled", + WID ("vbox_touchpad_general"), "sensitive", + G_SETTINGS_BIND_DEFAULT); + g_settings_bind (touchpad_settings, "touchpad-enabled", + WID ("vbox_touchpad_scrolling"), "sensitive", + G_SETTINGS_BIND_DEFAULT); g_settings_bind (touchpad_settings, "disable-while-typing", WID ("disable_w_typing_toggle"), "active", G_SETTINGS_BIND_DEFAULT); diff --git a/capplets/mouse/mate-mouse-properties.ui b/capplets/mouse/mate-mouse-properties.ui index 487961c5..d8779882 100644 --- a/capplets/mouse/mate-mouse-properties.ui +++ b/capplets/mouse/mate-mouse-properties.ui @@ -835,7 +835,23 @@ 12 18 - + + Enable _touchpad + True + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + True + + + False + False + 0 + + + + True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK @@ -880,7 +896,7 @@ - Disable _touchpad while typing + Disable touchpad _while typing True True False @@ -1062,11 +1078,11 @@ False False - 0 + 1 - + True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK @@ -1269,7 +1285,7 @@ False False - 1 + 2 -- cgit v1.2.1