Support collated copies

This commit is contained in:
Anton Thomasson 2020-10-04 18:16:21 +02:00
parent 4d0eeb35c2
commit 4d76999df6
9 changed files with 169 additions and 11 deletions

View file

@ -38,17 +38,18 @@ Page {
ListModel { ListModel {
id:mod id:mod
ListElement {name: "sides"; prettyName: qsTr("Sides"); tag: IppMsg.Enum} ListElement {name: "sides"; prettyName: qsTr("Sides"); tag: IppMsg.Enum}
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: "page-ranges"; prettyName: qsTr("Page range"); tag: IppMsg.IntegerRange} ListElement {name: "multiple-document-handling"; prettyName: qsTr("Collated copies"); tag: IppMsg.Keyword}
ListElement {name: "print-color-mode"; prettyName: qsTr("Color mode"); tag: IppMsg.Enum} ListElement {name: "page-ranges"; prettyName: qsTr("Page range"); tag: IppMsg.IntegerRange}
// ListElement {name: "orientation-requested"; prettyName: qsTr("Orientation"); tag: IppMsg.Enum} ListElement {name: "print-color-mode"; prettyName: qsTr("Color mode"); tag: IppMsg.Enum}
ListElement {name: "print-quality"; prettyName: qsTr("Quality"); tag: IppMsg.Enum} // ListElement {name: "orientation-requested"; prettyName: qsTr("Orientation"); tag: IppMsg.Enum}
ListElement {name: "printer-resolution"; prettyName: qsTr("Resolution"); tag: IppMsg.Resolution} ListElement {name: "print-quality"; prettyName: qsTr("Quality"); tag: IppMsg.Enum}
ListElement {name: "document-format"; prettyName: qsTr("Transfer format"); tag: IppMsg.MimeMediaType} ListElement {name: "printer-resolution"; prettyName: qsTr("Resolution"); tag: IppMsg.Resolution}
ListElement {name: "media-source"; prettyName: qsTr("Media source"); tag: IppMsg.Keyword} ListElement {name: "document-format"; prettyName: qsTr("Transfer format"); tag: IppMsg.MimeMediaType}
ListElement {name: "media-col"; prettyName: qsTr("Zero margins"); tag: IppMsg.BeginCollection} ListElement {name: "media-source"; prettyName: qsTr("Media source"); tag: IppMsg.Keyword}
ListElement {name: "media-col"; prettyName: qsTr("Zero margins"); tag: IppMsg.BeginCollection}
} }
SilicaListView { SilicaListView {

View file

@ -147,6 +147,20 @@ function ippName(name, value)
default: default:
return value return value
} }
case "multiple-document-handling":
switch(value) {
case "single-document":
return qsTr("single document");
case "separate-documents-uncollated-copies":
return qsTr("uncollated");
case "separate-documents-collated-copies":
return qsTr("collated");
case "single-document-new-sheet":
return qsTr("single document (new sheet)");
default:
return value
}
case "print-color-mode": case "print-color-mode":
switch(value) { switch(value) {
case "auto": case "auto":
@ -284,6 +298,9 @@ function limitChoices(name, choices, mimeType, ConvertChecker)
} }
case "printer-resolution": case "printer-resolution":
return choices.filter(unitsIsDpi); return choices.filter(unitsIsDpi);
case "multiple-document-handling" :
// Only collation settings valid, multiple documents not used
return choices.filter(function(elem) {return elem.indexOf("collated") != -1});
default: default:
return choices; return choices;
} }

View file

@ -418,6 +418,10 @@
<source>Page range</source> <source>Page range</source>
<translation>Seiten Bereich</translation> <translation>Seiten Bereich</translation>
</message> </message>
<message>
<source>Collated copies</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>RangeSetting</name> <name>RangeSetting</name>
@ -694,5 +698,21 @@
<source>Unknown State </source> <source>Unknown State </source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>single document</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>uncollated</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>collated</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>single document (new sheet)</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
</TS> </TS>

View file

@ -418,6 +418,10 @@
<source>Page range</source> <source>Page range</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Collated copies</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>RangeSetting</name> <name>RangeSetting</name>
@ -694,5 +698,21 @@
<source>Unknown State </source> <source>Unknown State </source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>single document</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>uncollated</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>collated</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>single document (new sheet)</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
</TS> </TS>

View file

@ -418,6 +418,10 @@
<source>Page range</source> <source>Page range</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Collated copies</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>RangeSetting</name> <name>RangeSetting</name>
@ -694,5 +698,21 @@
<source>Unknown State </source> <source>Unknown State </source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>single document</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>uncollated</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>collated</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>single document (new sheet)</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
</TS> </TS>

View file

@ -418,6 +418,10 @@
<source>Page range</source> <source>Page range</source>
<translation>Paginabereik</translation> <translation>Paginabereik</translation>
</message> </message>
<message>
<source>Collated copies</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>RangeSetting</name> <name>RangeSetting</name>
@ -694,5 +698,21 @@
<source>Unknown State </source> <source>Unknown State </source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>single document</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>uncollated</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>collated</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>single document (new sheet)</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
</TS> </TS>

View file

@ -418,6 +418,10 @@
<source>Zero margins</source> <source>Zero margins</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Collated copies</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>RangeSetting</name> <name>RangeSetting</name>
@ -694,5 +698,21 @@
<source>Unknown State </source> <source>Unknown State </source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>single document</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>uncollated</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>collated</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>single document (new sheet)</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
</TS> </TS>

View file

@ -418,6 +418,10 @@
<source>Page range</source> <source>Page range</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Collated copies</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>RangeSetting</name> <name>RangeSetting</name>
@ -694,5 +698,21 @@
<source>Unknown State </source> <source>Unknown State </source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>single document</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>uncollated</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>collated</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>single document (new sheet)</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
</TS> </TS>

View file

@ -418,6 +418,10 @@
<source>Page range</source> <source>Page range</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Collated copies</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>RangeSetting</name> <name>RangeSetting</name>
@ -694,5 +698,21 @@
<source>Unknown State </source> <source>Unknown State </source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>single document</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>uncollated</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>collated</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>single document (new sheet)</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
</TS> </TS>