diff options
| author | Albert Astals Cid <albert.astals.cid@kdab.com> | 2017-12-06 13:00:30 +0100 |
|---|---|---|
| committer | Albert Astals Cid <albert.astals.cid@kdab.com> | 2017-12-19 08:08:13 +0000 |
| commit | 414a703036db6d5b4b1f48b85d8c3b4702f869ec (patch) | |
| tree | a1fb7c1a9d61158c122c59cc0f9dbb91af06c1d3 /src/printsupport/widgets | |
| parent | 2831fa76655c614ed3df0816401514950e79b5e6 (diff) | |
CUPS: Use printer job-hold-until as default instead of the nohold
This also reads the job-hold-until from lpoptions if set there for the particular printer
Change-Id: Ic60fef675ab9f4760cd99ee9ac417b0478459681
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
Diffstat (limited to 'src/printsupport/widgets')
| -rw-r--r-- | src/printsupport/widgets/qcupsjobwidget.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/printsupport/widgets/qcupsjobwidget.cpp b/src/printsupport/widgets/qcupsjobwidget.cpp index adaaff831a..5d026d4c3d 100644 --- a/src/printsupport/widgets/qcupsjobwidget.cpp +++ b/src/printsupport/widgets/qcupsjobwidget.cpp @@ -73,7 +73,6 @@ QCupsJobWidget::QCupsJobWidget(QPrinter *printer, QPrintDevice *printDevice, QWi { m_ui.setupUi(this); //set all the default values - //TODO restore last used values initJobHold(); initJobBilling(); initJobPriority(); @@ -105,7 +104,14 @@ void QCupsJobWidget::initJobHold() connect(m_ui.jobHoldComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(toggleJobHoldTime())); - setJobHold(QCUPSSupport::NoHold, QTime()); + QCUPSSupport::JobHoldUntilWithTime jobHoldWithTime; + + if (m_printDevice) { + const QString jobHoldUntilString = m_printDevice->property(PDPK_CupsJobHoldUntil).toString(); + jobHoldWithTime = QCUPSSupport::parseJobHoldUntil(jobHoldUntilString); + } + + setJobHold(jobHoldWithTime.jobHold, jobHoldWithTime.time); toggleJobHoldTime(); } |