From 25516165e852af71671d740a8d9ed003ca7846ae Mon Sep 17 00:00:00 2001
From: Jim Evins <evins@snaught.com>
Date: Tue, 15 Feb 2005 02:07:29 +0000
Subject: [PATCH] 2005-02-14  Jim Evins  <evins@snaught.com>

	* data/templates/avery-us-templates.xml:
		Updated templates to use inches instead of points.
	* src/print-dialog.c: (printer_page_new):
		Changed packing style when adding printer selector widget.  This fixes
		debian Bug#295274.


git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@504 f5e0f49d-192f-0410-a22d-a8d8700d0965
---
 glabels2/ChangeLog                            |   8 +
 .../data/templates/avery-us-templates.xml     | 214 +++++++++++-------
 glabels2/src/print-dialog.c                   |   2 +-
 3 files changed, 145 insertions(+), 79 deletions(-)

diff --git a/glabels2/ChangeLog b/glabels2/ChangeLog
index 47bcaf39..20013c6a 100644
--- a/glabels2/ChangeLog
+++ b/glabels2/ChangeLog
@@ -1,3 +1,11 @@
+2005-02-14  Jim Evins  <evins@snaught.com>
+
+	* data/templates/avery-us-templates.xml:
+		Updated templates to use inches instead of points.
+	* src/print-dialog.c: (printer_page_new):
+		Changed packing style when adding printer selector widget.  This fixes
+		debian Bug#295274.
+
 2005-02-13  Jim Evins  <evins@snaught.com>
 
 	* AUTHORS:
diff --git a/glabels2/data/templates/avery-us-templates.xml b/glabels2/data/templates/avery-us-templates.xml
index b83e1bee..4bbe4ee0 100644
--- a/glabels2/data/templates/avery-us-templates.xml
+++ b/glabels2/data/templates/avery-us-templates.xml
@@ -3,16 +3,20 @@
 
 
   <!-- ******************************************************************** -->
+  <!-- ******************************************************************** -->
+  <!--                                                                      -->
   <!-- Avery US-Letter products (and look-alikes)                           -->
+  <!--                                                                      -->
+  <!-- ******************************************************************** -->
   <!-- ******************************************************************** -->
 
   <!-- =================================================================== -->
-  <!-- Avery 5160 family: Address Labels, 1'' x 2_5/8'', 30 per sheet    * -->
+  <!-- Avery 5160 family: Address Labels, 1'' x 2_5/8'', 30 per sheet    x -->
   <!-- =================================================================== -->
   <Template name="Avery  5160" size="US-Letter" _description="Address Labels">
-    <Label-rectangle id="0" width="189" height="72" round="5">
-      <Markup-margin size="5"/>
-      <Layout nx="3" ny="10" x0="11.5" y0="36" dx="200" dy="72"/>
+    <Label-rectangle id="0" width="2.625in" height="1in" round="0.0625in">
+      <Markup-margin size="0.0625in"/>
+      <Layout nx="3" ny="10" x0="0.1875in" y0="0.5in" dx="2.75in" dy="1in"/>
     </Label-rectangle>
     <Alias name="Avery  5260"/>
     <Alias name="Avery  5510"/>
@@ -49,12 +53,12 @@
   </Template>
 
   <!-- =================================================================== -->
-  <!-- Avery 5161 family: Address Labels, 1'' x 4'', 20 per sheet        * -->
+  <!-- Avery 5161 family: Address Labels, 1'' x 4'', 20 per sheet        x -->
   <!-- =================================================================== -->
   <Template name="Avery  5161" size="US-Letter" _description="Address Labels">
-    <Label-rectangle id="0" width="288" height="72" round="5">
-      <Markup-margin size="5"/>
-      <Layout nx="2" ny="10" x0="11.5" y0="36" dx="303" dy="72"/>
+    <Label-rectangle id="0" width="4in" height="1in" round="0.0625in">
+      <Markup-margin size="0.0625in"/>
+      <Layout nx="2" ny="10" x0="0.15625in" y0="0.5in" dx="4.1875in" dy="1in"/>
     </Label-rectangle>
     <Alias name="Avery  5261"/>
     <Alias name="Avery  5961"/>
@@ -64,12 +68,13 @@
   </Template>
 
   <!-- =================================================================== -->
-  <!-- Avery 5162 family: Address Labels, 1_1/3'' x 4'', 14 per sheet    * -->
+  <!-- Avery 5162 family: Address Labels, 1_1/3'' x 4'', 14 per sheet    x -->
   <!-- =================================================================== -->
   <Template name="Avery  5162" size="US-Letter" _description="Address Labels">
