Merge branch '4.0' into STAR-322_cloud-connection

plugins/UM3NetworkPrinting/resources/qml/ExpandableCard.qml

@@ -15,6 +15,7 @@ Item
     id: base
 
     property bool expanded: false
+    property bool enabled: true
     property var borderWidth: 1
     property color borderColor: "#CCCCCC"
     property color headerBackgroundColor: "white"
@@ -34,7 +35,7 @@ Item
             color: borderColor
             width: borderWidth
         }
-        color: headerMouseArea.containsMouse ? headerHoverColor : headerBackgroundColor
+        color: base.enabled && headerMouseArea.containsMouse ? headerHoverColor : headerBackgroundColor
         height: childrenRect.height
         width: parent.width
         Behavior on color
@@ -50,8 +51,12 @@ Item
     {
         id: headerMouseArea
         anchors.fill: header
-        onClicked: base.expanded = !base.expanded
+        onClicked:
-        hoverEnabled: true
+        {
+            if (!base.enabled) return
+            base.expanded = !base.expanded
+        }
+        hoverEnabled: base.enabled
     }
 
     Rectangle

plugins/UM3NetworkPrinting/resources/qml/MonitorBuildplateConfiguration.qml

@@ -18,7 +18,7 @@ import UM 1.3 as UM
 Item
 {
     // The buildplate name
-    property alias buildplate: buildplateLabel.text
+    property var buildplate: null
 
     // Height is one 18px label/icon
     height: 18 * screenScaleFactor // TODO: Theme!
@@ -34,7 +34,16 @@ Item
         Item
         {
             height: parent.height
-            width: 32 * screenScaleFactor // TODO: Theme! (Should be same as extruder icon width)
+            width: 32 * screenScaleFactor // Ensure the icon is centered under the extruder icon (same width)
+            
+            Rectangle
+            {
+                anchors.centerIn: parent
+                height: parent.height
+                width: height
+                color: buildplateIcon.visible > 0 ? "transparent" : "#eeeeee" // TODO: Theme!
+                radius: Math.floor(height / 2)
+            }
 
             UM.RecolorImage
             {
@@ -44,6 +53,7 @@ Item
                 height: parent.height
                 source: "../svg/icons/buildplate.svg"
                 width: height
+                visible: buildplate
             }
         }
         
@@ -53,7 +63,8 @@ Item
             color: "#191919" // TODO: Theme!
             elide: Text.ElideRight
             font: UM.Theme.getFont("default") // 12pt, regular
-            text: ""
+            text: buildplate ? buildplate : ""
+            visible: text !== ""
 
             // FIXED-LINE-HEIGHT:
             height: 18 * screenScaleFactor // TODO: Theme!

plugins/UM3NetworkPrinting/resources/qml/MonitorCarousel.qml

@@ -14,7 +14,12 @@ Item
     property var tileWidth: 834 * screenScaleFactor // TODO: Theme!
     property var tileHeight: 216 * screenScaleFactor // TODO: Theme!
     property var tileSpacing: 60 * screenScaleFactor // TODO: Theme!
-    property var maxOffset: (OutputDevice.printers.length - 1) * (tileWidth + tileSpacing)
+
+    // Array/model of printers to populate the carousel with
+    property var printers: []
+
+    // Maximum distance the carousel can be shifted
+    property var maxOffset: (printers.length - 1) * (tileWidth + tileSpacing)
 
     height: centerSection.height
     width: maximumWidth
@@ -129,7 +134,7 @@ Item
             
             Repeater
             {
-                model: OutputDevice.printers
+                model: printers
                 MonitorPrinterCard
                 {
                     printer: modelData
@@ -151,7 +156,7 @@ Item
         width: 36 * screenScaleFactor // TODO: Theme!
         height: 72 * screenScaleFactor // TODO: Theme!
         z: 10
-        visible: currentIndex < OutputDevice.printers.length - 1
+        visible: currentIndex < printers.length - 1
         onClicked: navigateTo(currentIndex + 1)
         hoverEnabled: true
         background: Rectangle
@@ -225,9 +230,10 @@ Item
             topMargin: 36 * screenScaleFactor // TODO: Theme!
         }
         spacing: 8 * screenScaleFactor // TODO: Theme!
+        visible: printers.length > 1
         Repeater
         {
-            model: OutputDevice.printers
+            model: printers
             Button
             {
                 background: Rectangle
@@ -243,7 +249,7 @@ Item
     }
 
     function navigateTo( i ) {
-        if (i >= 0 && i < OutputDevice.printers.length)
+        if (i >= 0 && i < printers.length)
         {
             tiles.x = -1 * i * (tileWidth + tileSpacing)
             currentIndex = i

plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml

@@ -54,7 +54,7 @@ UM.Dialog
         wrapMode: Text.WordWrap
         text:
         {
-            if (!printer.activePrintJob)
+            if (!printer || !printer.activePrintJob)
             {
                 return ""
             }

plugins/UM3NetworkPrinting/resources/qml/MonitorExtruderConfiguration.qml

@@ -39,38 +39,62 @@ Item
         color: "#eeeeee" // TODO: Theme!
         position: 0
     }
-    Label
+
+    Rectangle
     {
-        id: materialLabel
+        id: materialLabelWrapper
         anchors
         {
             left: extruderIcon.right
             leftMargin: 12 * screenScaleFactor // TODO: Theme!
         }
-        color: "#191919" // TODO: Theme!
+        color: materialLabel.visible > 0 ? "transparent" : "#eeeeee" // TODO: Theme!
-        elide: Text.ElideRight
-        font: UM.Theme.getFont("default") // 12pt, regular
-        text: ""
-
-        // FIXED-LINE-HEIGHT:
         height: 18 * screenScaleFactor // TODO: Theme!
-        verticalAlignment: Text.AlignVCenter
+        width: Math.max(materialLabel.contentWidth, 60 * screenScaleFactor) // TODO: Theme!
+        radius: 2 * screenScaleFactor // TODO: Theme!
+
+        Label
+        {
+            id: materialLabel
+            
+            color: "#191919" // TODO: Theme!
+            elide: Text.ElideRight
+            font: UM.Theme.getFont("default") // 12pt, regular
+            text: ""
+            visible: text !== ""
+
+            // FIXED-LINE-HEIGHT:
+            height: parent.height
+            verticalAlignment: Text.AlignVCenter
+        }
     }
-    Label
+
+    Rectangle
     {
-        id: printCoreLabel
+        id: printCoreLabelWrapper
         anchors
         {
-            left: materialLabel.left
+            left: materialLabelWrapper.left
             bottom: parent.bottom
         }
-        color: "#191919" // TODO: Theme!
+        color: printCoreLabel.visible > 0 ? "transparent" : "#eeeeee" // TODO: Theme!
-        elide: Text.ElideRight
-        font: UM.Theme.getFont("default_bold") // 12pt, bold
-        text: ""
-
-        // FIXED-LINE-HEIGHT:
         height: 18 * screenScaleFactor // TODO: Theme!
-        verticalAlignment: Text.AlignVCenter
+        width: Math.max(printCoreLabel.contentWidth, 36 * screenScaleFactor) // TODO: Theme!
+        radius: 2 * screenScaleFactor // TODO: Theme!
+
+        Label
+        {
+            id: printCoreLabel
+            
+            color: "#191919" // TODO: Theme!
+            elide: Text.ElideRight
+            font: UM.Theme.getFont("default_bold") // 12pt, bold
+            text: ""
+            visible: text !== ""
+
+            // FIXED-LINE-HEIGHT:
+            height: parent.height
+            verticalAlignment: Text.AlignVCenter
+        }
     }
 }

plugins/UM3NetworkPrinting/resources/qml/MonitorIconExtruder.qml

@@ -56,5 +56,6 @@ Item
         x: Math.round(size * 0.25) * screenScaleFactor
         y: Math.round(size * 0.15625) * screenScaleFactor
         // TODO: Once 'size' is themed, screenScaleFactor won't be needed
+        visible: position >= 0
     }
 }

plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml

@@ -26,6 +26,7 @@ Item
 
     ExpandableCard
     {
+        enabled: printJob != null
         borderColor: printJob.configurationChanges.length !== 0 ? "#f5a623" : "#CCCCCC" // TODO: Theme!
         headerItem: Row
         {
@@ -41,32 +42,56 @@ Item
                 anchors.verticalCenter: parent.verticalCenter
             }
 
-            Label
+            Item
             {
-                text: printJob && printJob.name ? printJob.name : ""
-                color: "#374355"
-                elide: Text.ElideRight
-                font: UM.Theme.getFont("medium") // 14pt, regular
                 anchors.verticalCenter: parent.verticalCenter
-                width: 216 * screenScaleFactor // TODO: Theme! (Should match column size)
-
-                // FIXED-LINE-HEIGHT:
                 height: 18 * screenScaleFactor // TODO: Theme!
-                verticalAlignment: Text.AlignVCenter
+                width: 216 * screenScaleFactor // TODO: Theme! (Should match column size)
+                Rectangle
+                {
+                    color: "#eeeeee"
+                    width: Math.round(parent.width / 2)
+                    height: parent.height
+                    visible: !printJob
+                }
+                Label
+                {
+                    text: printJob && printJob.name ? printJob.name : ""
+                    color: "#374355"
+                    elide: Text.ElideRight
+                    font: UM.Theme.getFont("medium") // 14pt, regular
+                    visible: printJob
+
+                    // FIXED-LINE-HEIGHT:
+                    height: parent.height
+                    verticalAlignment: Text.AlignVCenter
+                }
             }
 
-            Label
+            Item
             {
-                text: printJob ? OutputDevice.formatDuration(printJob.timeTotal) : ""
-                color: "#374355"
-                elide: Text.ElideRight
-                font: UM.Theme.getFont("medium") // 14pt, regular
                 anchors.verticalCenter: parent.verticalCenter
-                width: 216 * screenScaleFactor // TODO: Theme! (Should match column size)
-
-                // FIXED-LINE-HEIGHT:
                 height: 18 * screenScaleFactor // TODO: Theme!
-                verticalAlignment: Text.AlignVCenter
+                width: 216 * screenScaleFactor // TODO: Theme! (Should match column size)
+                Rectangle
+                {
+                    color: "#eeeeee"
+                    width: Math.round(parent.width / 3)
+                    height: parent.height
+                    visible: !printJob
+                }
+                Label
+                {
+                    text: printJob ? OutputDevice.formatDuration(printJob.timeTotal) : ""
+                    color: "#374355"
+                    elide: Text.ElideRight
+                    font: UM.Theme.getFont("medium") // 14pt, regular
+                    visible: printJob
+
+                    // FIXED-LINE-HEIGHT:
+                    height: 18 * screenScaleFactor // TODO: Theme!
+                    verticalAlignment: Text.AlignVCenter
+                }
             }
 
             Item
@@ -75,6 +100,14 @@ Item
                 height: 18 * screenScaleFactor // TODO: This should be childrenRect.height but QML throws warnings
                 width: childrenRect.width
 
+                Rectangle
+                {
+                    color: "#eeeeee"
+                    width: 72 * screenScaleFactor // TODO: Theme!
+                    height: parent.height
+                    visible: !printJob
+                }
+
                 Label
                 {
                     id: printerAssignmentLabel
@@ -100,7 +133,7 @@ Item
                     width: 120 * screenScaleFactor // TODO: Theme!
 
                     // FIXED-LINE-HEIGHT:
-                    height: 18 * screenScaleFactor // TODO: Theme!
+                    height: parent.height
                     verticalAlignment: Text.AlignVCenter
                 }
 
@@ -115,6 +148,7 @@ Item
                     }
                     height: childrenRect.height
                     spacing: 6 // TODO: Theme!
+                    visible: printJob
 
                     Repeater
                     {

plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobPreview.qml

@@ -16,23 +16,28 @@ Item
     width: size
     height: size
 
-    // Actual content
+    Rectangle
-    Image
     {
-        id: previewImage
         anchors.fill: parent
-        opacity:
+        color: printJob ? "transparent" : "#eeeeee" // TODO: Theme!
+        radius: 8 // TODO: Theme!
+        Image
         {
-            if (printJob && (printJob.state == "error" || printJob.configurationChanges.length > 0 || !printJob.isActive))
+            id: previewImage
+            anchors.fill: parent
+            opacity:
             {
-                return 0.5
+                if (printJob && (printJob.state == "error" || printJob.configurationChanges.length > 0 || !printJob.isActive))
+                {
+                    return 0.5
+                }
+                return 1.0
             }
-            return 1.0
+            source: printJob ? printJob.previewImageUrl : ""
         }
-        source: printJob ? printJob.previewImageUrl : ""
-        visible: printJob
     }
 
+
     UM.RecolorImage
     {
         id: ultiBotImage

plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml

@@ -34,16 +34,16 @@ Item
         {
             background: Rectangle
             {
-                color: printJob && printJob.isActive ? "#e4e4f2" : "#f3f3f9" // TODO: Theme!
+                color: "#f5f5f5" // TODO: Theme!
                 implicitHeight: visible ? 8 * screenScaleFactor : 0 // TODO: Theme!
                 implicitWidth: 180 * screenScaleFactor // TODO: Theme!
-                radius: 4 * screenScaleFactor // TODO: Theme!
+                radius: 2 * screenScaleFactor // TODO: Theme!
             }
             progress: Rectangle
             {
                 id: progressItem;
-                color: printJob && printJob.isActive ? "#0a0850" : "#9392b2" // TODO: Theme!
+                color: printJob && printJob.isActive ? "#3282ff" : "#CCCCCC" // TODO: Theme!
-                radius: 4 * screenScaleFactor // TODO: Theme!
+                radius: 2 * screenScaleFactor // TODO: Theme!
             }
         }
     }

plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml

@@ -33,16 +33,24 @@ Item
     width: 834 * screenScaleFactor // TODO: Theme!
     height: childrenRect.height
 
-    // Printer portion
     Rectangle
     {
-        id: printerInfo
+        id: background
+        anchors.fill: parent
+        color: "#FFFFFF" // TODO: Theme!
         border
         {
             color: "#CCCCCC" // TODO: Theme!
             width: borderSize // TODO: Remove once themed
         }
-        color: "white" // TODO: Theme!
+        radius: 2 * screenScaleFactor // TODO: Theme!
+    }
+
+    // Printer portion
+    Item
+    {
+        id: printerInfo
+
         width: parent.width
         height: 144 * screenScaleFactor // TODO: Theme!
 
@@ -56,16 +64,23 @@ Item
             }
             spacing: 18 * screenScaleFactor // TODO: Theme!
 
-            Image
+            Rectangle
             {
                 id: printerImage
                 width: 108 * screenScaleFactor // TODO: Theme!
                 height: 108 * screenScaleFactor // TODO: Theme!
-                fillMode: Image.PreserveAspectFit
+                color: printer ? "transparent" : "#eeeeee" // TODO: Theme!
-                source: "../png/" + printer.type + ".png"
+                radius: 8 // TODO: Theme!
-                mipmap: true
+                Image
+                {
+                    anchors.fill: parent
+                    fillMode: Image.PreserveAspectFit
+                    source: printer ? "../png/" + printer.type + ".png" : ""
+                    mipmap: true
+                }
             }
             
+
             Item
             {
                 anchors
@@ -75,20 +90,38 @@ Item
                 width: 180 * screenScaleFactor // TODO: Theme!
                 height: printerNameLabel.height + printerFamilyPill.height + 6 * screenScaleFactor // TODO: Theme!
 
-                Label
+                Rectangle
                 {
                     id: printerNameLabel
-                    text: printer && printer.name ? printer.name : ""
+                    // color: "#414054" // TODO: Theme!
-                    color: "#414054" // TODO: Theme!
+                    color: printer ? "transparent" : "#eeeeee" // TODO: Theme!
-                    elide: Text.ElideRight
-                    font: UM.Theme.getFont("large_bold") // 16pt, bold
-                    width: parent.width
-
-                    // FIXED-LINE-HEIGHT:
                     height: 18 * screenScaleFactor // TODO: Theme!
-                    verticalAlignment: Text.AlignVCenter
+                    width: parent.width
+                    radius: 2 * screenScaleFactor // TODO: Theme!
+                    
+                    Label
+                    {
+                        text: printer && printer.name ? printer.name : ""
+                        color: "#414054" // TODO: Theme!
+                        elide: Text.ElideRight
+                        font: UM.Theme.getFont("large") // 16pt, bold
+                        width: parent.width
+                        visible: printer
+
+                        // FIXED-LINE-HEIGHT:
+                        height: parent.height
+                        verticalAlignment: Text.AlignVCenter
+                    }
                 }
 
+                Rectangle
+                {
+                    color: "#eeeeee" // TODO: Theme!
+                    height: 18 * screenScaleFactor // TODO: Theme!
+                    radius: 2 * screenScaleFactor // TODO: Theme!
+                    visible: !printer
+                    width: 48 * screenScaleFactor // TODO: Theme!
+                }
                 MonitorPrinterPill
                 {
                     id: printerFamilyPill
@@ -98,7 +131,7 @@ Item
                         topMargin: 6 * screenScaleFactor // TODO: Theme!
                         left: printerNameLabel.left
                     }
-                    text: printer.type
+                    text: printer ? printer.type : ""
                 }
             }
 
@@ -106,16 +139,30 @@ Item
             {
                 id: printerConfiguration
                 anchors.verticalCenter: parent.verticalCenter
-                buildplate: "Glass"
+                buildplate: printer ? "Glass" : null // 'Glass' as a default
                 configurations:
-                [
+                {
-                    base.printer.printerConfiguration.extruderConfigurations[0],
+                    var configs = []
-                    base.printer.printerConfiguration.extruderConfigurations[1]
+                    if (printer)
-                ]
+                    {
-                height: 72 * screenScaleFactor // TODO: Theme!
+                        configs.push(printer.printerConfiguration.extruderConfigurations[0])
+                        configs.push(printer.printerConfiguration.extruderConfigurations[1])
+                    }
+                    else
+                    {
+                        configs.push(null, null)
+                    }
+                    return configs
+                }
+                height: 72 * screenScaleFactor // TODO: Theme!te theRect's x property
             }
+
+            // TODO: Make this work.
+            PropertyAnimation { target: printerConfiguration; property: "visible"; to: 0; loops: Animation.Infinite; duration: 500 }
         }
 
+        
+
         PrintJobContextMenu
         {
             id: contextButton
@@ -126,10 +173,11 @@ Item
                 top: parent.top
                 topMargin: 12 * screenScaleFactor // TODO: Theme!
             }
-            printJob: printer.activePrintJob
+            printJob: printer ? printer.activePrintJob : null
             width: 36 * screenScaleFactor // TODO: Theme!
             height: 36 * screenScaleFactor // TODO: Theme!
             enabled: base.enabled
+            visible: printer
         }
         CameraButton
         {
@@ -143,10 +191,24 @@ Item
             }
             iconSource: "../svg/icons/camera.svg"
             enabled: base.enabled
