Adjust details page

This commit is contained in:
Anton Thomasson 2020-09-30 20:57:05 +02:00
parent 1d1c71f596
commit cdcc7dc520
11 changed files with 233 additions and 300 deletions

View file

@ -54,8 +54,8 @@ DISTFILES += qml/harbour-seaprint.qml \
qml/pages/*svg \ qml/pages/*svg \
qml/pages/BusyPage.qml \ qml/pages/BusyPage.qml \
qml/pages/DebugPage.qml \ qml/pages/DebugPage.qml \
qml/pages/DetailsPage.qml \
qml/pages/NagScreen.qml \ qml/pages/NagScreen.qml \
qml/pages/PropertiesPage.qml \
qml/pages/SettingsPage.qml \ qml/pages/SettingsPage.qml \
rpm/harbour-seaprint.changes.in \ rpm/harbour-seaprint.changes.in \
rpm/harbour-seaprint.changes.run.in \ rpm/harbour-seaprint.changes.run.in \

View file

@ -37,26 +37,17 @@ Page {
} }
SectionHeader { SectionHeader {
text: qsTr("Printer state") text: qsTr("Printer status")
} }
Label { Label {
text: Utils.ippName("printer-state", printer.attrs["printer-state"].value) text: Utils.ippName("printer-state", printer.attrs["printer-state"].value)
} }
SectionHeader {
text: qsTr("Detailed printer state")
}
Label { Label {
text: Utils.ippName("printer-state-reasons", printer.attrs["printer-state-reasons"].value) text: Utils.ippName("printer-state-reasons", printer.attrs["printer-state-reasons"].value)
} }
SectionHeader {
text: qsTr("Printer state message")
visible: printer.attrs.hasOwnProperty("printer-state-message")
}
Label { Label {
text: printer.attrs["printer-state-message"].value text: printer.attrs["printer-state-message"].value
visible: printer.attrs.hasOwnProperty("printer-state-message") visible: printer.attrs.hasOwnProperty("printer-state-message")
@ -67,13 +58,11 @@ Page {
visible: printer.attrs.hasOwnProperty("ipp-versions-supported") visible: printer.attrs.hasOwnProperty("ipp-versions-supported")
} }
Repeater
Label
{ {
model: printer.attrs["ipp-versions-supported"].value.length text: printer.attrs["ipp-versions-supported"].value.join(" ")
Label visible: printer.attrs.hasOwnProperty("ipp-versions-supported")
{
text: printer.attrs["ipp-versions-supported"].value[index]
}
} }

View file

@ -256,8 +256,8 @@ Page {
onClicked: pageStack.push(Qt.resolvedUrl("JobsPage.qml"), {printer: printer}) onClicked: pageStack.push(Qt.resolvedUrl("JobsPage.qml"), {printer: printer})
} }
MenuItem { MenuItem {
text: qsTr("Printer properties") text: qsTr("Printer details")
onClicked: pageStack.push(Qt.resolvedUrl("PropertiesPage.qml"), {printer: printer}) onClicked: pageStack.push(Qt.resolvedUrl("DetailsPage.qml"), {printer: printer})
} }
MenuItem { MenuItem {
text: qsTr("Remove printer") text: qsTr("Remove printer")

View file

@ -867,7 +867,7 @@ var printerStateReasons =
"media-path-pick-roller-missing": "Media Path Pick Roller Missing", "media-path-pick-roller-missing": "Media Path Pick Roller Missing",
"motor-failure": "Motor Failure", "motor-failure": "Motor Failure",
"moving-to-paused": "Printer going offline", "moving-to-paused": "Printer going offline",
"none": "None", "none": "", //"None",
"opc-life-over": "Optical Photoconductor Life Over", "opc-life-over": "Optical Photoconductor Life Over",
"opc-near-eol": "OPC almost at end-of-life", "opc-near-eol": "OPC almost at end-of-life",
"other": "Check the printer for errors", "other": "Check the printer for errors",

View file

@ -186,6 +186,37 @@
<translation>In die Zwischenablage kopiert</translation> <translation>In die Zwischenablage kopiert</translation>
</message> </message>
</context> </context>
<context>
<name>DetailsPage</name>
<message>
<source>Details</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Make and model</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Printer status</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>IPP versions</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>IPP features</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Firmware</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Supply status</source>
<translation type="unfinished"></translation>
</message>
</context>
<context> <context>
<name>FirstPage</name> <name>FirstPage</name>
<message> <message>
@ -241,7 +272,7 @@
<translation>Verfügbare Drucker</translation> <translation>Verfügbare Drucker</translation>
</message> </message>
<message> <message>
<source>Printer properties</source> <source>Printer details</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
</context> </context>
@ -388,45 +419,6 @@
<translation>Seiten Bereich</translation> <translation>Seiten Bereich</translation>
</message> </message>
</context> </context>
<context>
<name>PropertiesPage</name>
<message>
<source>Details</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Printer state</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Detailed printer state</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Printer state message</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Printer firmware</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Supply status</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Make and model</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Ipp versions</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Ipp features</source>
<translation type="unfinished"></translation>
</message>
</context>
<context> <context>
<name>RangeSetting</name> <name>RangeSetting</name>
<message> <message>

View file

@ -186,6 +186,37 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
</context> </context>
<context>
<name>DetailsPage</name>
<message>
<source>Details</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Make and model</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Printer status</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>IPP versions</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>IPP features</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Firmware</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Supply status</source>
<translation type="unfinished"></translation>
</message>
</context>
<context> <context>
<name>FirstPage</name> <name>FirstPage</name>
<message> <message>
@ -241,7 +272,7 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<source>Printer properties</source> <source>Printer details</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
</context> </context>
@ -388,45 +419,6 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
</context> </context>
<context>
<name>PropertiesPage</name>
<message>
<source>Details</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Printer state</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Detailed printer state</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Printer state message</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Printer firmware</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Supply status</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Make and model</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Ipp versions</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Ipp features</source>
<translation type="unfinished"></translation>
</message>
</context>
<context> <context>
<name>RangeSetting</name> <name>RangeSetting</name>
<message> <message>

View file

@ -186,6 +186,37 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
</context> </context>
<context>
<name>DetailsPage</name>
<message>
<source>Details</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Make and model</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Printer status</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>IPP versions</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>IPP features</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Firmware</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Supply status</source>
<translation type="unfinished"></translation>
</message>
</context>
<context> <context>
<name>FirstPage</name> <name>FirstPage</name>
<message> <message>
@ -241,7 +272,7 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<source>Printer properties</source> <source>Printer details</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
</context> </context>
@ -388,45 +419,6 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
</context> </context>
<context>
<name>PropertiesPage</name>
<message>
<source>Details</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Printer state</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Detailed printer state</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Printer state message</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Printer firmware</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Supply status</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Make and model</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Ipp versions</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Ipp features</source>
<translation type="unfinished"></translation>
</message>
</context>
<context> <context>
<name>RangeSetting</name> <name>RangeSetting</name>
<message> <message>

View file

@ -186,6 +186,37 @@
<translation>Gekopieerd naar het klembord</translation> <translation>Gekopieerd naar het klembord</translation>
</message> </message>
</context> </context>
<context>
<name>DetailsPage</name>
<message>
<source>Details</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Make and model</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Printer status</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>IPP versions</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>IPP features</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Firmware</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Supply status</source>
<translation type="unfinished"></translation>
</message>
</context>
<context> <context>
<name>FirstPage</name> <name>FirstPage</name>
<message> <message>
@ -241,7 +272,7 @@
<translation>Beschikbare printers</translation> <translation>Beschikbare printers</translation>
</message> </message>
<message> <message>
<source>Printer properties</source> <source>Printer details</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
</context> </context>
@ -388,45 +419,6 @@
<translation>Paginabereik</translation> <translation>Paginabereik</translation>
</message> </message>
</context> </context>
<context>
<name>PropertiesPage</name>
<message>
<source>Details</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Printer state</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Detailed printer state</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Printer state message</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Printer firmware</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Supply status</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Make and model</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Ipp versions</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Ipp features</source>
<translation type="unfinished"></translation>
</message>
</context>
<context> <context>
<name>RangeSetting</name> <name>RangeSetting</name>
<message> <message>

View file

@ -186,6 +186,37 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
</context> </context>
<context>
<name>DetailsPage</name>
<message>
<source>Details</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Make and model</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Printer status</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>IPP versions</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>IPP features</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Firmware</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Supply status</source>
<translation type="unfinished"></translation>
</message>
</context>
<context> <context>
<name>FirstPage</name> <name>FirstPage</name>
<message> <message>
@ -241,7 +272,7 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<source>Printer properties</source> <source>Printer details</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
</context> </context>
@ -388,45 +419,6 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
</context> </context>
<context>
<name>PropertiesPage</name>
<message>
<source>Details</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Printer state</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Detailed printer state</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Printer state message</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Printer firmware</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Supply status</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Make and model</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Ipp versions</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Ipp features</source>
<translation type="unfinished"></translation>
</message>
</context>
<context> <context>
<name>RangeSetting</name> <name>RangeSetting</name>
<message> <message>

View file

@ -186,6 +186,37 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
</context> </context>
<context>
<name>DetailsPage</name>
<message>
<source>Details</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Make and model</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Printer status</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>IPP versions</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>IPP features</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Firmware</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Supply status</source>
<translation type="unfinished"></translation>
</message>
</context>
<context> <context>
<name>FirstPage</name> <name>FirstPage</name>
<message> <message>
@ -241,7 +272,7 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<source>Printer properties</source> <source>Printer details</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
</context> </context>
@ -388,45 +419,6 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
</context> </context>
<context>
<name>PropertiesPage</name>
<message>
<source>Details</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Printer state</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Detailed printer state</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Printer state message</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Printer firmware</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Supply status</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Make and model</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Ipp versions</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Ipp features</source>
<translation type="unfinished"></translation>
</message>
</context>
<context> <context>
<name>RangeSetting</name> <name>RangeSetting</name>
<message> <message>

View file

@ -186,6 +186,37 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
</context> </context>
<context>
<name>DetailsPage</name>
<message>
<source>Details</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Make and model</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Printer status</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>IPP versions</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>IPP features</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Firmware</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Supply status</source>
<translation type="unfinished"></translation>
</message>
</context>
<context> <context>
<name>FirstPage</name> <name>FirstPage</name>
<message> <message>
@ -241,7 +272,7 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<source>Printer properties</source> <source>Printer details</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
</context> </context>
@ -388,45 +419,6 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
</context> </context>
<context>
<name>PropertiesPage</name>
<message>
<source>Details</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Printer state</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Detailed printer state</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Printer state message</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Printer firmware</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Supply status</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Make and model</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Ipp versions</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Ipp features</source>
<translation type="unfinished"></translation>
</message>
</context>
<context> <context>
<name>RangeSetting</name> <name>RangeSetting</name>
<message> <message>