Unix: Fix usability of the print properties dialog

Previous behavior:
 * Open, change setting, cancel, open again, setting was as originally (i.e. unchanged)
 * Open, change setting, accept, open, change setting, cancel, open again, the setting would be as before pressing cancel
 * Open, change setting, accept, open, press cancel without changing anything, print, the initially changed setting is not applied

New behavior:
 * Pressing cancel just cancels the changes since you opened the dialog, everything you accepted previously stays correctly selected

Change-Id: I483647504682f26d3d21c5229cc6530bf14fe519
Reviewed-by: Andy Shaw <andy.shaw@qt.io>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>

1 files changed, 24 insertions, 1 deletions

diff --git a/src/printsupport/widgets/qcupsjobwidget.cpp b/src/printsupport/widgets/qcupsjobwidget.cpp
index 7525d7f1e1..dcdb933f73 100644
--- a/src/printsupport/widgets/qcupsjobwidget.cpp
+++ b/src/printsupport/widgets/qcupsjobwidget.cpp
@@ -77,6 +77,8 @@ QCupsJobWidget::QCupsJobWidget(QPrinter *printer, QPrintDevice *printDevice, QWi
     initJobBilling();
     initJobPriority();
     initBannerPages();
+
+    updateSavedValues();
 }
 
 QCupsJobWidget::~QCupsJobWidget()
@@ -91,6 +93,27 @@ void QCupsJobWidget::setupPrinter()
     QCUPSSupport::setBannerPages(m_printer, startBannerPage(), endBannerPage());
 }
 
+void QCupsJobWidget::updateSavedValues()
+{
+    m_savedJobHoldWithTime = { jobHold(), jobHoldTime() };
+    m_savedJobBilling = jobBilling();
+    m_savedPriority = jobPriority();
+    m_savedJobSheets = { startBannerPage(), endBannerPage() };
+}
+
+void QCupsJobWidget::revertToSavedValues()
+{
+    setJobHold(m_savedJobHoldWithTime.jobHold, m_savedJobHoldWithTime.time);
+    toggleJobHoldTime();
+
+    setJobBilling(m_savedJobBilling);
+
+    setJobPriority(m_savedPriority);
+
+    setStartBannerPage(m_savedJobSheets.startBannerPage);
+    setEndBannerPage(m_savedJobSheets.endBannerPage);
+}
+
 void QCupsJobWidget::initJobHold()
 {
     m_ui.jobHoldComboBox->addItem(tr("Print Immediately"),             QVariant::fromValue(QCUPSSupport::NoHold));
@@ -154,7 +177,7 @@ void QCupsJobWidget::initJobBilling()
 
 void QCupsJobWidget::setJobBilling(const QString &jobBilling)
 {
-    m_ui.jobBillingLineEdit->insert(jobBilling);
+    m_ui.jobBillingLineEdit->setText(jobBilling);
 }
 
 QString QCupsJobWidget::jobBilling() const