FCL/sf/mw/qt: comparison src/gui/painting/qprinter.cpp

equal deleted inserted replaced

-:93b982ccede2
+:5daf16870df6
 const qreal multiplier = qt_multiplierForUnit(unit, resolution);
 return QSizeF((qt_paperSizes[paperSize][width_index] * 72 / 25.4) / multiplier,
 (qt_paperSizes[paperSize][height_index] * 72 / 25.4) / multiplier);
 }
-// returns the actual num copies set on a printer, not
-// the number that is documented in QPrinter::numCopies()
-int qt_printerRealNumCopies(QPaintEngine *engine)
-{
-int numCopies = 1;
-if (engine->type() == QPaintEngine::PostScript
-|| engine->type() == QPaintEngine::Pdf)
-{
-QPdfBaseEngine *base = static_cast<QPdfBaseEngine *>(engine);
-numCopies = base->d_func()->copies;
-}
-#ifdef Q_WS_WIN
-else if (engine->type() == QPaintEngine::Windows) {
-QWin32PrintEngine *base = static_cast<QWin32PrintEngine *>(engine);
-numCopies = base->d_func()->num_copies;
-}
-#endif
-return numCopies;
-}
 void QPrinterPrivate::createDefaultEngines()
 {
 QPrinter::OutputFormat realOutputFormat = outputFormat;
 #if !defined (QTOPIA_PRINTENGINE)
 #if defined (Q_OS_UNIX) && ! defined (Q_WS_MAC)
 printer.
 \i setResolution() tells QPrinter what resolution you wish the
 printer to provide, in dots per inch (DPI).
 \i setFullPage() tells QPrinter whether you want to deal with the
 full page or just with the part the printer can draw on.
-\i setNumCopies() tells QPrinter how many copies of the document
+\i setCopyCount() tells QPrinter how many copies of the document
 it should print.
 \endlist
 Many of these functions can only be called before the actual printing
 begins (i.e., before QPainter::begin() is called). This usually makes
 Used to specify the print range selection option.
 \value AllPages All pages should be printed.
 \value Selection Only the selection should be printed.
 \value PageRange The specified page range should be printed.
+\value CurrentPage Only the current page should be printed.
 \sa QAbstractPrintDialog::PrintRange
 */
 /*!
 should use to print.
 \value AllPages All the pages should be printed.
 \value Selection Only the selection should be printed.
 \value PageRange Print according to the from page and to page options.
+\value CurrentPage Only the current page should be printed.
 \sa setPrintRange(), printRange()
 */
 /*
 \value PrintToFile Describes if print to file should be enabled.
 \value PrintSelection Describes if printing selections should be enabled.
 \value PrintPageRange Describes if printing page ranges (from, to) should
 be enabled
+\value PrintCurrentPage if Print Current Page option should be enabled
 \sa setOptionEnabled(), isOptionEnabled()
 */
 /*!
 if (d->validPrinter && d->outputFormat == format)
 return;
 d->outputFormat = format;
 QPrintEngine *oldPrintEngine = d->printEngine;
-QPaintEngine *oldPaintEngine = d->paintEngine; // same as the above - shouldn't be deleted
 const bool def_engine = d->use_default_engine;
 d->printEngine = 0;
 d->createDefaultEngines();
 QPrintEngine::PrintEnginePropertyKey key = d->manualSetList[i];
 QVariant prop;
 // PPK_NumberOfCopies need special treatmeant since it in most cases
 // will return 1, disregarding the actual value that was set
 if (key == QPrintEngine::PPK_NumberOfCopies)
-prop = QVariant(qt_printerRealNumCopies(oldPaintEngine));
+prop = QVariant(copyCount());
 else
 prop = oldPrintEngine->property(key);
 if (prop.isValid())
 d->printEngine->setProperty(key, prop);
 }
 return QPrinter::ColorMode(d->printEngine->property(QPrintEngine::PPK_ColorMode).toInt());
 }
 /*!
+\obsolete
 Returns the number of copies to be printed. The default value is 1.
 On Windows, Mac OS X and X11 systems that support CUPS, this will always
 return 1 as these operating systems can internally handle the number
 of copies.
 required to print in order to match the number specified in the printer setup
 dialog. This has been done since some printer drivers are not capable of
 buffering up the copies and in those cases the application must make an
 explicit call to the print code for each copy.
+Use copyCount() in conjunction with supportsMultipleCopies() instead.
 \sa setNumCopies(), actualNumCopies()
 */
 int QPrinter::numCopies() const
 {
 return d->printEngine->property(QPrintEngine::PPK_NumberOfCopies).toInt();
 }
 /*!
+\obsolete
 \since 4.6
 Returns the number of copies that will be printed. The default
 value is 1.
 This function always returns the actual value specified in the print
 dialog or using setNumCopies().
+Use copyCount() instead.
 \sa setNumCopies(), numCopies()
 */
 int QPrinter::actualNumCopies() const
 {
-Q_D(const QPrinter);
+return copyCount();
-return qt_printerRealNumCopies(d->paintEngine);
+}
-}
+/*!
-/*!
+\obsolete
 Sets the number of copies to be printed to \a numCopies.
 The printer driver reads this setting and prints the specified
 number of copies.
+Use setCopyCount() instead.
 \sa numCopies()
 */
 void QPrinter::setNumCopies(int numCopies)
 ABORT_IF_ACTIVE("QPrinter::setNumCopies");
 d->printEngine->setProperty(QPrintEngine::PPK_NumberOfCopies, numCopies);
 d->addToManualSetList(QPrintEngine::PPK_NumberOfCopies);
 }
