From c59e577a18ea20283a3267b9400de5f812056f93 Mon Sep 17 00:00:00 2001 From: Michael Bruning Date: Thu, 28 Apr 2016 19:26:17 +0200 Subject: Replace print dialog with a custom one for printing to pdf. The standard pdf print dialog does not work on OS X and Windows. Task-number: QTBUG-53016 Change-Id: Ic9dd1a1603e1cdbd82fef095cc660814bcd8c98e Reviewed-by: Kai Koehne --- .../demobrowser/browsermainwindow.cpp | 22 ++-- .../webenginewidgets/demobrowser/demobrowser.pro | 3 + .../demobrowser/printtopdfdialog.cpp | 132 +++++++++++++++++++++ .../demobrowser/printtopdfdialog.h | 86 ++++++++++++++ .../demobrowser/printtopdfdialog.ui | 119 +++++++++++++++++++ 5 files changed, 349 insertions(+), 13 deletions(-) create mode 100644 examples/webenginewidgets/demobrowser/printtopdfdialog.cpp create mode 100644 examples/webenginewidgets/demobrowser/printtopdfdialog.h create mode 100644 examples/webenginewidgets/demobrowser/printtopdfdialog.ui diff --git a/examples/webenginewidgets/demobrowser/browsermainwindow.cpp b/examples/webenginewidgets/demobrowser/browsermainwindow.cpp index 0f24de707..fbee934db 100644 --- a/examples/webenginewidgets/demobrowser/browsermainwindow.cpp +++ b/examples/webenginewidgets/demobrowser/browsermainwindow.cpp @@ -56,6 +56,7 @@ #include "chasewidget.h" #include "downloadmanager.h" #include "history.h" +#include "printtopdfdialog.h" #include "settings.h" #include "tabwidget.h" #include "toolbarsearch.h" @@ -313,9 +314,7 @@ void BrowserMainWindow::setupMenu() fileMenu->addAction(tr("P&rint Preview..."), this, SLOT(slotFilePrintPreview())); fileMenu->addAction(tr("&Print..."), this, SLOT(slotFilePrint()), QKeySequence::Print); #endif -#ifndef QT_NO_PRINTER fileMenu->addAction(tr("&Print to PDF..."), this, SLOT(slotFilePrintToPDF())); -#endif // ifndef QT_NO_PRINTER fileMenu->addSeparator(); QAction *action = fileMenu->addAction(tr("Private &Browsing..."), this, SLOT(slotPrivateBrowsing())); @@ -718,20 +717,17 @@ void BrowserMainWindow::slotHandlePdfPrinted(const QByteArray& result) void BrowserMainWindow::slotFilePrintToPDF() { -#ifndef QT_NO_PRINTER - if (!currentTab()) + if (!currentTab() || !m_printerOutputFileName.isEmpty()) return; - QPrinter printer; - QPrintDialog *dialog = new QPrintDialog(&printer, this); - dialog->setWindowTitle(tr("Print Document")); - if (dialog->exec() != QDialog::Accepted || printer.outputFileName().isEmpty() || !m_printerOutputFileName.isEmpty()) - return; - - m_printerOutputFileName = printer.outputFileName(); - currentTab()->page()->printToPdf(invoke(this, &BrowserMainWindow::slotHandlePdfPrinted), printer.pageLayout()); + QFileInfo info(QStringLiteral("printout.pdf")); + PrintToPdfDialog *dialog = new PrintToPdfDialog(info.absoluteFilePath(), this); + dialog->setWindowTitle(tr("Print to PDF")); + if (dialog->exec() != QDialog::Accepted || dialog->filePath().isEmpty()) + return; -#endif // QT_NO_PRINTER + m_printerOutputFileName = dialog->filePath(); + currentTab()->page()->printToPdf(invoke(this, &BrowserMainWindow::slotHandlePdfPrinted), dialog->pageLayout()); } #if defined(QWEBENGINEPAGE_PRINT) diff --git a/examples/webenginewidgets/demobrowser/demobrowser.pro b/examples/webenginewidgets/demobrowser/demobrowser.pro index e295cd9dd..87f362f90 100644 --- a/examples/webenginewidgets/demobrowser/demobrowser.pro +++ b/examples/webenginewidgets/demobrowser/demobrowser.pro @@ -15,6 +15,7 @@ FORMS += \ downloads.ui \ history.ui \ passworddialog.ui \ + printtopdfdialog.ui \ proxy.ui \ savepagedialog.ui \ settings.ui @@ -32,6 +33,7 @@ HEADERS += \ fullscreennotification.h \ history.h \ modelmenu.h \ + printtopdfdialog.h \ savepagedialog.h \ searchlineedit.h \ settings.h \ @@ -55,6 +57,7 @@ SOURCES += \ fullscreennotification.cpp \ history.cpp \ modelmenu.cpp \ + printtopdfdialog.cpp \ savepagedialog.cpp \ searchlineedit.cpp \ settings.cpp \ diff --git a/examples/webenginewidgets/demobrowser/printtopdfdialog.cpp b/examples/webenginewidgets/demobrowser/printtopdfdialog.cpp new file mode 100644 index 000000000..0f3b1765e --- /dev/null +++ b/examples/webenginewidgets/demobrowser/printtopdfdialog.cpp @@ -0,0 +1,132 @@ +/**************************************************************************** +** +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the demonstration applications of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** BSD License Usage +** Alternatively, you may use this file under the terms of the BSD license +** as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of The Qt Company Ltd nor the names of its +** contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "printtopdfdialog.h" +#include "ui_printtopdfdialog.h" + +#include +#ifndef QT_NO_PRINTER +#include +#include +#endif // QT_NO_PRINTER +#include + +PrintToPdfDialog::PrintToPdfDialog(const QString &filePath, QWidget *parent) : + QDialog(parent), + currentPageLayout(QPageLayout(QPageSize(QPageSize::A4), QPageLayout::Portrait, QMarginsF(0.0, 0.0, 0.0, 0.0))), + ui(new Ui::PrintToPdfDialog) +{ + ui->setupUi(this); + setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); + connect(ui->chooseFilePathButton, &QToolButton::clicked, this, &PrintToPdfDialog::onChooseFilePathButtonClicked); +#ifndef QT_NO_PRINTER + connect(ui->choosePageLayoutButton, &QToolButton::clicked, this, &PrintToPdfDialog::onChoosePageLayoutButtonClicked); +#else + ui->choosePageLayoutButton->hide(); +#endif // QT_NO_PRINTER + updatePageLayoutLabel(); + setFilePath(filePath); +} + +PrintToPdfDialog::~PrintToPdfDialog() +{ + delete ui; +} + +void PrintToPdfDialog::onChoosePageLayoutButtonClicked() +{ +#ifndef QT_NO_PRINTER + QPrinter printer; + printer.setPageLayout(currentPageLayout); + + QPageSetupDialog dlg(&printer, this); + if (dlg.exec() != QDialog::Accepted) + return; + currentPageLayout.setPageSize(printer.pageLayout().pageSize()); + currentPageLayout.setOrientation(printer.pageLayout().orientation()); + updatePageLayoutLabel(); +#endif // QT_NO_PRINTER +} + +void PrintToPdfDialog::onChooseFilePathButtonClicked() +{ + QFileInfo fi(filePath()); + QFileDialog dlg(this, tr("Save PDF as"), fi.absolutePath()); + dlg.setAcceptMode(QFileDialog::AcceptSave); + dlg.setDefaultSuffix(QStringLiteral(".pdf")); + dlg.selectFile(fi.absoluteFilePath()); + if (dlg.exec() != QDialog::Accepted) + return; + setFilePath(dlg.selectedFiles().first()); +} + +QString PrintToPdfDialog::filePath() const +{ + return QDir::fromNativeSeparators(ui->filePathLineEdit->text()); +} + +void PrintToPdfDialog::setFilePath(const QString &filePath) +{ + ui->filePathLineEdit->setText(QDir::toNativeSeparators(filePath)); +} + +QPageLayout PrintToPdfDialog::pageLayout() const +{ + return currentPageLayout; +} + +void PrintToPdfDialog::updatePageLayoutLabel() +{ + ui->pageLayoutLabel->setText(QString("%1, %2").arg( + currentPageLayout.pageSize().name()).arg( + currentPageLayout.orientation() == QPageLayout::Portrait + ? tr("Portrait") : tr("Landscape") + )); +} diff --git a/examples/webenginewidgets/demobrowser/printtopdfdialog.h b/examples/webenginewidgets/demobrowser/printtopdfdialog.h new file mode 100644 index 000000000..87fca72c3 --- /dev/null +++ b/examples/webenginewidgets/demobrowser/printtopdfdialog.h @@ -0,0 +1,86 @@ +/**************************************************************************** +** +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the demonstration applications of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** BSD License Usage +** Alternatively, you may use this file under the terms of the BSD license +** as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of The Qt Company Ltd nor the names of its +** contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef PRINTTOPDFDIALOG_H +#define PRINTTOPDFDIALOG_H + +#include +#include + +QT_BEGIN_NAMESPACE +namespace Ui { +class PrintToPdfDialog; +} +QT_END_NAMESPACE + +class PrintToPdfDialog : public QDialog +{ + Q_OBJECT + +public: + explicit PrintToPdfDialog(const QString &filePath, QWidget *parent = 0); + ~PrintToPdfDialog(); + + QString filePath() const; + QPageLayout pageLayout() const; + +private slots: + void onChoosePageLayoutButtonClicked(); + void onChooseFilePathButtonClicked(); + +private: + void setFilePath(const QString &); + void updatePageLayoutLabel(); + + QPageLayout currentPageLayout; + Ui::PrintToPdfDialog *ui; +}; + +#endif // PRINTTOPDFDIALOG_H diff --git a/examples/webenginewidgets/demobrowser/printtopdfdialog.ui b/examples/webenginewidgets/demobrowser/printtopdfdialog.ui new file mode 100644 index 000000000..dcfd5a3aa --- /dev/null +++ b/examples/webenginewidgets/demobrowser/printtopdfdialog.ui @@ -0,0 +1,119 @@ + + + PrintToPdfDialog + + + + 0 + 0 + 372 + 117 + + + + Dialog + + + + + + Qt::Horizontal + + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok + + + + + + + + + ... + + + + + + + Save as: + + + + + + + + + + Page layout: + + + + + + + ... + + + + + + + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + buttonBox + accepted() + PrintToPdfDialog + accept() + + + 248 + 254 + + + 157 + 274 + + + + + buttonBox + rejected() + PrintToPdfDialog + reject() + + + 316 + 260 + + + 286 + 274 + + + + + -- cgit v1.2.3