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

Fix sides and color-mode settings

Browse source
This commit is contained in:
Anton Thomasson 2020-10-17 12:08:51 +02:00
parent 75cb01961b
commit 2131cd4c5f
2 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
qml/pages/PrinterPage.qml
View file

@ -38,12 +38,12 @@ Page {
ListModel { ListModel {
id:mod id:mod
ListElement {name: "sides"; prettyName: qsTr("Sides"); tag: IppMsg.Enum} ListElement {name: "sides"; prettyName: qsTr("Sides"); tag: IppMsg.Keyword}
ListElement {name: "media"; prettyName: qsTr("Print media"); tag: IppMsg.Keyword} ListElement {name: "media"; prettyName: qsTr("Print media"); tag: IppMsg.Keyword}
ListElement {name: "copies"; prettyName: qsTr("Copies"); tag: IppMsg.Integer} ListElement {name: "copies"; prettyName: qsTr("Copies"); tag: IppMsg.Integer}
ListElement {name: "multiple-document-handling"; prettyName: qsTr("Collated copies"); tag: IppMsg.Keyword} ListElement {name: "multiple-document-handling"; prettyName: qsTr("Collated copies"); tag: IppMsg.Keyword}
ListElement {name: "page-ranges"; prettyName: qsTr("Page range"); tag: IppMsg.IntegerRange} ListElement {name: "page-ranges"; prettyName: qsTr("Page range"); tag: IppMsg.IntegerRange}
ListElement {name: "print-color-mode"; prettyName: qsTr("Color mode"); tag: IppMsg.Enum} ListElement {name: "print-color-mode"; prettyName: qsTr("Color mode"); tag: IppMsg.Keyword}
// ListElement {name: "orientation-requested"; prettyName: qsTr("Orientation"); tag: IppMsg.Enum} // ListElement {name: "orientation-requested"; prettyName: qsTr("Orientation"); tag: IppMsg.Enum}
ListElement {name: "print-quality"; prettyName: qsTr("Quality"); tag: IppMsg.Enum} ListElement {name: "print-quality"; prettyName: qsTr("Quality"); tag: IppMsg.Enum}
ListElement {name: "printer-resolution"; prettyName: qsTr("Resolution"); tag: IppMsg.Resolution} ListElement {name: "printer-resolution"; prettyName: qsTr("Resolution"); tag: IppMsg.Resolution}

15
src/ippprinter.cpp
View file

@ -441,19 +441,14 @@ void IppPrinter::print(QJsonObject attrs, QString filename, bool alwaysConvert,
} }
QString Sides = getAttrOrDefault(attrs, "sides").toString(); QString Sides = getAttrOrDefault(attrs, "sides").toString();
if(documentFormat=="image/pwg-raster" || documentFormat=="image/urf") if(documentFormat=="image/pwg-raster"
{ || documentFormat=="image/urf"
attrs.remove("sides"); || documentFormat == "application/postscript")
attrs.remove("print-color-mode"); { // Effected locally
attrs.remove("page-ranges");
}
else if(documentFormat == "application/postscript")
{
attrs.remove("sides");
attrs.remove("page-ranges"); attrs.remove("page-ranges");
} }
else if (documentFormat == "application/pdf") else if (documentFormat == "application/pdf")
{ { // Only effected locally if really needed
if(attrs.contains("page-ranges") && !_attrs.contains("page-ranges-supported")) if(attrs.contains("page-ranges") && !_attrs.contains("page-ranges-supported"))
{ {
pdfPageRangeAdjustNeeded = true; pdfPageRangeAdjustNeeded = true;