2005-04-21 Jim Evins <evins@snaught.com>

	* data/glade/template-designer.glade:
	* src/template-designer.c: (construct_pg_size_page),
	(pg_size_page_changed_cb), (build_template):
		Replaced the deprecated	GtkCombo widget with the new
		GtkComboBox.

git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@526 f5e0f49d-192f-0410-a22d-a8d8700d0965

diff --git a/glabels2/ChangeLog b/glabels2/ChangeLog
index 2b108464280bb742ebdb37b9f7e5c314ab7e4303..2984c06427adb8e07f2966a8e12172f56ee2d111 100644 (file)
--- a/glabels2/ChangeLog
+++ b/glabels2/ChangeLog
@@ -1,3 +1,11 @@
+2005-04-21  Jim Evins  <evins@snaught.com>
+
+       * data/glade/template-designer.glade:
+       * src/template-designer.c: (construct_pg_size_page),
+       (pg_size_page_changed_cb), (build_template):
+               Replaced the deprecated GtkCombo widget with the new
+               GtkComboBox.
+
 2005-04-20  Jim Evins  <evins@snaught.com>
 
        * data/glade/prefs-dialog.glade:

diff --git a/glabels2/data/glade/template-designer.glade b/glabels2/data/glade/template-designer.glade
index 2f8a53d64624e5c174986245a0dc4d40664d2881..8066f2968ea572c06e39621baf9ecc1045121844 100644 (file)
--- a/glabels2/data/glade/template-designer.glade
+++ b/glabels2/data/glade/template-designer.glade
@@ -12,6 +12,12 @@
   <property name="modal">False</property>
   <property name="resizable">True</property>
   <property name="destroy_with_parent">False</property>
+  <property name="decorated">True</property>
+  <property name="skip_taskbar_hint">False</property>
+  <property name="skip_pager_hint">False</property>
+  <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
+  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+  <property name="focus_on_map">True</property>
 
   <child>
     <widget class="GnomeDruid" id="druid">
@@ -63,6 +69,10 @@ This dialog will assist you in the creation of a custom gLabels template.</prope
                      <property name="yalign">0.5</property>
                      <property name="xpad">0</property>
                      <property name="ypad">0</property>
+                     <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                     <property name="width_chars">-1</property>
+                     <property name="single_line_mode">False</property>
+                     <property name="angle">0</property>
                    </widget>
                    <packing>
                      <property name="padding">0</property>
@@ -93,6 +103,10 @@ This dialog will assist you in the creation of a custom gLabels template.</prope
                          <property name="yalign">0.5</property>
                          <property name="xpad">0</property>
                          <property name="ypad">0</property>
+                         <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                         <property name="width_chars">-1</property>
+                         <property name="single_line_mode">False</property>
+                         <property name="angle">0</property>
                        </widget>
                        <packing>
                          <property name="left_attach">0</property>
@@ -117,6 +131,10 @@ This dialog will assist you in the creation of a custom gLabels template.</prope
                          <property name="yalign">0.5</property>
                          <property name="xpad">0</property>
                          <property name="ypad">0</property>
+                         <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                         <property name="width_chars">-1</property>
+                         <property name="single_line_mode">False</property>
+                         <property name="angle">0</property>
                        </widget>
                        <packing>
                          <property name="left_attach">0</property>
@@ -143,7 +161,7 @@ This dialog will assist you in the creation of a custom gLabels template.</prope
                              <property name="max_length">0</property>
                              <property name="text" translatable="yes"></property>
                              <property name="has_frame">True</property>
-                             <property name="invisible_char" translatable="yes">*</property>
+                             <property name="invisible_char">*</property>
                              <property name="activates_default">False</property>
                            </widget>
                            <packing>
@@ -166,6 +184,10 @@ This dialog will assist you in the creation of a custom gLabels template.</prope
                              <property name="yalign">0.5</property>
                              <property name="xpad">0</property>
                              <property name="ypad">0</property>
+                             <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                             <property name="width_chars">-1</property>
+                             <property name="single_line_mode">False</property>
+                             <property name="angle">0</property>
                            </widget>
                            <packing>
                              <property name="padding">0</property>
@@ -199,7 +221,7 @@ This dialog will assist you in the creation of a custom gLabels template.</prope
                              <property name="max_length">0</property>
                              <property name="text" translatable="yes"></property>
                              <property name="has_frame">True</property>
-                             <property name="invisible_char" translatable="yes">*</property>
+                             <property name="invisible_char">*</property>
                              <property name="activates_default">False</property>
                            </widget>
                            <packing>
@@ -222,6 +244,10 @@ This dialog will assist you in the creation of a custom gLabels template.</prope
                              <property name="yalign">0.5</property>
                              <property name="xpad">0</property>
                              <property name="ypad">0</property>
+                             <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                             <property name="width_chars">-1</property>
+                             <property name="single_line_mode">False</property>
+                             <property name="angle">0</property>
                            </widget>
                            <packing>
                              <property name="padding">0</property>
@@ -253,6 +279,10 @@ This dialog will assist you in the creation of a custom gLabels template.</prope
                          <property name="yalign">0</property>
                          <property name="xpad">0</property>
                          <property name="ypad">0</property>
+                         <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                         <property name="width_chars">-1</property>
+                         <property name="single_line_mode">False</property>
+                         <property name="angle">0</property>
                        </widget>
                        <packing>
                          <property name="left_attach">0</property>
@@ -273,7 +303,7 @@ This dialog will assist you in the creation of a custom gLabels template.</prope
                          <property name="max_length">0</property>
                          <property name="text" translatable="yes"></property>
                          <property name="has_frame">True</property>
-                         <property name="invisible_char" translatable="yes">*</property>
+                         <property name="invisible_char">*</property>
                          <property name="activates_default">False</property>
                        </widget>
                        <packing>
@@ -298,6 +328,10 @@ This dialog will assist you in the creation of a custom gLabels template.</prope
                          <property name="yalign">0</property>
                          <property name="xpad">0</property>
                          <property name="ypad">0</property>
+                         <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                         <property name="width_chars">-1</property>
+                         <property name="single_line_mode">False</property>
+                         <property name="angle">0</property>
                        </widget>
                        <packing>
                          <property name="left_attach">1</property>
@@ -358,6 +392,10 @@ This dialog will assist you in the creation of a custom gLabels template.</prope
                      <property name="yalign">0.5</property>
                      <property name="xpad">0</property>
                      <property name="ypad">0</property>
+                     <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                     <property name="width_chars">-1</property>
+                     <property name="single_line_mode">False</property>
+                     <property name="angle">0</property>
                    </widget>
                    <packing>
                      <property name="padding">0</property>
