From 81cbb6d8b69f5477906a17e94ff874c864241a5e Mon Sep 17 00:00:00 2001 From: Rachel Hestilow Date: Wed, 27 Jun 2001 16:32:18 +0000 Subject: [PATCH] 2001-06-27 Richard Hestilow 8049 bytes capplets/mouse/mouse-properties.glade | 475 ++++++++++++++---------- capplets/mouse/mouse-properties.glade.h | 13 +- capplets/mouse/mouse-right.png | Bin 0 -> 7894 bytes capplets/mouse/prefs-widget.c | 59 ++- 7 files changed, 349 insertions(+), 220 deletions(-) create mode 100644 capplets/mouse/ChangeLog create mode 100644 capplets/mouse/mouse-left.png create mode 100644 capplets/mouse/mouse-right.png diff --git a/capplets/mouse/ChangeLog b/capplets/mouse/ChangeLog new file mode 100644 index 000000000..03a2e0600 --- /dev/null +++ b/capplets/mouse/ChangeLog @@ -0,0 +1,16 @@ +2001-06-27 Richard Hestilow EK~N9y-{RV0RhjeJ08r5Vw?W3{0{?+0Nj)%{ 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 N0HdU(SRro~{C`gYEqed} literal 0 HcmV?d00001 diff --git a/capplets/mouse/mouse-properties.glade b/capplets/mouse/mouse-properties.glade index fdffda310..051dffeba 100644 --- a/capplets/mouse/mouse-properties.glade +++ b/capplets/mouse/mouse-properties.glade @@ -2,11 +2,11 @@ - New-mouse-properties - new-mouse-properties + New-mouse-properties-mockup + new-mouse-properties-mockup- src - pixmaps + C True True @@ -15,77 +15,107 @@ - GtkWindow - window1 - window1 + GnomeDialog + Mouse Configuration + Mouse Configuration GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE False - False + 448 + 272 + True True False + False + False - GtkTable - prefs_widget - 5 - 2 - 2 + GtkVBox + GnomeDialog:vbox + dialog-vbox1 False - 5 - 5 + 8 + + 4 + True + True + - GtkPixmap - mouse_pixmap - 0 - 0.5 - 0 - 0 - True + GtkHButtonBox + GnomeDialog:action_area + dialog-action_area1 + GTK_BUTTONBOX_END + 8 + 85 + 27 + 7 + 0 - 0 - 2 - 0 - 1 - 0 - 0 - True - True - False - False - True - True - - - - - GtkFrame - frame1 - - 0 - GTK_SHADOW_ETCHED_IN - - 0 - 1 - 1 - 2 - 0 - 0 - False - True - False - False - True - True + 0 + False + True + GTK_PACK_END - GtkVBox - vbox1 - 5 + GtkButton + button1 + True + True + GNOME_STOCK_BUTTON_OK + + + + GtkButton + button3 + True + True + GNOME_STOCK_BUTTON_CANCEL + + + + + GtkVBox + prefs_widget + False + 0 + + 0 + True + True + + + + GtkLabel + label16 + + GTK_JUSTIFY_LEFT + False + 7.45058e-09 + 0.5 + 0 + 0 + + 0 + False + False + + + + + GtkTable + table3 + 2 + 2 False - 5 + 0 + 0 + + 0 + False + False + GtkRadioButton @@ -94,16 +124,24 @@ toggled left_handed_selected_cb - Tue, 12 Sep 2000 15:07:52 GMT + Wed, 27 Jun 2001 15:46:37 GMT False True - rtol_group - 0 - False - False + 0 + 1 + 1 + 2 + 0 + 0 + False + False + False + False + False + False @@ -114,64 +152,44 @@ toggled right_handed_selected_cb - Tue, 12 Sep 2000 15:08:05 GMT + Wed, 27 Jun 2001 15:47:00 GMT False True - rtol_group - 0 - False - False + 1 + 2 + 1 + 2 + 0 + 0 + False + False + False + False + False + False - - - - - GtkFrame - frame2 - - 0 - GTK_SHADOW_ETCHED_IN - - 1 - 2 - 1 - 2 - 0 - 0 - False - False - False - False - True - True - - - - GtkTable - table2 - 5 - 5 - 3 - False - 5 - 5 - GtkHSeparator - hseparator1 + GtkPixmap + mouse_left_pixmap + 0.5 + 0.5 + 0 + 0 + True 0 - 3 - 2 - 3 + 1 + 0 + 1 0 0 True - True + False False False True @@ -180,35 +198,59 @@ - GtkLabel - label1 - - GTK_JUSTIFY_CENTER - False - 0 + GtkPixmap + mouse_right_pixmap + 0.5 0.5 0 0 + True - 0 - 3 + 1 + 2 0 1 0 0 - False + True False False False True - False + True + + + + GtkHSeparator + hseparator1 + + 4 + False + False + + + + + GtkTable + table2 + 3 + 2 + 7 + False + 3 + 3 + + 0 + False + False + GtkLabel - label2 - + label10 + GTK_JUSTIFY_CENTER False 0 @@ -217,9 +259,9 @@ 0 0 - 3 - 3 - 4 + 1 + 1 + 2 0 0 False @@ -252,74 +294,18 @@ 2 0 0 - False - True - False - False - True - True - - - - - GtkHScale - threshold_entry - True - False - GTK_POS_TOP - 1 - GTK_UPDATE_CONTINUOUS - 0 - 0 - 7 - 0 - 0 - 0 - - 1 - 2 - 4 - 5 - 0 - 0 - False - True - False - False - True - True - - - - - GtkLabel - label3 - - GTK_JUSTIFY_CENTER - False - 1 - 0.5 - 0 - 0 - - 0 - 1 - 1 - 2 - 0 - 0 - False + True False False False True - False + True GtkLabel - label5 + label11 GTK_JUSTIFY_CENTER False @@ -345,8 +331,8 @@ GtkLabel - label6 - + label12 + GTK_JUSTIFY_CENTER False 0 @@ -354,10 +340,10 @@ 0 0 - 2 + 0 3 - 4 - 5 + 0 + 1 0 0 False @@ -371,19 +357,120 @@ GtkLabel - label4 - + label13 + GTK_JUSTIFY_CENTER False - 1 + 0 0.5 0 0 - 0 - 1 - 4 - 5 + 4 + 5 + 1 + 2 + 0 + 0 + False + False + False + False + True + False + + + + + GtkHScale + sensitivity_entry + True + False + GTK_POS_TOP + 1 + GTK_UPDATE_DISCONTINUOUS + 0 + 0 + 7 + 0 + 0 + 0 + + 5 + 6 + 1 + 2 + 0 + 0 + True + False + False + False + True + True + + + + + GtkVSeparator + vseparator1 + + 3 + 4 + 0 + 2 + 8 + 3 + False + False + False + False + True + True + + + + + GtkLabel + label14 + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 0 + + 6 + 7 + 1 + 2 + 0 + 0 + False + False + False + False + True + False + + + + + GtkLabel + label15 + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 0 + + 4 + 7 + 0 + 1 0 0 False diff --git a/capplets/mouse/mouse-properties.glade.h b/capplets/mouse/mouse-properties.glade.h index 4b8f347c3..d3bdeb5dd 100644 --- a/capplets/mouse/mouse-properties.glade.h +++ b/capplets/mouse/mouse-properties.glade.h @@ -4,14 +4,13 @@ * DO NOT compile it as part of your application. */ -gchar *s = N_("window1"); -gchar *s = N_("Mouse buttons"); +gchar *s = N_("Mouse Configuration"); +gchar *s = N_("My mouse is:"); gchar *s = N_("Left handed"); gchar *s = N_("Right handed"); -gchar *s = N_("Mouse motion"); -gchar *s = N_("Acceleration"); -gchar *s = N_("Threshold"); gchar *s = N_("Slow"); gchar *s = N_("Fast"); -gchar *s = N_("Large"); -gchar *s = N_("Small"); +gchar *s = N_("Mouse speed:"); +gchar *s = N_("Low"); +gchar *s = N_("High"); +gchar *s = N_("Sensitivity:"); diff --git a/capplets/mouse/mouse-right.png b/capplets/mouse/mouse-right.png new file mode 100644 index 0000000000000000000000000000000000000000..85a7a6af80997ec880888f7fc71e25d7c47565c0 GIT binary patch literal 7894 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⁣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 UHht0L-$pf{qM#vPBWo7?Kkv27r~m)} literal 0 HcmV?d00001 diff --git a/capplets/mouse/prefs-widget.c b/capplets/mouse/prefs-widget.c index e411a75b4..d21ddb7d1 100644 --- a/capplets/mouse/prefs-widget.c +++ b/capplets/mouse/prefs-widget.c @@ -30,6 +30,7 @@ #include "prefs-widget.h" #define WID(str) (glade_xml_get_widget (prefs_widget->dialog_data, str)) +#define THRESHOLD_CONVERT(t) (7 - t) enum { ARG_0, @@ -61,6 +62,10 @@ static void acceleration_changed_cb (GtkAdjustment *adjustment, static void threshold_changed_cb (GtkAdjustment *adjustment, PrefsWidget *prefs_widget); +static void set_pixmap_file (PrefsWidget *prefs_widget, + const gchar *widget_name, + const gchar *filename); + guint prefs_widget_get_type (void) { @@ -90,10 +95,6 @@ prefs_widget_init (PrefsWidget *prefs_widget) { GtkWidget *widget; GtkAdjustment *adjustment; - GdkPixbuf *pixbuf; - GdkPixmap *pixmap; - GdkBitmap *mask; - char *filename; prefs_widget->dialog_data = glade_xml_new (GLADE_DATADIR "/mouse-properties.glade", @@ -103,17 +104,8 @@ prefs_widget_init (PrefsWidget *prefs_widget) "prefs_widget"); gtk_container_add (GTK_CONTAINER (prefs_widget), widget); - filename = gnome_pixmap_file ("gnome-mouse.png"); - pixbuf = gdk_pixbuf_new_from_file (filename); - g_free (filename); - - if (pixbuf) { - gdk_pixbuf_render_pixmap_and_mask (pixbuf, &pixmap, &mask, - 100); - gtk_pixmap_set (GTK_PIXMAP (WID ("mouse_pixmap")), - pixmap, mask); - gdk_pixbuf_unref (pixbuf); - } + set_pixmap_file (prefs_widget, "mouse_left_pixmap", "mouse-left.png"); + set_pixmap_file (prefs_widget, "mouse_right_pixmap", "mouse-right.png"); glade_xml_signal_connect_data (prefs_widget->dialog_data, "left_handed_selected_cb", @@ -129,7 +121,7 @@ prefs_widget_init (PrefsWidget *prefs_widget) acceleration_changed_cb, prefs_widget); adjustment = gtk_range_get_adjustment - (GTK_RANGE (WID ("threshold_entry"))); + (GTK_RANGE (WID ("sensitivity_entry"))); gtk_signal_connect (GTK_OBJECT (adjustment), "value_changed", threshold_changed_cb, prefs_widget); } @@ -249,8 +241,8 @@ read_preferences (PrefsWidget *prefs_widget, Preferences *prefs) gtk_adjustment_set_value (adjustment, prefs->acceleration); adjustment = gtk_range_get_adjustment - (GTK_RANGE (WID ("threshold_entry"))); - gtk_adjustment_set_value (adjustment, prefs->threshold); + (GTK_RANGE (WID ("sensitivity_entry"))); + gtk_adjustment_set_value (adjustment, THRESHOLD_CONVERT (prefs->threshold)); } static void @@ -312,8 +304,37 @@ threshold_changed_cb (GtkAdjustment *adjustment, PrefsWidget *prefs_widget) g_return_if_fail (adjustment != NULL); g_return_if_fail (GTK_IS_ADJUSTMENT (adjustment)); - prefs_widget->prefs->threshold = adjustment->value; + prefs_widget->prefs->threshold = THRESHOLD_CONVERT (adjustment->value); preferences_changed (prefs_widget->prefs); capplet_widget_state_changed (CAPPLET_WIDGET (prefs_widget), TRUE); } + +static void +set_pixmap_file (PrefsWidget *prefs_widget, const gchar *widget_name, const gchar *filename) +{ + GtkWidget *widget; + GdkPixbuf *pixbuf; + GdkPixmap *pixmap; + GdkBitmap *mask; + gchar *path; + + g_return_if_fail (IS_PREFS_WIDGET (prefs_widget)); + g_return_if_fail (widget_name != NULL); + g_return_if_fail (filename != NULL); + + widget = WID (widget_name); + g_return_if_fail (widget != NULL); + + path = gnome_pixmap_file (filename); + pixbuf = gdk_pixbuf_new_from_file (path); + g_free (path); + + if (pixbuf) { + gdk_pixbuf_render_pixmap_and_mask (pixbuf, &pixmap, &mask, + 100); + gtk_pixmap_set (GTK_PIXMAP (widget), + pixmap, mask); + gdk_pixbuf_unref (pixbuf); + } +}