+            visible: printer
         }
     }
 
 
+    // Divider
+    Rectangle
+    {
+        anchors
+        {
+            top: printJobInfo.top
+            left: printJobInfo.left
+            right: printJobInfo.right
+        }
+        height: borderSize // Remove once themed
+        color: background.border.color
+    }
+
     // Print job portion
     Rectangle
     {
@@ -158,10 +220,10 @@ Item
         }
         border
         {
-            color: printer.activePrintJob && printer.activePrintJob.configurationChanges.length > 0 ? "#f5a623" : "#CCCCCC" // TODO: Theme!
+            color: printer && printer.activePrintJob && printer.activePrintJob.configurationChanges.length > 0 ? "#f5a623" : "transparent" // TODO: Theme!
             width: borderSize // TODO: Remove once themed
         }
-        color: "white" // TODO: Theme!
+        color: "transparent" // TODO: Theme!
         height: 84 * screenScaleFactor + borderSize // TODO: Remove once themed
         width: parent.width
 
@@ -184,9 +246,12 @@ Item
                 {
                     verticalCenter: parent.verticalCenter
                 }
-                color: "#414054" // TODO: Theme!
+                color: printer ? "#414054" : "#aaaaaa" // TODO: Theme!
                 font: UM.Theme.getFont("large_bold") // 16pt, bold
                 text: {
+                    if (!printer) {
+                        return catalog.i18nc("@label:status", "Loading...")
+                    }
                     if (printer && printer.state == "disabled")
                     {
                         return catalog.i18nc("@label:status", "Unavailable")
@@ -215,10 +280,10 @@ Item
                 MonitorPrintJobPreview
                 {
                     anchors.centerIn: parent
-                    printJob: base.printer.activePrintJob
+                    printJob: printer ? printer.activePrintJob : null
                     size: parent.height
                 }
-                visible: printer.activePrintJob
+                visible: printer && printer.activePrintJob && !printerStatus.visible
             }
 
             Item
@@ -229,15 +294,15 @@ Item
                 }
                 width: 180 * screenScaleFactor // TODO: Theme!
                 height: printerNameLabel.height + printerFamilyPill.height + 6 * screenScaleFactor // TODO: Theme!
