QPrintDialog - Add more options to manual test

Add all the available QPrinter options to the QPrintDialog manual test
to allow for testing presets.

Change-Id: Ia6394094fc9920da0d6c645793d51650404899d8
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>

tests/manual/dialogs/printdialogpanel.cpp

@@ -45,6 +45,7 @@
 #include "utils.h"
 
 #include <QPrinter>
+#include <QPrinterInfo>
 #include <QPrintDialog>
 #include <QPrintPreviewDialog>
 #include <QPageSetupDialog>
@@ -64,6 +65,7 @@
 #include <QDateTime>
 #include <QDebug>
 #include <QTextStream>
+#include <QDir>
 
 const FlagData printerModeComboData[] =
 {
@@ -72,12 +74,7 @@ const FlagData printerModeComboData[] =
     {"HighResolution", QPrinter::HighResolution}
 };
 
-const FlagData orientationComboData[] =
+#if QT_VERSION < 0x050300
-{
-    {"Portrait", QPrinter::Portrait},
-    {"Landscape", QPrinter::Landscape},
-};
-
 const FlagData pageSizeComboData[] =
 {
     {"A4", QPrinter::A4},
@@ -112,6 +109,76 @@ const FlagData pageSizeComboData[] =
     {"Tabloid", QPrinter::Tabloid},
     {"Custom", QPrinter::Custom}
 };
+#endif
+
+const FlagData printRangeComboData[] =
+{
+    {"AllPages", QPrinter::AllPages},
+    {"Selection", QPrinter::Selection},
+    {"PageRange", QPrinter::PageRange},
+    {"CurrentPage", QPrinter::CurrentPage}
+};
+
+const FlagData pageOrderComboData[] =
+{
+    {"FirstPageFirst", QPrinter::FirstPageFirst},
+    {"LastPageFirst", QPrinter::LastPageFirst},
+};
+
+const FlagData duplexModeComboData[] =
+{
+    {"DuplexNone", QPrinter::DuplexNone},
+    {"DuplexAuto", QPrinter::DuplexAuto},
+    {"DuplexLongSide", QPrinter::DuplexLongSide},
+    {"DuplexShortSide", QPrinter::DuplexShortSide},
+};
+
+const FlagData paperSourceComboData[] =
+{
+    {"OnlyOne", QPrinter::OnlyOne},
+    {"Lower", QPrinter::Lower},
+    {"Middle", QPrinter::Middle},
+    {"Manual", QPrinter::Manual},
+    {"Envelope", QPrinter::Envelope},
+    {"EnvelopeManual", QPrinter::EnvelopeManual},
+    {"Auto", QPrinter::Auto},
+    {"Tractor", QPrinter::Tractor},
+    {"SmallFormat", QPrinter::SmallFormat},
+    {"LargeFormat", QPrinter::LargeFormat},
+    {"LargeCapacity", QPrinter::LargeCapacity},
+    {"Cassette", QPrinter::Cassette},
+    {"FormSource", QPrinter::FormSource},
+    {"DuplexLongSide", QPrinter::DuplexLongSide},
+    {"DuplexShortSide", QPrinter::DuplexShortSide},
+};
+
+const FlagData colorModeComboData[] =
+{
+    {"GrayScale", QPrinter::GrayScale},
+    {"Color", QPrinter::Color},
+};
+
+const FlagData unitsComboData[] =
+{
+    {"Millimeter", QPageLayout::Millimeter},
+    {"Inch", QPageLayout::Inch},
+    {"Point", QPageLayout::Point},
+    {"Pica", QPageLayout::Pica},
+    {"Didot", QPageLayout::Didot},
+    {"Cicero", QPageLayout::Cicero},
+};
+
+const FlagData orientationComboData[] =
+{
+    {"Portrait", QPageLayout::Portrait},
+    {"Landscape", QPageLayout::Landscape},
+};
+
+const FlagData layoutModeComboData[] =
+{
+    {"StandardMode", QPageLayout::StandardMode},
+    {"FullPageMode", QPageLayout::FullPageMode},
+};
 
 const FlagData printDialogOptions[] =
 {
@@ -123,14 +190,6 @@ const FlagData printDialogOptions[] =
     {"PrintCurrentPage", QPrintDialog::PrintCurrentPage}
 };
 
-const FlagData printRangeOptions[] =
-{
-    {"AllPages", QPrintDialog::AllPages},
-    {"Selection", QPrintDialog::Selection},
-    {"PageRange", QPrintDialog::PageRange},
-    {"CurrentPage", QPrintDialog::CurrentPage}
-};
-
 QTextStream &operator<<(QTextStream &s, const QSizeF &size)
 {
     s << size.width() << 'x' << size.height();
@@ -261,8 +320,12 @@ public slots:
 };
 
 PrintDialogPanel::PrintDialogPanel(QWidget *parent)
