From 04c46612c9e6d1f518d72faebac2191f3d6e2784 Mon Sep 17 00:00:00 2001 From: Anton Thomasson Date: Thu, 14 May 2020 21:05:23 +0200 Subject: [PATCH] Enable transparent sending of PDFs (was just disabled for experimenting with conversions) --- qml/pages/PrinterPage.qml | 3 ++- src/ippprinter.cpp | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/qml/pages/PrinterPage.qml b/qml/pages/PrinterPage.qml index b888f5d..0161247 100644 --- a/qml/pages/PrinterPage.qml +++ b/qml/pages/PrinterPage.qml @@ -22,7 +22,8 @@ Page { text: qsTr("Print") onClicked: { console.log(JSON.stringify(jobParams)) - pageStack.replace(Qt.resolvedUrl("BusyPage.qml"),{printer:printer}) + pageStack.replace(Qt.resolvedUrl("BusyPage.qml"),{printer:printer}, + PageStackAction.Immediate) printer.print(jobParams, page.selectedFile) } } diff --git a/src/ippprinter.cpp b/src/ippprinter.cpp index d88bb09..a0932a9 100644 --- a/src/ippprinter.cpp +++ b/src/ippprinter.cpp @@ -282,7 +282,7 @@ void IppPrinter::print(QJsonObject attrs, QString filename){ qDebug() << supportedMimeTypes << supportedMimeTypes.contains(mimeType); - if(from == Image || (from == Pdf /*&& !supportedMimeTypes.contains("application/pdf")*/)) + if(from == Image || (from == Pdf && !supportedMimeTypes.contains("application/pdf"))) { if(supportedMimeTypes.contains("image/pwg-raster")) {