Adjust details page

harbour-seaprint.pro

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

qml/pages/DetailsPage.qml

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

qml/pages/FirstPage.qml

@@ -256,8 +256,8 @@ Page {
                         onClicked:  pageStack.push(Qt.resolvedUrl("JobsPage.qml"), {printer: printer})
                     }
                     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 {
                         text: qsTr("Remove printer")

qml/pages/utils.js

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

translations/harbour-seaprint-de.ts

@@ -186,6 +186,37 @@
         <translation>In die Zwischenablage kopiert</translation>
     </message>
 </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>
     <name>FirstPage</name>
     <message>
@@ -241,7 +272,7 @@
         <translation>Verfügbare Drucker</translation>
     </message>
     <message>
-        <source>Printer properties</source>
+        <source>Printer details</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -388,45 +419,6 @@
         <translation>Seiten Bereich</translation>
     </message>
 </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>
     <name>RangeSetting</name>
     <message>

translations/harbour-seaprint-es.ts

@@ -186,6 +186,37 @@
         <translation type="unfinished"></translation>
     </message>
 </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>
     <name>FirstPage</name>
     <message>
@@ -241,7 +272,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Printer properties</source>
+        <source>Printer details</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -388,45 +419,6 @@
         <translation type="unfinished"></translation>
     </message>
 </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>
     <name>RangeSetting</name>
     <message>

translations/harbour-seaprint-fr.ts

@@ -186,6 +186,37 @@
         <translation type="unfinished"></translation>
     </message>
 </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>
     <name>FirstPage</name>
     <message>
@@ -241,7 +272,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Printer properties</source>
+        <source>Printer details</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -388,45 +419,6 @@
         <translation type="unfinished"></translation>
     </message>
 </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>
     <name>RangeSetting</name>
     <message>

translations/harbour-seaprint-nl.ts

@@ -186,6 +186,37 @@
         <translation>Gekopieerd naar het klembord</translation>
     </message>
 </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>
     <name>FirstPage</name>
     <message>
@@ -241,7 +272,7 @@
         <translation>Beschikbare printers</translation>
     </message>
     <message>
-        <source>Printer properties</source>
+        <source>Printer details</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -388,45 +419,6 @@
         <translation>Paginabereik</translation>
     </message>
 </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>
     <name>RangeSetting</name>
     <message>

translations/harbour-seaprint-pl.ts

@@ -186,6 +186,37 @@
         <translation type="unfinished"></translation>
     </message>
 </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>
     <name>FirstPage</name>
     <message>
@@ -241,7 +272,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Printer properties</source>
+        <source>Printer details</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -388,45 +419,6 @@
         <translation type="unfinished"></translation>
     </message>
 </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>
     <name>RangeSetting</name>
     <message>

translations/harbour-seaprint-zh_CN.ts

@@ -186,6 +186,37 @@
         <translation type="unfinished"></translation>
     </message>
 </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>
     <name>FirstPage</name>
     <message>
@@ -241,7 +272,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Printer properties</source>
+        <source>Printer details</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -388,45 +419,6 @@
         <translation type="unfinished"></translation>
     </message>
 </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>
     <name>RangeSetting</name>
     <message>

translations/harbour-seaprint.ts

@@ -186,6 +186,37 @@
         <translation type="unfinished"></translation>
     </message>
 </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>
     <name>FirstPage</name>
     <message>
@@ -241,7 +272,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Printer properties</source>
+        <source>Printer details</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -388,45 +419,6 @@
         <translation type="unfinished"></translation>
     </message>
 </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>
     <name>RangeSetting</name>
     <message>