-    : QWidget(parent)
+    : QWidget(parent), m_blockSignals(true)
 {
+#if QT_VERSION < 0x050300
+    m_printerLayout.setOutputFormat(QPrinter::PdfFormat);
+#endif
+
     m_panel.setupUi(this);
 
     // Setup the Create box
@@ -270,22 +333,55 @@ PrintDialogPanel::PrintDialogPanel(QWidget *parent)
     connect(m_panel.m_createButton, SIGNAL(clicked()), this, SLOT(createPrinter()));
     connect(m_panel.m_deleteButton, SIGNAL(clicked()), this, SLOT(deletePrinter()));
 
-    // Setup the Settings box
+    // Setup the Page Layout box
+    populateCombo(m_panel.m_unitsCombo, unitsComboData, sizeof(unitsComboData)/sizeof(FlagData));
+    connect(m_panel.m_unitsCombo, SIGNAL(currentIndexChanged(int)), this, SLOT(unitsChanged()));
+#if QT_VERSION >= 0x050300
+    for (int i = QPageSize::A4; i < QPageSize::LastPageSize; ++i) {
+        QPageSize::PageSizeId id = QPageSize::PageSizeId(i);
+        m_panel.m_pageSizeCombo->addItem(QPageSize::name(id), QVariant(id));
+    }
+#else
     populateCombo(m_panel.m_pageSizeCombo, pageSizeComboData, sizeof(pageSizeComboData)/sizeof(FlagData));
-    connect(m_panel.m_pageSizeCombo, SIGNAL(currentIndexChanged(int)), this, SLOT(enableCustomSizeControl()));
+#endif
+    connect(m_panel.m_pageSizeCombo, SIGNAL(currentIndexChanged(int)), this, SLOT(pageSizeChanged()));
+    connect(m_panel.m_pageWidth, SIGNAL(valueChanged(double)), this, SLOT(pageDimensionsChanged()));
+    connect(m_panel.m_pageHeight, SIGNAL(valueChanged(double)), this, SLOT(pageDimensionsChanged()));
     populateCombo(m_panel.m_orientationCombo, orientationComboData, sizeof(orientationComboData)/sizeof(FlagData));
+    connect(m_panel.m_orientationCombo, SIGNAL(currentIndexChanged(int)), this, SLOT(orientationChanged()));
+    connect(m_panel.m_leftMargin, SIGNAL(valueChanged(double)), this, SLOT(marginsChanged()));
+    connect(m_panel.m_topMargin, SIGNAL(valueChanged(double)), this, SLOT(marginsChanged()));
+    connect(m_panel.m_rightMargin, SIGNAL(valueChanged(double)), this, SLOT(marginsChanged()));
+    connect(m_panel.m_bottomMargin, SIGNAL(valueChanged(double)), this, SLOT(marginsChanged()));
+    populateCombo(m_panel.m_layoutModeCombo, layoutModeComboData, sizeof(layoutModeComboData)/sizeof(FlagData));
+    connect(m_panel.m_layoutModeCombo, SIGNAL(currentIndexChanged(int)), this, SLOT(layoutModeChanged()));
+
+    // Setup the Print Job box
+    m_panel.m_printerCombo->addItem(tr("Print to PDF"), QVariant("PdfFormat"));
+#if QT_VERSION >= 0x050300
+    foreach (const QString &name, QPrinterInfo::availablePrinterNames())
+        m_panel.m_printerCombo->addItem(name, QVariant(name));
+#else
+    foreach (const QPrinterInfo &printer, QPrinterInfo::availablePrinters())
+        m_panel.m_printerCombo->addItem(printer.printerName(), QVariant(printer.printerName()));
+#endif
+    connect(m_panel.m_printerCombo, SIGNAL(currentIndexChanged(int)), this, SLOT(printerChanged()));
+    populateCombo(m_panel.m_printRangeCombo, printRangeComboData, sizeof(printRangeComboData)/sizeof(FlagData));
+    populateCombo(m_panel.m_pageOrderCombo, pageOrderComboData, sizeof(pageOrderComboData)/sizeof(FlagData));
+    populateCombo(m_panel.m_duplexModeCombo, duplexModeComboData, sizeof(duplexModeComboData)/sizeof(FlagData));
+    populateCombo(m_panel.m_paperSourceCombo, paperSourceComboData, sizeof(paperSourceComboData)/sizeof(FlagData));
+    populateCombo(m_panel.m_colorModeCombo, colorModeComboData, sizeof(colorModeComboData)/sizeof(FlagData));
 
     // Setup the Dialogs box
     m_panel.m_dialogOptionsGroupBox->populateOptions(printDialogOptions, sizeof(printDialogOptions) / sizeof(FlagData));
-    populateCombo(m_panel.m_printDialogRangeCombo, printRangeOptions, sizeof(printRangeOptions) / sizeof(FlagData));
     QPrintDialog dialog;
     m_panel.m_dialogOptionsGroupBox->setValue(dialog.options());
-    m_panel.m_printDialogRangeCombo->setCurrentIndex(dialog.printRange());
     connect(m_panel.m_printButton, SIGNAL(clicked()), this, SLOT(showPrintDialog()));
     connect(m_panel.m_printPreviewButton, SIGNAL(clicked()), this, SLOT(showPreviewDialog()));
     connect(m_panel.m_pageSetupButton, SIGNAL(clicked()), this, SLOT(showPageSetupDialog()));
 
     enablePanels();
+    m_blockSignals = false;
 }
 
 PrintDialogPanel::~PrintDialogPanel()
