From 0f4f6772a3a4634425d351c74bc9f58e6e595e37 Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Thu, 31 May 2007 16:10:39 +0000 Subject: [PATCH] set nicer limits on the spinners --- src/behavior.c | 61 ++++++++-- src/obconf.glade | 287 ++++++++++++++++++++++++++++++++++++++++++++--- src/strings.c | 6 + 3 files changed, 327 insertions(+), 27 deletions(-) diff --git a/src/behavior.c b/src/behavior.c index 3607abc..e715c33 100644 --- a/src/behavior.c +++ b/src/behavior.c @@ -26,23 +26,35 @@ static void behavior_enable_stuff(); void behavior_setup_tab() { - GtkWidget *w, *winresist, *edgeresist; + GtkWidget *w, *w1, *w2; GtkSizeGroup *group; gchar *s; mapping = TRUE; - winresist = get_widget("resist_window"); - edgeresist = get_widget("resist_edge"); - group = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); - gtk_size_group_add_widget(group, winresist); - gtk_size_group_add_widget(group, edgeresist); - - winresist = get_widget("resist_window_label"); - edgeresist = get_widget("resist_edge_label"); - group = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); - gtk_size_group_add_widget(group, winresist); - gtk_size_group_add_widget(group, edgeresist); + w1 = get_widget("resist_window"); + w2 = get_widget("resist_edge"); + group = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); + gtk_size_group_add_widget(group, w1); + gtk_size_group_add_widget(group, w2); + + w1 = get_widget("resist_window_label"); + w2 = get_widget("resist_edge_label"); + group = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); + gtk_size_group_add_widget(group, w1); + gtk_size_group_add_widget(group, w2); + + w1 = get_widget("doubleclick_time"); + w2 = get_widget("drag_threshold"); + group = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); + gtk_size_group_add_widget(group, w1); + gtk_size_group_add_widget(group, w2); + + w1 = get_widget("doubleclick_time_label"); + w2 = get_widget("drag_threshold_label"); + group = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); + gtk_size_group_add_widget(group, w1); + gtk_size_group_add_widget(group, w2); w = get_widget("focus_mouse"); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w), @@ -83,6 +95,14 @@ void behavior_setup_tab() !g_ascii_strcasecmp(s, "UnderMouse")); g_free(s); + w = get_widget("doubleclick_time"); + gtk_spin_button_set_value(GTK_SPIN_BUTTON(w), + tree_get_int("mouse/doubleClickTime", 200)); + + w = get_widget("drag_threshold"); + gtk_spin_button_set_value(GTK_SPIN_BUTTON(w), + tree_get_int("mouse/dragThreshold", 3)); + behavior_enable_stuff(); mapping = FALSE; @@ -179,3 +199,20 @@ void on_resize_contents_toggled(GtkToggleButton *w, gpointer data) tree_set_bool("resize/drawContents", gtk_toggle_button_get_active(w)); } + +void on_doubleclick_time_value_changed(GtkSpinButton *w, gpointer data) +{ + if (mapping) return; + + tree_set_int("mouse/doubleClickTime", + gtk_spin_button_get_value_as_int(w)); +} + +void on_drag_threshold_value_changed(GtkSpinButton *w, gpointer data) +{ + if (mapping) return; + + tree_set_int("mouse/dragThreshold", + gtk_spin_button_get_value_as_int(w)); +} + diff --git a/src/obconf.glade b/src/obconf.glade index f15b54f..09b76d4 100644 --- a/src/obconf.glade +++ b/src/obconf.glade @@ -1193,11 +1193,11 @@ C - The close button True 1 0 - False + True GTK_UPDATE_ALWAYS False False - 0 0 100000 100 10 100000 + 0 0 10000 100 10 100 @@ -1549,12 +1549,12 @@ C - The close button True 1 0 - False + True GTK_UPDATE_ALWAYS False False - 20 0 10000 1 10 10 - + 20 0 100 1 10 10 + 0 @@ -1633,12 +1633,12 @@ C - The close button True 1 0 - False + True GTK_UPDATE_ALWAYS False False 1 0 100 1 10 10 - + 0 @@ -1695,7 +1695,264 @@ C - The close button 0 - True + False + True + + + + + + True + False + 6 + + + + True + <span weight="bold">Mouse Behavior</span> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + + True + False + 0 + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + + True + False + 6 + + + + True + False + 6 + + + + True + Double-_click time: + True + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + resist_window + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + + True + True + 1 + 0 + True + GTK_UPDATE_ALWAYS + False + False + 0 0 100000 100 10 100 + + + + 0 + False + True + + + + + + True + ms + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + 0 + False + True + + + + + + True + False + 6 + + + + True + Drag _threshold distance: + True + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + resist_edge + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + + True + True + 1 + 0 + True + GTK_UPDATE_ALWAYS + False + False + 1 1 100 1 10 10 + + + + 0 + False + True + + + + + + True + px + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + 0 + False + True + + + + + 0 + True + True + + + + + 0 + True + True + + + + + 0 + False True @@ -1836,7 +2093,7 @@ C - The close button True 1 0 - False + True GTK_UPDATE_ALWAYS False False @@ -2238,7 +2495,7 @@ C - The close button True 1 0 - False + True GTK_UPDATE_ALWAYS False False @@ -2283,7 +2540,7 @@ C - The close button True 1 0 - False + True GTK_UPDATE_ALWAYS False False @@ -2773,11 +3030,11 @@ C - The close button True 1 0 - False + True GTK_UPDATE_ALWAYS False False - 300 0 10000 1 10 10 + 300 0 10000 1 10 100 @@ -2895,11 +3152,11 @@ C - The close button True 1 0 - False + True GTK_UPDATE_ALWAYS False False - 300 0 10000 1 10 10 + 300 0 10000 1 10 100 diff --git a/src/strings.c b/src/strings.c index 5440eed..05ebde4 100644 --- a/src/strings.c +++ b/src/strings.c @@ -50,6 +50,12 @@ gchar *s = N_("Amount of resistance against other _windows:"); gchar *s = N_("px"); gchar *s = N_("Amount of resistance against screen _edges:"); gchar *s = N_("px"); +gchar *s = N_("Mouse Behavior"); +gchar *s = N_(" "); +gchar *s = N_("Double-_click time:"); +gchar *s = N_("ms"); +gchar *s = N_("Drag _threshold distance:"); +gchar *s = N_("px"); gchar *s = N_("Behavior"); gchar *s = N_("Desktops"); gchar *s = N_(" "); -- 2.39.2