2009-04-28 Jim Evins <evins@purple>

	* 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 5946352d2244eca6bc9dca65e656e9d7560e8278..819d633d4f589d3a22b874829d9f48b73e73d0e6 100644 (file)
--- a/glabels2/ChangeLog
+++ b/glabels2/ChangeLog
@@ -1,3 +1,15 @@
+2009-04-28  Jim Evins  <evins@purple>
+
+       * 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  <evins@snaught.com>
 
        * 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 d98e899f0e0b10ccaab336e8a3fde0c4a1a4e43f..d4ba2fe4a262589733031cd5d5acad154a7f0af3 100644 (file)
--- a/glabels2/data/glade/object-editor.glade
+++ b/glabels2/data/glade/object-editor.glade
@@ -382,7 +382,7 @@
                              <property name="update_policy">GTK_UPDATE_ALWAYS</property>
                              <property name="snap_to_ticks">False</property>
                              <property name="wrap">False</property>
-                             <property name="adjustment">1 1 100 1 10 10</property>
+                             <property name="adjustment">1 1 100 1 10 0</property>
                            </widget>
                            <packing>
                              <property name="padding">0</property>
@@ -864,7 +864,7 @@
                              <property name="update_policy">GTK_UPDATE_ALWAYS</property>
                              <property name="snap_to_ticks">False</property>
                              <property name="wrap">False</property>
-                             <property name="adjustment">1 0 5 0.01 0.1 0.1</property>
+                             <property name="adjustment">1 0 5 0.01 0.1 0</property>
                            </widget>
                            <packing>
                              <property name="padding">0</property>
@@ -989,7 +989,7 @@
                              <property name="update_policy">GTK_UPDATE_ALWAYS</property>
                              <property name="snap_to_ticks">False</property>
                              <property name="wrap">False</property>
-                             <property name="adjustment">1 0.25 4 0.25 1 1</property>
+                             <property name="adjustment">1 0.25 4 0.25 1 0</property>
                            </widget>
                            <packing>
                              <property name="padding">0</property>
@@ -1818,7 +1818,7 @@
                                  <property name="update_policy">GTK_UPDATE_ALWAYS</property>
                                  <property name="snap_to_ticks">False</property>
                                  <property name="wrap">False</property>
-                                 <property name="adjustment">1 1 100 1 10 10</property>
+                                 <property name="adjustment">1 1 100 1 10 0</property>
                                </widget>
                                <packing>
                                  <property name="padding">0</property>
@@ -2263,7 +2263,7 @@
                              <property name="update_policy">GTK_UPDATE_ALWAYS</property>
                              <property name="snap_to_ticks">True</property>
                              <property name="wrap">False</property>
-                             <property name="adjustment">1 0 100 0.01 10 10</property>
+                             <property name="adjustment">1 0 100 0.01 10 0</property>
                            </widget>
                            <packing>
                              <property name="padding">0</property>
@@ -2355,7 +2355,7 @@
                              <property name="update_policy">GTK_UPDATE_ALWAYS</property>
                              <property name="snap_to_ticks">True</property>
                              <property name="wrap">False</property>
-                             <property name="adjustment">1 0 100 0.01 10 10</property>
+                             <property name="adjustment">1 0 100 0.01 10 0</property>
                            </widget>
                            <packing>
                              <property name="padding">0</property>
@@ -2541,7 +2541,7 @@
                              <property name="update_policy">GTK_UPDATE_ALWAYS</property>
                              <property name="snap_to_ticks">True</property>
                              <property name="wrap">False</property>
-                             <property name="adjustment">1 0 100 0.01 10 10</property>
+                             <property name="adjustment">1 0 100 0.01 10 0</property>
                            </widget>
                            <packing>
                              <property name="padding">0</property>
@@ -2600,7 +2600,7 @@
                              <property name="update_policy">GTK_UPDATE_ALWAYS</property>
                              <property name="snap_to_ticks">True</property>
                              <property name="wrap">False</property>
-                             <property name="adjustment">0 -180 180 0.1 5 5</property>
+                             <property name="adjustment">0 -180 180 0.1 5 0</property>
                            </widget>
                            <packing>
                              <property name="padding">0</property>
@@ -2819,7 +2819,7 @@
                          <property name="update_policy">GTK_UPDATE_ALWAYS</property>
                          <property name="snap_to_ticks">True</property>
                          <property name="wrap">False</property>
