Remove QPrintPropertiesDialog::selectPrinter
It is only ever called after the constructor, so merge the code Change-Id: I5c75a2cd367af401b41920f51754a64dc6c6eb40 Reviewed-by: Andy Shaw <andy.shaw@qt.io>
This commit is contained in:
parent
881690969c
commit
072dd59de7
@ -124,11 +124,10 @@ class QPrintPropertiesDialog : public QDialog
|
|||||||
{
|
{
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
public:
|
public:
|
||||||
QPrintPropertiesDialog(QPrinter *printer, QAbstractPrintDialog *parent = nullptr);
|
QPrintPropertiesDialog(QPrinter *printer, QPrinter::OutputFormat outputFormat,
|
||||||
|
const QString &printerName, QAbstractPrintDialog *parent = nullptr);
|
||||||
~QPrintPropertiesDialog();
|
~QPrintPropertiesDialog();
|
||||||
|
|
||||||
void selectPrinter(QPrinter::OutputFormat outputFormat, const QString &printerName);
|
|
||||||
|
|
||||||
void setupPrinter() const;
|
void setupPrinter() const;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
@ -234,7 +233,8 @@ public:
|
|||||||
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
QPrintPropertiesDialog::QPrintPropertiesDialog(QPrinter *printer, QAbstractPrintDialog *parent)
|
QPrintPropertiesDialog::QPrintPropertiesDialog(QPrinter *printer, QPrinter::OutputFormat outputFormat,
|
||||||
|
const QString &printerName, QAbstractPrintDialog *parent)
|
||||||
: QDialog(parent)
|
: QDialog(parent)
|
||||||
{
|
{
|
||||||
setWindowTitle(tr("Printer Properties"));
|
setWindowTitle(tr("Printer Properties"));
|
||||||
@ -249,6 +249,7 @@ QPrintPropertiesDialog::QPrintPropertiesDialog(QPrinter *printer, QAbstractPrint
|
|||||||
connect(m_buttons->button(QDialogButtonBox::Cancel), SIGNAL(clicked()), this, SLOT(reject()));
|
connect(m_buttons->button(QDialogButtonBox::Cancel), SIGNAL(clicked()), this, SLOT(reject()));
|
||||||
|
|
||||||
widget.pageSetup->setPrinter(printer);
|
widget.pageSetup->setPrinter(printer);
|
||||||
|
widget.pageSetup->selectPrinter(outputFormat, printerName);
|
||||||
|
|
||||||
#if QT_CONFIG(cupsjobwidget)
|
#if QT_CONFIG(cupsjobwidget)
|
||||||
m_jobOptions = new QCupsJobWidget(printer);
|
m_jobOptions = new QCupsJobWidget(printer);
|
||||||
@ -268,11 +269,6 @@ void QPrintPropertiesDialog::setupPrinter() const
|
|||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
void QPrintPropertiesDialog::selectPrinter(QPrinter::OutputFormat outputFormat, const QString &printerName)
|
|
||||||
{
|
|
||||||
widget.pageSetup->selectPrinter(outputFormat, printerName);
|
|
||||||
}
|
|
||||||
|
|
||||||
////////////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////////////
|
||||||
////////////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
@ -838,16 +834,20 @@ void QUnixPrintWidgetPrivate::setupPrinterProperties()
|
|||||||
if (propertiesDialog)
|
if (propertiesDialog)
|
||||||
delete propertiesDialog;
|
delete propertiesDialog;
|
||||||
|
|
||||||
propertiesDialog = new QPrintPropertiesDialog(q->printer(), q);
|
QPrinter::OutputFormat outputFormat;
|
||||||
propertiesDialog->setResult(QDialog::Rejected);
|
QString printerName;
|
||||||
propertiesDialogShown = false;
|
|
||||||
|
|
||||||
if (q->isOptionEnabled(QPrintDialog::PrintToFile)
|
if (q->isOptionEnabled(QPrintDialog::PrintToFile)
|
||||||
&& (widget.printers->currentIndex() == widget.printers->count() - 1)) {// PDF
|
&& (widget.printers->currentIndex() == widget.printers->count() - 1)) {// PDF
|
||||||
propertiesDialog->selectPrinter(QPrinter::PdfFormat, QString());
|
outputFormat = QPrinter::PdfFormat;
|
||||||
|
} else {
|
||||||
|
outputFormat = QPrinter::NativeFormat;
|
||||||
|
printerName = widget.printers->currentText();
|
||||||
}
|
}
|
||||||
else
|
|
||||||
propertiesDialog->selectPrinter(QPrinter::NativeFormat, widget.printers->currentText());
|
propertiesDialog = new QPrintPropertiesDialog(q->printer(), outputFormat, printerName, q);
|
||||||
|
propertiesDialog->setResult(QDialog::Rejected);
|
||||||
|
propertiesDialogShown = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
void QUnixPrintWidgetPrivate::_q_btnPropertiesClicked()
|
void QUnixPrintWidgetPrivate::_q_btnPropertiesClicked()
|
||||||
|
Loading…
x
Reference in New Issue
Block a user