-    <Label-rectangle id="0" width="288" height="96" round="5">
-      <Markup-margin size="5"/>
-      <Layout nx="2" ny="7" x0="10.5" y0="60" dx="303" dy="96"/>
+    <Label-rectangle id="0" width="4in" height="1.333333333in" round="0.0625in">
+      <Markup-margin size="0.0625in"/>
+      <Layout nx="2" ny="7"
+              x0="0.15625in" y0="0.833333333in" dx="4.1875in" dy="1.333333333in"/>
     </Label-rectangle>
     <Alias name="Avery  5262"/>
     <Alias name="Avery  5512"/>
@@ -88,23 +93,33 @@
   </Template>
 
   <!-- =================================================================== -->
-  <!-- Avery 6879 family: Address Labels, 1_1/4'' x 3_3/4'', 12 per sheet  -->
+  <!-- Avery 6879 family: Address Labels, 1_1/4'' x 3_3/4'', 12 per sheetx -->
   <!-- =================================================================== -->
   <Template name="Avery  6879" size="US-Letter" _description="Address Labels">
-    <Label-rectangle id="0" width="270" height="90" round="5" waste="5">
-      <Markup-margin size="5"/>
-      <Layout nx="2" ny="6" x0="27" y0="81" dx="288" dy="108"/>
+    <Label-rectangle id="0" width="3.75in" height="1.25in" round="0.0625in" waste="5pt">
+      <Markup-margin size="0.0625in"/>
+      <Layout nx="2" ny="6" x0="0.375in" y0="1.125in" dx="4in" dy="1.5in"/>
     </Label-rectangle>
     <Alias name="Avery  8769"/>
   </Template>
 
   <!-- =================================================================== -->
-  <!-- Avery 5163 family: Shipping Labels, 4'' x 2'', 10 per sheet       * -->
+  <!-- Avery 5159 family: Address Labels, 1_1/2'' x 4'', 14 per sheet      -->
+  <!-- =================================================================== -->
+  <Template name="Avery  5159" size="US-Letter" description="Address Labels">
+    <Label-rectangle id="0" width="4in" height="1.5in" round="0.0625in" waste="0in">
+      <Markup-margin size="0.0625in"/>
+      <Layout nx="2" ny="7" x0="0.15625in" y0="0.25in" dx="4.1875in" dy="1.5in"/>
+    </Label-rectangle>
+  </Template>
+
+  <!-- =================================================================== -->
+  <!-- Avery 5163 family: Shipping Labels, 4'' x 2'', 10 per sheet       x -->
   <!-- =================================================================== -->
   <Template name="Avery  5163" size="US-Letter" _description="Shipping Labels">
-    <Label-rectangle id="0" width="288" height="144" round="10">
-      <Markup-margin size="10"/>
-      <Layout nx="2" ny="5" x0="11.25" y0="36" dx="301.5" dy="144"/>
+    <Label-rectangle id="0" width="4in" height="2in" round="0.125in">
+      <Markup-margin size="0.125in"/>
+      <Layout nx="2" ny="5" x0="0.1625in" y0="0.5in" dx="4.1875in" dy="2in"/>
     </Label-rectangle>
     <Alias name="Avery  5263"/>
     <Alias name="Avery  5513"/>
@@ -125,12 +140,12 @@
   </Template>
 
   <!-- =================================================================== -->
-  <!-- Avery 5164 family: Shipping Labels. 4'' x 3_1/4'', 6 per sheet      -->
+  <!-- Avery 5164 family: Shipping Labels. 4'' x 3_1/3'', 6 per sheet    x -->
   <!-- =================================================================== -->
   <Template name="Avery  5164" size="US-Letter" _description="Shipping Labels">
-    <Label-rectangle id="0" width="288" height="234" round="10">
-      <Markup-margin size="5"/>
-      <Layout nx="2" ny="3" x0="13" y0="36" dx="301" dy="234"/>
+    <Label-rectangle id="0" width="4in" height="3.333333333in" round="0.125in">
+      <Markup-margin size="0.125in"/>
+      <Layout nx="2" ny="3" x0="0.15625in" y0="0.5in" dx="4.1875in" dy="3.333333333in"/>
     </Label-rectangle>
     <Alias name="Avery  5264"/>
     <Alias name="Avery  5514"/>