-                visible: printer.activePrintJob
+                visible: printer && printer.activePrintJob && !printerStatus.visible
 
                 Label
                 {
                     id: printerJobNameLabel
-                    color: printer.activePrintJob && printer.activePrintJob.isActive ? "#414054" : "#babac1" // TODO: Theme!
+                    color: printer && printer.activePrintJob && printer.activePrintJob.isActive ? "#414054" : "#babac1" // TODO: Theme!
                     elide: Text.ElideRight
-                    font: UM.Theme.getFont("large_bold") // 16pt, bold
+                    font: UM.Theme.getFont("large") // 16pt, bold
-                    text: base.printer.activePrintJob ? base.printer.activePrintJob.name : "Untitled" // TODO: I18N
+                    text: printer && printer.activePrintJob ? printer.activePrintJob.name : "Untitled" // TODO: I18N
                     width: parent.width
 
                     // FIXED-LINE-HEIGHT:
@@ -254,10 +319,10 @@ Item
                         topMargin: 6 * screenScaleFactor // TODO: Theme!
                         left: printerJobNameLabel.left
                     }
-                    color: printer.activePrintJob && printer.activePrintJob.isActive ? "#53657d" : "#babac1" // TODO: Theme!
+                    color: printer && printer.activePrintJob && printer.activePrintJob.isActive ? "#53657d" : "#babac1" // TODO: Theme!
                     elide: Text.ElideRight
                     font: UM.Theme.getFont("default") // 12pt, regular
