Mercurial > hg > forks > geeqie

changeset 1921:9a82e917c61d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fixed stereo.fixed preferences
author Vladimir Nadvornik <nadvornik@suse.cz>
date Tue, 27 Sep 2011 22:03:47 +0200
parents 465b904a7e05
children 4f200abfccd7
files src/preferences.c src/ui_misc.c src/ui_misc.h
diffstat 3 files changed, 31 insertions(+), 18 deletions(-) [+]
line wrap: on
line diff
--- a/src/preferences.c	Tue Sep 27 21:12:02 2011 +0200
+++ b/src/preferences.c	Tue Sep 27 22:03:47 2011 +0200
@@ -146,12 +146,6 @@
 				   (gdouble)SLIDESHOW_SUBSECOND_PRECISION + 0.01);
 }
 
-static void pref_spin_int_cb(GtkWidget *widget, gpointer data)
-{
-        gint *var = data;
-        *var = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(widget));
-}
-
 /*
  *-----------------------------------------------------------------------------
  * sync progam to config window routine (private)
@@ -2143,18 +2137,18 @@
 
 	group2 = pref_group_new(box2, FALSE, _("Fixed position"), GTK_ORIENTATION_VERTICAL);
 	table = pref_table_new(group2, 5, 3, FALSE, FALSE);
-	pref_table_spin(table, 0, 0, _("Width"), NULL,
-			  1, 5000, 1, 0, options->stereo.fixed_w, G_CALLBACK(pref_spin_int_cb), &c_options->stereo.fixed_w);
-	pref_table_spin(table, 3, 0,  _("Height"), NULL,
-			  1, 5000, 1, 0, options->stereo.fixed_h, G_CALLBACK(pref_spin_int_cb), &c_options->stereo.fixed_h);
-	pref_table_spin(table, 0, 1,  _("Left X"), NULL,
-			  0, 5000, 1, 0, options->stereo.fixed_x1, G_CALLBACK(pref_spin_int_cb), &c_options->stereo.fixed_x1);
-	pref_table_spin(table, 3, 1,  _("Left Y"), NULL,
-			  0, 5000, 1, 0, options->stereo.fixed_y1, G_CALLBACK(pref_spin_int_cb), &c_options->stereo.fixed_y1);
-	pref_table_spin(table, 0, 2,  _("Right X"), NULL,
-			  0, 5000, 1, 0, options->stereo.fixed_x2, G_CALLBACK(pref_spin_int_cb), &c_options->stereo.fixed_x2);
-	pref_table_spin(table, 3, 2,  _("Right Y"), NULL,
-			  0, 5000, 1, 0, options->stereo.fixed_y2, G_CALLBACK(pref_spin_int_cb), &c_options->stereo.fixed_y2);
+	pref_table_spin_new_int(table, 0, 0, _("Width"), NULL,
+			  1, 5000, 1, options->stereo.fixed_w, &c_options->stereo.fixed_w);
+	pref_table_spin_new_int(table, 3, 0,  _("Height"), NULL,
+			  1, 5000, 1, options->stereo.fixed_h, &c_options->stereo.fixed_h);
+	pref_table_spin_new_int(table, 0, 1,  _("Left X"), NULL,
+			  0, 5000, 1, options->stereo.fixed_x1, &c_options->stereo.fixed_x1);
+	pref_table_spin_new_int(table, 3, 1,  _("Left Y"), NULL,
+			  0, 5000, 1, options->stereo.fixed_y1, &c_options->stereo.fixed_y1);
+	pref_table_spin_new_int(table, 0, 2,  _("Right X"), NULL,
+			  0, 5000, 1, options->stereo.fixed_x2, &c_options->stereo.fixed_x2);
+	pref_table_spin_new_int(table, 3, 2,  _("Right Y"), NULL,
+			  0, 5000, 1, options->stereo.fixed_y2, &c_options->stereo.fixed_y2);
 
 }
 
--- a/src/ui_misc.c	Tue Sep 27 21:12:02 2011 +0200
+++ b/src/ui_misc.c	Tue Sep 27 22:03:47 2011 +0200
@@ -722,6 +722,20 @@
 	return spin;
 }
 
+GtkWidget *pref_table_spin_new_int(GtkWidget *table, gint column, gint row,
+				   const gchar *text, const gchar *suffix,
+				   gint min, gint max, gint step,
+				   gint value, gint *value_var)
+{
+	*value_var = value;
+	return pref_table_spin(table, column, row,
+			       text, suffix,
+			       (gdouble)min, (gdouble)max, (gdouble)step, 0,
+			       value,
+			       G_CALLBACK(pref_spin_int_cb), value_var);
+}
+
+
 #if ! GTK_CHECK_VERSION(2,12,0)
 
 static void pref_toolbar_destroy_cb(GtkWidget *widget, gpointer data)
--- a/src/ui_misc.h	Tue Sep 27 21:12:02 2011 +0200
+++ b/src/ui_misc.h	Tue Sep 27 22:03:47 2011 +0200
@@ -136,6 +136,11 @@
 			   gdouble value,
 			   GCallback func, gpointer data);
 
+GtkWidget *pref_table_spin_new_int(GtkWidget *table, gint column, gint row,
+				   const gchar *text, const gchar *suffix,
+				   gint min, gint max, gint step,
+				   gint value, gint *value_var);
+
 
 GtkWidget *pref_toolbar_new(GtkWidget *parent_box, GtkToolbarStyle style);
 GtkWidget *pref_toolbar_button(GtkWidget *toolbar,