@@ -143,12 +158,22 @@
   </Template>
 
   <!-- =================================================================== -->
-  <!-- Avery 5167 family: Address Labels, 1_3/4'' x 1/2'', 80 per sheet  * -->
+  <!-- Avery 5168 family:  Shipping Labels 5'' x 3_1/2'', 4 per sheet      -->
+  <!-- =================================================================== -->
+  <Template name="Avery  5168" size="US-Letter" description="Shipping Labels">
+    <Label-rectangle id="0" width="3.5in" height="5in" round="0.0625in" waste="0in">
+      <Markup-margin size="0.0625in"/>
+      <Layout nx="2" ny="2" x0="0.5in" y0="0.5in" dx="4in" dy="5in"/>
+    </Label-rectangle>
+  </Template>
+
+  <!-- =================================================================== -->
+  <!-- Avery 5167 family: Address Labels, 1_3/4'' x 1/2'', 80 per sheet  x -->
   <!-- =================================================================== -->
   <Template name="Avery  5167" size="US-Letter" _description="Return Address Labels">
-    <Label-rectangle id="0" width="126" height="36" round="5">
-      <Markup-margin size="5"/>
-      <Layout nx="4" ny="20" x0="20.25" y0="36" dx="148.5" dy="36"/>
+    <Label-rectangle id="0" width="1.75in" height="0.5in" round="0.0625in">
+      <Markup-margin size="0.0625in"/>
+      <Layout nx="4" ny="20" x0="0.28125in" y0="0.5in" dx="2.0625in" dy="0.5in"/>
     </Label-rectangle>
     <Alias name="Avery  5267"/>
     <Alias name="Avery  5667"/>
@@ -166,12 +191,12 @@
   </Template>
 
   <!-- =================================================================== -->
-  <!-- Avery 5196 family: Diskette Labels, 2_3/4'' x 2_3/4'', 9 per sheet* -->
+  <!-- Avery 5196 family: Diskette Labels, 2_3/4'' x 2_3/4'', 9 per sheetx -->
   <!-- =================================================================== -->
   <Template name="Avery  5196" size="US-Letter" _description="Diskette Labels">
-    <Label-rectangle id="0" width="198" height="198" round="5">
-      <Markup-margin size="5"/>
-      <Layout nx="3" ny="3" x0="9" y0="36" dx="198" dy="216"/>
+    <Label-rectangle id="0" width="2.75in" height="2.75in" round="0.0625in">
+      <Markup-margin size="0.0625in"/>
+      <Layout nx="3" ny="3" x0="0.125in" y0="0.5in" dx="2.75in" dy="3in"/>
     </Label-rectangle>
     <Alias name="Avery  5096"/>
     <Alias name="Avery  5896"/>
@@ -181,12 +206,12 @@
   </Template>
 
   <!-- =================================================================== -->
-  <!-- Avery 6490 family: Diskette Labels, 2_11/16'' x 2'', 15 per sheet * -->
+  <!-- Avery 6490 family: Diskette Labels, 2_11/16'' x 2'', 15 per sheet x -->
   <!-- =================================================================== -->
   <Template name="Avery  6490" size="US-Letter" _description="Diskette Labels">
-    <Label-rectangle id="0" width="193.5" height="144" round="5">
-      <Markup-margin size="5"/>
-      <Layout nx="3" ny="5" x0="9.215999926" y0="36" dx="200.2679959" dy="144"/>
+    <Label-rectangle id="0" width="2.6875in" height="2in" round="0.0625in">
+      <Markup-margin size="0.0625in"/>
+      <Layout nx="3" ny="5" x0="0.125in" y0="0.5in" dx="2.78125in" dy="2in"/>
     </Label-rectangle>
     <Alias name="Avery  6501"/>
     <Alias name="Avery  6861"/>
@@ -194,15 +219,23 @@
   </Template> 
 
   <!-- =================================================================== -->
-  <!-- Avery 5366 family: Filing Labels, 2/3'' x 3_7/16'', 30 per sheet    -->
+  <!-- Avery 5366 family: Filing Labels, 2/3'' x 3_7/16'', 30 per sheet  x -->
   <!-- =================================================================== -->
   <Template name="Avery  5366" size="US-Letter" _description="Filing Labels">
-    <Label-rectangle id="0" width="252" height="48" round="5">
-      <Markup-margin size="5"/>
-      <Layout nx="2" ny="15" x0="36" y0="36" dx="288" dy="48"/>
+    <Label-rectangle id="0" width="3.4375in" height="0.666666667in" round="0.0625in">
+      <Markup-margin size="0.0625in"/>
+      <Layout nx="2" ny="15" x0="0.53125in" y0="0.5in" dx="4in" dy="0.666666667in"/>
     </Label-rectangle>
