medvedych/harbour-seaprint
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix messages, cleanup

Browse source
This commit is contained in:
Anton Thomasson 2021-11-15 21:47:16 +01:00
parent fce3974d51
commit 497f860aaf
10 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
qml/pages/PrinterPage.qml
View file

@ -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

4
src/convertworker.cpp
View file

@ -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;

2
src/ippprinter.cpp
View file

@ -586,7 +586,7 @@ void IppPrinter::print(QJsonObject jobAttrs, QString filename)
Tumble = true;
}
setBusyMessage(tr("Converting"));
setBusyMessage(tr("Preparing"));
if(mimeType == Mimer::PDF)
{

2
translations/harbour-seaprint-de.ts
View file

@ -339,7 +339,7 @@
<translation>Unbekannte Dokumentenformat Größe</translation>
</message>
<message>
<source>Converting</source>
<source>Preparing</source>
<translation type="unfinished"></translation>
</message>
</context>

2
translations/harbour-seaprint-es.ts
View file

@ -339,7 +339,7 @@
<translation type="unfinished"></translation>
</message>
<message>
<source>Converting</source>
<source>Preparing</source>
<translation type="unfinished"></translation>
</message>
</context>

2
translations/harbour-seaprint-fr.ts
View file

@ -339,7 +339,7 @@
<translation type="unfinished"></translation>
</message>
<message>
<source>Converting</source>
<source>Preparing</source>
<translation type="unfinished"></translation>
</message>
</context>

2
translations/harbour-seaprint-nl.ts
View file

@ -339,7 +339,7 @@
<translation>Onbekende afmetingen van documentformaat</translation>
</message>
<message>
<source>Converting</source>
<source>Preparing</source>
<translation type="unfinished"></translation>
</message>
</context>

2
translations/harbour-seaprint-pl.ts
View file

@ -339,7 +339,7 @@
<translation type="unfinished"></translation>
</message>
<message>
<source>Converting</source>
<source>Preparing</source>
<translation type="unfinished"></translation>
</message>
</context>

4
translations/harbour-seaprint-zh_CN.ts
View file

@ -339,8 +339,8 @@
<translation>未知稳定格式尺寸</translation>
</message>
<message>
<source>Converting</source>
<translation>正在转换</translation>
<source>Preparing</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>

2
translations/harbour-seaprint.ts
View file

@ -339,7 +339,7 @@
<translation type="unfinished"></translation>
</message>
<message>
<source>Converting</source>
<source>Preparing</source>
<translation type="unfinished"></translation>
</message>
</context>