@@ -298,7 +394,8 @@ void PrintDialogPanel::enablePanels()
     m_panel.m_createButton->setEnabled(!exists);
     m_panel.m_printerModeCombo->setEnabled(!exists);
     m_panel.m_deleteButton->setEnabled(exists);
-    m_panel.m_settingsGroupBox->setEnabled(exists);
+    m_panel.m_pageLayoutGroupBox->setEnabled(exists);
+    m_panel.m_printJobGroupBox->setEnabled(exists);
     m_panel.m_dialogsGroupBox->setEnabled(exists);
 }
 
@@ -308,7 +405,6 @@ void PrintDialogPanel::createPrinter()
     m_printer.reset(new QPrinter(mode)); // Can set only once.
     retrieveSettings(m_printer.data());
     enablePanels();
-    enableCustomSizeControl();
 }
 
 void PrintDialogPanel::deletePrinter()
@@ -317,41 +413,249 @@ void PrintDialogPanel::deletePrinter()
     enablePanels();
 }
 
-QSizeF PrintDialogPanel::pageSize() const
+QSizeF PrintDialogPanel::customPageSize() const
 {
     return QSizeF(m_panel.m_pageWidth->value(), m_panel.m_pageHeight->value());
 }
 
-void PrintDialogPanel::setPageSize(const QSizeF &sizef)
+// Apply the settings to the QPrinter
-{
-    m_panel.m_pageWidth->setValue(sizef.width());
-    m_panel.m_pageHeight->setValue(sizef.height());
-}
-
 void PrintDialogPanel::applySettings(QPrinter *printer) const
 {
-    const QPrinter::PageSize pageSizeId = comboBoxValue<QPrinter::PageSize>(m_panel.m_pageSizeCombo);
+    QString printerName = m_panel.m_printerCombo->currentData().toString();
-    if (pageSizeId == QPrinter::Custom)
+    if (printerName == QStringLiteral("PdfFormat"))
-        printer->setPaperSize(pageSize(), QPrinter::Millimeter);
+        printer->setOutputFileName(m_panel.m_fileName->text());
     else
-        printer->setPageSize(pageSizeId);
+        printer->setPrinterName(printerName);
-    printer->setOrientation(comboBoxValue<QPrinter::Orientation>(m_panel.m_orientationCombo));
+    printer->setPrintRange(comboBoxValue<QPrinter::PrintRange>(m_panel.m_printRangeCombo));
-    printer->setFullPage(m_panel.m_fullPageCheckBox->isChecked());
+    printer->setFromTo(m_panel.m_fromPage->value(), m_panel.m_toPage->value());
+    printer->setPageOrder(comboBoxValue<QPrinter::PageOrder>(m_panel.m_pageOrderCombo));
+    printer->setCopyCount(m_panel.m_copyCount->value());
+    printer->setCollateCopies(m_panel.m_collateCopies->isChecked());
+    printer->setDuplex(comboBoxValue<QPrinter::DuplexMode>(m_panel.m_duplexModeCombo));
+    printer->setPaperSource(comboBoxValue<QPrinter::PaperSource>(m_panel.m_paperSourceCombo));
+    printer->setColorMode(comboBoxValue<QPrinter::ColorMode>(m_panel.m_colorModeCombo));
+    printer->setResolution(m_panel.m_resolution->value());
+
+#if QT_VERSION >= 0x050300
+    printer->setPageLayout(m_pageLayout);
+#else
+    if (m_printerLayout.pageSize() == QPrinter::Custom)
+        printer->setPaperSize(customPageSize(), m_units);
+    else
+        printer->setPageSize(m_printerLayout.pageSize());
+    printer->setOrientation(m_printerLayout.orientation());
+    printer->setFullPage(m_printerLayout.fullPage());
+    double left, top, right, bottom;
+    m_printerLayout.getPageMargins(&left, &top, &right, &bottom, m_units);
+    printer->setPageMargins(left, top, right, bottom, m_units);
+#endif
 }
 
