page size also for print mode

mhugent · mhugent · commit 8ee164d40f6b · 2009-11-13T20:05:18.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@12102 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/app/composer/qgscomposer.cpp b/src/app/composer/qgscomposer.cpp
@@ -453,7 +453,6 @@ void QgsComposer::on_mActionExportAsPDF_triggered()
 void QgsComposer::on_mActionPrint_triggered()
 {
   QPrinter printer;
-  //portrait or landscape
   if ( mComposition )
   {
     if ( mComposition->paperWidth() >= mComposition->paperHeight() )
@@ -465,10 +464,12 @@ void QgsComposer::on_mActionPrint_triggered()
       printer.setOrientation( QPrinter::Portrait );
     }
   }
+  printer.setPaperSize( QSizeF( mComposition->paperWidth(), mComposition->paperHeight() ), QPrinter::Millimeter );
   QPrintDialog printDialog( &printer, 0 );
-
   if ( printDialog.exec() != QDialog::Accepted )
+  {
     return;
+  }
 
   print( printer );
 }

Original file line number	Diff line number	Diff line change
`@@ -453,7 +453,6 @@ void QgsComposer::on_mActionExportAsPDF_triggered()`
`453`	`453`	`void QgsComposer::on_mActionPrint_triggered()`
`454`	`454`	`{`
`455`	`455`	`QPrinter printer;`
`456`		`- //portrait or landscape`
`457`	`456`	`if ( mComposition )`
`458`	`457`	`{`
`459`	`458`	`if ( mComposition->paperWidth() >= mComposition->paperHeight() )`
`@@ -465,10 +464,12 @@ void QgsComposer::on_mActionPrint_triggered()`
`465`	`464`	`printer.setOrientation( QPrinter::Portrait );`
`466`	`465`	`}`
`467`	`466`	`}`
	`467`	`+ printer.setPaperSize( QSizeF( mComposition->paperWidth(), mComposition->paperHeight() ), QPrinter::Millimeter );`
`468`	`468`	`QPrintDialog printDialog( &printer, 0 );`
`469`		`-`
`470`	`469`	`if ( printDialog.exec() != QDialog::Accepted )`
	`470`	`+ {`
`471`	`471`	`return;`
	`472`	`+ }`
`472`	`473`
`473`	`474`	`print( printer );`
`474`	`475`	`}`