-                         <property name="adjustment">0 0 100 0.01 10 10</property>
+                         <property name="adjustment">0 0 100 0.01 10 0</property>
                        </widget>
                        <packing>
                          <property name="left_attach">1</property>
@@ -2841,7 +2841,7 @@
                          <property name="update_policy">GTK_UPDATE_ALWAYS</property>
                          <property name="snap_to_ticks">True</property>
                          <property name="wrap">False</property>
-                         <property name="adjustment">0 0 100 0.01 10 10</property>
+                         <property name="adjustment">0 0 100 0.01 10 0</property>
                        </widget>
                        <packing>
                          <property name="left_attach">1</property>
@@ -2968,7 +2968,7 @@
                                  <property name="update_policy">GTK_UPDATE_ALWAYS</property>
                                  <property name="snap_to_ticks">True</property>
                                  <property name="wrap">False</property>
-                                 <property name="adjustment">0 0 100 0.00999999977648 10 10</property>
+                                 <property name="adjustment">0 0 100 0.00999999977648 10 0</property>
                                </widget>
                                <packing>
                                  <property name="padding">0</property>
@@ -3063,7 +3063,7 @@
                                  <property name="update_policy">GTK_UPDATE_ALWAYS</property>
                                  <property name="snap_to_ticks">True</property>
                                  <property name="wrap">False</property>
-                                 <property name="adjustment">0 0 100 0.00999999977648 10 10</property>
+                                 <property name="adjustment">0 0 100 0.00999999977648 10 0</property>
                                </widget>
                                <packing>
                                  <property name="padding">0</property>
@@ -3328,7 +3328,7 @@
                                  <property name="update_policy">GTK_UPDATE_ALWAYS</property>
                                  <property name="snap_to_ticks">False</property>
                                  <property name="wrap">False</property>
-                                 <property name="adjustment">1 0 100 1 10 10</property>
+                                 <property name="adjustment">1 0 100 1 10 0</property>
                                </widget>
                                <packing>
                                  <property name="padding">0</property>

diff --git a/glabels2/data/glade/prefs-dialog.glade b/glabels2/data/glade/prefs-dialog.glade
index 81694c9a793e472c9cc954e55cb9336b4a02c4c6..b169a3817cbe0034668dabd2d8975a418d636ac6 100644 (file)
--- a/glabels2/data/glade/prefs-dialog.glade
+++ b/glabels2/data/glade/prefs-dialog.glade
@@ -610,7 +610,7 @@
                                  <property name="update_policy">GTK_UPDATE_ALWAYS</property>
                                  <property name="snap_to_ticks">False</property>
                                  <property name="wrap">False</property>
-                                 <property name="adjustment">1 1 100 1 10 10</property>
+                                 <property name="adjustment">1 1 100 1 10 0</property>
                                </widget>
                                <packing>
                                  <property name="padding">0</property>
@@ -831,7 +831,7 @@
                                  <property name="update_policy">GTK_UPDATE_ALWAYS</property>
                                  <property name="snap_to_ticks">False</property>
                                  <property name="wrap">False</property>
-                                 <property name="adjustment">1 0 5 0.01 0.1 0.1</property>
+                                 <property name="adjustment">1 0 5 0.01 0.1 0</property>
                                </widget>
                                <packing>
                                  <property name="padding">0</property>
@@ -1009,7 +1009,7 @@
                                  <property name="update_policy">GTK_UPDATE_ALWAYS</property>
                                  <property name="snap_to_ticks">False</property>
                                  <property name="wrap">False</property>
-                                 <property name="adjustment">1 0.25 4 0.25 1 1</property>
+                                 <property name="adjustment">1 0.25 4 0.25 1 0</property>
                                </widget>
                                <packing>
                                  <property name="padding">0</property>

diff --git a/glabels2/data/glade/property-bar.glade b/glabels2/data/glade/property-bar.glade
index 6ba9b341d29ccb5758908fde295b4928f87bcc1f..f86d77301fd27851f227db7ddceeb4b68c9711c6 100644 (file)
--- a/glabels2/data/glade/property-bar.glade
+++ b/glabels2/data/glade/property-bar.glade
@@ -86,7 +86,7 @@
                  <property name="update_policy">GTK_UPDATE_ALWAYS</property>
                  <property name="snap_to_ticks">False</property>
                  <property name="wrap">False</property>