+// Retrieve the settings from the QPrinter
 void PrintDialogPanel::retrieveSettings(const QPrinter *printer)
 {
-    setComboBoxValue(m_panel.m_pageSizeCombo, printer->pageSize());
+    if (printer->outputFormat() == QPrinter::NativeFormat) {
-    setComboBoxValue(m_panel.m_orientationCombo, printer->orientation());
+        m_panel.m_printerCombo->setCurrentIndex(m_panel.m_printerCombo->findData(QVariant(printer->printerName())));
-    m_panel.m_fullPageCheckBox->setChecked(printer->fullPage());
+        m_panel.m_fileName->setEnabled(false);
-    setPageSize(m_printer->paperSize(QPrinter::Millimeter));
+    } else {
+        m_panel.m_printerCombo->setCurrentIndex(m_panel.m_printerCombo->findData(QVariant(QStringLiteral("PdfFormat"))));
+        m_panel.m_fileName->setEnabled(true);
+    }
+    m_panel.m_fileName->setText(printer->outputFileName());
+    setComboBoxValue(m_panel.m_printRangeCombo, printer->printRange());
+    m_panel.m_fromPage->setValue(printer->fromPage());
+    m_panel.m_toPage->setValue(printer->toPage());
+    setComboBoxValue(m_panel.m_pageOrderCombo, printer->pageOrder());
+    m_panel.m_copyCount->setValue(printer->copyCount());
+    m_panel.m_collateCopies->setChecked(printer->collateCopies());
+    setComboBoxValue(m_panel.m_duplexModeCombo, printer->duplex());
+    setComboBoxValue(m_panel.m_paperSourceCombo, printer->paperSource());
+    setComboBoxValue(m_panel.m_colorModeCombo, printer->colorMode());
+    m_panel.m_resolution->setValue(printer->resolution());
+
+#if QT_VERSION >= 0x050300
+    m_pageLayout = printer->pageLayout();
+#else
+    if (printer->pageSize() == QPrinter::Custom)
+        m_printerLayout.setPaperSize(customPageSize(), m_units);
+    else
+        m_printerLayout.setPageSize(printer->pageSize());
+    m_printerLayout.setOrientation(printer->orientation());
+    m_printerLayout.setFullPage(printer->fullPage());
+    double left, top, right, bottom;
+    printer->getPageMargins(&left, &top, &right, &bottom, m_units);
+    m_printerLayout.setPageMargins(left, top, right, bottom, m_units);
+#endif
+    updatePageLayoutWidgets();
 }
 
