diff --git a/src/gtkutils.c b/src/gtkutils.c index 2cdb3f8..acbfdd1 100644 --- a/src/gtkutils.c +++ b/src/gtkutils.c @@ -97,7 +97,7 @@ GtkWidget *ut_spin_button_new(gchar *label, gint min, gint max, gint val, GtkWid labelw = gtk_label_new(label); gtk_box_pack_start(GTK_BOX(hbox), labelw, FALSE, FALSE, 5); - adj = GTK_ADJUSTMENT (gtk_adjustment_new(val, min, max, 1, 10, 10)); + adj = GTK_ADJUSTMENT (gtk_adjustment_new (val, min, max, 1, 10, 0)); button = gtk_spin_button_new(adj, 1, 0); gtk_spin_button_set_numeric(GTK_SPIN_BUTTON(button), TRUE); gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 5); @@ -106,26 +106,6 @@ GtkWidget *ut_spin_button_new(gchar *label, gint min, gint max, gint val, GtkWid } -GtkWidget *ut_spin_button_start_new(gchar *label, gint min, gint max, gint val, GtkWidget *parent) -{ - GtkAdjustment *adj; - GtkWidget *button, *hbox, *labelw; - - hbox = gtk_hbox_new(FALSE, 0); - gtk_box_pack_start(GTK_BOX(parent), hbox, TRUE, TRUE, 2); - - labelw = gtk_label_new(label); - gtk_box_pack_start(GTK_BOX(hbox), labelw, FALSE, FALSE, 5); - - adj = GTK_ADJUSTMENT (gtk_adjustment_new(val, min, max, 1, 10, 10)); - button = gtk_spin_button_new(adj, 1, 0); - gtk_spin_button_set_numeric(GTK_SPIN_BUTTON(button), TRUE); - gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 5); - - return button; -} - - /* shows simple message box */ void ut_simple_message_box(gchar *message) { diff --git a/src/gtkutils.h b/src/gtkutils.h index 0c9f53e..061e75f 100644 --- a/src/gtkutils.h +++ b/src/gtkutils.h @@ -35,12 +35,6 @@ GtkWidget *ut_spin_button_new (gchar *label, gint val, GtkWidget *parent); -GtkWidget *ut_spin_button_start_new (gchar *label, - gint min, - gint max, - gint val, - GtkWidget *parent); - void ut_simple_message_box (gchar *message); void ut_simple_message_box_with_title (gchar *message, gchar *title); diff --git a/src/preferences.c b/src/preferences.c index 9f22205..0d51497 100644 --- a/src/preferences.c +++ b/src/preferences.c @@ -159,9 +159,9 @@ void preferences_dialog (void) buttons[PR_SHOW_ANIM] = ut_check_button_new(_("Show animation of disappearing of the ball"), pref_get_show_destroy(), vbox); buttons[PR_SHOW_HL] = ut_check_button_new(_("Highlight \"active\" cell"), pref_get_show_highlight(), vbox); - buttons[PR_HL_DR] = ut_spin_button_start_new(_("Highlight red value: "), -128, 128, prefs_get_hl_dr(), vbox); - buttons[PR_HL_DG] = ut_spin_button_start_new(_("Highlight green value: "), -128, 128, prefs_get_hl_dg(), vbox); - buttons[PR_HL_DB] = ut_spin_button_start_new(_("Highlight blue value: "), -128, 128, prefs_get_hl_db(), vbox); + buttons[PR_HL_DR] = ut_spin_button_new(_("Highlight red value: "), -128, 128, prefs_get_hl_dr(), vbox); + buttons[PR_HL_DG] = ut_spin_button_new(_("Highlight green value: "), -128, 128, prefs_get_hl_dg(), vbox); + buttons[PR_HL_DB] = ut_spin_button_new(_("Highlight blue value: "), -128, 128, prefs_get_hl_db(), vbox); g_signal_connect (G_OBJECT(buttons[PR_SHOW_HL]), "toggled", G_CALLBACK(parent_toggled), buttons[PR_HL_DR]); g_signal_connect (G_OBJECT(buttons[PR_SHOW_HL]), "toggled", G_CALLBACK(parent_toggled), buttons[PR_HL_DG]); g_signal_connect (G_OBJECT(buttons[PR_SHOW_HL]), "toggled", G_CALLBACK(parent_toggled), buttons[PR_HL_DB]); @@ -170,7 +170,7 @@ void preferences_dialog (void) gtk_widget_set_sensitive (buttons[PR_HL_DB], pref_get_show_highlight()); buttons[PR_TIME_LIMIT] = ut_check_button_new(_("Enable time limit"), timer_get_limit() > 0 ? 1 : 0, vbox); - buttons[PR_TIME_VALUE] = ut_spin_button_start_new(_("Time limit (seconds): "), 1, 3600, timer_get_limit() > 0 ? timer_get_limit() : 60, vbox); + buttons[PR_TIME_VALUE] = ut_spin_button_new(_("Time limit (seconds): "), 1, 3600, timer_get_limit() > 0 ? timer_get_limit() : 60, vbox); g_signal_connect (G_OBJECT(buttons[PR_TIME_LIMIT]), "toggled", G_CALLBACK(parent_toggled), buttons[PR_TIME_VALUE]); gtk_widget_set_sensitive (buttons[PR_TIME_VALUE], timer_get_limit() > 0 ? 1 : 0);