-                    text: printer.activePrintJob ? printer.activePrintJob.owner : "Anonymous" // TODO: I18N
+                    text: printer && printer.activePrintJob ? printer.activePrintJob.owner : "Anonymous" // TODO: I18N
                     width: parent.width
 
                     // FIXED-LINE-HEIGHT:
@@ -272,8 +337,8 @@ Item
                 {
                     verticalCenter: parent.verticalCenter
                 }
-                printJob: printer.activePrintJob
+                printJob: printer && printer.activePrintJob
-                visible: printer.activePrintJob && printer.activePrintJob.configurationChanges.length === 0
+                visible: printer && printer.activePrintJob && printer.activePrintJob.configurationChanges.length === 0 && !printerStatus.visible
             }
 
             Label
@@ -284,7 +349,7 @@ Item
                 }
                 font: UM.Theme.getFont("default")
                 text: "Requires configuration changes"
-                visible: printer.activePrintJob && printer.activePrintJob.configurationChanges.length > 0
+                visible: printer && printer.activePrintJob && printer.activePrintJob.configurationChanges.length > 0 && !printerStatus.visible
 
                 // FIXED-LINE-HEIGHT:
                 height: 18 * screenScaleFactor // TODO: Theme!
@@ -326,7 +391,7 @@ Item
             }
             implicitHeight: 32 * screenScaleFactor // TODO: Theme!
             implicitWidth: 96 * screenScaleFactor // TODO: Theme!