@@ -388,6 +426,10 @@ This dialog will assist you in the creation of a custom gLabels template.</prope
                          <property name="yalign">0.5</property>
                          <property name="xpad">0</property>
                          <property name="ypad">0</property>
+                         <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                         <property name="width_chars">-1</property>
+                         <property name="single_line_mode">False</property>
+                         <property name="angle">0</property>
                        </widget>
                        <packing>
                          <property name="left_attach">0</property>
@@ -412,6 +454,10 @@ This dialog will assist you in the creation of a custom gLabels template.</prope
                          <property name="yalign">0.5</property>
                          <property name="xpad">0</property>
                          <property name="ypad">0</property>
+                         <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                         <property name="width_chars">-1</property>
+                         <property name="single_line_mode">False</property>
+                         <property name="angle">0</property>
                        </widget>
                        <packing>
                          <property name="left_attach">0</property>
@@ -436,6 +482,10 @@ This dialog will assist you in the creation of a custom gLabels template.</prope
                          <property name="yalign">0.5</property>
                          <property name="xpad">0</property>
                          <property name="ypad">0</property>
+                         <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                         <property name="width_chars">-1</property>
+                         <property name="single_line_mode">False</property>
+                         <property name="angle">0</property>
                        </widget>
                        <packing>
                          <property name="left_attach">0</property>
@@ -454,34 +504,10 @@ This dialog will assist you in the creation of a custom gLabels template.</prope
                          <property name="spacing">0</property>
 
                          <child>
-                           <widget class="GtkCombo" id="pg_size_combo">
+                           <widget class="GtkComboBox" id="pg_size_combo">
                              <property name="visible">True</property>
-                             <property name="value_in_list">False</property>
-                             <property name="allow_empty">True</property>
-                             <property name="case_sensitive">False</property>
-                             <property name="enable_arrow_keys">True</property>
-                             <property name="enable_arrows_always">False</property>
-
-                             <child internal-child="entry">
-                               <widget class="GtkEntry" id="pg_size_entry">
-                                 <property name="visible">True</property>
-                                 <property name="can_focus">True</property>
-                                 <property name="editable">False</property>
-                                 <property name="visibility">True</property>
-                                 <property name="max_length">0</property>
-                                 <property name="text" translatable="yes"></property>
-                                 <property name="has_frame">True</property>
-                                 <property name="invisible_char" translatable="yes">*</property>
-                                 <property name="activates_default">False</property>
-                               </widget>
-                             </child>
-
-                             <child internal-child="list">
-                               <widget class="GtkList" id="combo-list1">
-                                 <property name="visible">True</property>
-                                 <property name="selection_mode">GTK_SELECTION_BROWSE</property>
-                               </widget>
-                             </child>
+                             <property name="add_tearoffs">False</property>
+                             <property name="focus_on_click">True</property>
                            </widget>
                            <packing>
                              <property name="padding">0</property>
@@ -513,7 +539,7 @@ This dialog will assist you in the creation of a custom gLabels template.</prope
                            <widget class="GtkSpinButton" id="pg_w_spin">
                              <property name="visible">True</property>
                              <property name="can_focus">True</property>
-                             <property name="climb_rate">0.01</property>
+                             <property name="climb_rate">0.00999999977648</property>
                              <property name="digits">0</property>
                              <property name="numeric">False</property>
                              <property name="update_policy">GTK_UPDATE_ALWAYS</property>
@@ -541,6 +567,10 @@ This dialog will assist you in the creation of a custom gLabels template.</prope
                              <property name="yalign">0.5</property>
                              <property name="xpad">0</property>
                              <property name="ypad">0</property>
+                             <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                             <property name="width_chars">-1</property>
+                             <property name="single_line_mode">False</property>
+                             <property name="angle">0</property>
                            </widget>
                            <packing>
                              <property name="padding">0</property>
@@ -569,7 +599,7 @@ This dialog will assist you in the creation of a custom gLabels template.</prope
                            <widget class="GtkSpinButton" id="pg_h_spin">
                              <property name="visible">True</property>
                              <property name="can_focus">True</property>
-                             <property name="climb_rate">0.01</property>
+                             <property name="climb_rate">0.00999999977648</property>
                              <property name="digits">0</property>
                              <property name="numeric">False</property>
                              <property name="update_policy">GTK_UPDATE_ALWAYS</property>
@@ -597,6 +627,10 @@ This dialog will assist you in the creation of a custom gLabels template.</prope
                              <property name="yalign">0.5</property>
                              <property name="xpad">0</property>
                              <property name="ypad">0</property>
+                             <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                             <property name="width_chars">-1</property>
+                             <property name="single_line_mode">False</property>
+                             <property name="angle">0</property>
                            </widget>
                            <packing>
                              <property name="padding">0</property>
@@ -664,6 +698,10 @@ This dialog will assist you in the creation of a custom gLabels template.</prope
                      <property name="yalign">0.5</property>
                      <property name="xpad">0</property>
                      <property name="ypad">0</property>
+                     <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                     <property name="width_chars">-1</property>
+                     <property name="single_line_mode">False</property>
+                     <property name="angle">0</property>
                    </widget>
                    <packing>
                      <property name="padding">0</property>
@@ -685,6 +723,7 @@ This dialog will assist you in the creation of a custom gLabels template.</prope
                          <property name="label" translatable="yes">Rectangular or square (can have rounded corners)</property>
                          <property name="use_underline">True</property>
                          <property name="relief">GTK_RELIEF_NORMAL</property>
+                         <property name="focus_on_click">True</property>
                          <property name="active">False</property>
                          <property name="inconsistent">False</property>
                          <property name="draw_indicator">True</property>
@@ -703,6 +742,7 @@ This dialog will assist you in the creation of a custom gLabels template.</prope
                          <property name="label" translatable="yes">Round</property>
                          <property name="use_underline">True</property>
                          <property name="relief">GTK_RELIEF_NORMAL</property>
+                         <property name="focus_on_click">True</property>
                          <property name="active">False</property>
                          <property name="inconsistent">False</property>
                          <property name="draw_indicator">True</property>
@@ -722,6 +762,7 @@ This dialog will assist you in the creation of a custom gLabels template.</prope
                          <property name="label" translatable="yes">CD/DVD (including credit card CDs)</property>
                          <property name="use_underline">True</property>
                          <property name="relief">GTK_RELIEF_NORMAL</property>
+                         <property name="focus_on_click">True</property>
                          <property name="active">False</property>
                          <property name="inconsistent">False</property>
                          <property name="draw_indicator">True</property>
@@ -783,6 +824,10 @@ This dialog will assist you in the creation of a custom gLabels template.</prope
                      <property name="yalign">0.5</property>
                      <property name="xpad">0</property>
                      <property name="ypad">0</property>