+    <Alias name="Avery  5066"/>
+    <Alias name="Avery  5166"/>
+    <Alias name="Avery  5266"/>
+    <Alias name="Avery  5268"/>
     <Alias name="Avery  5368"/>
     <Alias name="Avery  5378"/>
+    <Alias name="Avery  5666"/>
+    <Alias name="Avery  5766"/>
+    <Alias name="Avery  5866"/>
+    <Alias name="Avery  5966"/>
     <Alias name="Avery  6368"/>
     <Alias name="Avery  6466"/>
     <Alias name="Avery  6468"/>
@@ -210,17 +243,18 @@
     <Alias name="Avery  6505"/>
     <Alias name="Avery  6865"/>
     <Alias name="Avery  8066"/>
+    <Alias name="Avery  8166"/>
     <Alias name="Avery  8366"/>
     <Alias name="Avery  8478"/>
   </Template>
 
   <!-- =================================================================== -->
-  <!-- Avery 5371 family: Business Cards, 2'' x 3_1/2'', 10 per sheet    * -->
+  <!-- Avery 5371 family: Business Cards, 2'' x 3_1/2'', 10 per sheet    x -->
   <!-- =================================================================== -->
   <Template name="Avery  5371" size="US-Letter" _description="Business Cards">
-    <Label-rectangle id="0" width="252" height="144" round="0">
-      <Markup-margin size="5"/>
-      <Layout nx="2" ny="5" x0="54" y0="36" dx="252" dy="144"/>
+    <Label-rectangle id="0" width="3.5in" height="2in" round="0">
+      <Markup-margin size="0.0625in"/>
+      <Layout nx="2" ny="5" x0="0.75in" y0="0.5in" dx="3.5in" dy="2in"/>
     </Label-rectangle>
     <Alias name="Avery  5372"/>
     <Alias name="Avery  5376"/>
@@ -265,12 +299,12 @@
   </Template>
 
   <!-- =================================================================== -->
-  <!-- Avery 8373 family: Business Cards, 2'' x 3_1/2'', 8 per sheet     * -->
+  <!-- Avery 8373 family: Business Cards, 2'' x 3_1/2'', 8 per sheet     x -->
   <!-- =================================================================== -->
   <Template name="Avery  8373" size="US-Letter" _description="Business Cards">
-    <Label-rectangle id="0" width="252" height="144" round="0" waste="5">
-      <Markup-margin size="5"/>
-      <Layout nx="2" ny="4" x0="36" y0="54" dx="288" dy="180"/>
+    <Label-rectangle id="0" width="3.5in" height="2in" round="0" waste="0.0625in">
+      <Markup-margin size="0.0625in"/>
+      <Layout nx="2" ny="4" x0="0.5in" y0="0.75in" dx="4in" dy="2.5in"/>
     </Label-rectangle>
     <Alias name="Avery  3612"/>
     <Alias name="Avery  5881"/>
@@ -278,12 +312,12 @@
   </Template>
 
   <!-- =================================================================== -->
-  <!-- Avery 5395 family: Name Badge Labels, 2_1/3'' x 3_3/8'', 8 per sheet -->
+  <!-- Avery 5395 family: Name Badge Labels, 2_1/3'' x 3_3/8'', 8 per sheetx -->
   <!-- =================================================================== -->
   <Template name="Avery  5395" size="US-Letter" _description="Name Badge Labels">
-    <Label-rectangle id="0" width="235" height="168" round="15">
-      <Markup-margin size="5"/>
-      <Layout nx="2" ny="4" x0="53" y0="42" dx="272.5" dy="180.5"/>
+    <Label-rectangle id="0" width="3.375in" height="2.333333333in" round="0.1875in" waste="0.0625in">
+      <Markup-margin size="0.0625in"/>
+      <Layout nx="2" ny="4" x0="0.6875in" y0="0.583333333in" dx="3.75in" dy="2.5in"/>
     </Label-rectangle>
     <Alias name="Avery  5095"/>
     <Alias name="Avery  5895"/>
@@ -292,7 +326,7 @@
   </Template>
 
   <!-- =================================================================== -->
