From 28f1c1b9ef10fc3a49a64a535c7747a009939453 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Thu, 18 Aug 2011 11:04:06 +0200 Subject: Restore feature compatibility with QPrinter in QTextDocument::print Add a margin method to QPagedPaintDevice. The other variables required are stored in QPagedPaintDevicePrivate without a public API for now. This needs cleaning up once we have a new printing system. Change-Id: Id3f2d7ac7f3cbce8619072a897d91f3a588add64 Reviewed-on: http://codereview.qt.nokia.com/3211 Reviewed-by: Qt Sanity Bot Reviewed-by: Gunnar Sletta --- src/gui/painting/painting.pri | 1 + src/gui/painting/qpagedpaintdevice.cpp | 26 ++++++- src/gui/painting/qpagedpaintdevice.h | 13 +++- src/gui/painting/qpagedpaintdevice_p.h | 89 +++++++++++++++++++++++ src/gui/painting/qpdfwriter.cpp | 15 ++++ src/gui/painting/qpdfwriter.h | 2 + src/gui/text/qtextcontrol.cpp | 6 +- src/gui/text/qtextdocument.cpp | 21 +++--- src/printsupport/dialogs/qabstractprintdialog.cpp | 22 +++--- src/printsupport/dialogs/qabstractprintdialog_p.h | 5 +- src/printsupport/kernel/qprinter.cpp | 31 +++++--- src/printsupport/kernel/qprinter.h | 2 + src/printsupport/kernel/qprinter_p.h | 5 -- src/widgets/widgets/qwidgettextcontrol.cpp | 6 +- 14 files changed, 197 insertions(+), 47 deletions(-) create mode 100644 src/gui/painting/qpagedpaintdevice_p.h diff --git a/src/gui/painting/painting.pri b/src/gui/painting/painting.pri index 530bdb36df..c059e96c86 100644 --- a/src/gui/painting/painting.pri +++ b/src/gui/painting/painting.pri @@ -12,6 +12,7 @@ HEADERS += \ painting/qmemrotate_p.h \ painting/qoutlinemapper_p.h \ painting/qpagedpaintdevice.h \ + painting/qpagedpaintdevice_p.h \ painting/qpaintdevice.h \ painting/qpaintengine.h \ painting/qpaintengine_p.h \ diff --git a/src/gui/painting/qpagedpaintdevice.cpp b/src/gui/painting/qpagedpaintdevice.cpp index dd756db023..e5b2c0716e 100644 --- a/src/gui/painting/qpagedpaintdevice.cpp +++ b/src/gui/painting/qpagedpaintdevice.cpp @@ -46,6 +46,7 @@ class QPagedPaintDevicePrivate public: QPagedPaintDevice::PageSize pageSize; QSizeF pageSizeMM; + QPagedPaintDevice::Margins margins; }; static const struct { @@ -102,7 +103,6 @@ static const struct { QPagedPaintDevice::QPagedPaintDevice() : d(new QPagedPaintDevicePrivate) { - setPageSize(A4); } /*! @@ -201,3 +201,27 @@ QSizeF QPagedPaintDevice::pageSizeMM() const return d->pageSizeMM; } +/*! + Sets the margins to be used to \a margins. + + Margins are specified in millimeters. + + The margins are purely a hint to the drawing method. They don't affect the + coordinate system or clipping. + + \sa margins + */ +void QPagedPaintDevice::setMargins(const Margins &margins) +{ + d->margins = margins; +} + +/*! + returns the current margins of the paint device. The default is 0. + + /sa setMargins + */ +QPagedPaintDevice::Margins QPagedPaintDevice::margins() const +{ + return d->margins; +} diff --git a/src/gui/painting/qpagedpaintdevice.h b/src/gui/painting/qpagedpaintdevice.h index faba555adf..f3a133a8d9 100644 --- a/src/gui/painting/qpagedpaintdevice.h +++ b/src/gui/painting/qpagedpaintdevice.h @@ -31,7 +31,18 @@ public: virtual void setPageSizeMM(const QSizeF &size); QSizeF pageSizeMM() const; -private: + struct Margins { + qreal left; + qreal right; + qreal top; + qreal bottom; + }; + + virtual void setMargins(const Margins &margins); + Margins margins() const; + +protected: + friend class QPagedPaintDevicePrivate; QPagedPaintDevicePrivate *d; }; diff --git a/src/gui/painting/qpagedpaintdevice_p.h b/src/gui/painting/qpagedpaintdevice_p.h new file mode 100644 index 0000000000..55f78d54c5 --- /dev/null +++ b/src/gui/painting/qpagedpaintdevice_p.h @@ -0,0 +1,89 @@ +/**************************************************************************** +** +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtGui module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** GNU Lesser General Public License Usage +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. +** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QPAGEDPAINTDEVICE_P_H +#define QPAGEDPAINTDEVICE_P_H + +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + +#include + +QT_BEGIN_NAMESPACE + +class Q_GUI_EXPORT QPagedPaintDevicePrivate +{ +public: + QPagedPaintDevicePrivate() + : pageSize(QPagedPaintDevice::A4), + pageSizeMM(210, 297), + fromPage(0), + toPage(0), + pageOrderAscending(true), + printSelectionOnly(false) + { + margins.left = margins.right = margins.top = margins.bottom = 0; + } + + static inline QPagedPaintDevicePrivate *get(QPagedPaintDevice *pd) { return pd->d; } + + QPagedPaintDevice::PageSize pageSize; + QSizeF pageSizeMM; + QPagedPaintDevice::Margins margins; + + // These are currently required to keep QPrinter functionality working in QTextDocument::print() + int fromPage; + int toPage; + bool pageOrderAscending; + bool printSelectionOnly; +}; + +QT_END_NAMESPACE + +#endif diff --git a/src/gui/painting/qpdfwriter.cpp b/src/gui/painting/qpdfwriter.cpp index e36caf568f..9da5491d19 100644 --- a/src/gui/painting/qpdfwriter.cpp +++ b/src/gui/painting/qpdfwriter.cpp @@ -195,3 +195,18 @@ bool QPdfWriter::newPage() return d->engine->newPage(); } + + +/*! + \reimp + */ +void QPdfWriter::setMargins(const Margins &m) +{ + Q_D(QPdfWriter); + + const qreal multiplier = 72./25.4; + d->engine->d_func()->leftMargin = m.left*multiplier; + d->engine->d_func()->rightMargin = m.right*multiplier; + d->engine->d_func()->topMargin = m.top*multiplier; + d->engine->d_func()->bottomMargin = m.bottom*multiplier; +} diff --git a/src/gui/painting/qpdfwriter.h b/src/gui/painting/qpdfwriter.h index 4e617aa617..b224c12ed7 100644 --- a/src/gui/painting/qpdfwriter.h +++ b/src/gui/painting/qpdfwriter.h @@ -72,6 +72,8 @@ public: void setPageSize(PageSize size); void setPageSizeMM(const QSizeF &size); + void setMargins(const Margins &m); + protected: QPaintEngine *paintEngine() const; int metric(PaintDeviceMetric id) const; diff --git a/src/gui/text/qtextcontrol.cpp b/src/gui/text/qtextcontrol.cpp index 03845deb38..d280a67a1b 100644 --- a/src/gui/text/qtextcontrol.cpp +++ b/src/gui/text/qtextcontrol.cpp @@ -60,6 +60,7 @@ #include "qtextdocumentwriter.h" #include "private/qtextcursor_p.h" #include "qpagedpaintdevice.h" +#include "private/qpagedpaintdevice_p.h" #include #include @@ -2237,9 +2238,7 @@ void QTextControl::print(QPagedPaintDevice *printer) const return; QTextDocument *tempDoc = 0; const QTextDocument *doc = d->doc; - // #### -#if 0 - if (printer->printRange() == QPrinter::Selection) { + if (QPagedPaintDevicePrivate::get(printer)->printSelectionOnly) { if (!d->cursor.hasSelection()) return; tempDoc = new QTextDocument(const_cast(doc)); @@ -2253,7 +2252,6 @@ void QTextControl::print(QPagedPaintDevice *printer) const // copy the custom object handlers doc->documentLayout()->d_func()->handlers = d->doc->documentLayout()->d_func()->handlers; } -#endif doc->print(printer); delete tempDoc; } diff --git a/src/gui/text/qtextdocument.cpp b/src/gui/text/qtextdocument.cpp index 6e3d5286e0..c1714edb0c 100644 --- a/src/gui/text/qtextdocument.cpp +++ b/src/gui/text/qtextdocument.cpp @@ -64,6 +64,7 @@ #include "qtextdocument_p.h" #include #include "qpagedpaintdevice.h" +#include "private/qpagedpaintdevice_p.h" #include @@ -1717,16 +1718,18 @@ void QTextDocument::print(QPagedPaintDevice *printer) const if (!printer) return; - // ### -// if (!d->title.isEmpty()) -// printer->setDocName(d->title); - bool documentPaginated = d->pageSize.isValid() && !d->pageSize.isNull() && d->pageSize.height() != INT_MAX; + QPagedPaintDevicePrivate *pd = QPagedPaintDevicePrivate::get(printer); + // ### set page size to paginated size? -// if (!documentPaginated && !printer->fullPage() && !printer->d_func()->hasCustomPageMargins) -// printer->setPageMargins(23.53, 23.53, 23.53, 23.53, QPrinter::Millimeter); + QPagedPaintDevice::Margins m = printer->margins(); + if (!documentPaginated && m.left == 0. && m.right == 0. && m.top == 0. && m.bottom == 0.) { + m.left = m.right = m.top = m.bottom = 2.; + printer->setMargins(m); + } + // ### use the margins correctly QPainter p(printer); @@ -1796,10 +1799,8 @@ void QTextDocument::print(QPagedPaintDevice *printer) const clonedDoc->setPageSize(body.size()); } - int fromPage = 0; - int toPage = 0; -// int fromPage = printer->fromPage(); -// int toPage = printer->toPage(); + int fromPage = pd->fromPage; + int toPage = pd->toPage; bool ascending = true; if (fromPage == 0 && toPage == 0) { diff --git a/src/printsupport/dialogs/qabstractprintdialog.cpp b/src/printsupport/dialogs/qabstractprintdialog.cpp index ff572dd9f3..73b9c4f14e 100644 --- a/src/printsupport/dialogs/qabstractprintdialog.cpp +++ b/src/printsupport/dialogs/qabstractprintdialog.cpp @@ -115,6 +115,9 @@ QAbstractPrintDialog::QAbstractPrintDialog(QPrinter *printer, QWidget *parent) Q_D(QAbstractPrintDialog); setWindowTitle(QCoreApplication::translate("QPrintDialog", "Print")); d->setPrinter(printer); + d->minPage = printer->fromPage(); + int to = printer->toPage(); + d->maxPage = to > 0 ? to : INT_MAX; } /*! @@ -245,7 +248,7 @@ bool QAbstractPrintDialog::isOptionEnabled(PrintDialogOption option) const void QAbstractPrintDialog::setPrintRange(PrintRange range) { Q_D(QAbstractPrintDialog); - d->pd->printRange = QPrinter::PrintRange(range); + d->printer->setPrintRange(QPrinter::PrintRange(range)); } /*! @@ -266,8 +269,8 @@ void QAbstractPrintDialog::setMinMax(int min, int max) Q_D(QAbstractPrintDialog); Q_ASSERT_X(min <= max, "QAbstractPrintDialog::setMinMax", "'min' must be less than or equal to 'max'"); - d->pd->minPage = min; - d->pd->maxPage = max; + d->minPage = min; + d->maxPage = max; d->options |= PrintPageRange; } @@ -278,7 +281,7 @@ void QAbstractPrintDialog::setMinMax(int min, int max) int QAbstractPrintDialog::minPage() const { Q_D(const QAbstractPrintDialog); - return d->pd->minPage; + return d->minPage; } /*! @@ -289,7 +292,7 @@ int QAbstractPrintDialog::minPage() const int QAbstractPrintDialog::maxPage() const { Q_D(const QAbstractPrintDialog); - return d->pd->maxPage; + return d->maxPage; } /*! @@ -300,10 +303,9 @@ void QAbstractPrintDialog::setFromTo(int from, int to) Q_D(QAbstractPrintDialog); Q_ASSERT_X(from <= to, "QAbstractPrintDialog::setFromTo", "'from' must be less than or equal to 'to'"); - d->pd->fromPage = from; - d->pd->toPage = to; + d->printer->setFromTo(from, to); - if (d->pd->minPage == 0 && d->pd->maxPage == 0) + if (d->minPage == 0 && d->maxPage == 0) setMinMax(1, to); } @@ -314,7 +316,7 @@ void QAbstractPrintDialog::setFromTo(int from, int to) int QAbstractPrintDialog::fromPage() const { Q_D(const QAbstractPrintDialog); - return d->pd->fromPage; + return d->printer->fromPage(); } /*! @@ -324,7 +326,7 @@ int QAbstractPrintDialog::fromPage() const int QAbstractPrintDialog::toPage() const { Q_D(const QAbstractPrintDialog); - return d->pd->toPage; + return d->printer->toPage(); } diff --git a/src/printsupport/dialogs/qabstractprintdialog_p.h b/src/printsupport/dialogs/qabstractprintdialog_p.h index 45dd7e1e6a..e329cb3169 100644 --- a/src/printsupport/dialogs/qabstractprintdialog_p.h +++ b/src/printsupport/dialogs/qabstractprintdialog_p.h @@ -74,7 +74,8 @@ public: QAbstractPrintDialogPrivate() : printer(0), pd(0), ownsPrinter(false) , options(QAbstractPrintDialog::PrintToFile | QAbstractPrintDialog::PrintPageRange | - QAbstractPrintDialog::PrintCollateCopies | QAbstractPrintDialog::PrintShowPageSize) + QAbstractPrintDialog::PrintCollateCopies | QAbstractPrintDialog::PrintShowPageSize), + minPage(0), maxPage(INT_MAX) { } @@ -88,6 +89,8 @@ public: virtual void setTabs(const QList &) {} void setPrinter(QPrinter *newPrinter); + int minPage; + int maxPage; }; #endif //QT_NO_PRINTER diff --git a/src/printsupport/kernel/qprinter.cpp b/src/printsupport/kernel/qprinter.cpp index 3f169755d8..a0740976f4 100644 --- a/src/printsupport/kernel/qprinter.cpp +++ b/src/printsupport/kernel/qprinter.cpp @@ -54,6 +54,7 @@ #include "qplatformprintplugin_qpa.h" #include +#include #if defined (Q_WS_WIN) #include @@ -1153,6 +1154,8 @@ QSizeF QPrinter::paperSize(Unit unit) const void QPrinter::setPageOrder(PageOrder pageOrder) { + d->pageOrderAscending = (pageOrder == FirstPageFirst); + Q_D(QPrinter); ABORT_IF_ACTIVE("QPrinter::setPageOrder"); d->printEngine->setProperty(QPrintEngine::PPK_PageOrder, pageOrder); @@ -1658,17 +1661,29 @@ QRect QPrinter::paperRect() const specified with the \a unit parameter. */ void QPrinter::setPageMargins(qreal left, qreal top, qreal right, qreal bottom, QPrinter::Unit unit) +{ + const qreal multiplier = qt_multiplierForUnit(unit, resolution()) * 25.4/72.; + Margins m = { left*multiplier, right*multiplier, top*multiplier, bottom*multiplier }; + setMargins(m); +} + +/*! + reimp + */ +void QPrinter::setMargins(const Margins &m) { Q_D(QPrinter); - const qreal multiplier = qt_multiplierForUnit(unit, resolution()); + + const qreal multiplier = 72./25.4; QList margins; - margins << (left * multiplier) << (top * multiplier) - << (right * multiplier) << (bottom * multiplier); + margins << (m.left * multiplier) << (m.top * multiplier) + << (m.right * multiplier) << (m.bottom * multiplier); d->printEngine->setProperty(QPrintEngine::PPK_PageMargins, margins); d->addToManualSetList(QPrintEngine::PPK_PageMargins); d->hasCustomPageMargins = true; } + /*! \since 4.4 @@ -1972,7 +1987,6 @@ void QPrinter::setPrinterSelectionOption(const QString &option) int QPrinter::fromPage() const { - Q_D(const QPrinter); return d->fromPage; } @@ -1997,7 +2011,6 @@ int QPrinter::fromPage() const int QPrinter::toPage() const { - Q_D(const QPrinter); return d->toPage; } @@ -2020,18 +2033,12 @@ int QPrinter::toPage() const void QPrinter::setFromTo(int from, int to) { - Q_D(QPrinter); if (from > to) { qWarning() << "QPrinter::setFromTo: 'from' must be less than or equal to 'to'"; from = to; } d->fromPage = from; d->toPage = to; - - if (d->minPage == 0 && d->maxPage == 0) { - d->minPage = 1; - d->maxPage = to; - } } /*! @@ -2041,6 +2048,8 @@ void QPrinter::setFromTo(int from, int to) */ void QPrinter::setPrintRange( PrintRange range ) { + d->printSelectionOnly = (range == Selection); + Q_D(QPrinter); d->printRange = range; } diff --git a/src/printsupport/kernel/qprinter.h b/src/printsupport/kernel/qprinter.h index 2f91c8b1e9..f3c6615692 100644 --- a/src/printsupport/kernel/qprinter.h +++ b/src/printsupport/kernel/qprinter.h @@ -246,6 +246,8 @@ public: void setPrintRange(PrintRange range); PrintRange printRange() const; + void setMargins(const Margins &m); + void setPageMargins(qreal left, qreal top, qreal right, qreal bottom, Unit unit); void getPageMargins(qreal *left, qreal *top, qreal *right, qreal *bottom, Unit unit) const; diff --git a/src/printsupport/kernel/qprinter_p.h b/src/printsupport/kernel/qprinter_p.h index 1d5660e4d7..b339612d66 100644 --- a/src/printsupport/kernel/qprinter_p.h +++ b/src/printsupport/kernel/qprinter_p.h @@ -79,10 +79,6 @@ public: , paintEngine(0) , q_ptr(printer) , printRange(QPrinter::AllPages) - , minPage(1) - , maxPage(INT_MAX) - , fromPage(0) - , toPage(0) , use_default_engine(true) , validPrinter(false) , hasCustomPageMargins(false) @@ -116,7 +112,6 @@ public: QPrinter *q_ptr; QPrinter::PrintRange printRange; - int minPage, maxPage, fromPage, toPage; uint use_default_engine : 1; uint had_default_engines : 1; diff --git a/src/widgets/widgets/qwidgettextcontrol.cpp b/src/widgets/widgets/qwidgettextcontrol.cpp index 609a67b27a..f45211c1ff 100644 --- a/src/widgets/widgets/qwidgettextcontrol.cpp +++ b/src/widgets/widgets/qwidgettextcontrol.cpp @@ -63,6 +63,7 @@ #include "private/qwidgettextcontrol_p.h" #include "qgraphicssceneevent.h" #include "qpagedpaintdevice.h" +#include "private/qpagedpaintdevice_p.h" #include "qtextdocumentwriter.h" #include "private/qtextcursor_p.h" @@ -2430,9 +2431,7 @@ void QWidgetTextControl::print(QPagedPaintDevice *printer) const return; QTextDocument *tempDoc = 0; const QTextDocument *doc = d->doc; -#if 0 - // #### - if (printer->printRange() == QPrinter::Selection) { + if (QPagedPaintDevicePrivate::get(printer)->printSelectionOnly) { if (!d->cursor.hasSelection()) return; tempDoc = new QTextDocument(const_cast(doc)); @@ -2446,7 +2445,6 @@ void QWidgetTextControl::print(QPagedPaintDevice *printer) const // copy the custom object handlers doc->documentLayout()->d_func()->handlers = d->doc->documentLayout()->d_func()->handlers; } -#endif doc->print(printer); delete tempDoc; } -- cgit v1.2.3