diff options
| author | John Layt <jlayt@kde.org> | 2013-12-16 13:42:59 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-13 16:38:31 +0100 |
| commit | 98504fb82da12133ae6b566c6dafd86e1076bc9a (patch) | |
| tree | c71622d6f03944f392a888333a3c36825be71447 | |
| parent | c3c3dcf87d42283250cbbddf1557c61e7c609566 (diff) | |
QPrinter - Add missing PaperSource values
Add extra PaperSource values for all Windows DM_BINS values. Also add
CustomSource for use on OSX and CUPS when the PPD defines an InputTray
value that cannot be matched.
Change-Id: I2dfd565288942705a9872ab1b7c4cd32722ba674
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
| -rw-r--r-- | src/printsupport/kernel/qprintengine_win.cpp | 3 | ||||
| -rw-r--r-- | src/printsupport/kernel/qprinter.cpp | 7 | ||||
| -rw-r--r-- | src/printsupport/kernel/qprinter.h | 7 |
3 files changed, 15 insertions, 2 deletions
diff --git a/src/printsupport/kernel/qprintengine_win.cpp b/src/printsupport/kernel/qprintengine_win.cpp index 0b338c535f..a739d87ae9 100644 --- a/src/printsupport/kernel/qprintengine_win.cpp +++ b/src/printsupport/kernel/qprintengine_win.cpp @@ -195,6 +195,9 @@ static const struct { { DMBIN_LARGECAPACITY, QPrinter::LargeCapacity }, { DMBIN_CASSETTE, QPrinter::Cassette }, { DMBIN_FORMSOURCE, QPrinter::FormSource }, + { DMBIN_FIRST, QPrinter::First }, + { DMBIN_LAST, QPrinter::Last }, + { DMBIN_UPPER, QPrinter::Upper }, { 0, (QPrinter::PaperSource) -1 } }; diff --git a/src/printsupport/kernel/qprinter.cpp b/src/printsupport/kernel/qprinter.cpp index f23708045d..984b11123e 100644 --- a/src/printsupport/kernel/qprinter.cpp +++ b/src/printsupport/kernel/qprinter.cpp @@ -516,12 +516,17 @@ void QPrinterPrivate::setProperty(QPrintEngine::PrintEnginePropertyKey key, cons \value LargeCapacity \value LargeFormat \value Lower - \value MaxPageSource + \value MaxPageSource Deprecated, use LastPaperSource instead \value Middle \value Manual \value OnlyOne \value Tractor \value SmallFormat + \value First + \value Last + \value Upper + \value CustomSource A PaperSource defined by the printer that is unknown to Qt + \value LastPaperSource The highest valid PaperSource value, currently CustomSource */ /*! diff --git a/src/printsupport/kernel/qprinter.h b/src/printsupport/kernel/qprinter.h index 2528157532..d529c06b4d 100644 --- a/src/printsupport/kernel/qprinter.h +++ b/src/printsupport/kernel/qprinter.h @@ -103,7 +103,12 @@ public: LargeCapacity, Cassette, FormSource, - MaxPageSource + MaxPageSource, // Deprecated + First, + Last, + Upper, + CustomSource, + LastPaperSource = CustomSource }; enum PrinterState { Idle, |