diff -r a1e53a9ffcf3 -r f55fa7eb3cf3 Preferences/ConfigurationPages/PrinterPage.ui
--- a/Preferences/ConfigurationPages/PrinterPage.ui Mon Feb 29 19:43:46 2016 +0100
+++ b/Preferences/ConfigurationPages/PrinterPage.ui Wed Mar 02 19:41:59 2016 +0100
@@ -1,56 +1,86 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
<class>PrinterPage</class>
- <widget class="QWidget" name="PrinterPage" >
- <property name="geometry" >
+ <widget class="QWidget" name="PrinterPage">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
- <width>446</width>
+ <width>448</width>
<height>568</height>
</rect>
</property>
- <layout class="QVBoxLayout" >
+ <layout class="QVBoxLayout" name="verticalLayout">
<item>
- <widget class="QLabel" name="headerLabel" >
- <property name="text" >
- <string><b>Configure printer settings</b></string>
+ <widget class="QLabel" name="headerLabel">
+ <property name="text">
+ <string><b>Configure printer settings</b></string>
</property>
</widget>
</item>
<item>
- <widget class="Line" name="line7" >
- <property name="frameShape" >
+ <widget class="Line" name="line7">
+ <property name="frameShape">
<enum>QFrame::HLine</enum>
</property>
- <property name="frameShadow" >
+ <property name="frameShadow">
<enum>QFrame::Sunken</enum>
</property>
- <property name="orientation" >
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item>
- <layout class="QGridLayout" >
- <item row="1" column="1" colspan="2" >
- <widget class="QFrame" name="frame_2" >
- <property name="frameShape" >
+ <layout class="QGridLayout" name="gridLayout">
+ <item row="0" column="0">
+ <widget class="QLabel" name="TextLabel1">
+ <property name="text">
+ <string>Printername:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1" colspan="3">
+ <widget class="QLineEdit" name="printerNameEdit"/>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="TextLabel2">
+ <property name="text">
+ <string>Colour Mode:</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignTop</set>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1" colspan="3">
+ <widget class="QFrame" name="frame_2">
+ <property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
- <layout class="QVBoxLayout" >
- <property name="margin" >
+ <layout class="QVBoxLayout">
+ <property name="leftMargin">
+ <number>0</number>
+ </property>
+ <property name="topMargin">
+ <number>0</number>
+ </property>
+ <property name="rightMargin">
+ <number>0</number>
+ </property>
+ <property name="bottomMargin">
<number>0</number>
</property>
<item>
- <widget class="QRadioButton" name="printerColorButton" >
- <property name="text" >
+ <widget class="QRadioButton" name="printerColorButton">
+ <property name="text">
<string>Colour</string>
</property>
</widget>
</item>
<item>
- <widget class="QRadioButton" name="printerGrayscaleButton" >
- <property name="text" >
+ <widget class="QRadioButton" name="printerGrayscaleButton">
+ <property name="text">
<string>Gray Scale</string>
</property>
</widget>
@@ -58,28 +88,47 @@
</layout>
</widget>
</item>
- <item row="2" column="1" colspan="2" >
- <widget class="QFrame" name="frame" >
- <property name="frameShape" >
+ <item row="2" column="0">
+ <widget class="QLabel" name="TextLabel4">
+ <property name="text">
+ <string>Page Order:</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignTop</set>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1" colspan="3">
+ <widget class="QFrame" name="frame">
+ <property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
- <layout class="QVBoxLayout" >
- <property name="spacing" >
+ <layout class="QVBoxLayout">
+ <property name="spacing">
<number>6</number>
</property>
- <property name="margin" >
+ <property name="leftMargin">
+ <number>0</number>
+ </property>
+ <property name="topMargin">
+ <number>0</number>
+ </property>
+ <property name="rightMargin">
+ <number>0</number>
+ </property>
+ <property name="bottomMargin">
<number>0</number>
</property>
<item>
- <widget class="QRadioButton" name="printFirstPageFirstButton" >
- <property name="text" >
+ <widget class="QRadioButton" name="printFirstPageFirstButton">
+ <property name="text">
<string>First Page First</string>
</property>
</widget>
</item>
<item>
- <widget class="QRadioButton" name="printFirstPageLastButton" >
- <property name="text" >
+ <widget class="QRadioButton" name="printFirstPageLastButton">
+ <property name="text">
<string>Last Page First</string>
</property>
</widget>
@@ -87,88 +136,32 @@
</layout>
</widget>
</item>
- <item row="0" column="1" colspan="2" >
- <widget class="QLineEdit" name="printerNameEdit" />
- </item>
- <item row="0" column="0" >
- <widget class="QLabel" name="TextLabel1" >
- <property name="text" >
- <string>Printername:</string>
- </property>
- </widget>
- </item>
- <item row="3" column="0" >
- <widget class="QLabel" name="TextLabel3" >
- <property name="text" >
+ <item row="3" column="0">
+ <widget class="QLabel" name="TextLabel3">
+ <property name="text">
<string>Magnification:</string>
</property>
</widget>
</item>
- <item row="4" column="1" colspan="2" >
- <widget class="QLineEdit" name="printheaderFontSample" >
- <property name="focusPolicy" >
- <enum>Qt::NoFocus</enum>
- </property>
- <property name="text" >
- <string>Header Font</string>
- </property>
- <property name="alignment" >
- <set>Qt::AlignHCenter</set>
- </property>
- <property name="readOnly" >
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item row="4" column="0" >
- <widget class="QPushButton" name="printheaderFontButton" >
- <property name="toolTip" >
- <string>Press to select the font for the page headers</string>
- </property>
- <property name="text" >
- <string>Header Font</string>
- </property>
- </widget>
- </item>
- <item row="3" column="1" >
- <widget class="QSpinBox" name="printMagnificationSpinBox" >
- <property name="minimum" >
+ <item row="3" column="1">
+ <widget class="QSpinBox" name="printMagnificationSpinBox">
+ <property name="minimum">
<number>-10</number>
</property>
- <property name="maximum" >
+ <property name="maximum">
<number>10</number>
</property>
- <property name="value" >
+ <property name="value">
<number>-3</number>
</property>
</widget>
</item>
- <item row="1" column="0" >
- <widget class="QLabel" name="TextLabel2" >
- <property name="text" >
- <string>Colour Mode:</string>
- </property>
- <property name="alignment" >
- <set>Qt::AlignTop</set>
- </property>
- </widget>
- </item>
- <item row="2" column="0" >
- <widget class="QLabel" name="TextLabel4" >
- <property name="text" >
- <string>Page Order:</string>
- </property>
- <property name="alignment" >
- <set>Qt::AlignTop</set>
- </property>
- </widget>
- </item>
- <item row="3" column="2" >
+ <item row="3" column="2" colspan="2">
<spacer>
- <property name="orientation" >
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeHint" stdset="0" >
+ <property name="sizeHint" stdset="0">
<size>
<width>251</width>
<height>20</height>
@@ -176,88 +169,153 @@
</property>
</spacer>
</item>
+ <item row="4" column="0">
+ <widget class="QLabel" name="label">
+ <property name="text">
+ <string>Resolution:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="1" colspan="2">
+ <widget class="QSpinBox" name="resolutionSpinBox">
+ <property name="toolTip">
+ <string>Select the printer resolution </string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
+ <property name="suffix">
+ <string> DPI</string>
+ </property>
+ <property name="maximum">
+ <number>6000</number>
+ </property>
+ <property name="singleStep">
+ <number>50</number>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="3">
+ <spacer name="horizontalSpacer">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>208</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item row="5" column="0">
+ <widget class="QPushButton" name="printheaderFontButton">
+ <property name="toolTip">
+ <string>Press to select the font for the page headers</string>
+ </property>
+ <property name="text">
+ <string>Header Font</string>
+ </property>
+ </widget>
+ </item>
+ <item row="5" column="1" colspan="3">
+ <widget class="QLineEdit" name="printheaderFontSample">
+ <property name="focusPolicy">
+ <enum>Qt::NoFocus</enum>
+ </property>
+ <property name="text">
+ <string>Header Font</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignHCenter</set>
+ </property>
+ <property name="readOnly">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
</layout>
</item>
<item>
- <layout class="QHBoxLayout" >
+ <layout class="QHBoxLayout">
<item>
- <widget class="QGroupBox" name="groupBox" >
- <property name="title" >
+ <widget class="QGroupBox" name="groupBox">
+ <property name="title">
<string>Margins</string>
</property>
- <layout class="QGridLayout" >
- <item row="0" column="1" >
- <widget class="QDoubleSpinBox" name="topMarginSpinBox" >
- <property name="toolTip" >
+ <layout class="QGridLayout">
+ <item row="0" column="1">
+ <widget class="QDoubleSpinBox" name="topMarginSpinBox">
+ <property name="toolTip">
<string>Enter the top margin in cm.</string>
</property>
- <property name="suffix" >
+ <property name="suffix">
<string> cm</string>
</property>
- <property name="decimals" >
+ <property name="decimals">
<number>1</number>
</property>
- <property name="maximum" >
+ <property name="maximum">
<double>9.900000000000000</double>
</property>
- <property name="singleStep" >
+ <property name="singleStep">
<double>0.500000000000000</double>
</property>
</widget>
</item>
- <item row="1" column="0" >
- <widget class="QDoubleSpinBox" name="leftMarginSpinBox" >
- <property name="toolTip" >
+ <item row="1" column="0">
+ <widget class="QDoubleSpinBox" name="leftMarginSpinBox">
+ <property name="toolTip">
<string>Enter the left margin in cm.</string>
</property>
- <property name="suffix" >
+ <property name="suffix">
<string> cm</string>
</property>
- <property name="decimals" >
+ <property name="decimals">
<number>1</number>
</property>
- <property name="maximum" >
+ <property name="maximum">
<double>9.900000000000000</double>
</property>
- <property name="singleStep" >
+ <property name="singleStep">
<double>0.500000000000000</double>
</property>
</widget>
</item>
- <item row="1" column="2" >
- <widget class="QDoubleSpinBox" name="rightMarginSpinBox" >
- <property name="toolTip" >
+ <item row="1" column="2">
+ <widget class="QDoubleSpinBox" name="rightMarginSpinBox">
+ <property name="toolTip">
<string>Enter the right margin in cm.</string>
</property>
- <property name="suffix" >
+ <property name="suffix">
<string> cm</string>
</property>
- <property name="decimals" >
+ <property name="decimals">
<number>1</number>
</property>
- <property name="maximum" >
+ <property name="maximum">
<double>9.900000000000000</double>
</property>
- <property name="singleStep" >
+ <property name="singleStep">
<double>0.500000000000000</double>
</property>
</widget>
</item>
- <item row="2" column="1" >
- <widget class="QDoubleSpinBox" name="bottomMarginSpinBox" >
- <property name="toolTip" >
+ <item row="2" column="1">
+ <widget class="QDoubleSpinBox" name="bottomMarginSpinBox">
+ <property name="toolTip">
<string>Enter the bottom margin in cm.</string>
</property>
- <property name="suffix" >
+ <property name="suffix">
<string> cm</string>
</property>
- <property name="decimals" >
+ <property name="decimals">
<number>1</number>
</property>
- <property name="maximum" >
+ <property name="maximum">
<double>9.900000000000000</double>
</property>
- <property name="singleStep" >
+ <property name="singleStep">
<double>0.500000000000000</double>
</property>
</widget>
@@ -267,10 +325,10 @@
</item>
<item>
<spacer>
- <property name="orientation" >
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeHint" stdset="0" >
+ <property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
@@ -282,10 +340,10 @@
</item>
<item>
<spacer>
- <property name="orientation" >
+ <property name="orientation">
<enum>Qt::Vertical</enum>
</property>
- <property name="sizeHint" stdset="0" >
+ <property name="sizeHint" stdset="0">
<size>
<width>428</width>
<height>61</height>
@@ -302,6 +360,7 @@
<tabstop>printFirstPageFirstButton</tabstop>
<tabstop>printFirstPageLastButton</tabstop>
<tabstop>printMagnificationSpinBox</tabstop>
+ <tabstop>resolutionSpinBox</tabstop>
<tabstop>printheaderFontButton</tabstop>
<tabstop>topMarginSpinBox</tabstop>
<tabstop>leftMarginSpinBox</tabstop>
