diff --git a/qml/pages/PrinterPage.qml b/qml/pages/PrinterPage.qml index 73238e9..df5919b 100644 --- a/qml/pages/PrinterPage.qml +++ b/qml/pages/PrinterPage.qml @@ -115,7 +115,7 @@ Page { tag: IppMsg.IntegerRange name: "page-ranges" prettyName: qsTr("Page range") - valid: (selectedFileType == "application/pdf" || Mimer.isOffice(selectedFileType)) + valid: (selectedFileType == Mimer.PDF || Mimer.isOffice(selectedFileType)) property var pdfpages: ConvertChecker.pdfPages(selectedFile) high: pdfpages == 0 ? 65535 : pdfpages diff --git a/src/convertworker.cpp b/src/convertworker.cpp index 981a26f..695cc6d 100644 --- a/src/convertworker.cpp +++ b/src/convertworker.cpp @@ -48,7 +48,7 @@ void ConvertWorker::cancelJob(QByteArray msg) void ConvertWorker::justUpload(QString filename, QByteArray header) { - qDebug() << "justupload"; + emit busyMessage(tr("Printing")); CurlRequester cid(_printer->httpUrl()); cid.setFinishedCallback(_printer, &IppPrinter::printRequestFinished); @@ -70,10 +70,8 @@ void ConvertWorker::convertPdf(QString filename, QByteArray header, try { Format format; - qDebug() << "to pdf" << HwResX << HwResY; emit busyMessage(tr("Printing")); - if(targetFormat == Mimer::URF) { format = Format::URF; diff --git a/src/ippprinter.cpp b/src/ippprinter.cpp index 38f5c1c..3459450 100644 --- a/src/ippprinter.cpp +++ b/src/ippprinter.cpp @@ -586,7 +586,7 @@ void IppPrinter::print(QJsonObject jobAttrs, QString filename) Tumble = true; } - setBusyMessage(tr("Converting")); + setBusyMessage(tr("Preparing")); if(mimeType == Mimer::PDF) { diff --git a/translations/harbour-seaprint-de.ts b/translations/harbour-seaprint-de.ts index 98890ee..e449168 100644 --- a/translations/harbour-seaprint-de.ts +++ b/translations/harbour-seaprint-de.ts @@ -339,7 +339,7 @@ Unbekannte Dokumentenformat Größe - Converting + Preparing diff --git a/translations/harbour-seaprint-es.ts b/translations/harbour-seaprint-es.ts index b4b1849..1c8a3f7 100644 --- a/translations/harbour-seaprint-es.ts +++ b/translations/harbour-seaprint-es.ts @@ -339,7 +339,7 @@ - Converting + Preparing diff --git a/translations/harbour-seaprint-fr.ts b/translations/harbour-seaprint-fr.ts index 078feb0..d75eec4 100644 --- a/translations/harbour-seaprint-fr.ts +++ b/translations/harbour-seaprint-fr.ts @@ -339,7 +339,7 @@ - Converting + Preparing diff --git a/translations/harbour-seaprint-nl.ts b/translations/harbour-seaprint-nl.ts index d29be7f..14feb6e 100644 --- a/translations/harbour-seaprint-nl.ts +++ b/translations/harbour-seaprint-nl.ts @@ -339,7 +339,7 @@ Onbekende afmetingen van documentformaat - Converting + Preparing diff --git a/translations/harbour-seaprint-pl.ts b/translations/harbour-seaprint-pl.ts index 0e1df9b..c3aacb8 100644 --- a/translations/harbour-seaprint-pl.ts +++ b/translations/harbour-seaprint-pl.ts @@ -339,7 +339,7 @@ - Converting + Preparing diff --git a/translations/harbour-seaprint-zh_CN.ts b/translations/harbour-seaprint-zh_CN.ts index 641a85c..1dac39c 100644 --- a/translations/harbour-seaprint-zh_CN.ts +++ b/translations/harbour-seaprint-zh_CN.ts @@ -339,8 +339,8 @@ 未知稳定格式尺寸 - Converting - 正在转换 + Preparing + diff --git a/translations/harbour-seaprint.ts b/translations/harbour-seaprint.ts index 3b4c024..3ca2a51 100644 --- a/translations/harbour-seaprint.ts +++ b/translations/harbour-seaprint.ts @@ -339,7 +339,7 @@ - Converting + Preparing