From d94ccf310a9ca01593750a34f743ec652f6a344e Mon Sep 17 00:00:00 2001 From: Albert Astals Cid Date: Wed, 27 Dec 2017 11:12:19 +0100 Subject: 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 Reviewed-by: Frederik Gladhorn --- src/printsupport/kernel/qcups_p.h | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'src/printsupport/kernel') diff --git a/src/printsupport/kernel/qcups_p.h b/src/printsupport/kernel/qcups_p.h index afddfdbf22..4b27632a60 100644 --- a/src/printsupport/kernel/qcups_p.h +++ b/src/printsupport/kernel/qcups_p.h @@ -145,13 +145,19 @@ public: struct JobSheets { - BannerPage startBannerPage = QCUPSSupport::NoBanner; - BannerPage endBannerPage = QCUPSSupport::NoBanner; + JobSheets(BannerPage s = NoBanner, BannerPage e = NoBanner) + : startBannerPage(s), endBannerPage(e) {} + + BannerPage startBannerPage; + BannerPage endBannerPage; }; static JobSheets parseJobSheets(const QString &jobSheets); struct JobHoldUntilWithTime { + JobHoldUntilWithTime(JobHoldUntil jh = NoHold, const QTime &t = QTime()) + : jobHold(jh), time(t) {} + JobHoldUntil jobHold; QTime time; }; -- cgit v1.2.3