summaryrefslogtreecommitdiffstats
path: root/src/printsupport/dialogs/qprintdialog_unix.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/printsupport/dialogs/qprintdialog_unix.cpp')
-rw-r--r--src/printsupport/dialogs/qprintdialog_unix.cpp20
1 files changed, 5 insertions, 15 deletions
diff --git a/src/printsupport/dialogs/qprintdialog_unix.cpp b/src/printsupport/dialogs/qprintdialog_unix.cpp
index fe7e43814c..a903d170f2 100644
--- a/src/printsupport/dialogs/qprintdialog_unix.cpp
+++ b/src/printsupport/dialogs/qprintdialog_unix.cpp
@@ -203,7 +203,6 @@ public:
void selectPrinter(const QPrinter::OutputFormat outputFormat);
- void _q_chbPrintLastFirstToggled(bool);
void _q_togglePageSetCombo(bool);
#ifndef QT_NO_MESSAGEBOX
void _q_checkFields();
@@ -363,9 +362,6 @@ void QPrintDialogPrivate::init()
#endif
QObject::connect(buttons, SIGNAL(rejected()), q, SLOT(reject()));
- QObject::connect(options.reverse, SIGNAL(toggled(bool)),
- q, SLOT(_q_chbPrintLastFirstToggled(bool)));
-
QObject::connect(options.printSelection, SIGNAL(toggled(bool)),
q, SLOT(_q_togglePageSetCombo(bool)));
@@ -416,6 +412,10 @@ void QPrintDialogPrivate::applyPrinterProperties()
void QPrintDialogPrivate::setupPrinter()
{
+ // First setup the requested OutputFormat, Printer and Page Size first
+ top->d->setupPrinter();
+
+ // Then setup Print Job options
Q_Q(QPrintDialog);
QPrinter* p = q->printer();
@@ -429,6 +429,7 @@ void QPrintDialogPrivate::setupPrinter()
}
p->setColorMode(options.color->isChecked() ? QPrinter::Color : QPrinter::GrayScale);
+ p->setPageOrder(options.reverse->isChecked() ? QPrinter::LastPageFirst : QPrinter::FirstPageFirst);
// print range
if (options.printAll->isChecked()) {
@@ -482,17 +483,6 @@ void QPrintDialogPrivate::setupPrinter()
// copies
p->setCopyCount(options.copies->value());
p->setCollateCopies(options.collate->isChecked());
-
- top->d->setupPrinter();
-}
-
-void QPrintDialogPrivate::_q_chbPrintLastFirstToggled(bool checked)
-{
- Q_Q(QPrintDialog);
- if (checked)
- q->printer()->setPageOrder(QPrinter::LastPageFirst);
- else
- q->printer()->setPageOrder(QPrinter::FirstPageFirst);
}
void QPrintDialogPrivate::_q_togglePageSetCombo(bool checked)