+                     <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                     <property name="width_chars">-1</property>
+                     <property name="single_line_mode">False</property>
+                     <property name="angle">0</property>
                    </widget>
                    <packing>
                      <property name="padding">0</property>
@@ -819,6 +864,10 @@ This dialog will assist you in the creation of a custom gLabels template.</prope
                              <property name="yalign">0.5</property>
                              <property name="xpad">0</property>
                              <property name="ypad">0</property>
+                             <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                             <property name="width_chars">-1</property>
+                             <property name="single_line_mode">False</property>
+                             <property name="angle">0</property>
                            </widget>
                            <packing>
                              <property name="left_attach">0</property>
@@ -843,6 +892,10 @@ This dialog will assist you in the creation of a custom gLabels template.</prope
                              <property name="yalign">0.5</property>
                              <property name="xpad">0</property>
                              <property name="ypad">0</property>
+                             <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                             <property name="width_chars">-1</property>
+                             <property name="single_line_mode">False</property>
+                             <property name="angle">0</property>
                            </widget>
                            <packing>
                              <property name="left_attach">0</property>
@@ -867,6 +920,10 @@ This dialog will assist you in the creation of a custom gLabels template.</prope
                              <property name="yalign">0.5</property>
                              <property name="xpad">0</property>
                              <property name="ypad">0</property>
+                             <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                             <property name="width_chars">-1</property>
+                             <property name="single_line_mode">False</property>
+                             <property name="angle">0</property>
                            </widget>
                            <packing>
                              <property name="left_attach">0</property>
@@ -891,6 +948,10 @@ This dialog will assist you in the creation of a custom gLabels template.</prope
                              <property name="yalign">0.5</property>
                              <property name="xpad">0</property>
                              <property name="ypad">0</property>
+                             <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                             <property name="width_chars">-1</property>
+                             <property name="single_line_mode">False</property>
+                             <property name="angle">0</property>
                            </widget>
                            <packing>
                              <property name="left_attach">0</property>
@@ -915,6 +976,10 @@ This dialog will assist you in the creation of a custom gLabels template.</prope
                              <property name="yalign">0.5</property>
                              <property name="xpad">0</property>
                              <property name="ypad">0</property>
+                             <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                             <property name="width_chars">-1</property>
+                             <property name="single_line_mode">False</property>
+                             <property name="angle">0</property>
                            </widget>
                            <packing>
                              <property name="left_attach">2</property>
@@ -939,6 +1004,10 @@ This dialog will assist you in the creation of a custom gLabels template.</prope
                              <property name="yalign">0.5</property>
                              <property name="xpad">0</property>
                              <property name="ypad">0</property>
+                             <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                             <property name="width_chars">-1</property>
+                             <property name="single_line_mode">False</property>
+                             <property name="angle">0</property>
                            </widget>
                            <packing>
                              <property name="left_attach">2</property>
@@ -963,6 +1032,10 @@ This dialog will assist you in the creation of a custom gLabels template.</prope
                              <property name="yalign">0.5</property>
                              <property name="xpad">0</property>
                              <property name="ypad">0</property>
+                             <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                             <property name="width_chars">-1</property>
+                             <property name="single_line_mode">False</property>
+                             <property name="angle">0</property>
                            </widget>
                            <packing>
                              <property name="left_attach">2</property>
@@ -987,6 +1060,10 @@ This dialog will assist you in the creation of a custom gLabels template.</prope
                              <property name="yalign">0.5</property>
                              <property name="xpad">0</property>
                              <property name="ypad">0</property>
+                             <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                             <property name="width_chars">-1</property>
+                             <property name="single_line_mode">False</property>
+                             <property name="angle">0</property>
                            </widget>
                            <packing>
                              <property name="left_attach">2</property>
@@ -1002,7 +1079,7 @@ This dialog will assist you in the creation of a custom gLabels template.</prope
                            <widget class="GtkSpinButton" id="rect_w_spin">
                              <property name="visible">True</property>
                              <property name="can_focus">True</property>
-                             <property name="climb_rate">0.01</property>
+                             <property name="climb_rate">0.00999999977648</property>
                              <property name="digits">0</property>
                              <property name="numeric">False</property>
                              <property name="update_policy">GTK_UPDATE_ALWAYS</property>
@@ -1023,7 +1100,7 @@ This dialog will assist you in the creation of a custom gLabels template.</prope
                            <widget class="GtkSpinButton" id="rect_h_spin">
                              <property name="visible">True</property>
                              <property name="can_focus">True</property>
-                             <property name="climb_rate">0.01</property>
+                             <property name="climb_rate">0.00999999977648</property>
                              <property name="digits">0</property>
                              <property name="numeric">False</property>
                              <property name="update_policy">GTK_UPDATE_ALWAYS</property>
@@ -1044,7 +1121,7 @@ This dialog will assist you in the creation of a custom gLabels template.</prope
                            <widget class="GtkSpinButton" id="rect_r_spin">
                              <property name="visible">True</property>
                              <property name="can_focus">True</property>
-                             <property name="climb_rate">0.01</property>
+                             <property name="climb_rate">0.00999999977648</property>
                              <property name="digits">0</property>
                              <property name="numeric">False</property>
                              <property name="update_policy">GTK_UPDATE_ALWAYS</property>
@@ -1065,7 +1142,7 @@ This dialog will assist you in the creation of a custom gLabels template.</prope
                            <widget class="GtkSpinButton" id="rect_x_waste_spin">
                              <property name="visible">True</property>
                              <property name="can_focus">True</property>
-                             <property name="climb_rate">0.01</property>
+                             <property name="climb_rate">0.00999999977648</property>
                              <property name="digits">0</property>
                              <property name="numeric">False</property>
                              <property name="update_policy">GTK_UPDATE_ALWAYS</property>
@@ -1095,6 +1172,10 @@ This dialog will assist you in the creation of a custom gLabels template.</prope
                              <property name="yalign">0.5</property>
                              <property name="xpad">0</property>
                              <property name="ypad">0</property>
+                             <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                             <property name="width_chars">-1</property>
+                             <property name="single_line_mode">False</property>
+                             <property name="angle">0</property>
                            </widget>
                            <packing>
                              <property name="left_attach">0</property>
@@ -1110,7 +1191,7 @@ This dialog will assist you in the creation of a custom gLabels template.</prope
                            <widget class="GtkSpinButton" id="rect_margin_spin">
                              <property name="visible">True</property>
                              <property name="can_focus">True</property>
-                             <property name="climb_rate">0.01</property>
+                             <property name="climb_rate">0.00999999977648</property>
                              <property name="digits">0</property>
                              <property name="numeric">False</property>
                              <property name="update_policy">GTK_UPDATE_ALWAYS</property>
