diff options
author | John Layt <jlayt@kde.org> | 2013-11-29 15:54:06 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-05 19:33:50 +0100 |
commit | 27473f19bb26b5b4434689c663d483e48b43fdef (patch) | |
tree | 7bc04d3d93a779759cc47d25d03f30021543b43e /src/plugins/platforms/cocoa/qprintengine_mac.mm | |
parent | 053bee8b80f4f987718c6633b831a58eb231b599 (diff) |
QPrintEngine - Fix PPK_DocumentName
Add support to the Mac print engine for set/get the Document Name using
the Job Name setting. Our documentation states this is one use that the
document name will be put to so is appropriate to be used.
Change the Windows print engine to default to a blank Docuemnt Name
consistent with the other print engines. If still blank when printing
then use a default value.
Task-number: QTBUG-27724
Task-number: QTBUG-22144
Change-Id: If590811b5720e6f759eabc290b578b94e221f9f4
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/plugins/platforms/cocoa/qprintengine_mac.mm')
-rw-r--r-- | src/plugins/platforms/cocoa/qprintengine_mac.mm | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/plugins/platforms/cocoa/qprintengine_mac.mm b/src/plugins/platforms/cocoa/qprintengine_mac.mm index dd2bd718f6..170eccdd1b 100644 --- a/src/plugins/platforms/cocoa/qprintengine_mac.mm +++ b/src/plugins/platforms/cocoa/qprintengine_mac.mm @@ -615,9 +615,6 @@ void QMacPrintEngine::setProperty(PrintEnginePropertyKey key, const QVariant &va break; case PPK_CustomBase: break; - case PPK_DocumentName: - // TODO Add support using PMPrintSettingsSetJobName / PMPrintSettingsGetJobName - break; case PPK_Duplex: // TODO Add support using PMSetDuplex / PMGetDuplex break; @@ -665,7 +662,9 @@ void QMacPrintEngine::setProperty(PrintEnginePropertyKey key, const QVariant &va PMSessionValidatePageFormat(d->session(), d->format(), kPMDontWantBoolean); break; } - + case PPK_DocumentName: + PMPrintSettingsSetJobName(d->settings(), QCFString(value.toString())); + break; case PPK_FullPage: d->fullPage = value.toBool(); break; @@ -770,10 +769,6 @@ QVariant QMacPrintEngine::property(PrintEnginePropertyKey key) const case PPK_CustomBase: // Special case, leave null break; - case PPK_DocumentName: - // TODO Add support using PMPrintSettingsSetJobName / PMPrintSettingsGetJobName - ret = QString(); - break; case PPK_Duplex: // TODO Add support using PMSetDuplex / PMGetDuplex ret = QPrinter::DuplexNone; @@ -807,6 +802,12 @@ QVariant QMacPrintEngine::property(PrintEnginePropertyKey key) const break; // The following keys are properties and settings that are supported by the Mac PrintEngine + case PPK_DocumentName: { + CFStringRef name; + PMPrintSettingsGetJobName(d->settings(), &name); + ret = QCFString::toQString(name); + break; + } case PPK_FullPage: ret = d->fullPage; break; |