-                 <property name="adjustment">1 1 250 1 10 10</property>
+                 <property name="adjustment">1 1 250 1 10 0</property>
                </widget>
              </child>
            </widget>
@@ -359,7 +359,7 @@
              <property name="update_policy">GTK_UPDATE_ALWAYS</property>
              <property name="snap_to_ticks">False</property>
              <property name="wrap">False</property>
-             <property name="adjustment">1 0.25 4 0.25 1 1</property>
+             <property name="adjustment">1 0.25 4 0.25 1 0</property>
            </widget>
          </child>
        </widget>

diff --git a/glabels2/data/glade/template-designer.glade b/glabels2/data/glade/template-designer.glade
index 7f05f9f1d0fe1574f2e5432bdb600866c525ba94..22a0be782aadb7b45449d75256962fcc680b78b3 100644 (file)
--- 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.</prope
                      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
                      <property name="snap_to_ticks">False</property>
                      <property name="wrap">False</property>
-                     <property name="adjustment">1 0 100 1 10 10</property>
+                     <property name="adjustment">1 0 100 1 10 0</property>
                    </widget>
                    <packing>
                      <property name="padding">0</property>
@@ -699,7 +699,7 @@ This dialog will assist you in the creation of a custom gLabels template.</prope
                      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
                      <property name="snap_to_ticks">False</property>
                      <property name="wrap">False</property>
-                     <property name="adjustment">1 0 100 1 10 10</property>
+                     <property name="adjustment">1 0 100 1 10 0</property>
                    </widget>
                    <packing>
                      <property name="padding">0</property>
@@ -1193,7 +1193,7 @@ This dialog will assist you in the creation of a custom gLabels template.</prope
                      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
                      <property name="snap_to_ticks">False</property>
                      <property name="wrap">False</property>
-                     <property name="adjustment">0 0 100 1 10 10</property>
+                     <property name="adjustment">0 0 100 1 10 0</property>
                    </widget>
                    <packing>
                      <property name="left_attach">1</property>
@@ -1214,7 +1214,7 @@ This dialog will assist you in the creation of a custom gLabels template.</prope
                      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
                      <property name="snap_to_ticks">False</property>
                      <property name="wrap">False</property>
-                     <property name="adjustment">0 0 100 1 10 10</property>
+                     <property name="adjustment">0 0 100 1 10 0</property>
                    </widget>
                    <packing>
                      <property name="left_attach">1</property>
@@ -1235,7 +1235,7 @@ This dialog will assist you in the creation of a custom gLabels template.</prope
                      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
                      <property name="snap_to_ticks">False</property>
                      <property name="wrap">False</property>
-                     <property name="adjustment">0 0 100 1 10 10</property>
+                     <property name="adjustment">0 0 100 1 10 0</property>
                    </widget>
                    <packing>
                      <property name="left_attach">1</property>
@@ -1256,7 +1256,7 @@ This dialog will assist you in the creation of a custom gLabels template.</prope
                      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
                      <property name="snap_to_ticks">False</property>
                      <property name="wrap">False</property>
-                     <property name="adjustment">0 0 100 1 10 10</property>
+                     <property name="adjustment">0 0 100 1 10 0</property>
                    </widget>
                    <packing>
                      <property name="left_attach">1</property>
@@ -1305,7 +1305,7 @@ This dialog will assist you in the creation of a custom gLabels template.</prope
                      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
                      <property name="snap_to_ticks">False</property>
                      <property name="wrap">False</property>
-                     <property name="adjustment">0 0 100 1 10 10</property>
+                     <property name="adjustment">0 0 100 1 10 0</property>
                    </widget>
                    <packing>
                      <property name="left_attach">1</property>
@@ -1354,7 +1354,7 @@ This dialog will assist you in the creation of a custom gLabels template.</prope
                      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
                      <property name="snap_to_ticks">False</property>
                      <property name="wrap">False</property>
-                     <property name="adjustment">0 0 100 1 10 10</property>
+                     <property name="adjustment">0 0 100 1 10 0</property>
                    </widget>
                    <packing>
                      <property name="left_attach">1</property>
@@ -1592,7 +1592,7 @@ This dialog will assist you in the creation of a custom gLabels template.</prope
                      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
                      <property name="snap_to_ticks">False</property>
                      <property name="wrap">False</property>
-                     <property name="adjustment">0 0 100 1 10 10</property>
+                     <property name="adjustment">0 0 100 1 10 0</property>
                    </widget>
                    <packing>
                      <property name="left_attach">1</property>
