From ea3f8ff6d0d1551a44b0c1a892470d9d48ebb858 Mon Sep 17 00:00:00 2001 From: Martin Klapetek Date: Wed, 11 Sep 2013 21:02:42 +0200 Subject: Add CUPS Banner Pages options to print support Adds a way to set standard CUPS Banner Pages. This widget is part of the Job Options widget/tab in Properties dialog. [ChangeLog][QtPrintSupport][QPrintDialog] Added support for setting CUPS Banner pages in the print dialog. Change-Id: Ia7a22b7a0f51c12d170986caee61af7109e781e9 Reviewed-by: John Layt --- src/printsupport/widgets/qcupsjobwidget.cpp | 44 +++++++++++++++++++++++++++++ src/printsupport/widgets/qcupsjobwidget.ui | 42 ++++++++++++++++++--------- src/printsupport/widgets/qcupsjobwidget_p.h | 7 +++++ 3 files changed, 80 insertions(+), 13 deletions(-) (limited to 'src/printsupport/widgets') diff --git a/src/printsupport/widgets/qcupsjobwidget.cpp b/src/printsupport/widgets/qcupsjobwidget.cpp index 28fb8e859b..9940e6a1af 100644 --- a/src/printsupport/widgets/qcupsjobwidget.cpp +++ b/src/printsupport/widgets/qcupsjobwidget.cpp @@ -75,6 +75,7 @@ QCupsJobWidget::QCupsJobWidget(QWidget *parent) initJobHold(); initJobBilling(); initJobPriority(); + initBannerPages(); } QCupsJobWidget::~QCupsJobWidget() @@ -91,6 +92,7 @@ void QCupsJobWidget::setupPrinter() QCUPSSupport::setJobHold(m_printer, jobHold(), jobHoldTime()); QCUPSSupport::setJobBilling(m_printer, jobBilling()); QCUPSSupport::setJobPriority(m_printer, jobPriority()); + QCUPSSupport::setBannerPages(m_printer, startBannerPage(), endBannerPage()); } void QCupsJobWidget::initJobHold() @@ -168,4 +170,46 @@ int QCupsJobWidget::jobPriority() const return m_ui.jobPrioritySpinBox->value(); } +void QCupsJobWidget::initBannerPages() +{ + m_ui.startBannerPageCombo->addItem(tr("None", "CUPS Banner page"), QVariant::fromValue(QCUPSSupport::NoBanner)); + m_ui.startBannerPageCombo->addItem(tr("Standard", "CUPS Banner page"), QVariant::fromValue(QCUPSSupport::Standard)); + m_ui.startBannerPageCombo->addItem(tr("Unclassified", "CUPS Banner page"), QVariant::fromValue(QCUPSSupport::Unclassified)); + m_ui.startBannerPageCombo->addItem(tr("Confidential", "CUPS Banner page"), QVariant::fromValue(QCUPSSupport::Confidential)); + m_ui.startBannerPageCombo->addItem(tr("Classified", "CUPS Banner page"), QVariant::fromValue(QCUPSSupport::Classified)); + m_ui.startBannerPageCombo->addItem(tr("Secret", "CUPS Banner page"), QVariant::fromValue(QCUPSSupport::Secret)); + m_ui.startBannerPageCombo->addItem(tr("Top Secret", "CUPS Banner page"), QVariant::fromValue(QCUPSSupport::TopSecret)); + + m_ui.endBannerPageCombo->addItem(tr("None", "CUPS Banner page"), QVariant::fromValue(QCUPSSupport::NoBanner)); + m_ui.endBannerPageCombo->addItem(tr("Standard", "CUPS Banner page"), QVariant::fromValue(QCUPSSupport::Standard)); + m_ui.endBannerPageCombo->addItem(tr("Unclassified", "CUPS Banner page"), QVariant::fromValue(QCUPSSupport::Unclassified)); + m_ui.endBannerPageCombo->addItem(tr("Confidential", "CUPS Banner page"), QVariant::fromValue(QCUPSSupport::Confidential)); + m_ui.endBannerPageCombo->addItem(tr("Classified", "CUPS Banner page"), QVariant::fromValue(QCUPSSupport::Classified)); + m_ui.endBannerPageCombo->addItem(tr("Secret", "CUPS Banner page"), QVariant::fromValue(QCUPSSupport::Secret)); + m_ui.endBannerPageCombo->addItem(tr("Top Secret", "CUPS Banner page"), QVariant::fromValue(QCUPSSupport::TopSecret)); + + setStartBannerPage(QCUPSSupport::NoBanner); + setEndBannerPage(QCUPSSupport::NoBanner); +} + +void QCupsJobWidget::setStartBannerPage(const QCUPSSupport::BannerPage bannerPage) +{ + m_ui.startBannerPageCombo->setCurrentIndex(m_ui.startBannerPageCombo->findData(QVariant::fromValue(bannerPage))); +} + +QCUPSSupport::BannerPage QCupsJobWidget::startBannerPage() const +{ + return m_ui.startBannerPageCombo->itemData(m_ui.startBannerPageCombo->currentIndex()).value(); +} + +void QCupsJobWidget::setEndBannerPage(const QCUPSSupport::BannerPage bannerPage) +{ + m_ui.endBannerPageCombo->setCurrentIndex(m_ui.endBannerPageCombo->findData(QVariant::fromValue(bannerPage))); +} + +QCUPSSupport::BannerPage QCupsJobWidget::endBannerPage() const +{ + return m_ui.endBannerPageCombo->itemData(m_ui.endBannerPageCombo->currentIndex()).value(); +} + QT_END_NAMESPACE diff --git a/src/printsupport/widgets/qcupsjobwidget.ui b/src/printsupport/widgets/qcupsjobwidget.ui index 2c03ef843a..7450c0629f 100644 --- a/src/printsupport/widgets/qcupsjobwidget.ui +++ b/src/printsupport/widgets/qcupsjobwidget.ui @@ -12,8 +12,8 @@ Job - - + + Job Control @@ -72,23 +72,39 @@ - - - - Qt::Vertical + + + + + + + Banner Pages + + + + + + + + + + + + End: - - - 20 - 35 - + + + + + + Start: - + - + Qt::Vertical diff --git a/src/printsupport/widgets/qcupsjobwidget_p.h b/src/printsupport/widgets/qcupsjobwidget_p.h index b0f276b251..a5e2bf8083 100644 --- a/src/printsupport/widgets/qcupsjobwidget_p.h +++ b/src/printsupport/widgets/qcupsjobwidget_p.h @@ -89,9 +89,16 @@ private: void setJobPriority(int priority = 50); int jobPriority() const; + void setStartBannerPage(const QCUPSSupport::BannerPage bannerPage = QCUPSSupport::NoBanner); + QCUPSSupport::BannerPage startBannerPage() const; + + void setEndBannerPage(const QCUPSSupport::BannerPage bannerPage = QCUPSSupport::NoBanner); + QCUPSSupport::BannerPage endBannerPage() const; + void initJobHold(); void initJobBilling(); void initJobPriority(); + void initBannerPages(); QPrinter *m_printer; Ui::QCupsJobWidget m_ui; -- cgit v1.2.3