Fix messages, cleanup
This commit is contained in:
parent
fce3974d51
commit
497f860aaf
10 changed files with 11 additions and 13 deletions
|
@ -115,7 +115,7 @@ Page {
|
||||||
tag: IppMsg.IntegerRange
|
tag: IppMsg.IntegerRange
|
||||||
name: "page-ranges"
|
name: "page-ranges"
|
||||||
prettyName: qsTr("Page range")
|
prettyName: qsTr("Page range")
|
||||||
valid: (selectedFileType == "application/pdf" || Mimer.isOffice(selectedFileType))
|
valid: (selectedFileType == Mimer.PDF || Mimer.isOffice(selectedFileType))
|
||||||
|
|
||||||
property var pdfpages: ConvertChecker.pdfPages(selectedFile)
|
property var pdfpages: ConvertChecker.pdfPages(selectedFile)
|
||||||
high: pdfpages == 0 ? 65535 : pdfpages
|
high: pdfpages == 0 ? 65535 : pdfpages
|
||||||
|
|
|
@ -48,7 +48,7 @@ void ConvertWorker::cancelJob(QByteArray msg)
|
||||||
|
|
||||||
void ConvertWorker::justUpload(QString filename, QByteArray header)
|
void ConvertWorker::justUpload(QString filename, QByteArray header)
|
||||||
{
|
{
|
||||||
qDebug() << "justupload";
|
emit busyMessage(tr("Printing"));
|
||||||
|
|
||||||
CurlRequester cid(_printer->httpUrl());
|
CurlRequester cid(_printer->httpUrl());
|
||||||
cid.setFinishedCallback(_printer, &IppPrinter::printRequestFinished);
|
cid.setFinishedCallback(_printer, &IppPrinter::printRequestFinished);
|
||||||
|
@ -70,10 +70,8 @@ void ConvertWorker::convertPdf(QString filename, QByteArray header,
|
||||||
try {
|
try {
|
||||||
Format format;
|
Format format;
|
||||||
|
|
||||||
qDebug() << "to pdf" << HwResX << HwResY;
|
|
||||||
emit busyMessage(tr("Printing"));
|
emit busyMessage(tr("Printing"));
|
||||||
|
|
||||||
|
|
||||||
if(targetFormat == Mimer::URF)
|
if(targetFormat == Mimer::URF)
|
||||||
{
|
{
|
||||||
format = Format::URF;
|
format = Format::URF;
|
||||||
|
|
|
@ -586,7 +586,7 @@ void IppPrinter::print(QJsonObject jobAttrs, QString filename)
|
||||||
Tumble = true;
|
Tumble = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
setBusyMessage(tr("Converting"));
|
setBusyMessage(tr("Preparing"));
|
||||||
|
|
||||||
if(mimeType == Mimer::PDF)
|
if(mimeType == Mimer::PDF)
|
||||||
{
|
{
|
||||||
|
|
|
@ -339,7 +339,7 @@
|
||||||
<translation>Unbekannte Dokumentenformat Größe</translation>
|
<translation>Unbekannte Dokumentenformat Größe</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<source>Converting</source>
|
<source>Preparing</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
</context>
|
</context>
|
||||||
|
|
|
@ -339,7 +339,7 @@
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<source>Converting</source>
|
<source>Preparing</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
</context>
|
</context>
|
||||||
|
|
|
@ -339,7 +339,7 @@
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<source>Converting</source>
|
<source>Preparing</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
</context>
|
</context>
|
||||||
|
|
|
@ -339,7 +339,7 @@
|
||||||
<translation>Onbekende afmetingen van documentformaat</translation>
|
<translation>Onbekende afmetingen van documentformaat</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<source>Converting</source>
|
<source>Preparing</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
</context>
|
</context>
|
||||||
|
|
|
@ -339,7 +339,7 @@
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<source>Converting</source>
|
<source>Preparing</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
</context>
|
</context>
|
||||||
|
|
|
@ -339,8 +339,8 @@
|
||||||
<translation>未知稳定格式尺寸</translation>
|
<translation>未知稳定格式尺寸</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<source>Converting</source>
|
<source>Preparing</source>
|
||||||
<translation>正在转换</translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
</context>
|
</context>
|
||||||
<context>
|
<context>
|
||||||
|
|
|
@ -339,7 +339,7 @@
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<source>Converting</source>
|
<source>Preparing</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
</context>
|
</context>
|
||||||
|
|
Loading…
Reference in a new issue