+/*!
+\since 4.7
+Sets the number of copies to be printed to \a count.
+The printer driver reads this setting and prints the specified number of
+copies.
+\sa copyCount(), supportsMultipleCopies()
+*/
+void QPrinter::setCopyCount(int count)
+{
+Q_D(QPrinter);
+ABORT_IF_ACTIVE("QPrinter::setCopyCount;");
+d->printEngine->setProperty(QPrintEngine::PPK_CopyCount, count);
+d->addToManualSetList(QPrintEngine::PPK_CopyCount);
+}
+/*!
+\since 4.7
+Returns the number of copies that will be printed. The default value is 1.
+\sa setCopyCount(), supportsMultipleCopies()
+*/
+int QPrinter::copyCount() const
+{
+Q_D(const QPrinter);
+return d->printEngine->property(QPrintEngine::PPK_CopyCount).toInt();
+}
+/*!
+\since 4.7
+Returns true if the printer supports printing multiple copies of the same
+document in one job; otherwise false is returned.
+On most systems this function will return true. However, on X11 systems
+that do not support CUPS, this function will return false. That means the
+application has to handle the number of copies by printing the same
+document the required number of times.
+\sa setCopyCount(), copyCount()
+*/
+bool QPrinter::supportsMultipleCopies() const
+{
+Q_D(const QPrinter);
+return d->printEngine->property(QPrintEngine::PPK_SupportsMultipleCopies).toBool();
+}
 /*!
 \since 4.1
 Returns true if collation is turned on when multiple copies is selected.
 printer.
 \value PPK_FullPage A boolean describing if the printer should be
 full page or not.
-\value PPK_NumberOfCopies An integer specifying the number of
+\value PPK_NumberOfCopies Obsolete. An integer specifying the number of
-copies
+copies. Use PPK_CopyCount instead.
 \value PPK_Orientation Specifies a QPrinter::Orientation value.
 \value PPK_OutputFileName The output file name as a string. An
 empty file name indicates that the printer should not print to a file.
 \value PPK_CustomPaperSize A QSizeF specifying a custom paper size
 in the QPrinter::Point unit.
 \value PPK_PageMargins A QList<QVariant> containing the left, top,
 right and bottom margin values.
+\value PPK_CopyCount An integer specifying the number of copies to print.
+\value PPK_SupportsMultipleCopies A boolean value indicating whether or not
+the printer supports printing multiple copies in one job.
 \value PPK_CustomBase Basis for extension.
 */
 /*!

branch	GCC_SURGE
changeset 31	5daf16870df6
parent 30	5dc02b23752f