-void PrintDialogPanel::enableCustomSizeControl()
+void PrintDialogPanel::updatePageLayoutWidgets()
 {
-    bool custom = (m_panel.m_pageSizeCombo->currentIndex() == QPrinter::Custom);
+    m_blockSignals = true;
+#if QT_VERSION >= 0x050300
+    setComboBoxValue(m_panel.m_unitsCombo, m_pageLayout.units());
+    setComboBoxValue(m_panel.m_pageSizeCombo, m_pageLayout.pageSize().id());
+    QSizeF sizef = m_pageLayout.pageSize().size(QPageSize::Unit(m_pageLayout.units()));
+    bool custom = (m_pageLayout.pageSize().id() == QPageSize::Custom);
+    setComboBoxValue(m_panel.m_orientationCombo, m_pageLayout.orientation());
+    m_panel.m_leftMargin->setValue(m_pageLayout.margins().left());
+    m_panel.m_topMargin->setValue(m_pageLayout.margins().top());
+    m_panel.m_rightMargin->setValue(m_pageLayout.margins().right());
+    m_panel.m_bottomMargin->setValue(m_pageLayout.margins().bottom());
+    setComboBoxValue(m_panel.m_layoutModeCombo, m_pageLayout.mode());
+    QRectF rectf = m_pageLayout.paintRect();
+#else
+    setComboBoxValue(m_panel.m_unitsCombo, m_units);
+    setComboBoxValue(m_panel.m_pageSizeCombo, m_printerLayout.pageSize());
+    QSizeF sizef = m_printerLayout.paperSize(m_units);
+    bool custom = (m_printerLayout.pageSize() == QPrinter::Custom);
+    setComboBoxValue(m_panel.m_orientationCombo, m_printerLayout.orientation());
+    double left, top, right, bottom;
+    m_printerLayout.getPageMargins(&left, &top, &right, &bottom, m_units);
+    m_panel.m_leftMargin->setValue(left);
+    m_panel.m_topMargin->setValue(top);
+    m_panel.m_rightMargin->setValue(right);
+    m_panel.m_bottomMargin->setValue(bottom);
+    if (m_printerLayout.fullPage())
+        setComboBoxValue(m_panel.m_layoutModeCombo, QPageLayout::FullPageMode);
+    else
+        setComboBoxValue(m_panel.m_layoutModeCombo, QPageLayout::StandardMode);
+    QRectF rectf = m_printerLayout.pageRect(m_units);
+#endif
+    m_panel.m_pageWidth->setValue(sizef.width());
+    m_panel.m_pageHeight->setValue(sizef.height());
     m_panel.m_pageWidth->setEnabled(custom);
     m_panel.m_pageHeight->setEnabled(custom);
+    m_panel.m_rectX->setValue(rectf.x());
+    m_panel.m_rectY->setValue(rectf.y());
+    m_panel.m_rectWidth->setValue(rectf.width());
+    m_panel.m_rectHeight->setValue(rectf.height());
+    QString suffix;
+    switch (comboBoxValue<QPageLayout::Unit>(m_panel.m_unitsCombo)) {
+    case QPageLayout::Millimeter:
+        suffix = tr(" mm");
+        break;
+    case QPageLayout::Point:
+        suffix = tr(" pt");
+        break;
+    case QPageLayout::Inch:
+        suffix = tr(" in");
+        break;
+    case QPageLayout::Pica:
+        suffix = tr(" pc");
+        break;
+    case QPageLayout::Didot:
+        suffix = tr(" DD");
+        break;
+    case QPageLayout::Cicero:
+        suffix = tr(" CC");
+        break;
+    }
+    m_panel.m_pageWidth->setSuffix(suffix);
+    m_panel.m_pageHeight->setSuffix(suffix);
+    m_panel.m_leftMargin->setSuffix(suffix);
+    m_panel.m_topMargin->setSuffix(suffix);
+    m_panel.m_rightMargin->setSuffix(suffix);
+    m_panel.m_bottomMargin->setSuffix(suffix);
+    m_panel.m_rectX->setSuffix(suffix);
+    m_panel.m_rectY->setSuffix(suffix);
+    m_panel.m_rectWidth->setSuffix(suffix);
+    m_panel.m_rectHeight->setSuffix(suffix);
+    m_blockSignals = false;
+}
+
+void PrintDialogPanel::unitsChanged()
+{
+    if (m_blockSignals)
+        return;
+#if QT_VERSION >= 0x050300
+    m_pageLayout.setUnits(comboBoxValue<QPageLayout::Unit>(m_panel.m_unitsCombo));
+#else
+    m_units = comboBoxValue<QPrinter::Unit>(m_panel.m_unitsCombo);
+#endif
+    updatePageLayoutWidgets();
+}
+
+void PrintDialogPanel::pageSizeChanged()
+{
+    if (m_blockSignals)
+        return;
+#if QT_VERSION >= 0x050300
+    const QPageSize::PageSizeId pageSizeId = comboBoxValue<QPageSize::PageSizeId>(m_panel.m_pageSizeCombo);
+    QPageSize pageSize;
+    if (pageSizeId == QPageSize::Custom)
+        pageSize = QPageSize(QSizeF(200, 200), QPageSize::Unit(m_pageLayout.units()));
+    else
+        pageSize = QPageSize(pageSizeId);
+    m_pageLayout.setPageSize(pageSize);
+#else
+    const QPrinter::PageSize pageSize = comboBoxValue<QPrinter::PageSize>(m_panel.m_pageSizeCombo);
+    if (pageSize == QPrinter::Custom)
+        m_printerLayout.setPaperSize(QSizeF(200, 200), m_units);
+    else
+        m_printerLayout.setPageSize(pageSize);
+#endif
+    updatePageLayoutWidgets();
+}
+
+void PrintDialogPanel::pageDimensionsChanged()
+{
+    if (m_blockSignals)
+        return;
+#if QT_VERSION >= 0x050300
+    m_pageLayout.setPageSize(QPageSize(customPageSize(), QPageSize::Unit(m_pageLayout.units())));
+#else
+    m_printerLayout.setPaperSize(customPageSize(), m_units);
+#endif
+    updatePageLayoutWidgets();
+}
+
+void PrintDialogPanel::orientationChanged()
+{
+    if (m_blockSignals)
+        return;
+#if QT_VERSION >= 0x050300
+    m_pageLayout.setOrientation(comboBoxValue<QPageLayout::Orientation>(m_panel.m_orientationCombo));
+#else
+    m_printerLayout.setOrientation(comboBoxValue<QPrinter::Orientation>(m_panel.m_orientationCombo));
+#endif
+    updatePageLayoutWidgets();
+}
+
+void PrintDialogPanel::marginsChanged()
+{
+    if (m_blockSignals)
+        return;
+#if QT_VERSION >= 0x050300
+    m_pageLayout.setMargins(QMarginsF(m_panel.m_leftMargin->value(), m_panel.m_topMargin->value(),
+                                      m_panel.m_rightMargin->value(), m_panel.m_bottomMargin->value()));
+#else
+    m_printerLayout.setPageMargins(m_panel.m_leftMargin->value(), m_panel.m_topMargin->value(),
+                                   m_panel.m_rightMargin->value(), m_panel.m_bottomMargin->value(),
+                                   m_units);
+#endif
+    updatePageLayoutWidgets();
+}
+
+void PrintDialogPanel::layoutModeChanged()
+{
+    if (m_blockSignals)
+        return;
+#if QT_VERSION >= 0x050300
+    m_pageLayout.setMode(comboBoxValue<QPageLayout::Mode>(m_panel.m_layoutModeCombo));
+#else
+    bool fullPage = (comboBoxValue<QPageLayout::Mode>(m_panel.m_layoutModeCombo) == QPageLayout::FullPageMode);
+    m_printerLayout.setFullPage(fullPage);
+#endif
+    updatePageLayoutWidgets();
+}
+
+void PrintDialogPanel::printerChanged()
+{
+    bool isPdf = (m_panel.m_printerCombo->currentData().toString() == QStringLiteral("PdfFormat"));
+    m_panel.m_fileName->setEnabled(isPdf);
+    if (isPdf && m_panel.m_fileName->text().isEmpty())
+        m_panel.m_fileName->setText(QDir::homePath() + QDir::separator() + QStringLiteral("print.pdf"));
 }
 
 void PrintDialogPanel::showPrintDialog()
