From: Jim Evins Date: Wed, 29 Apr 2009 02:15:57 +0000 (+0000) Subject: 2009-04-28 Jim Evins X-Git-Tag: glabels-2_2_5~6 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=987a9259d51cfe2fbbed149ded2e93c92e0b17ad;p=glabels 2009-04-28 Jim Evins * data/glade/object-editor.glade: * data/glade/prefs-dialog.glade: * data/glade/property-bar.glade: * data/glade/template-designer.glade: * src/wdgt-print-copies.c: (gl_wdgt_print_copies_construct), (first_spin_cb), (last_spin_cb): * src/wdgt-print-merge.c: (gl_wdgt_print_merge_construct): Zero out adjustment->page_size for all spinbuttons. With gtk-2.14 this causes many warning and with gtk-2.16 this actually breaks the spinbuttons. git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/branches/glabels-2_2@833 f5e0f49d-192f-0410-a22d-a8d8700d0965 --- diff --git a/glabels2/ChangeLog b/glabels2/ChangeLog index 5946352d..819d633d 100644 --- a/glabels2/ChangeLog +++ b/glabels2/ChangeLog @@ -1,3 +1,15 @@ +2009-04-28 Jim Evins + + * data/glade/object-editor.glade: + * data/glade/prefs-dialog.glade: + * data/glade/property-bar.glade: + * data/glade/template-designer.glade: + * src/wdgt-print-copies.c: (gl_wdgt_print_copies_construct), + (first_spin_cb), (last_spin_cb): + * src/wdgt-print-merge.c: (gl_wdgt_print_merge_construct): + Zero out adjustment->page_size for all spinbuttons. With gtk-2.14 this causes + many warning and with gtk-2.16 this actually breaks the spinbuttons. + 2009-01-07 Jim Evins * src/critical-error-handler.c: (critical_error_handler): diff --git a/glabels2/data/glade/object-editor.glade b/glabels2/data/glade/object-editor.glade index d98e899f..d4ba2fe4 100644 --- a/glabels2/data/glade/object-editor.glade +++ b/glabels2/data/glade/object-editor.glade @@ -382,7 +382,7 @@ GTK_UPDATE_ALWAYS False False - 1 1 100 1 10 10 + 1 1 100 1 10 0 0 @@ -864,7 +864,7 @@ GTK_UPDATE_ALWAYS False False - 1 0 5 0.01 0.1 0.1 + 1 0 5 0.01 0.1 0 0 @@ -989,7 +989,7 @@ GTK_UPDATE_ALWAYS False False - 1 0.25 4 0.25 1 1 + 1 0.25 4 0.25 1 0 0 @@ -1818,7 +1818,7 @@ GTK_UPDATE_ALWAYS False False - 1 1 100 1 10 10 + 1 1 100 1 10 0 0 @@ -2263,7 +2263,7 @@ GTK_UPDATE_ALWAYS True False - 1 0 100 0.01 10 10 + 1 0 100 0.01 10 0 0 @@ -2355,7 +2355,7 @@ GTK_UPDATE_ALWAYS True False - 1 0 100 0.01 10 10 + 1 0 100 0.01 10 0 0 @@ -2541,7 +2541,7 @@ GTK_UPDATE_ALWAYS True False - 1 0 100 0.01 10 10 + 1 0 100 0.01 10 0 0 @@ -2600,7 +2600,7 @@ GTK_UPDATE_ALWAYS True False - 0 -180 180 0.1 5 5 + 0 -180 180 0.1 5 0 0 @@ -2819,7 +2819,7 @@ GTK_UPDATE_ALWAYS True False - 0 0 100 0.01 10 10 + 0 0 100 0.01 10 0 1 @@ -2841,7 +2841,7 @@ GTK_UPDATE_ALWAYS True False - 0 0 100 0.01 10 10 + 0 0 100 0.01 10 0 1 @@ -2968,7 +2968,7 @@ GTK_UPDATE_ALWAYS True False - 0 0 100 0.00999999977648 10 10 + 0 0 100 0.00999999977648 10 0 0 @@ -3063,7 +3063,7 @@ GTK_UPDATE_ALWAYS True False - 0 0 100 0.00999999977648 10 10 + 0 0 100 0.00999999977648 10 0 0 @@ -3328,7 +3328,7 @@ GTK_UPDATE_ALWAYS False False - 1 0 100 1 10 10 + 1 0 100 1 10 0 0 diff --git a/glabels2/data/glade/prefs-dialog.glade b/glabels2/data/glade/prefs-dialog.glade index 81694c9a..b169a381 100644 --- a/glabels2/data/glade/prefs-dialog.glade +++ b/glabels2/data/glade/prefs-dialog.glade @@ -610,7 +610,7 @@ GTK_UPDATE_ALWAYS False False - 1 1 100 1 10 10 + 1 1 100 1 10 0 0 @@ -831,7 +831,7 @@ GTK_UPDATE_ALWAYS False False - 1 0 5 0.01 0.1 0.1 + 1 0 5 0.01 0.1 0 0 @@ -1009,7 +1009,7 @@ GTK_UPDATE_ALWAYS False False - 1 0.25 4 0.25 1 1 + 1 0.25 4 0.25 1 0 0 diff --git a/glabels2/data/glade/property-bar.glade b/glabels2/data/glade/property-bar.glade index 6ba9b341..f86d7730 100644 --- a/glabels2/data/glade/property-bar.glade +++ b/glabels2/data/glade/property-bar.glade @@ -86,7 +86,7 @@ GTK_UPDATE_ALWAYS False False - 1 1 250 1 10 10 + 1 1 250 1 10 0 @@ -359,7 +359,7 @@ GTK_UPDATE_ALWAYS False False - 1 0.25 4 0.25 1 1 + 1 0.25 4 0.25 1 0 diff --git a/glabels2/data/glade/template-designer.glade b/glabels2/data/glade/template-designer.glade index 7f05f9f1..22a0be78 100644 --- a/glabels2/data/glade/template-designer.glade +++ b/glabels2/data/glade/template-designer.glade @@ -639,7 +639,7 @@ This dialog will assist you in the creation of a custom gLabels template.GTK_UPDATE_ALWAYS False False - 1 0 100 1 10 10 + 1 0 100 1 10 0 0 @@ -699,7 +699,7 @@ This dialog will assist you in the creation of a custom gLabels template.GTK_UPDATE_ALWAYS False False - 1 0 100 1 10 10 + 1 0 100 1 10 0 0 @@ -1193,7 +1193,7 @@ This dialog will assist you in the creation of a custom gLabels template.GTK_UPDATE_ALWAYS False False - 0 0 100 1 10 10 + 0 0 100 1 10 0 1 @@ -1214,7 +1214,7 @@ This dialog will assist you in the creation of a custom gLabels template.GTK_UPDATE_ALWAYS False False - 0 0 100 1 10 10 + 0 0 100 1 10 0 1 @@ -1235,7 +1235,7 @@ This dialog will assist you in the creation of a custom gLabels template.GTK_UPDATE_ALWAYS False False - 0 0 100 1 10 10 + 0 0 100 1 10 0 1 @@ -1256,7 +1256,7 @@ This dialog will assist you in the creation of a custom gLabels template.GTK_UPDATE_ALWAYS False False - 0 0 100 1 10 10 + 0 0 100 1 10 0 1 @@ -1305,7 +1305,7 @@ This dialog will assist you in the creation of a custom gLabels template.GTK_UPDATE_ALWAYS False False - 0 0 100 1 10 10 + 0 0 100 1 10 0 1 @@ -1354,7 +1354,7 @@ This dialog will assist you in the creation of a custom gLabels template.GTK_UPDATE_ALWAYS False False - 0 0 100 1 10 10 + 0 0 100 1 10 0 1 @@ -1592,7 +1592,7 @@ This dialog will assist you in the creation of a custom gLabels template.GTK_UPDATE_ALWAYS False False - 0 0 100 1 10 10 + 0 0 100 1 10 0 1 @@ -1613,7 +1613,7 @@ This dialog will assist you in the creation of a custom gLabels template.GTK_UPDATE_ALWAYS False False - 0 0 100 1 10 10 + 0 0 100 1 10 0 1 @@ -1746,7 +1746,7 @@ This dialog will assist you in the creation of a custom gLabels template.GTK_UPDATE_ALWAYS False False - 0 0 100 1 10 10 + 0 0 100 1 10 0 1 @@ -2012,7 +2012,7 @@ This dialog will assist you in the creation of a custom gLabels template.GTK_UPDATE_ALWAYS False False - 0 0 100 1 10 10 + 0 0 100 1 10 0 1 @@ -2033,7 +2033,7 @@ This dialog will assist you in the creation of a custom gLabels template.GTK_UPDATE_ALWAYS False False - 0 0 100 1 10 10 + 0 0 100 1 10 0 1 @@ -2054,7 +2054,7 @@ This dialog will assist you in the creation of a custom gLabels template.GTK_UPDATE_ALWAYS False False - 0 0 100 1 10 10 + 0 0 100 1 10 0 1 @@ -2075,7 +2075,7 @@ This dialog will assist you in the creation of a custom gLabels template.GTK_UPDATE_ALWAYS False False - 0 0 100 1 10 10 + 0 0 100 1 10 0 1 @@ -2096,7 +2096,7 @@ This dialog will assist you in the creation of a custom gLabels template.GTK_UPDATE_ALWAYS False False - 0 0 100 1 10 10 + 0 0 100 1 10 0 1 @@ -2313,7 +2313,7 @@ This dialog will assist you in the creation of a custom gLabels template.GTK_UPDATE_ALWAYS False False - 0 0 100 1 10 10 + 0 0 100 1 10 0 1 @@ -2580,7 +2580,7 @@ two layouts. GTK_UPDATE_ALWAYS False False - 1 1 2 1 1 1 + 1 1 2 1 1 0 0 @@ -3018,7 +3018,7 @@ two layouts. GTK_UPDATE_ALWAYS False False - 1 1 100 1 10 10 + 1 1 100 1 10 0 1 @@ -3039,7 +3039,7 @@ two layouts. GTK_UPDATE_ALWAYS False False - 1 1 100 1 10 10 + 1 1 100 1 10 0 1 @@ -3060,7 +3060,7 @@ two layouts. GTK_UPDATE_ALWAYS False False - 1 1 100 1 10 10 + 1 1 100 1 10 0 2 @@ -3081,7 +3081,7 @@ two layouts. GTK_UPDATE_ALWAYS False False - 1 1 100 1 10 10 + 1 1 100 1 10 0 2 @@ -3102,7 +3102,7 @@ two layouts. GTK_UPDATE_ALWAYS False False - 0 0 100 1 10 10 + 0 0 100 1 10 0 1 @@ -3123,7 +3123,7 @@ two layouts. GTK_UPDATE_ALWAYS False False - 0 0 100 1 10 10 + 0 0 100 1 10 0 2 @@ -3144,7 +3144,7 @@ two layouts. GTK_UPDATE_ALWAYS False False - 0 0 100 1 10 10 + 0 0 100 1 10 0 1 @@ -3165,7 +3165,7 @@ two layouts. GTK_UPDATE_ALWAYS False False - 0 0 100 1 10 10 + 0 0 100 1 10 0 2 @@ -3186,7 +3186,7 @@ two layouts. GTK_UPDATE_ALWAYS False False - 0 0 100 1 10 10 + 0 0 100 1 10 0 1 @@ -3207,7 +3207,7 @@ two layouts. GTK_UPDATE_ALWAYS False False - 0 0 100 1 10 10 + 0 0 100 1 10 0 2 @@ -3228,7 +3228,7 @@ two layouts. GTK_UPDATE_ALWAYS False False - 0 0 100 1 10 10 + 0 0 100 1 10 0 1 @@ -3249,7 +3249,7 @@ two layouts. GTK_UPDATE_ALWAYS False False - 0 0 100 1 10 10 + 0 0 100 1 10 0 2 diff --git a/glabels2/src/wdgt-print-copies.c b/glabels2/src/wdgt-print-copies.c index f09522a0..7d2f35b1 100644 --- a/glabels2/src/wdgt-print-copies.c +++ b/glabels2/src/wdgt-print-copies.c @@ -152,7 +152,7 @@ gl_wdgt_print_copies_construct (glWdgtPrintCopies *copies, copies->sheets_radio = gtk_radio_button_new_with_label (radio_group, _("Sheets:")); gtk_box_pack_start (GTK_BOX(whbox1), copies->sheets_radio, FALSE, FALSE, 0); - adjust = gtk_adjustment_new (1, 1.0, 10.0, 1.0, 10.0, 10.0); + adjust = gtk_adjustment_new (1, 1.0, 100.0, 1.0, 10.0, 0.0); copies->sheets_spin = gtk_spin_button_new (GTK_ADJUSTMENT (adjust), 1.0, 0); gtk_box_pack_start (GTK_BOX(whbox1), copies->sheets_spin, FALSE, FALSE, 0); @@ -171,15 +171,12 @@ gl_wdgt_print_copies_construct (glWdgtPrintCopies *copies, gtk_radio_button_new_with_label (radio_group, _("Labels")); gtk_box_pack_start (GTK_BOX(whbox1), copies->labels_radio, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX(whbox1), gtk_label_new (_("from:")), FALSE, FALSE, 0); - adjust = gtk_adjustment_new (1, 1.0, copies->labels_per_sheet, - 1.0, 10.0, 10.0); + adjust = gtk_adjustment_new (1, 1.0, copies->labels_per_sheet, 1.0, 10.0, 0.0); copies->first_spin = gtk_spin_button_new (GTK_ADJUSTMENT (adjust), 1.0, 0); gtk_box_pack_start (GTK_BOX(whbox1), copies->first_spin, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX(whbox1), gtk_label_new (_("to:")), FALSE, FALSE, 0); - adjust = gtk_adjustment_new (copies->labels_per_sheet, - 1.0, copies->labels_per_sheet, - 1.0, 10.0, 10.0); + adjust = gtk_adjustment_new (copies->labels_per_sheet, 1.0, copies->labels_per_sheet, 1.0, 10.0, 0.0); copies->last_spin = gtk_spin_button_new (GTK_ADJUSTMENT (adjust), 1.0, 0); gtk_box_pack_start (GTK_BOX(whbox1), copies->last_spin, FALSE, FALSE, 0); @@ -251,11 +248,10 @@ first_spin_cb (GtkSpinButton * spinbutton, gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (copies->last_spin)); - gtk_spin_button_get_adjustment (GTK_SPIN_BUTTON (copies->last_spin))-> - lower = first; + gtk_spin_button_get_adjustment (GTK_SPIN_BUTTON (copies->last_spin))->lower = first; gl_wdgt_mini_preview_highlight_range (GL_WDGT_MINI_PREVIEW(copies->mini_preview), - first, last); + first, last); } /*--------------------------------------------------------------------------*/ @@ -275,11 +271,10 @@ last_spin_cb (GtkSpinButton * spinbutton, gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (copies->last_spin)); - gtk_spin_button_get_adjustment (GTK_SPIN_BUTTON (copies->first_spin))-> - upper = last; + gtk_spin_button_get_adjustment (GTK_SPIN_BUTTON (copies->first_spin))->upper = last; gl_wdgt_mini_preview_highlight_range (GL_WDGT_MINI_PREVIEW(copies->mini_preview), - first, last); + first, last); } /*--------------------------------------------------------------------------*/ diff --git a/glabels2/src/wdgt-print-merge.c b/glabels2/src/wdgt-print-merge.c index bc1fe6fd..f05d4eda 100644 --- a/glabels2/src/wdgt-print-merge.c +++ b/glabels2/src/wdgt-print-merge.c @@ -151,12 +151,9 @@ gl_wdgt_print_merge_construct (glWdgtPrintMerge * merge, whbox1 = gtk_hbox_new (FALSE, GL_HIG_PAD2); gtk_box_pack_start (GTK_BOX(wvbox), whbox1, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX(whbox1), - gtk_label_new (_("Start on label")), FALSE, FALSE, 0); - adjust = - gtk_adjustment_new (1, 1.0, merge->labels_per_sheet, 1.0, 10.0, - 10.0); - merge->first_spin = - gtk_spin_button_new (GTK_ADJUSTMENT (adjust), 1.0, 0); + gtk_label_new (_("Start on label")), FALSE, FALSE, 0); + adjust = gtk_adjustment_new (1, 1.0, merge->labels_per_sheet, 1.0, 10.0, 0.0); + merge->first_spin = gtk_spin_button_new (GTK_ADJUSTMENT (adjust), 1.0, 0); gtk_box_pack_start (GTK_BOX(whbox1), merge->first_spin, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX(whbox1), gtk_label_new (_("on 1st sheet")), FALSE, FALSE, 0); @@ -169,9 +166,8 @@ gl_wdgt_print_merge_construct (glWdgtPrintMerge * merge, gtk_box_pack_start (GTK_BOX(wvbox), whbox1, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX(whbox1), gtk_label_new (_("Copies:")), FALSE, FALSE, 0); - adjust = gtk_adjustment_new (1, 1.0, 10.0, 1.0, 10.0, 10.0); - merge->copies_spin = gtk_spin_button_new (GTK_ADJUSTMENT (adjust), - 1.0, 0); + adjust = gtk_adjustment_new (1, 1.0, 100.0, 1.0, 10.0, 0.0); + merge->copies_spin = gtk_spin_button_new (GTK_ADJUSTMENT (adjust), 1.0, 0); gtk_box_pack_start (GTK_BOX(whbox1), merge->copies_spin, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX(whbox1), gtk_label_new (" "), FALSE, FALSE, 0); merge->collate_check = gtk_check_button_new_with_label (_("Collate"));