-  <!-- Avery 5829 family: CD/DVD Labels (face only), 2 per sheet         * -->
+  <!-- Avery 5824 family: CD/DVD Labels (face only), 2 per sheet         * -->
   <!-- =================================================================== -->
   <Template name="Avery  5824" size="US-Letter" description="CD/DVD Labels">
     <Label-cd id="0" radius="166.5pt" hole="58.5pt" waste="9pt">
@@ -302,23 +336,22 @@
   </Template>
 
   <!-- =================================================================== -->
-  <!-- Avery 5931 family: CD/DVD Labels (face only), 2 per sheet         * -->
+  <!-- Avery 5931 family: CD/DVD Labels (face only), 2 per sheet         x -->
   <!-- =================================================================== -->
   <Template name="Avery  5931-Disc" size="US-Letter"
          _description="CD/DVD Labels (Disc Labels)">
-    <Label-cd id="0" radius="166.5" hole="58.5" waste="5">
-      <Markup-margin size="5"/>
-      <Markup-line x1="0" y1="166.5" x2="108" y2="166.5"/>
-      <Markup-line x1="225" y1="166.5" x2="333" y2="166.5"/>
-      <Markup-line x1="166.5" y1="0" x2="166.5" y2="108"/>
-      <Markup-line x1="166.5" y1="225" x2="166.5" y2="333"/>
-      <Layout nx="1" ny="2" x0="139.5" y0="49.5" dx="0" dy="360"/>
+    <Label-cd id="0" radius="2.3125in" hole="0.8125in" waste="0.0625in">
+      <Markup-margin size="0.0625in"/>
+      <Markup-line x1="0" y1="2.3125in" x2="1.5in" y2="2.3125in"/>
+      <Markup-line x1="3.125in" y1="2.3125in" x2="4.625in" y2="2.3125in"/>
+      <Markup-line x1="2.3125in" y1="0" x2="2.3125in" y2="1.5in"/>
+      <Markup-line x1="2.3125in" y1="3.125in" x2="2.3125in" y2="4.625in"/>
+      <Layout nx="1" ny="2" x0="1.9375in" y0="0.6875in" dx="0" dy="5in"/>
     </Label-cd>
     <Alias name="Avery  5691-Disc"/>
     <Alias name="Avery  5692-Disc"/>
     <Alias name="Avery  5694-Disc"/>
     <Alias name="Avery  5698-Disc"/>
-    <Alias name="Avery  5931-Disc"/>
     <Alias name="Avery  6692-Disc"/>
     <Alias name="Avery  8536-Disc"/>
     <Alias name="Avery  8691-Disc"/>
@@ -338,9 +371,34 @@
   </Template>
 
   <!-- =================================================================== -->
-  <!-- Avery 5931 family: CD/DVD Labels (spine only), 4 per sheet        * -->
+  <!-- Avery 5931 family: CD/DVD Labels (spine only), 4 per sheet        x -->
   <!-- =================================================================== -->
-  <!-- TODO "Avery  5931-Spine" -->
+  <Template name="Avery 5931-Spine" size="US-Letter" 
+         _description="CD/DVD Labels (Spine Labels)">
+    <Label-rectangle id="0" width="0.21875in" height="4.6875in" round="0.0625in" waste="0.0625in">
+      <Layout nx="2" ny="2" x0="0.5in" y0="0.734375in" dx="0.46875in" dy="4.84375in"/>
+    </Label-rectangle>
+    <Alias name="Avery  5691-Spine"/>
+    <Alias name="Avery  5692-Spine"/>
+    <Alias name="Avery  5694-Spine"/>
+    <Alias name="Avery  5698-Spine"/>
+    <Alias name="Avery  6692-Spine"/>
+    <Alias name="Avery  8536-Spine"/>
+    <Alias name="Avery  8691-Spine"/>
+    <Alias name="Avery  8692-Spine"/>
+    <Alias name="Avery  8694-Spine"/>
+    <Alias name="Avery  8695-Spine"/>
+    <Alias name="Avery  8699-Spine"/>
+    <Alias name="Avery  8831-Spine"/>
+    <Alias name="Avery  8832-Spine"/>
+    <Alias name="Avery  8842-Spine"/>
+    <Alias name="Avery  8844-Spine"/>
+    <Alias name="Avery  8846-Spine"/>
+    <Alias name="Avery  8847-Spine"/>
+    <Alias name="Avery  8931-Spine"/>
+    <Alias name="Avery  8941-Spine"/>
+    <Alias name="Avery  8942-Spine"/>
+  </Template>
 
   <!-- =================================================================== -->
   <!-- Avery 5997face family: VCR Labels, 1_7/8'' x 3_1/16'', 10 per sheet -->
