Rework printer cards

Contributes to CL-1051
2025-07-12 17:27:51 -06:00 · 2018-09-28 12:15:33 +02:00 · 2018-09-28 12:15:33 +02:00 · b5c893c08e
commit b5c893c08e
parent fc333d53c5
4 changed files with 807 additions and 711 deletions
--- a/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml
+++ b/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml
@ -0,0 +1,119 @@
+import QtQuick 2.3
+import QtQuick.Controls.Styles 1.3
+import QtQuick.Controls 1.4
+import UM 1.3 as UM
+
+ProgressBar {
+    property var progress: {
+        if (printer.activePrintJob == null) {
+            return 0;
+        }
+        var result = printer.activePrintJob.timeElapsed / printer.activePrintJob.timeTotal;
+        if (result > 1.0) {
+            result = 1.0;
+        }
+        return result;
+    }
+    value: progress;
+
+    style: ProgressBarStyle {
+        property var remainingTime:
+        {
+            if(printer.activePrintJob == null)
+            {
+                return 0
+            }
+            /* Sometimes total minus elapsed is less than 0. Use Math.max() to prevent remaining
+                time from ever being less than 0. Negative durations cause strange behavior such
+                as displaying "-1h -1m". */
+            var activeJob = printer.activePrintJob
+            return Math.max(activeJob.timeTotal - activeJob.timeElapsed, 0);
+        }
+        property var progressText:
+        {
+            if(printer.activePrintJob == null)
+            {
+                return ""
+            }
+            switch(printer.activePrintJob.state)
+            {
+                case "wait_cleanup":
+                    if(printer.activePrintJob.timeTotal > printer.activePrintJob.timeElapsed)
+                    {
+                        return catalog.i18nc("@label:status", "Aborted")
+                    }
+                    return catalog.i18nc("@label:status", "Finished")
+                case "pre_print":
+                case "sent_to_printer":
+                    return catalog.i18nc("@label:status", "Preparing")
+                case "aborted":
+                    return catalog.i18nc("@label:status", "Aborted")
+                case "wait_user_action":
+                    return catalog.i18nc("@label:status", "Aborted")
+                case "pausing":
+                    return catalog.i18nc("@label:status", "Pausing")
+                case "paused":
+                    return OutputDevice.formatDuration( remainingTime )
+                case "resuming":
+                    return catalog.i18nc("@label:status", "Resuming")
+                case "queued":
+                    return catalog.i18nc("@label:status", "Action required")
+                default:
+                    return OutputDevice.formatDuration( remainingTime )
+            }
+        }
+
+        background: Rectangle
+        {
+            implicitWidth: 100
+            implicitHeight: visible ? 24 : 0
+            color: UM.Theme.getColor("viewport_background")
+        }
+
+        progress: Rectangle
+        {
+            color:
+            {
+                var state = printer.activePrintJob.state
+                var inactiveStates = [
+                    "pausing",
+                    "paused",
+                    "resuming",
+                    "wait_cleanup"
+                ]
+                if(inactiveStates.indexOf(state) > -1 && remainingTime > 0)
+                {
+                    return UM.Theme.getColor("monitor_tab_text_inactive")
+                }
+                else
+                {
+                    return UM.Theme.getColor("primary")
+                }
+            }
+            id: progressItem
+            function getTextOffset()
+            {
+                if(progressItem.width + progressLabel.width + 16 < control.width)
+                {
+                    return progressItem.width + UM.Theme.getSize("default_margin").width
+                }
+                else
+                {
+                    return progressItem.width - progressLabel.width - UM.Theme.getSize("default_margin").width
+                }
+            }
+
+            Label
+            {
+                id: progressLabel
+                anchors.left: parent.left
+                anchors.leftMargin: getTextOffset()
+                text: progressText
+                anchors.verticalCenter: parent.verticalCenter
+                color: progressItem.width + progressLabel.width < control.width ? "black" : "white"
+                width: contentWidth
+                font: UM.Theme.getFont("default")
+            }
+        }
+    }
+}