From 47cde78edcd6faa2f6fe6fe49b7de5bea5a4a685 Mon Sep 17 00:00:00 2001
From: Anton Thomasson <antonthomasson@gmail.com>
Date: Thu, 13 Jan 2022 21:10:47 +0100
Subject: [PATCH] Rearrange details page, add performance data

---
 qml/pages/DetailsPage.qml              | 48 ++++++++++++++++++--------
 translations/harbour-seaprint-de.ts    | 12 +++++++
 translations/harbour-seaprint-es.ts    | 12 +++++++
 translations/harbour-seaprint-fr.ts    | 12 +++++++
 translations/harbour-seaprint-nl.ts    | 12 +++++++
 translations/harbour-seaprint-pl.ts    | 12 +++++++
 translations/harbour-seaprint-zh_CN.ts | 12 +++++++
 7 files changed, 106 insertions(+), 14 deletions(-)

diff --git a/qml/pages/DetailsPage.qml b/qml/pages/DetailsPage.qml
index ac4d0a1..1c84041 100644
--- a/qml/pages/DetailsPage.qml
+++ b/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")
-                visible: printer.attrs.hasOwnProperty("marker-colors")
+                text: qsTr("Performance")
+                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
-                {
-                    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]
-
-                }
             }
+
+            Label
+            {
+                text: ""+printer.attrs["pages-per-minute-color"].value+" "+qsTr("pages/min (color)")
+                visible: printer.attrs.hasOwnProperty("pages-per-minute-color")
+
+            }
+
         }
     }
 }
diff --git a/translations/harbour-seaprint-de.ts b/translations/harbour-seaprint-de.ts
index ab4745a..8d61670 100644
--- a/translations/harbour-seaprint-de.ts
+++ b/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>
diff --git a/translations/harbour-seaprint-es.ts b/translations/harbour-seaprint-es.ts
index 9a6ea22..2ce144c 100644
--- a/translations/harbour-seaprint-es.ts
+++ b/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>
diff --git a/translations/harbour-seaprint-fr.ts b/translations/harbour-seaprint-fr.ts
index 30fa49e..525d06b 100644
--- a/translations/harbour-seaprint-fr.ts
+++ b/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>
diff --git a/translations/harbour-seaprint-nl.ts b/translations/harbour-seaprint-nl.ts
index de171fe..4f393d5 100644
--- a/translations/harbour-seaprint-nl.ts
+++ b/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>
diff --git a/translations/harbour-seaprint-pl.ts b/translations/harbour-seaprint-pl.ts
index 8241a51..068cddb 100644
--- a/translations/harbour-seaprint-pl.ts
+++ b/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>
diff --git a/translations/harbour-seaprint-zh_CN.ts b/translations/harbour-seaprint-zh_CN.ts
index 005455f..7b3342b 100644
--- a/translations/harbour-seaprint-zh_CN.ts
+++ b/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>