@@ -1140,6 +1221,10 @@ This dialog will assist you in the creation of a custom gLabels template.</prope
                              <property name="yalign">0.5</property>
                              <property name="xpad">0</property>
                              <property name="ypad">0</property>
+                             <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                             <property name="width_chars">-1</property>
+                             <property name="single_line_mode">False</property>
+                             <property name="angle">0</property>
                            </widget>
                            <packing>
                              <property name="left_attach">2</property>
@@ -1155,7 +1240,7 @@ This dialog will assist you in the creation of a custom gLabels template.</prope
                            <widget class="GtkSpinButton" id="rect_y_waste_spin">
                              <property name="visible">True</property>
                              <property name="can_focus">True</property>
-                             <property name="climb_rate">0.01</property>
+                             <property name="climb_rate">0.00999999977648</property>
                              <property name="digits">0</property>
                              <property name="numeric">False</property>
                              <property name="update_policy">GTK_UPDATE_ALWAYS</property>
@@ -1185,6 +1270,10 @@ This dialog will assist you in the creation of a custom gLabels template.</prope
                              <property name="yalign">0.5</property>
                              <property name="xpad">0</property>
                              <property name="ypad">0</property>
+                             <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                             <property name="width_chars">-1</property>
+                             <property name="single_line_mode">False</property>
+                             <property name="angle">0</property>
                            </widget>
                            <packing>
                              <property name="left_attach">2</property>
@@ -1209,6 +1298,10 @@ This dialog will assist you in the creation of a custom gLabels template.</prope
                              <property name="yalign">0.5</property>
                              <property name="xpad">0</property>
                              <property name="ypad">0</property>
+                             <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                             <property name="width_chars">-1</property>
+                             <property name="single_line_mode">False</property>
+                             <property name="angle">0</property>
                            </widget>
                            <packing>
                              <property name="left_attach">0</property>
@@ -1291,6 +1384,10 @@ This dialog will assist you in the creation of a custom gLabels template.</prope
                      <property name="yalign">0.5</property>
                      <property name="xpad">0</property>
                      <property name="ypad">0</property>
+                     <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                     <property name="width_chars">-1</property>
+                     <property name="single_line_mode">False</property>
+                     <property name="angle">0</property>
                    </widget>
                    <packing>
                      <property name="padding">0</property>
@@ -1327,6 +1424,10 @@ This dialog will assist you in the creation of a custom gLabels template.</prope
                              <property name="yalign">0.5</property>
                              <property name="xpad">0</property>
                              <property name="ypad">0</property>
+                             <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                             <property name="width_chars">-1</property>
+                             <property name="single_line_mode">False</property>
+                             <property name="angle">0</property>
                            </widget>
                            <packing>
                              <property name="left_attach">0</property>
@@ -1351,6 +1452,10 @@ This dialog will assist you in the creation of a custom gLabels template.</prope
                              <property name="yalign">0.5</property>
                              <property name="xpad">0</property>
                              <property name="ypad">0</property>
+                             <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                             <property name="width_chars">-1</property>
+                             <property name="single_line_mode">False</property>
+                             <property name="angle">0</property>
                            </widget>
                            <packing>
                              <property name="left_attach">0</property>
@@ -1366,7 +1471,7 @@ This dialog will assist you in the creation of a custom gLabels template.</prope
                            <widget class="GtkSpinButton" id="round_r_spin">
                              <property name="visible">True</property>
                              <property name="can_focus">True</property>
-                             <property name="climb_rate">0.01</property>
+                             <property name="climb_rate">0.00999999977648</property>
                              <property name="digits">0</property>
                              <property name="numeric">False</property>
                              <property name="update_policy">GTK_UPDATE_ALWAYS</property>
@@ -1387,7 +1492,7 @@ This dialog will assist you in the creation of a custom gLabels template.</prope
                            <widget class="GtkSpinButton" id="round_waste_spin">
                              <property name="visible">True</property>
                              <property name="can_focus">True</property>
-                             <property name="climb_rate">0.01</property>
+                             <property name="climb_rate">0.00999999977648</property>
                              <property name="digits">0</property>
                              <property name="numeric">False</property>
                              <property name="update_policy">GTK_UPDATE_ALWAYS</property>
@@ -1417,6 +1522,10 @@ This dialog will assist you in the creation of a custom gLabels template.</prope
                              <property name="yalign">0.5</property>
                              <property name="xpad">0</property>
                              <property name="ypad">0</property>
+                             <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                             <property name="width_chars">-1</property>
+                             <property name="single_line_mode">False</property>
+                             <property name="angle">0</property>
                            </widget>
                            <packing>
                              <property name="left_attach">2</property>
@@ -1441,6 +1550,10 @@ This dialog will assist you in the creation of a custom gLabels template.</prope
                              <property name="yalign">0.5</property>
                              <property name="xpad">0</property>
                              <property name="ypad">0</property>
+                             <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                             <property name="width_chars">-1</property>
+                             <property name="single_line_mode">False</property>
+                             <property name="angle">0</property>
                            </widget>
                            <packing>
                              <property name="left_attach">2</property>
@@ -1465,6 +1578,10 @@ This dialog will assist you in the creation of a custom gLabels template.</prope
                              <property name="yalign">0.5</property>
                              <property name="xpad">0</property>
                              <property name="ypad">0</property>
+                             <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                             <property name="width_chars">-1</property>
+                             <property name="single_line_mode">False</property>
+                             <property name="angle">0</property>
                            </widget>
                            <packing>
                              <property name="left_attach">0</property>
@@ -1489,6 +1606,10 @@ This dialog will assist you in the creation of a custom gLabels template.</prope
                              <property name="yalign">0.5</property>
                              <property name="xpad">0</property>
                              <property name="ypad">0</property>
+                             <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                             <property name="width_chars">-1</property>
+                             <property name="single_line_mode">False</property>
+                             <property name="angle">0</property>
                            </widget>
                            <packing>
                              <property name="left_attach">2</property>
@@ -1504,7 +1625,7 @@ This dialog will assist you in the creation of a custom gLabels template.</prope
                            <widget class="GtkSpinButton" id="round_margin_spin">
                              <property name="visible">True</property>
                              <property name="can_focus">True</property>
-                             <property name="climb_rate">0.01</property>
+                             <property name="climb_rate">0.00999999977648</property>
                              <property name="digits">0</property>
                              <property name="numeric">False</property>
                              <property name="update_policy">GTK_UPDATE_ALWAYS</property>
@@ -1592,6 +1713,10 @@ This dialog will assist you in the creation of a custom gLabels template.</prope
                      <property name="yalign">0.5</property>
                      <property name="xpad">0</property>
                      <property name="ypad">0</property>
