Move paper size setting

src/arguments.cc

@@ -428,7 +428,7 @@ CommandLineParserPrivate::CommandLineParserPrivate(Settings & s):
 	addarg("collate", 0, "Collate when printing multiple copies", new ConstSetter<bool>(s.collate,true,false));
 	addarg("copies", 0, "Number of copies to print into the pdf file", new IntSetter(s.copies, "number", 1));
 	addarg("orientation",'O',"Set orientation to Landscape or Portrait", new OrientationSetter(s.orientation, "orientation", QPrinter::Portrait));
-	addarg("page-size",'s',"Set paper size to: A4, Letter, etc.", new PageSizeSetter(s.pageSize, "size", QPrinter::A4));
+	addarg("page-size",'s',"Set paper size to: A4, Letter, etc.", new PageSizeSetter(s.size.pageSize, "size", QPrinter::A4));
 	addarg("proxy",'p',"Use a proxy", new ProxySetter(s.proxy, "proxy"));
 	addarg("username",0,"HTTP Authentication username", new QStrSetter(s.username, "username",""));
 	addarg("password",0,"HTTP Authentication password", new QStrSetter(s.password, "password",""));

src/pageconverter.cc

@@ -187,7 +187,7 @@ void PageConverterPrivate::preparePrint(bool ok) {
 		printer->setPaperSize(QSizeF(settings.size.width.first,settings.size.height.first), settings.size.height.second);
 	}
 	else {
-		printer->setPaperSize(settings.pageSize);
+		printer->setPaperSize(settings.size.pageSize);
 	}
 	
 	printer->setOrientation(settings.orientation);

src/settings.hh

@@ -94,8 +94,10 @@ struct Settings {
 		QPair<qreal, QPrinter::Unit> left;
 	};
 	
-	/*! \brief Settings consdering page size */
+	/*! \brief Settings considering page size */
 	struct SizeSettings {
+		//! What size paper should we use
+		QPrinter::PageSize pageSize; 
 		//!Height of the page
 		QPair<qreal, QPrinter::Unit> height;
 		//!Width of the page
@@ -139,8 +141,6 @@ struct Settings {
 	bool enableIntelligentShrinking;
 	//! How many milliseconds should we wait for a javascrit redirect
 	int jsredirectwait;
-	//! What size paper should we use
-	QPrinter::PageSize pageSize; 
 	//! Should we orientate in landscape or portrate
 	QPrinter::Orientation orientation; 
 	//! Color or grayscale