@@ -367,11 +425,11 @@
   </Template>
 
   <!-- =================================================================== -->
-  <!-- Avery 8165 family: Full-page label, 8_1/2'' x 11'', 1 per sheet   * -->
+  <!-- Avery 8165 family: Full-page label, 8_1/2'' x 11'', 1 per sheet   x -->
   <!-- =================================================================== -->
   <Template name="Avery  8165" size="US-Letter" _description="Full Sheet Labels">
-    <Label-rectangle id="0" width="612" height="792" round="0">
-      <Markup-margin size="5"/>
+    <Label-rectangle id="0" width="8.5in" height="11.in" round="0">
+      <Markup-margin size="0.0625in"/>
       <Layout nx="1" ny="1" x0="0" y0="0" dx="0" dy="0"/>
     </Label-rectangle>
     <Alias name="Avery  3114"/>
@@ -424,35 +482,35 @@
   </Template>
 
   <!-- =================================================================== -->
-  <!-- Avery 3274.1 family: Square stickers, 2_1/2'' x 2_1/2, 9 per sheet  -->
+  <!-- Avery 3274.1 family: Square stickers, 2_1/2'' x 2_1/2, 9 per sheetx  -->
   <!-- =================================================================== -->
   <Template name="Avery  3274.1" size="US-Letter" _description="Square Labels">
-    <Label-rectangle id="0" width="180" height="180" round="0">
-      <Markup-margin size="5"/>
-      <Layout nx="3" ny="3" x0="22.5" y0="90" dx="193.5" dy="216"/>
+    <Label-rectangle id="0" width="2.5in" height="2.5in" round="0">
+      <Markup-margin size="0.0625in"/>
+      <Layout nx="3" ny="3" x0="0.3125in" y0="1.25in" dx="2.6875in" dy="3in"/>
     </Label-rectangle>
     <Alias name="Avery  3111"/>
   </Template>
 
   <!-- =================================================================== -->
-  <!-- Avery 3274.2 family: Small round stickers, 1_1/2'', 20 per sheet    -->
+  <!-- Avery 3274.2 family: Small round stickers, 1_1/2'', 20 per sheet  x -->
   <!-- =================================================================== -->
   <Template name="Avery  3274.2" size="US-Letter" _description="Small Round Labels">
-    <Label-round id="0" radius="54">
-      <Markup-margin size="5"/>
-      <Layout nx="4" ny="5" x0="36" y0="54" dx="144" dy="144"/>
+    <Label-round id="0" radius="0.75in">
+      <Markup-margin size="0.0625in"/>
+      <Layout nx="4" ny="5" x0="0.5in" y0="0.75in" dx="2in" dy="2in"/>
     </Label-round>
     <Alias name="Avery  3112"/>
     <Alias name="Avery  8293"/>
   </Template>
 
   <!-- =================================================================== -->
-  <!-- Avery 3274.3 family: Large round stickers, 2_1/2'', 9 per sheet     -->
+  <!-- Avery 3274.3 family: Large round stickers, 2_1/2'', 9 per sheet   x -->
   <!-- =================================================================== -->
   <Template name="Avery  3274.3" size="US-Letter" _description="Large Round Labels">
-    <Label-round id="0" radius="90">
+    <Label-round id="0" radius="1.25in">
       <Markup-margin size="5"/>
-      <Layout nx="3" ny="3" x0="22.5" y0="90" dx="193.5" dy="216"/>
+      <Layout nx="3" ny="3" x0="0.3125in" y0="1.25in" dx="2.6875in" dy="3in"/>
     </Label-round>
   </Template>
 
diff --git a/glabels2/src/print-dialog.c b/glabels2/src/print-dialog.c
index 7fd5307f..62fbf0d0 100644
--- a/glabels2/src/print-dialog.c
+++ b/glabels2/src/print-dialog.c
@@ -378,7 +378,7 @@ printer_page_new (glPrintDialog *dialog,
 	dialog->priv->printer_select =
 		gnome_printer_selector_new (gnome_print_config_default ());
 	gtk_widget_show (dialog->priv->printer_select);
-	gl_hig_vbox_add_widget (GL_HIG_VBOX(vbox), dialog->priv->printer_select);
+	gtk_box_pack_start (GTK_BOX(vbox), dialog->priv->printer_select, TRUE, TRUE, 0);
 
 	return vbox;
 }
-- 
2.39.5