+                     <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                     <property name="width_chars">-1</property>
+                     <property name="single_line_mode">False</property>
+                     <property name="angle">0</property>
                    </widget>
                    <packing>
                      <property name="padding">0</property>
@@ -1628,6 +1753,10 @@ This dialog will assist you in the creation of a custom gLabels template.</prope
                              <property name="yalign">0.5</property>
                              <property name="xpad">0</property>
                              <property name="ypad">0</property>
+                             <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                             <property name="width_chars">-1</property>
+                             <property name="single_line_mode">False</property>
+                             <property name="angle">0</property>
                            </widget>
                            <packing>
                              <property name="left_attach">0</property>
@@ -1652,6 +1781,10 @@ This dialog will assist you in the creation of a custom gLabels template.</prope
                              <property name="yalign">0.5</property>
                              <property name="xpad">0</property>
                              <property name="ypad">0</property>
+                             <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                             <property name="width_chars">-1</property>
+                             <property name="single_line_mode">False</property>
+                             <property name="angle">0</property>
                            </widget>
                            <packing>
                              <property name="left_attach">0</property>
@@ -1676,6 +1809,10 @@ This dialog will assist you in the creation of a custom gLabels template.</prope
                              <property name="yalign">0.5</property>
                              <property name="xpad">0</property>
                              <property name="ypad">0</property>
+                             <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                             <property name="width_chars">-1</property>
+                             <property name="single_line_mode">False</property>
+                             <property name="angle">0</property>
                            </widget>
                            <packing>
                              <property name="left_attach">0</property>
@@ -1700,6 +1837,10 @@ This dialog will assist you in the creation of a custom gLabels template.</prope
                              <property name="yalign">0.5</property>
                              <property name="xpad">0</property>
                              <property name="ypad">0</property>
+                             <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                             <property name="width_chars">-1</property>
+                             <property name="single_line_mode">False</property>
+                             <property name="angle">0</property>
                            </widget>
                            <packing>
                              <property name="left_attach">0</property>
@@ -1724,6 +1865,10 @@ This dialog will assist you in the creation of a custom gLabels template.</prope
                              <property name="yalign">0.5</property>
                              <property name="xpad">0</property>
                              <property name="ypad">0</property>
+                             <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                             <property name="width_chars">-1</property>
+                             <property name="single_line_mode">False</property>
+                             <property name="angle">0</property>
                            </widget>
                            <packing>
                              <property name="left_attach">0</property>
@@ -1739,7 +1884,7 @@ This dialog will assist you in the creation of a custom gLabels template.</prope
                            <widget class="GtkSpinButton" id="cd_radius_spin">
                              <property name="visible">True</property>
                              <property name="can_focus">True</property>
-                             <property name="climb_rate">0.01</property>
+                             <property name="climb_rate">0.00999999977648</property>
                              <property name="digits">0</property>
                              <property name="numeric">False</property>
                              <property name="update_policy">GTK_UPDATE_ALWAYS</property>
@@ -1760,7 +1905,7 @@ This dialog will assist you in the creation of a custom gLabels template.</prope
                            <widget class="GtkSpinButton" id="cd_hole_spin">
                              <property name="visible">True</property>
                              <property name="can_focus">True</property>
-                             <property name="climb_rate">0.01</property>
+                             <property name="climb_rate">0.00999999977648</property>
                              <property name="digits">0</property>
                              <property name="numeric">False</property>
                              <property name="update_policy">GTK_UPDATE_ALWAYS</property>
@@ -1781,7 +1926,7 @@ This dialog will assist you in the creation of a custom gLabels template.</prope
                            <widget class="GtkSpinButton" id="cd_w_spin">
                              <property name="visible">True</property>
                              <property name="can_focus">True</property>
-                             <property name="climb_rate">0.01</property>
+                             <property name="climb_rate">0.00999999977648</property>
                              <property name="digits">0</property>
                              <property name="numeric">False</property>
                              <property name="update_policy">GTK_UPDATE_ALWAYS</property>
@@ -1802,7 +1947,7 @@ This dialog will assist you in the creation of a custom gLabels template.</prope
                            <widget class="GtkSpinButton" id="cd_h_spin">
                              <property name="visible">True</property>
                              <property name="can_focus">True</property>
-                             <property name="climb_rate">0.01</property>
+                             <property name="climb_rate">0.00999999977648</property>
                              <property name="digits">0</property>
                              <property name="numeric">False</property>
                              <property name="update_policy">GTK_UPDATE_ALWAYS</property>
@@ -1823,7 +1968,7 @@ This dialog will assist you in the creation of a custom gLabels template.</prope
                            <widget class="GtkSpinButton" id="cd_waste_spin">
                              <property name="visible">True</property>
                              <property name="can_focus">True</property>
-                             <property name="climb_rate">0.01</property>
+                             <property name="climb_rate">0.00999999977648</property>
                              <property name="digits">0</property>
                              <property name="numeric">False</property>
                              <property name="update_policy">GTK_UPDATE_ALWAYS</property>
@@ -1853,6 +1998,10 @@ This dialog will assist you in the creation of a custom gLabels template.</prope
                              <property name="yalign">0.5</property>
                              <property name="xpad">0</property>
                              <property name="ypad">0</property>
+                             <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                             <property name="width_chars">-1</property>
+                             <property name="single_line_mode">False</property>
+                             <property name="angle">0</property>
                            </widget>
                            <packing>
                              <property name="left_attach">2</property>
@@ -1877,6 +2026,10 @@ This dialog will assist you in the creation of a custom gLabels template.</prope
                              <property name="yalign">0.5</property>
                              <property name="xpad">0</property>
                              <property name="ypad">0</property>
+                             <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                             <property name="width_chars">-1</property>
+                             <property name="single_line_mode">False</property>
+                             <property name="angle">0</property>
                            </widget>
                            <packing>
                              <property name="left_attach">2</property>
@@ -1901,6 +2054,10 @@ This dialog will assist you in the creation of a custom gLabels template.</prope
                              <property name="yalign">0.5</property>
                              <property name="xpad">0</property>
                              <property name="ypad">0</property>
+                             <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                             <property name="width_chars">-1</property>
+                             <property name="single_line_mode">False</property>
+                             <property name="angle">0</property>
                            </widget>
                            <packing>
                              <property name="left_attach">2</property>
@@ -1925,6 +2082,10 @@ This dialog will assist you in the creation of a custom gLabels template.</prope
                              <property name="yalign">0.5</property>
                              <property name="xpad">0</property>
                              <property name="ypad">0</property>
+                             <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                             <property name="width_chars">-1</property>
+                             <property name="single_line_mode">False</property>
+                             <property name="angle">0</property>
                            </widget>
                            <packing>
                              <property name="left_attach">2</property>
