Merge pull request #4997 from Ultimaker/prevent_monitor_stage_overlap

Quick fix to prevent monitor stage from overlapping header

plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml

@@ -97,6 +97,7 @@ Item
                         return ""
                     }
                     visible: printJob
+                    width: 120 * screenScaleFactor // TODO: Theme!
 
                     // FIXED-LINE-HEIGHT:
                     height: 18 * screenScaleFactor // TODO: Theme!

plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterPill.qml

@@ -12,7 +12,19 @@ import UM 1.2 as UM
 Item
 {
     // The printer name
-    property alias text: printerNameLabel.text;
+    property var text: ""
+    property var tagText: {
+        switch(text) {
+            case "Ultimaker 3":
+                return "UM 3"
+            case "Ultimaker 3 Extended":
+                return "UM 3 EXT"
+            case "Ultimaker S5":
+                return "UM S5"
+            default:
+                return text
+        }
+    }
 
     implicitHeight: 18 * screenScaleFactor // TODO: Theme!
     implicitWidth: printerNameLabel.contentWidth + 12 // TODO: Theme!
@@ -28,7 +40,7 @@ Item
         id: printerNameLabel
         anchors.centerIn: parent
         color: "#535369" // TODO: Theme!
-        text: ""
+        text: tagText
         font.pointSize: 10
     }
 }

resources/qml/Cura.qml

@@ -252,7 +252,7 @@ UM.MainWindow
                 anchors
                 {
                     // Align to the top of the stageMenu since the stageMenu may not exist
-                    top: parent.top
+                    top: stageMenu.source ? stageMenu.verticalCenter : parent.top
                     left: parent.left
                     right: parent.right
                     bottom: parent.bottom