@@ -1613,7 +1613,7 @@ This dialog will assist you in the creation of a custom gLabels template.</prope
                      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
                      <property name="snap_to_ticks">False</property>
                      <property name="wrap">False</property>
-                     <property name="adjustment">0 0 100 1 10 10</property>
+                     <property name="adjustment">0 0 100 1 10 0</property>
                    </widget>
                    <packing>
                      <property name="left_attach">1</property>
@@ -1746,7 +1746,7 @@ This dialog will assist you in the creation of a custom gLabels template.</prope
                      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
                      <property name="snap_to_ticks">False</property>
                      <property name="wrap">False</property>
-                     <property name="adjustment">0 0 100 1 10 10</property>
+                     <property name="adjustment">0 0 100 1 10 0</property>
                    </widget>
                    <packing>
                      <property name="left_attach">1</property>
@@ -2012,7 +2012,7 @@ This dialog will assist you in the creation of a custom gLabels template.</prope
                      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
                      <property name="snap_to_ticks">False</property>
                      <property name="wrap">False</property>
-                     <property name="adjustment">0 0 100 1 10 10</property>
+                     <property name="adjustment">0 0 100 1 10 0</property>
                    </widget>
                    <packing>
                      <property name="left_attach">1</property>
@@ -2033,7 +2033,7 @@ This dialog will assist you in the creation of a custom gLabels template.</prope
                      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
                      <property name="snap_to_ticks">False</property>
                      <property name="wrap">False</property>
-                     <property name="adjustment">0 0 100 1 10 10</property>
+                     <property name="adjustment">0 0 100 1 10 0</property>
                    </widget>
                    <packing>
                      <property name="left_attach">1</property>
@@ -2054,7 +2054,7 @@ This dialog will assist you in the creation of a custom gLabels template.</prope
                      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
                      <property name="snap_to_ticks">False</property>
                      <property name="wrap">False</property>
-                     <property name="adjustment">0 0 100 1 10 10</property>
+                     <property name="adjustment">0 0 100 1 10 0</property>
                    </widget>
                    <packing>
                      <property name="left_attach">1</property>
@@ -2075,7 +2075,7 @@ This dialog will assist you in the creation of a custom gLabels template.</prope
                      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
                      <property name="snap_to_ticks">False</property>
                      <property name="wrap">False</property>
-                     <property name="adjustment">0 0 100 1 10 10</property>
+                     <property name="adjustment">0 0 100 1 10 0</property>
                    </widget>
                    <packing>
                      <property name="left_attach">1</property>
@@ -2096,7 +2096,7 @@ This dialog will assist you in the creation of a custom gLabels template.</prope
                      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
                      <property name="snap_to_ticks">False</property>
                      <property name="wrap">False</property>
-                     <property name="adjustment">0 0 100 1 10 10</property>
+                     <property name="adjustment">0 0 100 1 10 0</property>
                    </widget>
                    <packing>
                      <property name="left_attach">1</property>
@@ -2313,7 +2313,7 @@ This dialog will assist you in the creation of a custom gLabels template.</prope
                      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
                      <property name="snap_to_ticks">False</property>
                      <property name="wrap">False</property>
-                     <property name="adjustment">0 0 100 1 10 10</property>
+                     <property name="adjustment">0 0 100 1 10 0</property>
                    </widget>
                    <packing>
                      <property name="left_attach">1</property>
@@ -2580,7 +2580,7 @@ two layouts.</property>
                  <property name="update_policy">GTK_UPDATE_ALWAYS</property>
                  <property name="snap_to_ticks">False</property>
                  <property name="wrap">False</property>
-                 <property name="adjustment">1 1 2 1 1 1</property>
+                 <property name="adjustment">1 1 2 1 1 0</property>
                </widget>
                <packing>
                  <property name="padding">0</property>
@@ -3018,7 +3018,7 @@ two layouts.</property>
                      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
                      <property name="snap_to_ticks">False</property>
                      <property name="wrap">False</property>
-                     <property name="adjustment">1 1 100 1 10 10</property>
+                     <property name="adjustment">1 1 100 1 10 0</property>
                    </widget>
                    <packing>
                      <property name="left_attach">1</property>
@@ -3039,7 +3039,7 @@ two layouts.</property>
                      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
                      <property name="snap_to_ticks">False</property>
                      <property name="wrap">False</property>
