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

Give better feedback when there is no way to convert

Browse source
This commit is contained in:
Anton Thomasson 2022-05-26 12:28:29 +02:00
parent ab96dc547f
commit 18f0c66dba
1 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/ippprinter.cpp
View file

@ -630,6 +630,8 @@ void IppPrinter::print(QJsonObject jobAttrs, QString filename)
return;
}
bool knownTargetFormat = true;
if(targetFormat == Mimer::PDF)
{
Params.format = PrintParameters::PDF;
@ -646,6 +648,10 @@ void IppPrinter::print(QJsonObject jobAttrs, QString filename)
{
Params.format = PrintParameters::URF;
}
else
{
knownTargetFormat = false;
}
QSizeF size = PaperSizes[Params.paperSizeName.c_str()];
Params.paperSizeUnits = PrintParameters::Millimeters;
@ -689,11 +695,11 @@ void IppPrinter::print(QJsonObject jobAttrs, QString filename)
{ // Can't process Postscript
emit doJustUpload(filename, contents);
}
else if(mimer->isImage(targetFormat))
else if(mimer->isImage(mimeType) && mimer->isImage(targetFormat))
{ // Just make sure the image is in the desired format (and jpeg baseline-encoded), don't resize locally
emit doPrintImageAsImage(filename, contents, targetFormat);
}
else
else if(knownTargetFormat) // Params.format can be trusted
{
QString Sides = getAttrOrDefault(jobAttrs, "sides").toString();
@ -733,9 +739,12 @@ void IppPrinter::print(QJsonObject jobAttrs, QString filename)
else
{
emit convertFailed(tr("Cannot convert this file format"));
return;
}
}
else
{
emit convertFailed(tr("Cannot convert this file format"));
}
return;
}