whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix UI mismatch when QPrinter::setDuplex 

Amends fa854f214a. If user call
QPrinter::setDuplex method, the QPrintDialog explicitDuplexMode value
won't update.

Fix this by:
1) handle device-specific default and value set in QPrinter in
QCupsPrintEngine(Private)
2) handle the explicitly user-selected value in QPrintDialog(Private)

Done-with: Michael Weghorn <m.weghorn@posteo.de>
Pick-to: 5.15 6.2 6.3
Fixes: QTBUG-99504
Change-Id: I1a471a8554e83aa4bec8bb95fcc95f9135b0ac8c
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
bb10
Zhang Hao 2022-01-13 16:30:12 +08:00
parent 715ed74c89
commit 72931f4920
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/printsupport/cups/qcupsprintengine.cpp
View File

@ -89,8 +89,10 @@ void QCupsPrintEngine::setProperty(PrintEnginePropertyKey key, const QVariant &v
break;
case PPK_Duplex: {
QPrint::DuplexMode mode = QPrint::DuplexMode(value.toInt());
if (mode != d->duplex && d->m_printDevice.supportedDuplexModes().contains(mode))
if (d->m_printDevice.supportedDuplexModes().contains(mode)) {
d->duplex = mode;
d->duplexRequestedExplicitly = true;
}
break;
}
case PPK_PrinterName:
@ -277,9 +279,12 @@ void QCupsPrintEnginePrivate::changePrinter(const QString &newPrinter)
m_printDevice.swap(printDevice);
printerName = m_printDevice.id();
// Check if new printer supports current settings, otherwise us defaults
if (duplex != QPrint::DuplexAuto && !m_printDevice.supportedDuplexModes().contains(duplex))
// in case a duplex value was explicitly set, check if new printer supports current value,
// otherwise use device default
if (!duplexRequestedExplicitly || !m_printDevice.supportedDuplexModes().contains(duplex)) {
duplex = m_printDevice.defaultDuplexMode();
duplexRequestedExplicitly = false;
}
QPrint::ColorMode colorMode = grayscale ? QPrint::GrayScale : QPrint::Color;
if (!m_printDevice.supportedColorModes().contains(colorMode))
grayscale = m_printDevice.defaultColorMode() == QPrint::GrayScale;

1
src/plugins/printsupport/cups/qcupsprintengine_p.h
View File

@ -100,6 +100,7 @@ private:
QStringList cupsOptions;
QString cupsTempFile;
QPrint::DuplexMode duplex;
bool duplexRequestedExplicitly = false;
};
QT_END_NAMESPACE

7
src/printsupport/dialogs/qprintdialog_unix.cpp
View File

@ -708,13 +708,14 @@ void QPrintDialogPrivate::selectPrinter(const QPrinter::OutputFormat outputForma
else
options.grayscale->setChecked(true);
// keep duplex value explicitly set by user, if any, and selected printer supports it;
// use device default otherwise
// duplex priorities to be as follows:
// 1) a user-selected duplex value in the dialog has highest prority
// 2) duplex value set in the QPrinter
QPrint::DuplexMode duplex;
if (explicitDuplexMode != QPrint::DuplexAuto && supportedDuplexMode.contains(explicitDuplexMode))
duplex = explicitDuplexMode;
else
duplex = top->d->m_currentPrintDevice.defaultDuplexMode();
duplex = static_cast<QPrint::DuplexMode>(p->duplex());
switch (duplex) {
case QPrint::DuplexNone:
options.noDuplex->setChecked(true); break;