@@ -1949,6 +2110,10 @@ This dialog will assist you in the creation of a custom gLabels template.</prope
                              <property name="yalign">0.5</property>
                              <property name="xpad">0</property>
                              <property name="ypad">0</property>
+                             <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                             <property name="width_chars">-1</property>
+                             <property name="single_line_mode">False</property>
+                             <property name="angle">0</property>
                            </widget>
                            <packing>
                              <property name="left_attach">2</property>
@@ -1973,6 +2138,10 @@ This dialog will assist you in the creation of a custom gLabels template.</prope
                              <property name="yalign">0.5</property>
                              <property name="xpad">0</property>
                              <property name="ypad">0</property>
+                             <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                             <property name="width_chars">-1</property>
+                             <property name="single_line_mode">False</property>
+                             <property name="angle">0</property>
                            </widget>
                            <packing>
                              <property name="left_attach">0</property>
@@ -1997,6 +2166,10 @@ This dialog will assist you in the creation of a custom gLabels template.</prope
                              <property name="yalign">0.5</property>
                              <property name="xpad">0</property>
                              <property name="ypad">0</property>
+                             <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                             <property name="width_chars">-1</property>
+                             <property name="single_line_mode">False</property>
+                             <property name="angle">0</property>
                            </widget>
                            <packing>
                              <property name="left_attach">2</property>
@@ -2012,7 +2185,7 @@ This dialog will assist you in the creation of a custom gLabels template.</prope
                            <widget class="GtkSpinButton" id="cd_margin_spin">
                              <property name="visible">True</property>
                              <property name="can_focus">True</property>
-                             <property name="climb_rate">0.01</property>
+                             <property name="climb_rate">0.00999999977648</property>
                              <property name="digits">0</property>
                              <property name="numeric">False</property>
                              <property name="update_policy">GTK_UPDATE_ALWAYS</property>
@@ -2104,6 +2277,10 @@ The second example illustrates when two layouts are needed.</property>
                      <property name="yalign">0.5</property>
                      <property name="xpad">0</property>
                      <property name="ypad">0</property>
+                     <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                     <property name="width_chars">-1</property>
+                     <property name="single_line_mode">False</property>
+                     <property name="angle">0</property>
                    </widget>
                    <packing>
                      <property name="padding">0</property>
@@ -2153,6 +2330,10 @@ one layout.</property>
                              <property name="yalign">0.5</property>
                              <property name="xpad">0</property>
                              <property name="ypad">0</property>
+                             <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                             <property name="width_chars">-1</property>
+                             <property name="single_line_mode">False</property>
+                             <property name="angle">0</property>
                            </widget>
                            <packing>
                              <property name="padding">0</property>
@@ -2203,6 +2384,10 @@ two layouts.</property>
                              <property name="yalign">0.5</property>
                              <property name="xpad">0</property>
                              <property name="ypad">0</property>
+                             <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                             <property name="width_chars">-1</property>
+                             <property name="single_line_mode">False</property>
+                             <property name="angle">0</property>
                            </widget>
                            <packing>
                              <property name="padding">0</property>
@@ -2244,6 +2429,10 @@ two layouts.</property>
                          <property name="yalign">0.5</property>
                          <property name="xpad">0</property>
                          <property name="ypad">0</property>
+                         <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                         <property name="width_chars">-1</property>
+                         <property name="single_line_mode">False</property>
+                         <property name="angle">0</property>
                        </widget>
                        <packing>
                          <property name="padding">0</property>
@@ -2256,7 +2445,7 @@ two layouts.</property>
                        <widget class="GtkSpinButton" id="nlayouts_spin">
                          <property name="visible">True</property>
                          <property name="can_focus">True</property>
-                         <property name="climb_rate">0.1</property>
+                         <property name="climb_rate">0.10000000149</property>
                          <property name="digits">0</property>
                          <property name="numeric">False</property>
                          <property name="update_policy">GTK_UPDATE_ALWAYS</property>
@@ -2320,6 +2509,10 @@ two layouts.</property>
                      <property name="yalign">0.5</property>
                      <property name="xpad">0</property>
                      <property name="ypad">0</property>
+                     <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                     <property name="width_chars">-1</property>
+                     <property name="single_line_mode">False</property>
+                     <property name="angle">0</property>
                    </widget>
                    <packing>
                      <property name="padding">0</property>
@@ -2356,6 +2549,10 @@ two layouts.</property>
                              <property name="yalign">0.5</property>
                              <property name="xpad">0</property>
                              <property name="ypad">0</property>
+                             <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                             <property name="width_chars">-1</property>
+                             <property name="single_line_mode">False</property>
+                             <property name="angle">0</property>
                            </widget>
                            <packing>
                              <property name="left_attach">1</property>
@@ -2380,6 +2577,10 @@ two layouts.</property>
                              <property name="yalign">0.5</property>
                              <property name="xpad">0</property>
                              <property name="ypad">0</property>
+                             <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                             <property name="width_chars">-1</property>
+                             <property name="single_line_mode">False</property>
+                             <property name="angle">0</property>
                            </widget>
                            <packing>
                              <property name="left_attach">2</property>
@@ -2404,6 +2605,10 @@ two layouts.</property>
                              <property name="yalign">0.5</property>
                              <property name="xpad">0</property>
                              <property name="ypad">0</property>
+                             <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                             <property name="width_chars">-1</property>
+                             <property name="single_line_mode">False</property>
+                             <property name="angle">0</property>
                            </widget>
                            <packing>
                              <property name="left_attach">0</property>
@@ -2428,6 +2633,10 @@ two layouts.</property>
                              <property name="yalign">0.5</property>
                              <property name="xpad">0</property>
                              <property name="ypad">0</property>
+                             <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                             <property name="width_chars">-1</property>
+                             <property name="single_line_mode">False</property>
+                             <property name="angle">0</property>
                            </widget>
                            <packing>
                              <property name="left_attach">0</property>
@@ -2452,6 +2661,10 @@ two layouts.</property>
                              <property name="yalign">0.5</property>
                              <property name="xpad">0</property>
                              <property name="ypad">0</property>
+                             <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                             <property name="width_chars">-1</property>
+                             <property name="single_line_mode">False</property>
+                             <property name="angle">0</property>
                            </widget>
                            <packing>
                              <property name="left_attach">0</property>
@@ -2476,6 +2689,10 @@ two layouts.</property>
                              <property name="yalign">0.5</property>
                              <property name="xpad">0</property>
                              <property name="ypad">0</property>
+                             <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                             <property name="width_chars">-1</property>
+                             <property name="single_line_mode">False</property>
+                             <property name="angle">0</property>
                            </widget>
                            <packing>
                              <property name="left_attach">0</property>