@@ -359,7 +663,6 @@ void PrintDialogPanel::showPrintDialog()
     applySettings(m_printer.data());
     QPrintDialog dialog(m_printer.data(), this);
     dialog.setOptions(m_panel.m_dialogOptionsGroupBox->value<QPrintDialog::PrintDialogOptions>());
-    dialog.setPrintRange(comboBoxValue<QPrintDialog::PrintRange>(m_panel.m_printDialogRangeCombo));
     if (dialog.exec() == QDialog::Accepted) {
         retrieveSettings(m_printer.data());
         print(m_printer.data());

tests/manual/dialogs/printdialogpanel.h

@@ -46,6 +46,10 @@
 
 #include "ui_printdialogpanel.h"
 
+#if QT_VERSION >= 0x050300
+#include <QPageLayout>
+#endif
+#include <QPrinter>
 #include <QWidget>
 
 QT_BEGIN_NAMESPACE
@@ -59,6 +63,31 @@ QT_END_NAMESPACE
 class PageSizeControl;
 class OptionsControl;
 
+#if QT_VERSION < 0x050300
+// Copied from class QPageLayout introduced in Qt 5.3
+namespace QPageLayout
+{
+    enum Unit {
+        Millimeter,
+        Point,
+        Inch,
+        Pica,
+        Didot,
+        Cicero
+    };
+
+    enum Orientation {
+        Portrait,
+        Landscape
+    };
+
+    enum Mode {
+        StandardMode,  // Paint Rect includes margins
+        FullPageMode   // Paint Rect excludes margins
+    };
+}
+#endif
+
 class PrintDialogPanel  : public QWidget
 {
     Q_OBJECT
@@ -72,17 +101,30 @@ private slots:
     void showPrintDialog();
     void showPreviewDialog();
     void showPageSetupDialog();
-    void enableCustomSizeControl();
+    void unitsChanged();
+    void pageSizeChanged();
+    void pageDimensionsChanged();
+    void orientationChanged();
+    void marginsChanged();
+    void layoutModeChanged();
+    void printerChanged();
 
 private:
-    QSizeF pageSize() const;
+    QSizeF customPageSize() const;
-    void setPageSize(const QSizeF &sizef);
     void applySettings(QPrinter *printer) const;
     void retrieveSettings(const QPrinter *printer);
+    void updatePageLayoutWidgets();
     void enablePanels();
 
+    bool m_blockSignals;
     Ui::PrintDialogPanel m_panel;
 
+#if QT_VERSION >= 0x050300
+    QPageLayout m_pageLayout;
+#else
+    QPrinter m_printerLayout;
+    QPrinter::Unit m_units;
+#endif
     QScopedPointer<QPrinter> m_printer;
 };
 

tests/manual/dialogs/printdialogpanel.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>507</width>
+    <width>650</width>
-    <height>291</height>
+    <height>707</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -79,7 +79,7 @@
       </widget>
      </item>
      <item>
-      <widget class="QGroupBox" name="m_settingsGroupBox">
+      <widget class="QGroupBox" name="m_pageLayoutGroupBox">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
          <horstretch>0</horstretch>
@@ -87,20 +87,30 @@
         </sizepolicy>
        </property>
        <property name="title">
-        <string>Settings</string>
+        <string>Page Layout</string>
        </property>
        <layout class="QFormLayout" name="formLayout_2">
         <item row="0" column="0">
+         <widget class="QLabel" name="label_5">
+          <property name="text">
+           <string>Units:</string>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="1">
+         <widget class="QComboBox" name="m_unitsCombo"/>
+        </item>
+        <item row="1" column="0">
          <widget class="QLabel" name="label_3">
           <property name="text">
            <string>Page Size:</string>
           </property>
          </widget>
         </item>
-        <item row="0" column="1">
+        <item row="1" column="1">
          <widget class="QComboBox" name="m_pageSizeCombo"/>
         </item>
-        <item row="1" column="1">
+        <item row="2" column="1">
          <layout class="QHBoxLayout" name="horizontalLayout_2">
           <item>
            <widget class="QDoubleSpinBox" name="m_pageWidth">
@@ -150,30 +160,430 @@
           </item>
          </layout>
         </item>
-        <item row="2" column="0">
+        <item row="3" column="0">
          <widget class="QLabel" name="label_2">
           <property name="text">
            <string>Orientation:</string>
           </property>
          </widget>
         </item>
-        <item row="2" column="1">
+        <item row="3" column="1">
          <widget class="QComboBox" name="m_orientationCombo"/>
         </item>
-        <item row="3" column="0">
+        <item row="4" column="0">
+         <widget class="QLabel" name="label_7">
+          <property name="text">
+           <string>Margins:</string>
+          </property>
+         </widget>
+        </item>
+        <item row="4" column="1">
+         <layout class="QHBoxLayout" name="horizontalLayout_3">
+          <item>
+           <widget class="QDoubleSpinBox" name="m_leftMargin">
+            <property name="maximum">
+             <double>1000.000000000000000</double>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QLabel" name="label_8">
+            <property name="text">
+             <string>l</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QDoubleSpinBox" name="m_rightMargin">
+            <property name="maximum">
+             <double>1000.000000000000000</double>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QLabel" name="label_9">
+            <property name="text">
+             <string>t</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QDoubleSpinBox" name="m_topMargin">
+            <property name="maximum">
+             <double>1000.000000000000000</double>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QLabel" name="label_10">
+            <property name="text">
+             <string>r</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QDoubleSpinBox" name="m_bottomMargin">
+            <property name="maximum">
+             <double>1000.000000000000000</double>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QLabel" name="label_11">
+            <property name="text">
+             <string>b</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <spacer name="horizontalSpacer_3">
+            <property name="orientation">
+             <enum>Qt::Horizontal</enum>
+            </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>40</width>
+              <height>20</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+         </layout>
+        </item>
+        <item row="5" column="0">
          <widget class="QLabel" name="label_6">
           <property name="text">
-           <string>Full Page Mode:</string>
+           <string>Layout Mode:</string>
+          </property>
+         </widget>
+        </item>
+        <item row="5" column="1">
+         <widget class="QComboBox" name="m_layoutModeCombo"/>
+        </item>
+        <item row="6" column="0">
+         <widget class="QLabel" name="label_16">
+          <property name="text">
+           <string>Paint Rect:</string>
+          </property>
+         </widget>
+        </item>
+        <item row="6" column="1">
+         <layout class="QHBoxLayout" name="horizontalLayout_4">
+          <item>
+           <widget class="QDoubleSpinBox" name="m_rectX">
+            <property name="enabled">
+             <bool>false</bool>
+            </property>
+            <property name="buttonSymbols">
+             <enum>QAbstractSpinBox::NoButtons</enum>
+            </property>
+            <property name="suffix">
+             <string> mm</string>
+            </property>
+            <property name="maximum">
+             <double>1000.000000000000000</double>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QLabel" name="label_12">
+            <property name="text">
+             <string>x</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QDoubleSpinBox" name="m_rectY">
+            <property name="enabled">
+             <bool>false</bool>
+            </property>
+            <property name="buttonSymbols">
+             <enum>QAbstractSpinBox::NoButtons</enum>
+            </property>
+            <property name="maximum">
+             <double>1000.000000000000000</double>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QLabel" name="label_13">
+            <property name="text">
+             <string>y</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QDoubleSpinBox" name="m_rectWidth">
+            <property name="enabled">
+             <bool>false</bool>
+            </property>
+            <property name="buttonSymbols">
+             <enum>QAbstractSpinBox::NoButtons</enum>
+            </property>
+            <property name="maximum">
+             <double>1000.000000000000000</double>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QLabel" name="label_14">
+            <property name="text">
+             <string>w</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QDoubleSpinBox" name="m_rectHeight">
+            <property name="enabled">
+             <bool>false</bool>
+            </property>
+            <property name="buttonSymbols">
+             <enum>QAbstractSpinBox::NoButtons</enum>
+            </property>
+            <property name="maximum">
+             <double>1000.000000000000000</double>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QLabel" name="label_15">
+            <property name="text">
+             <string>h</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <spacer name="horizontalSpacer_4">
+            <property name="orientation">
+             <enum>Qt::Horizontal</enum>
+            </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>40</width>
+              <height>20</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+         </layout>
+        </item>
+       </layout>
+      </widget>
+     </item>
+     <item>
+      <widget class="QGroupBox" name="m_printJobGroupBox">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="title">
+        <string>Print Job</string>
+       </property>
+       <layout class="QFormLayout" name="formLayout_3">
+        <property name="fieldGrowthPolicy">
+         <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
+        </property>
+        <item row="0" column="0">
+         <widget class="QLabel" name="label_17">
+          <property name="text">
+           <string>Printer:</string>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="1">
+         <widget class="QComboBox" name="m_printerCombo"/>
+        </item>
+        <item row="1" column="0">
+         <widget class="QLabel" name="label_18">
+          <property name="text">
+           <string>File Name:</string>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="1">
+         <widget class="QLineEdit" name="m_fileName"/>
+        </item>
+        <item row="2" column="0">
+         <widget class="QLabel" name="label_19">
+          <property name="text">
+           <string>Print Range:</string>
+          </property>
+         </widget>
+        </item>
+        <item row="2" column="1">
+         <widget class="QComboBox" name="m_printRangeCombo"/>
+        </item>
+        <item row="3" column="0">
+         <widget class="QLabel" name="label_20">
+          <property name="text">
+           <string>Page Range:</string>
           </property>
          </widget>
         </item>
         <item row="3" column="1">
-         <widget class="QCheckBox" name="m_fullPageCheckBox">
+         <layout class="QHBoxLayout" name="horizontalLayout_5">
+          <item>
+           <widget class="QSpinBox" name="m_fromPage">
+            <property name="minimum">
+             <number>0</number>
+            </property>
+            <property name="maximum">
+             <number>100</number>
+            </property>
+            <property name="value">
+             <number>0</number>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QLabel" name="label_21">
+            <property name="text">
+             <string>to</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QSpinBox" name="m_toPage">
+            <property name="minimum">
+             <number>0</number>
+            </property>
+            <property name="maximum">
+             <number>100</number>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <spacer name="horizontalSpacer_5">
+            <property name="orientation">
+             <enum>Qt::Horizontal</enum>
+            </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>40</width>
+              <height>20</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+         </layout>
+        </item>
+        <item row="5" column="0">
+         <widget class="QLabel" name="label_25">
           <property name="text">
-           <string/>
+           <string>Copies:</string>
           </property>
          </widget>
         </item>
+        <item row="5" column="1">
+         <layout class="QHBoxLayout" name="horizontalLayout_6">
+          <item>
+           <widget class="QSpinBox" name="m_copyCount">
+            <property name="maximum">
+             <number>100</number>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <spacer name="horizontalSpacer_7">
+            <property name="orientation">
+             <enum>Qt::Horizontal</enum>
+            </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>40</width>
+              <height>20</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+          <item>
+           <widget class="QCheckBox" name="m_collateCopies">
+            <property name="text">
+             <string>Collate Copies</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </item>
+        <item row="6" column="0">
+         <widget class="QLabel" name="label_22">
+          <property name="text">
+           <string>Duplex Mode:</string>
+          </property>
+         </widget>
+        </item>
+        <item row="6" column="1">
+         <widget class="QComboBox" name="m_duplexModeCombo"/>
+        </item>
+        <item row="7" column="0">
+         <widget class="QLabel" name="label_27">
+          <property name="text">
+           <string>Paper Source:</string>
+          </property>
+         </widget>
+        </item>
+        <item row="7" column="1">
+         <widget class="QComboBox" name="m_paperSourceCombo"/>
+        </item>
+        <item row="8" column="0">
+         <widget class="QLabel" name="label_23">
+          <property name="text">
+           <string>Color Mode:</string>
+          </property>
+         </widget>
+        </item>
+        <item row="8" column="1">
+         <widget class="QComboBox" name="m_colorModeCombo"/>
+        </item>
+        <item row="9" column="0">
+         <widget class="QLabel" name="label_28">
+          <property name="text">
+           <string>Resolution:</string>
+          </property>
+         </widget>
+        </item>
+        <item row="9" column="1">
+         <layout class="QHBoxLayout" name="horizontalLayout_7">
+          <item>
+           <widget class="QSpinBox" name="m_resolution">
+            <property name="minimum">
+             <number>1</number>
+            </property>
+            <property name="maximum">
+             <number>5000</number>
+            </property>
+            <property name="singleStep">
+             <number>100</number>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <spacer name="horizontalSpacer_6">
+            <property name="orientation">
+             <enum>Qt::Horizontal</enum>
+            </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>40</width>
+              <height>20</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+         </layout>
+        </item>
+        <item row="4" column="0">
+         <widget class="QLabel" name="label_24">
+          <property name="text">
+           <string>Page Order:</string>
+          </property>
+         </widget>
+        </item>
+        <item row="4" column="1">
+         <widget class="QComboBox" name="m_pageOrderCombo"/>
+        </item>
        </layout>
       </widget>
      </item>
@@ -213,9 +623,6 @@
           </property>
          </widget>
         </item>
-        <item>
-         <widget class="QComboBox" name="m_printDialogRangeCombo"/>
-        </item>
         <item>
          <widget class="QPushButton" name="m_printButton">
           <property name="text">