Move media selection to parametric if zero margins
This commit is contained in:
parent
46746aeebc
commit
76e05f45c5
5 changed files with 46 additions and 2 deletions
|
@ -106,6 +106,7 @@ void IppPrinter::refresh() {
|
||||||
request.setHeader(QNetworkRequest::UserAgentHeader, "SeaPrint " SEAPRINT_VERSION);
|
request.setHeader(QNetworkRequest::UserAgentHeader, "SeaPrint " SEAPRINT_VERSION);
|
||||||
|
|
||||||
QJsonObject o = opAttrs();
|
QJsonObject o = opAttrs();
|
||||||
|
|
||||||
IppMsg msg = IppMsg(o);
|
IppMsg msg = IppMsg(o);
|
||||||
_nam->post(request, msg.encode(IppMsg::GetPrinterAttrs));
|
_nam->post(request, msg.encode(IppMsg::GetPrinterAttrs));
|
||||||
|
|
||||||
|
@ -332,7 +333,35 @@ void IppPrinter::print(QJsonObject attrs, QString filename,
|
||||||
QJsonObject o = opAttrs();
|
QJsonObject o = opAttrs();
|
||||||
o.insert("job-name", QJsonObject {{"tag", IppMsg::NameWithoutLanguage}, {"value", fileinfo.fileName()}});
|
o.insert("job-name", QJsonObject {{"tag", IppMsg::NameWithoutLanguage}, {"value", fileinfo.fileName()}});
|
||||||
|
|
||||||
QJsonArray jobCreationAttributes = _attrs["job-creation-attributes-supported"].toObject()["value"].toArray();
|
QString PaperSize = getAttrOrDefault(attrs, "media").toString();
|
||||||
|
|
||||||
|
if(attrs.contains("media-col") && attrs.contains("media-col"))
|
||||||
|
{
|
||||||
|
qDebug() << "moving media to media-col" << PaperSize;
|
||||||
|
if(!PaperSizes.contains(PaperSize))
|
||||||
|
{
|
||||||
|
emit convertFailed(tr("Unknown document format dimensions"));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
int x = PaperSizes[PaperSize].first*100;
|
||||||
|
int y = PaperSizes[PaperSize].second*100;
|
||||||
|
|
||||||
|
QJsonObject Dimensions =
|
||||||
|
{{"tag", IppMsg::BeginCollection},
|
||||||
|
{"value", QJsonObject { {"x-dimension", QJsonObject{{"tag", IppMsg::Integer}, {"value", x}}},
|
||||||
|
{"y-dimension", QJsonObject{{"tag", IppMsg::Integer}, {"value", y}}} }
|
||||||
|
}};
|
||||||
|
|
||||||
|
// TODO: make a setter function
|
||||||
|
QJsonObject MediaCol = attrs["media-col"].toObject();
|
||||||
|
QJsonObject MediaColValue = MediaCol["value"].toObject();
|
||||||
|
MediaColValue["media-size"] = Dimensions;
|
||||||
|
MediaCol["value"] = MediaColValue;
|
||||||
|
attrs["media-col"] = MediaCol;
|
||||||
|
|
||||||
|
attrs.remove("media");
|
||||||
|
}
|
||||||
|
|
||||||
QString documentFormat = getAttrOrDefault(attrs, "document-format").toString();
|
QString documentFormat = getAttrOrDefault(attrs, "document-format").toString();
|
||||||
qDebug() << "target format:" << documentFormat << "alwaysConvert:" << alwaysConvert;
|
qDebug() << "target format:" << documentFormat << "alwaysConvert:" << alwaysConvert;
|
||||||
|
@ -384,7 +413,6 @@ void IppPrinter::print(QJsonObject attrs, QString filename,
|
||||||
QString PrintColorMode = getAttrOrDefault(attrs, "print-color-mode").toString();
|
QString PrintColorMode = getAttrOrDefault(attrs, "print-color-mode").toString();
|
||||||
quint32 Colors = PrintColorMode.contains("color") ? 3 : PrintColorMode.contains("monochrome") ? 1 : 0;
|
quint32 Colors = PrintColorMode.contains("color") ? 3 : PrintColorMode.contains("monochrome") ? 1 : 0;
|
||||||
|
|
||||||
QString PaperSize = getAttrOrDefault(attrs, "media").toString();
|
|
||||||
if(!PaperSizes.contains(PaperSize))
|
if(!PaperSizes.contains(PaperSize))
|
||||||
{
|
{
|
||||||
emit convertFailed(tr("Unsupported print media"));
|
emit convertFailed(tr("Unsupported print media"));
|
||||||
|
|
|
@ -225,6 +225,10 @@
|
||||||
<source>Unknown document format</source>
|
<source>Unknown document format</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
|
<message>
|
||||||
|
<source>Unknown document format dimensions</source>
|
||||||
|
<translation type="unfinished"></translation>
|
||||||
|
</message>
|
||||||
</context>
|
</context>
|
||||||
<context>
|
<context>
|
||||||
<name>JobsPage</name>
|
<name>JobsPage</name>
|
||||||
|
|
|
@ -225,6 +225,10 @@
|
||||||
<source>Unknown document format</source>
|
<source>Unknown document format</source>
|
||||||
<translation>Formato de documento desconocido</translation>
|
<translation>Formato de documento desconocido</translation>
|
||||||
</message>
|
</message>
|
||||||
|
<message>
|
||||||
|
<source>Unknown document format dimensions</source>
|
||||||
|
<translation type="unfinished"></translation>
|
||||||
|
</message>
|
||||||
</context>
|
</context>
|
||||||
<context>
|
<context>
|
||||||
<name>JobsPage</name>
|
<name>JobsPage</name>
|
||||||
|
|
|
@ -225,6 +225,10 @@
|
||||||
<source>Unknown document format</source>
|
<source>Unknown document format</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
|
<message>
|
||||||
|
<source>Unknown document format dimensions</source>
|
||||||
|
<translation type="unfinished"></translation>
|
||||||
|
</message>
|
||||||
</context>
|
</context>
|
||||||
<context>
|
<context>
|
||||||
<name>JobsPage</name>
|
<name>JobsPage</name>
|
||||||
|
|
|
@ -225,6 +225,10 @@
|
||||||
<source>Unknown document format</source>
|
<source>Unknown document format</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
|
<message>
|
||||||
|
<source>Unknown document format dimensions</source>
|
||||||
|
<translation type="unfinished"></translation>
|
||||||
|
</message>
|
||||||
</context>
|
</context>
|
||||||
<context>
|
<context>
|
||||||
<name>JobsPage</name>
|
<name>JobsPage</name>
|
||||||
|
|
Loading…
Reference in a new issue