@@ -2500,6 +2717,10 @@ two layouts.</property>
                              <property name="yalign">0.5</property>
                              <property name="xpad">0</property>
                              <property name="ypad">0</property>
+                             <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                             <property name="width_chars">-1</property>
+                             <property name="single_line_mode">False</property>
+                             <property name="angle">0</property>
                            </widget>
                            <packing>
                              <property name="left_attach">0</property>
@@ -2524,6 +2745,10 @@ two layouts.</property>
                              <property name="yalign">0.5</property>
                              <property name="xpad">0</property>
                              <property name="ypad">0</property>
+                             <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                             <property name="width_chars">-1</property>
+                             <property name="single_line_mode">False</property>
+                             <property name="angle">0</property>
                            </widget>
                            <packing>
                              <property name="left_attach">0</property>
@@ -2548,6 +2773,10 @@ two layouts.</property>
                              <property name="yalign">0.5</property>
                              <property name="xpad">0</property>
                              <property name="ypad">0</property>
+                             <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                             <property name="width_chars">-1</property>
+                             <property name="single_line_mode">False</property>
+                             <property name="angle">0</property>
                            </widget>
                            <packing>
                              <property name="left_attach">3</property>
@@ -2572,6 +2801,10 @@ two layouts.</property>
                              <property name="yalign">0.5</property>
                              <property name="xpad">0</property>
                              <property name="ypad">0</property>
+                             <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                             <property name="width_chars">-1</property>
+                             <property name="single_line_mode">False</property>
+                             <property name="angle">0</property>
                            </widget>
                            <packing>
                              <property name="left_attach">3</property>
@@ -2596,6 +2829,10 @@ two layouts.</property>
                              <property name="yalign">0.5</property>
                              <property name="xpad">0</property>
                              <property name="ypad">0</property>
+                             <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                             <property name="width_chars">-1</property>
+                             <property name="single_line_mode">False</property>
+                             <property name="angle">0</property>
                            </widget>
                            <packing>
                              <property name="left_attach">3</property>
@@ -2620,6 +2857,10 @@ two layouts.</property>
                              <property name="yalign">0.5</property>
                              <property name="xpad">0</property>
                              <property name="ypad">0</property>
+                             <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                             <property name="width_chars">-1</property>
+                             <property name="single_line_mode">False</property>
+                             <property name="angle">0</property>
                            </widget>
                            <packing>
                              <property name="left_attach">3</property>
@@ -2635,7 +2876,7 @@ two layouts.</property>
                            <widget class="GtkSpinButton" id="layout1_nx_spin">
                              <property name="visible">True</property>
                              <property name="can_focus">True</property>
-                             <property name="climb_rate">0.01</property>
+                             <property name="climb_rate">0.00999999977648</property>
                              <property name="digits">0</property>
                              <property name="numeric">False</property>
                              <property name="update_policy">GTK_UPDATE_ALWAYS</property>
@@ -2656,7 +2897,7 @@ two layouts.</property>
                            <widget class="GtkSpinButton" id="layout1_ny_spin">
                              <property name="visible">True</property>
                              <property name="can_focus">True</property>
-                             <property name="climb_rate">0.01</property>
+                             <property name="climb_rate">0.00999999977648</property>
                              <property name="digits">0</property>
                              <property name="numeric">False</property>
                              <property name="update_policy">GTK_UPDATE_ALWAYS</property>
@@ -2677,7 +2918,7 @@ two layouts.</property>
                            <widget class="GtkSpinButton" id="layout2_nx_spin">
                              <property name="visible">True</property>
                              <property name="can_focus">True</property>
-                             <property name="climb_rate">0.01</property>
+                             <property name="climb_rate">0.00999999977648</property>
                              <property name="digits">0</property>
                              <property name="numeric">False</property>
                              <property name="update_policy">GTK_UPDATE_ALWAYS</property>
@@ -2698,7 +2939,7 @@ two layouts.</property>
                            <widget class="GtkSpinButton" id="layout2_ny_spin">
                              <property name="visible">True</property>
                              <property name="can_focus">True</property>
-                             <property name="climb_rate">0.01</property>
+                             <property name="climb_rate">0.00999999977648</property>
                              <property name="digits">0</property>
                              <property name="numeric">False</property>
                              <property name="update_policy">GTK_UPDATE_ALWAYS</property>
@@ -2719,7 +2960,7 @@ two layouts.</property>
                            <widget class="GtkSpinButton" id="layout1_x0_spin">
                              <property name="visible">True</property>
                              <property name="can_focus">True</property>
-                             <property name="climb_rate">0.01</property>
+                             <property name="climb_rate">0.00999999977648</property>
                              <property name="digits">0</property>
                              <property name="numeric">False</property>
                              <property name="update_policy">GTK_UPDATE_ALWAYS</property>
@@ -2740,7 +2981,7 @@ two layouts.</property>
                            <widget class="GtkSpinButton" id="layout2_x0_spin">
                              <property name="visible">True</property>
                              <property name="can_focus">True</property>
-                             <property name="climb_rate">0.01</property>
+                             <property name="climb_rate">0.00999999977648</property>
                              <property name="digits">0</property>
                              <property name="numeric">False</property>
                              <property name="update_policy">GTK_UPDATE_ALWAYS</property>
@@ -2761,7 +3002,7 @@ two layouts.</property>
                            <widget class="GtkSpinButton" id="layout1_y0_spin">
                              <property name="visible">True</property>
                              <property name="can_focus">True</property>
-                             <property name="climb_rate">0.01</property>
+                             <property name="climb_rate">0.00999999977648</property>
                              <property name="digits">0</property>
                              <property name="numeric">False</property>
                              <property name="update_policy">GTK_UPDATE_ALWAYS</property>
@@ -2782,7 +3023,7 @@ two layouts.</property>
                            <widget class="GtkSpinButton" id="layout2_y0_spin">
                              <property name="visible">True</property>
                              <property name="can_focus">True</property>
-                             <property name="climb_rate">0.01</property>
+                             <property name="climb_rate">0.00999999977648</property>
                              <property name="digits">0</property>
                              <property name="numeric">False</property>
                              <property name="update_policy">GTK_UPDATE_ALWAYS</property>
@@ -2803,7 +3044,7 @@ two layouts.</property>
                            <widget class="GtkSpinButton" id="layout1_dx_spin">
                              <property name="visible">True</property>
                              <property name="can_focus">True</property>
-                             <property name="climb_rate">0.01</property>
+                             <property name="climb_rate">0.00999999977648</property>
                              <property name="digits">0</property>
                              <property name="numeric">False</property>
                              <property name="update_policy">GTK_UPDATE_ALWAYS</property>
