diff options
Diffstat (limited to 'src/printsupport')
-rw-r--r-- | src/printsupport/CMakeLists.txt | 180 | ||||
-rw-r--r-- | src/printsupport/configure.cmake | 58 | ||||
-rw-r--r-- | src/printsupport/dialogs/qpagesetupdialog_unix.cpp | 18 | ||||
-rw-r--r-- | src/printsupport/dialogs/qprintdialog_unix.cpp | 2 | ||||
-rw-r--r-- | src/printsupport/widgets/qcupsjobwidget.cpp | 2 |
5 files changed, 249 insertions, 11 deletions
diff --git a/src/printsupport/CMakeLists.txt b/src/printsupport/CMakeLists.txt new file mode 100644 index 0000000000..c11b9d8b15 --- /dev/null +++ b/src/printsupport/CMakeLists.txt @@ -0,0 +1,180 @@ +# Generated from printsupport.pro. + +##################################################################### +## PrintSupport Module: +##################################################################### + +qt_add_module(PrintSupport + PLUGIN_TYPES printsupport + SOURCES + kernel/qpaintengine_alpha.cpp kernel/qpaintengine_alpha_p.h + kernel/qplatformprintdevice.cpp kernel/qplatformprintdevice.h + kernel/qplatformprintersupport.cpp kernel/qplatformprintersupport.h + kernel/qplatformprintplugin.cpp kernel/qplatformprintplugin.h + kernel/qprint_p.h + kernel/qprintdevice.cpp kernel/qprintdevice_p.h + kernel/qprintengine.h + kernel/qprintengine_pdf.cpp + kernel/qprinter.cpp kernel/qprinter.h kernel/qprinter_p.h + kernel/qprinterinfo.cpp kernel/qprinterinfo.h kernel/qprinterinfo_p.h + kernel/qtprintsupportglobal.h kernel/qtprintsupportglobal_p.h + DEFINES + QT_NO_FOREACH + QT_NO_USING_NAMESPACE + INCLUDE_DIRECTORIES + dialogs + widgets + LIBRARIES + Qt::CorePrivate + Qt::GuiPrivate + Qt::WidgetsPrivate + PUBLIC_LIBRARIES + Qt::Core + Qt::Gui + Qt::Widgets + PRIVATE_MODULE_INTERFACE + Qt::CorePrivate + Qt::GuiPrivate + Qt::WidgetsPrivate +) + +#### Keys ignored in scope 1:.:.:printsupport.pro:<TRUE>: +# QMAKE_LIBS = "$$QMAKE_LIBS_PRINTSUPPORT" + +## Scopes: +##################################################################### + +qt_extend_target(PrintSupport CONDITION QT_FEATURE_printpreviewwidget + SOURCES + kernel/qpaintengine_preview.cpp kernel/qpaintengine_preview_p.h + widgets/qprintpreviewwidget.cpp widgets/qprintpreviewwidget.h +) + +qt_extend_target(PrintSupport CONDITION WIN32 + SOURCES + kernel/qprintengine_win.cpp kernel/qprintengine_win_p.h +) + +qt_extend_target(PrintSupport CONDITION WIN32 AND NOT WINRT + LIBRARIES + comdlg32 + gdi32 + user32 + winspool +) + +qt_extend_target(PrintSupport CONDITION QT_FEATURE_cups AND UNIX AND NOT APPLE + SOURCES + kernel/qcups.cpp kernel/qcups_p.h +) + +qt_extend_target(PrintSupport CONDITION QT_FEATURE_cupsjobwidget AND UNIX AND NOT APPLE + SOURCES + widgets/qcupsjobwidget.cpp widgets/qcupsjobwidget.ui widgets/qcupsjobwidget_p.h + ENABLE_AUTOGEN_TOOLS + uic +) + +qt_extend_target(PrintSupport CONDITION QT_FEATURE_printdialog + SOURCES + dialogs/qabstractprintdialog.cpp dialogs/qabstractprintdialog.h dialogs/qabstractprintdialog_p.h + dialogs/qpagesetupdialog.cpp dialogs/qpagesetupdialog.h dialogs/qpagesetupdialog_p.h + dialogs/qpagesetupwidget.ui + dialogs/qprintdialog.h + ENABLE_AUTOGEN_TOOLS + uic +) + +if(QT_FEATURE_printdialog) + # Resources: + set(qprintdialog_resource_files + "images/fit-page-24.png" + "images/fit-page-32.png" + "images/fit-width-24.png" + "images/fit-width-32.png" + "images/go-first-24.png" + "images/go-first-32.png" + "images/go-last-24.png" + "images/go-last-32.png" + "images/go-next-24.png" + "images/go-next-32.png" + "images/go-previous-24.png" + "images/go-previous-32.png" + "images/layout-landscape-24.png" + "images/layout-landscape-32.png" + "images/layout-portrait-24.png" + "images/layout-portrait-32.png" + "images/page-setup-24.png" + "images/page-setup-32.png" + "images/print-24.png" + "images/print-32.png" + "images/view-page-multi-24.png" + "images/view-page-multi-32.png" + "images/view-page-one-24.png" + "images/view-page-one-32.png" + "images/view-page-sided-24.png" + "images/view-page-sided-32.png" + "images/zoom-in-24.png" + "images/zoom-in-32.png" + "images/zoom-out-24.png" + "images/zoom-out-32.png" + ) + + qt_add_resource(PrintSupport "qprintdialog" + PREFIX + "/qt-project.org/dialogs/qprintpreviewdialog" + BASE + "dialogs" + FILES + ${qprintdialog_resource_files} + ) + set(qprintdialog1_resource_files + "images/status-color.png" + "images/status-gray-scale.png" + ) + + qt_add_resource(PrintSupport "qprintdialog1" + PREFIX + "/qt-project.org/dialogs/qprintdialog" + BASE + "dialogs" + FILES + ${qprintdialog1_resource_files} + ) +endif() + +qt_extend_target(PrintSupport CONDITION APPLE_OSX AND QT_FEATURE_printdialog + SOURCES + dialogs/qpagesetupdialog_mac.mm + dialogs/qprintdialog_mac.mm + LIBRARIES + ${FWAppKit} +) + +qt_extend_target(PrintSupport CONDITION QT_FEATURE_printdialog AND WIN32 + SOURCES + dialogs/qpagesetupdialog_win.cpp + dialogs/qprintdialog_win.cpp +) + +qt_extend_target(PrintSupport CONDITION QT_FEATURE_printdialog AND UNIX AND NOT APPLE + SOURCES + dialogs/qpagesetupdialog_unix.cpp dialogs/qpagesetupdialog_unix_p.h + dialogs/qprintdialog_unix.cpp + dialogs/qprintpropertieswidget.ui + dialogs/qprintsettingsoutput.ui + dialogs/qprintwidget.ui + INCLUDE_DIRECTORIES + ${QT_SOURCE_TREE}/src/plugins/printsupport/cups + ENABLE_AUTOGEN_TOOLS + uic +) + +qt_extend_target(PrintSupport CONDITION QT_FEATURE_printpreviewdialog + SOURCES + dialogs/qprintpreviewdialog.cpp dialogs/qprintpreviewdialog.h +) +qt_add_docs(PrintSupport + doc/qtprintsupport.qdocconf +) + diff --git a/src/printsupport/configure.cmake b/src/printsupport/configure.cmake new file mode 100644 index 0000000000..c9b5f74750 --- /dev/null +++ b/src/printsupport/configure.cmake @@ -0,0 +1,58 @@ + + +#### Inputs + + + +#### Libraries + +qt_find_package(Cups PROVIDED_TARGETS Cups::Cups) + + +#### Tests + + + +#### Features + +qt_feature("cups" PUBLIC PRIVATE + SECTION "Painting" + LABEL "CUPS" + PURPOSE "Provides support for the Common Unix Printing System." + CONDITION Cups_FOUND AND QT_FEATURE_printer AND QT_FEATURE_datestring +) +qt_feature_definition("cups" "QT_NO_CUPS" NEGATE VALUE "1") +qt_feature("cupsjobwidget" PUBLIC PRIVATE + SECTION "Widgets" + LABEL "CUPS job control widget" + CONDITION ( QT_FEATURE_buttongroup ) AND ( QT_FEATURE_calendarwidget ) AND ( QT_FEATURE_checkbox ) AND ( QT_FEATURE_combobox ) AND ( QT_FEATURE_cups ) AND ( QT_FEATURE_datetimeedit ) AND ( QT_FEATURE_groupbox ) AND ( QT_FEATURE_tablewidget ) +) +qt_feature_definition("cupsjobwidget" "QT_NO_CUPSJOBWIDGET" NEGATE VALUE "1") +qt_feature("printer" PUBLIC + SECTION "Painting" + LABEL "QPrinter" + PURPOSE "Provides a printer backend of QPainter." + CONDITION NOT APPLE_UIKIT AND NOT WINRT AND QT_FEATURE_picture AND QT_FEATURE_temporaryfile AND QT_FEATURE_pdf +) +qt_feature_definition("printer" "QT_NO_PRINTER" NEGATE VALUE "1") +qt_feature("printpreviewwidget" PUBLIC + SECTION "Widgets" + LABEL "QPrintPreviewWidget" + PURPOSE "Provides a widget for previewing page layouts for printer output." + CONDITION QT_FEATURE_graphicsview AND QT_FEATURE_printer AND QT_FEATURE_mainwindow +) +qt_feature_definition("printpreviewwidget" "QT_NO_PRINTPREVIEWWIDGET" NEGATE VALUE "1") +qt_feature("printdialog" PUBLIC + SECTION "Dialogs" + LABEL "QPrintDialog" + PURPOSE "Provides a dialog widget for specifying printer configuration." + CONDITION ( QT_FEATURE_buttongroup ) AND ( QT_FEATURE_checkbox ) AND ( QT_FEATURE_combobox ) AND ( QT_FEATURE_dialog ) AND ( QT_FEATURE_datetimeedit ) AND ( QT_FEATURE_dialogbuttonbox ) AND ( QT_FEATURE_printer ) AND ( QT_FEATURE_radiobutton ) AND ( QT_FEATURE_spinbox ) AND ( QT_FEATURE_tabwidget ) AND ( QT_FEATURE_treeview ) +) +qt_feature_definition("printdialog" "QT_NO_PRINTDIALOG" NEGATE VALUE "1") +qt_feature("printpreviewdialog" PUBLIC + SECTION "Dialogs" + LABEL "QPrintPreviewDialog" + PURPOSE "Provides a dialog for previewing and configuring page layouts for printer output." + CONDITION QT_FEATURE_printpreviewwidget AND QT_FEATURE_printdialog AND QT_FEATURE_toolbar AND QT_FEATURE_formlayout +) +qt_feature_definition("printpreviewdialog" "QT_NO_PRINTPREVIEWDIALOG" NEGATE VALUE "1") diff --git a/src/printsupport/dialogs/qpagesetupdialog_unix.cpp b/src/printsupport/dialogs/qpagesetupdialog_unix.cpp index 78e5b8d1ef..2b7c0ce6ec 100644 --- a/src/printsupport/dialogs/qpagesetupdialog_unix.cpp +++ b/src/printsupport/dialogs/qpagesetupdialog_unix.cpp @@ -274,21 +274,21 @@ QPageSetupWidget::QPageSetupWidget(QWidget *parent) initUnits(); initPagesPerSheet(); - connect(m_ui.unitCombo, QOverload<int>::of(&QComboBox::activated), this, &QPageSetupWidget::unitChanged); + connect(m_ui.unitCombo, &QComboBox::activated, this, &QPageSetupWidget::unitChanged); - connect(m_ui.pageSizeCombo, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &QPageSetupWidget::pageSizeChanged); - connect(m_ui.pageWidth, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &QPageSetupWidget::pageSizeChanged); - connect(m_ui.pageHeight, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &QPageSetupWidget::pageSizeChanged); + connect(m_ui.pageSizeCombo, &QComboBox::currentIndexChanged, this, &QPageSetupWidget::pageSizeChanged); + connect(m_ui.pageWidth, &QDoubleSpinBox::valueChanged, this, &QPageSetupWidget::pageSizeChanged); + connect(m_ui.pageHeight, &QDoubleSpinBox::valueChanged, this, &QPageSetupWidget::pageSizeChanged); - connect(m_ui.leftMargin, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &QPageSetupWidget::leftMarginChanged); - connect(m_ui.topMargin, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &QPageSetupWidget::topMarginChanged); - connect(m_ui.rightMargin, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &QPageSetupWidget::rightMarginChanged); - connect(m_ui.bottomMargin, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &QPageSetupWidget::bottomMarginChanged); + connect(m_ui.leftMargin, &QDoubleSpinBox::valueChanged, this, &QPageSetupWidget::leftMarginChanged); + connect(m_ui.topMargin, &QDoubleSpinBox::valueChanged, this, &QPageSetupWidget::topMarginChanged); + connect(m_ui.rightMargin, &QDoubleSpinBox::valueChanged, this, &QPageSetupWidget::rightMarginChanged); + connect(m_ui.bottomMargin, &QDoubleSpinBox::valueChanged, this, &QPageSetupWidget::bottomMarginChanged); connect(m_ui.portrait, &QRadioButton::clicked, this, &QPageSetupWidget::pageOrientationChanged); connect(m_ui.landscape, &QRadioButton::clicked, this, &QPageSetupWidget::pageOrientationChanged); - connect(m_ui.pagesPerSheetCombo, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &QPageSetupWidget::pagesPerSheetChanged); + connect(m_ui.pagesPerSheetCombo, &QComboBox::currentIndexChanged, this, &QPageSetupWidget::pagesPerSheetChanged); } // Init the Units combo box diff --git a/src/printsupport/dialogs/qprintdialog_unix.cpp b/src/printsupport/dialogs/qprintdialog_unix.cpp index bf77666c41..f3b47bcbd2 100644 --- a/src/printsupport/dialogs/qprintdialog_unix.cpp +++ b/src/printsupport/dialogs/qprintdialog_unix.cpp @@ -487,7 +487,7 @@ bool QPrintPropertiesDialog::createAdvancedOptionsWidget() if (choicesCb->count() > 1) { - connect(choicesCb, QOverload<int>::of(&QComboBox::currentIndexChanged), this, setPpdOptionFromCombo); + connect(choicesCb, &QComboBox::currentIndexChanged, this, setPpdOptionFromCombo); // We need an extra label at the end to show the conflict warning QWidget *choicesCbWithLabel = new QWidget(); diff --git a/src/printsupport/widgets/qcupsjobwidget.cpp b/src/printsupport/widgets/qcupsjobwidget.cpp index 456ed9db19..6d9e7432bc 100644 --- a/src/printsupport/widgets/qcupsjobwidget.cpp +++ b/src/printsupport/widgets/qcupsjobwidget.cpp @@ -125,7 +125,7 @@ void QCupsJobWidget::initJobHold() m_ui.jobHoldComboBox->addItem(tr("Weekend (Saturday to Sunday)"), QVariant::fromValue(QCUPSSupport::Weekend)); m_ui.jobHoldComboBox->addItem(tr("Specific Time"), QVariant::fromValue(QCUPSSupport::SpecificTime)); - connect(m_ui.jobHoldComboBox, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &QCupsJobWidget::toggleJobHoldTime); + connect(m_ui.jobHoldComboBox, &QComboBox::currentIndexChanged, this, &QCupsJobWidget::toggleJobHoldTime); QCUPSSupport::JobHoldUntilWithTime jobHoldWithTime; |