From 212578c380024147e3b1f79ce0ca7eb41851bd64 Mon Sep 17 00:00:00 2001
From: Jim Evins <evins@snaught.com>
Date: Tue, 22 Jan 2019 22:14:22 -0500
Subject: [PATCH] Ideal template for Dymo 30334/11345 for testing.

---
 model/PageRenderer.cpp             |  5 +----
 templates/dymo-other-templates.xml | 29 +++++++++++++++++------------
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/model/PageRenderer.cpp b/model/PageRenderer.cpp
index 9c2b702..b450ff7 100644
--- a/model/PageRenderer.cpp
+++ b/model/PageRenderer.cpp
@@ -193,10 +193,6 @@ namespace glabels
 		void PageRenderer::print( QPrinter* printer ) const
 		{
 			QSizeF pageSize( mModel->tmplate()->pageWidth().pt(), mModel->tmplate()->pageHeight().pt() );
-			if ( mModel->tmplate()->pageWidth().pt() > mModel->tmplate()->pageHeight().pt() )
-			{
-				printer->setOrientation( QPrinter::Landscape );
-			}
 			printer->setPageSize( QPageSize(pageSize, QPageSize::Point) );
 			printer->setFullPage( true );
 			printer->setPageMargins( 0, 0, 0, 0, QPrinter::Point );
@@ -207,6 +203,7 @@ namespace glabels
 			QRectF rectPts = printer->paperRect( QPrinter::Point );
 			painter.scale( rectPx.width()/rectPts.width(), rectPx.height()/rectPts.height() );
 
+
 			for ( int iPage = 0; iPage < mNPages; iPage++ )
 			{
 				if ( iPage )
diff --git a/templates/dymo-other-templates.xml b/templates/dymo-other-templates.xml
index 538b5f6..a06f1cb 100644
--- a/templates/dymo-other-templates.xml
+++ b/templates/dymo-other-templates.xml
@@ -16,6 +16,23 @@
   </Template>
 
   <Template brand="Dymo" part="99010" equiv="30252" />
+
+
+  <!-- =================================================================== -->
+  <!-- 57mm x 32mm Return address labels.                                  -->
+  <!-- =================================================================== -->
+  <Template brand="Dymo" part="30334" _description="Return address labels"
+	    size="roll" roll_width="61mm" width="57mm" height="32mm" >
+    <Meta category="label"/>
+    <Meta category="mail"/>
+    <Label-rectangle id="0" width="57mm" height="32mm" round="2mm" x_waste="0mm" y_waste="0mm">
+      <Markup-margin x_size="3mm" y_size="3mm" />
+      <Layout nx="1" ny="1" x0="0" y0="0" dx="0" dy="0"/>
+    </Label-rectangle>
+  </Template>
+  
+  <Template brand="Dymo" part="11354" equiv="30334" />
+
   
   <!-- =================================================================== -->
   <!-- Postage stamp labels.                                               -->
@@ -66,18 +83,6 @@
     </Label-rectangle>
   </Template>  
   
-  <!-- =================================================================== -->
-  <!-- Dymo 11354 Return address labels.                                   -->
-  <!-- =================================================================== -->
-  <Template brand="Dymo" part="11354" size="Other" width="32mm" height="57mm" _description="Return address labels">
-    <Meta category="label"/>
-    <Meta category="mail"/>
-    <Label-rectangle id="0" width="32mm" height="57mm" round="0pt" x_waste="0pt" y_waste="0pt">
-      <Markup-margin size="0pt"/>
-      <Layout nx="1" ny="1" x0="0pt" y0="0pt" dx="32mm" dy="57mm"/>
-    </Label-rectangle>
-  </Template>
-  
   <!-- =================================================================== -->
   <!-- Dymo 11355 Return address labels.                                   -->
   <!-- =================================================================== -->