@@ -2824,7 +3065,7 @@ two layouts.</property>
                            <widget class="GtkSpinButton" id="layout2_dx_spin">
                              <property name="visible">True</property>
                              <property name="can_focus">True</property>
-                             <property name="climb_rate">0.01</property>
+                             <property name="climb_rate">0.00999999977648</property>
                              <property name="digits">0</property>
                              <property name="numeric">False</property>
                              <property name="update_policy">GTK_UPDATE_ALWAYS</property>
@@ -2845,7 +3086,7 @@ two layouts.</property>
                            <widget class="GtkSpinButton" id="layout1_dy_spin">
                              <property name="visible">True</property>
                              <property name="can_focus">True</property>
-                             <property name="climb_rate">0.01</property>
+                             <property name="climb_rate">0.00999999977648</property>
                              <property name="digits">0</property>
                              <property name="numeric">False</property>
                              <property name="update_policy">GTK_UPDATE_ALWAYS</property>
@@ -2866,7 +3107,7 @@ two layouts.</property>
                            <widget class="GtkSpinButton" id="layout2_dy_spin">
                              <property name="visible">True</property>
                              <property name="can_focus">True</property>
-                             <property name="climb_rate">0.01</property>
+                             <property name="climb_rate">0.00999999977648</property>
                              <property name="digits">0</property>
                              <property name="numeric">False</property>
                              <property name="update_policy">GTK_UPDATE_ALWAYS</property>
@@ -2909,6 +3150,10 @@ two layouts.</property>
                              <property name="yalign">0.5</property>
                              <property name="xpad">0</property>
                              <property name="ypad">0</property>
+                             <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                             <property name="width_chars">-1</property>
+                             <property name="single_line_mode">False</property>
+                             <property name="angle">0</property>
                            </widget>
                            <packing>
                              <property name="padding">0</property>
@@ -2946,6 +3191,7 @@ two layouts.</property>
                                  <property name="label" translatable="yes">Print test sheet</property>
                                  <property name="use_underline">True</property>
                                  <property name="relief">GTK_RELIEF_NORMAL</property>
+                                 <property name="focus_on_click">True</property>
                                </widget>
                                <packing>
                                  <property name="padding">0</property>

diff --git a/glabels2/src/template-designer.c b/glabels2/src/template-designer.c
index e2740db6e4e937b85b6a172e8dcc299f14512de5..e329268002e831fdcc0d02e52770bed9a0a669fc 100644 (file)
--- a/glabels2/src/template-designer.c
+++ b/glabels2/src/template-designer.c
@@ -31,8 +31,7 @@
 #include <libgnomeui/gnome-druid-page-edge.h>
 #include <libgnomeui/gnome-druid-page-standard.h>
 #include <gtk/gtktogglebutton.h>
-#include <gtk/gtkcombo.h>
-#include <gtk/gtkentry.h>
+#include <gtk/gtkcombobox.h>
 #include <gtk/gtkspinbutton.h>
 
 #include "prefs.h"
@@ -122,7 +121,6 @@ struct _glTemplateDesignerPrivate
 
        /* Page size page controls */
        GtkWidget       *pg_size_combo;
-       GtkWidget       *pg_size_entry;
        GtkWidget       *pg_w_spin;
        GtkWidget       *pg_h_spin;
        GtkWidget       *pg_w_units_label;
@@ -508,8 +506,6 @@ construct_pg_size_page (glTemplateDesigner      *dlg,
        /* Page Size Page Widgets */
        dlg->priv->pg_size_combo =
                glade_xml_get_widget (dlg->priv->gui, "pg_size_combo");
-       dlg->priv->pg_size_entry =
-               glade_xml_get_widget (dlg->priv->gui, "pg_size_entry");
        dlg->priv->pg_w_spin =
                glade_xml_get_widget (dlg->priv->gui, "pg_w_spin");
        dlg->priv->pg_h_spin =
@@ -519,13 +515,15 @@ construct_pg_size_page (glTemplateDesigner      *dlg,
        dlg->priv->pg_h_units_label =
                glade_xml_get_widget (dlg->priv->gui, "pg_h_units_label");
 
+       gl_util_combo_box_add_text_model (GTK_COMBO_BOX (dlg->priv->pg_size_combo));
+
        /* Load page size combo */
        page_sizes = gl_paper_get_name_list ();
-       gtk_combo_set_popdown_strings (GTK_COMBO(dlg->priv->pg_size_combo), page_sizes);
+       gl_util_combo_box_set_strings (GTK_COMBO_BOX (dlg->priv->pg_size_combo), page_sizes);
        gl_paper_free_name_list (page_sizes);
        default_page_size_id = gl_prefs_get_page_size ();
        default_page_size_name = gl_paper_lookup_name_from_id (default_page_size_id);
-       gtk_entry_set_text (GTK_ENTRY(dlg->priv->pg_size_entry), default_page_size_name);
+       gl_util_combo_box_set_active_text (GTK_COMBO_BOX (dlg->priv->pg_size_combo), default_page_size_name);
        g_free (default_page_size_name);
 
        /* Apply units to spinbuttons and units labels. */
@@ -548,7 +546,7 @@ construct_pg_size_page (glTemplateDesigner      *dlg,
 
        /* Connect a handler that listens for changes in these widgets */
        /* This controls sensitivity of related widgets. */
-       g_signal_connect_swapped (G_OBJECT(dlg->priv->pg_size_entry), "changed",
+       g_signal_connect_swapped (G_OBJECT(dlg->priv->pg_size_combo), "changed",
                                  G_CALLBACK(pg_size_page_changed_cb), dlg);
 
        /* Use this same handler to prepare the page. */
@@ -1130,7 +1128,7 @@ pg_size_page_changed_cb (glTemplateDesigner *dlg)
        
 
        page_size_name =
-               gtk_editable_get_chars (GTK_EDITABLE(dlg->priv->pg_size_entry), 0, -1);
+               gtk_combo_box_get_active_text (GTK_COMBO_BOX (dlg->priv->pg_size_combo));
 
        if (page_size_name && strlen(page_size_name)) {
 
@@ -1551,7 +1549,7 @@ build_template (glTemplateDesigner      *dlg)
        desc     = gtk_editable_get_chars (GTK_EDITABLE(dlg->priv->description_entry), 0, -1);
 
        page_size_name =
-               gtk_editable_get_chars (GTK_EDITABLE(dlg->priv->pg_size_entry), 0, -1);
+               gtk_combo_box_get_active_text (GTK_COMBO_BOX (dlg->priv->pg_size_combo));
        paper = gl_paper_from_name (page_size_name);
        if ( g_strcasecmp (paper->id, "Other") == 0 ) {
                paper->width =