-            visible: printer.activePrintJob && printer.activePrintJob.configurationChanges.length > 0
+            visible: printer && printer.activePrintJob && printer.activePrintJob.configurationChanges.length > 0 && !printerStatus.visible
             onClicked: base.enabled ? overrideConfirmationDialog.open() : {}
         }
     }

plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterConfiguration.qml

@@ -19,7 +19,7 @@ Item
     property alias buildplate: buildplateConfig.buildplate
 
     // Array of extracted extruder configurations
-    property var configurations: null
+    property var configurations: [null,null]
 
     // Default size, but should be stretched to fill parent
     height: 72 * parent.height
@@ -37,10 +37,10 @@ Item
 
             MonitorExtruderConfiguration
             {
-                color: modelData.activeMaterial ? modelData.activeMaterial.color : "#eeeeee" // TODO: Theme!
+                color: modelData && modelData.activeMaterial ? modelData.activeMaterial.color : "#eeeeee" // TODO: Theme!
-                material: modelData.activeMaterial ? modelData.activeMaterial.name : ""
+                material: modelData && modelData.activeMaterial ? modelData.activeMaterial.name : ""
-                position: modelData.position
+                position: modelData && modelData.position ? modelData.position : -1 // Use negative one to create empty extruder number
-                printCore: modelData.hotendID
+                printCore: modelData ? modelData.hotendID : ""
 
                 // Keep things responsive!
                 width: Math.floor((base.width - (configurations.length - 1) * extruderConfigurationRow.spacing) / configurations.length)
@@ -53,6 +53,6 @@ Item
     {
         id: buildplateConfig
         anchors.bottom: parent.bottom
-        buildplate: "Glass" // 'Glass' as a default
+        buildplate: null
     }
 }

plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterPill.qml

@@ -27,12 +27,12 @@ Item
     }
 
     implicitHeight: 18 * screenScaleFactor // TODO: Theme!
-    implicitWidth: printerNameLabel.contentWidth + 12 // TODO: Theme!
+    implicitWidth: Math.max(printerNameLabel.contentWidth + 12 * screenScaleFactor, 36 * screenScaleFactor) // TODO: Theme!
 
     Rectangle {
         id: background
         anchors.fill: parent
-        color: "#e4e4f2" // TODO: Theme!
+        color: printerNameLabel.visible ? "#e4e4f2" : "#eeeeee"// TODO: Theme!
         radius: 2 * screenScaleFactor // TODO: Theme!
     }
 
@@ -41,6 +41,7 @@ Item
         anchors.centerIn: parent
         color: "#535369" // TODO: Theme!
         text: tagText
-        font.pointSize: 10
+        font.pointSize: 10 // TODO: Theme!
+        visible: text !== ""
     }
 }

plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml

@@ -144,7 +144,6 @@ Item
             topMargin: 12 * screenScaleFactor // TODO: Theme!
         }
         style: UM.Theme.styles.scrollview
-        visible: OutputDevice.receivedPrintJobs
         width: parent.width
 
         ListView
@@ -160,7 +159,7 @@ Item
                 }
                 printJob: modelData
             }
-            model: OutputDevice.queuedPrintJobs
+            model: OutputDevice.receivedPrintJobs ? OutputDevice.queuedPrintJobs : [null,null]
             spacing: 6  // TODO: Theme!
         }
     }

plugins/UM3NetworkPrinting/resources/qml/MonitorStage.qml

@@ -64,8 +64,10 @@ Component
             }
             width: parent.width
             height: 264 * screenScaleFactor // TODO: Theme!
-            MonitorCarousel {
+            MonitorCarousel
+            {
                 id: carousel
+                printers: OutputDevice.receivedPrintJobs ? OutputDevice.printers : [null]
             }
         }