-                     <property name="adjustment">1 1 100 1 10 10</property>
+                     <property name="adjustment">1 1 100 1 10 0</property>
                    </widget>
                    <packing>
                      <property name="left_attach">1</property>
@@ -3060,7 +3060,7 @@ two layouts.</property>
                      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
                      <property name="snap_to_ticks">False</property>
                      <property name="wrap">False</property>
-                     <property name="adjustment">1 1 100 1 10 10</property>
+                     <property name="adjustment">1 1 100 1 10 0</property>
                    </widget>
                    <packing>
                      <property name="left_attach">2</property>
@@ -3081,7 +3081,7 @@ two layouts.</property>
                      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
                      <property name="snap_to_ticks">False</property>
                      <property name="wrap">False</property>
-                     <property name="adjustment">1 1 100 1 10 10</property>
+                     <property name="adjustment">1 1 100 1 10 0</property>
                    </widget>
                    <packing>
                      <property name="left_attach">2</property>
@@ -3102,7 +3102,7 @@ two layouts.</property>
                      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
                      <property name="snap_to_ticks">False</property>
                      <property name="wrap">False</property>
-                     <property name="adjustment">0 0 100 1 10 10</property>
+                     <property name="adjustment">0 0 100 1 10 0</property>
                    </widget>
                    <packing>
                      <property name="left_attach">1</property>
@@ -3123,7 +3123,7 @@ two layouts.</property>
                      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
                      <property name="snap_to_ticks">False</property>
                      <property name="wrap">False</property>
-                     <property name="adjustment">0 0 100 1 10 10</property>
+                     <property name="adjustment">0 0 100 1 10 0</property>
                    </widget>
                    <packing>
                      <property name="left_attach">2</property>
@@ -3144,7 +3144,7 @@ two layouts.</property>
                      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
                      <property name="snap_to_ticks">False</property>
                      <property name="wrap">False</property>
-                     <property name="adjustment">0 0 100 1 10 10</property>
+                     <property name="adjustment">0 0 100 1 10 0</property>
                    </widget>
                    <packing>
                      <property name="left_attach">1</property>
@@ -3165,7 +3165,7 @@ two layouts.</property>
                      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
                      <property name="snap_to_ticks">False</property>
                      <property name="wrap">False</property>
-                     <property name="adjustment">0 0 100 1 10 10</property>
+                     <property name="adjustment">0 0 100 1 10 0</property>
                    </widget>
                    <packing>
                      <property name="left_attach">2</property>
@@ -3186,7 +3186,7 @@ two layouts.</property>
                      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
                      <property name="snap_to_ticks">False</property>
                      <property name="wrap">False</property>
-                     <property name="adjustment">0 0 100 1 10 10</property>
+                     <property name="adjustment">0 0 100 1 10 0</property>
                    </widget>
                    <packing>
                      <property name="left_attach">1</property>
@@ -3207,7 +3207,7 @@ two layouts.</property>
                      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
                      <property name="snap_to_ticks">False</property>
                      <property name="wrap">False</property>
-                     <property name="adjustment">0 0 100 1 10 10</property>
+                     <property name="adjustment">0 0 100 1 10 0</property>
                    </widget>
                    <packing>
                      <property name="left_attach">2</property>
@@ -3228,7 +3228,7 @@ two layouts.</property>
                      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
                      <property name="snap_to_ticks">False</property>
                      <property name="wrap">False</property>
-                     <property name="adjustment">0 0 100 1 10 10</property>
+                     <property name="adjustment">0 0 100 1 10 0</property>
                    </widget>
                    <packing>
                      <property name="left_attach">1</property>
@@ -3249,7 +3249,7 @@ two layouts.</property>
                      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
                      <property name="snap_to_ticks">False</property>
                      <property name="wrap">False</property>
-                     <property name="adjustment">0 0 100 1 10 10</property>
+                     <property name="adjustment">0 0 100 1 10 0</property>
                    </widget>
                    <packing>
                      <property name="left_attach">2</property>

diff --git a/glabels2/src/wdgt-print-copies.c b/glabels2/src/wdgt-print-copies.c
index f09522a01cfb032f9d8143deac734952113af848..7d2f35b116a8839f07629e6648acb153513ff427 100644 (file)
--- 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 bc1fe6fdd87a86b768c7ed738f0e01654c7c6702..f05d4edaf1a0018746e5e9148903510fde32766d 100644 (file)
--- 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"));