Rearrange details page, add performance data

qml/pages/DetailsPage.qml

@@ -69,6 +69,27 @@ Page {
                 visible: printer.attrs.hasOwnProperty("printer-state-message")
             }
 
+            SectionHeader {
+                text: qsTr("Supply status")
+                visible: printer.attrs.hasOwnProperty("marker-colors")
+            }
+
+            Repeater
+            {
+                model: printer.attrs["marker-colors"].value.length
+
+                SupplyItem
+                {
+                    color: printer.attrs["marker-colors"].value[index]
+                    level: printer.attrs["marker-levels"].value[index]
+                    high_level: printer.attrs["marker-high-levels"].value[index]
+                    low_level: printer.attrs["marker-low-levels"].value[index]
+                    name: printer.attrs["marker-names"].value[index]
+                    type: printer.attrs["marker-types"].value[index]
+
+                }
+            }
+
             SectionHeader {
                 text: qsTr("IPP versions")
                 visible: printer.attrs.hasOwnProperty("ipp-versions-supported")
@@ -115,25 +136,24 @@ Page {
             }
 
             SectionHeader {
-                text: qsTr("Supply status")
+                text: qsTr("Performance")
-                visible: printer.attrs.hasOwnProperty("marker-colors")
+                visible: printer.attrs.hasOwnProperty("pages-per-minute") || printer.attrs.hasOwnProperty("pages-per-minute-color")
             }
 
-            Repeater
+            Label
             {
-                model: printer.attrs["marker-colors"].value.length
+                text: ""+printer.attrs["pages-per-minute"].value+" "+qsTr("pages/min")
+                visible: printer.attrs.hasOwnProperty("pages-per-minute")
 
-                SupplyItem
+            }
+
+            Label
             {
-                    color: printer.attrs["marker-colors"].value[index]
+                text: ""+printer.attrs["pages-per-minute-color"].value+" "+qsTr("pages/min (color)")
-                    level: printer.attrs["marker-levels"].value[index]
+                visible: printer.attrs.hasOwnProperty("pages-per-minute-color")
-                    high_level: printer.attrs["marker-high-levels"].value[index]
+
-                    low_level: printer.attrs["marker-low-levels"].value[index]
+            }
-                    name: printer.attrs["marker-names"].value[index]
-                    type: printer.attrs["marker-types"].value[index]
 
         }
     }
 }
-    }
-}

translations/harbour-seaprint-de.ts

@@ -205,6 +205,18 @@
         <source>Location</source>
         <translation>Standort</translation>
     </message>
+    <message>
+        <source>Performance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>pages/min</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>pages/min (color)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>FirstPage</name>

translations/harbour-seaprint-es.ts

@@ -205,6 +205,18 @@
         <source>Location</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Performance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>pages/min</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>pages/min (color)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>FirstPage</name>

translations/harbour-seaprint-fr.ts

@@ -205,6 +205,18 @@
         <source>Location</source>
         <translation>Localisation</translation>
     </message>
+    <message>
+        <source>Performance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>pages/min</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>pages/min (color)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>FirstPage</name>

translations/harbour-seaprint-nl.ts

@@ -205,6 +205,18 @@
         <source>Location</source>
         <translation>Locatie</translation>
     </message>
+    <message>
+        <source>Performance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>pages/min</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>pages/min (color)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>FirstPage</name>

translations/harbour-seaprint-pl.ts

@@ -205,6 +205,18 @@
         <source>Location</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Performance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>pages/min</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>pages/min (color)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>FirstPage</name>

translations/harbour-seaprint-zh_CN.ts

@@ -205,6 +205,18 @@
         <source>Location</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Performance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>pages/min</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>pages/min (color)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>FirstPage</name>