Merge branch 'STAR-322_cloud-connection' of github.com:Ultimaker/Cura into STAR-322_cloud-connection-multipart-upload

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
     }
 }

plugins/UM3NetworkPrinting/src/Cloud/CloudApiClient.py

@@ -8,6 +8,7 @@ from PyQt5.QtCore import QUrl
 from PyQt5.QtNetwork import QNetworkRequest, QNetworkReply, QNetworkAccessManager
 
 from UM.Logger import Logger
+from cura import CuraConstants
 from cura.API import Account
 from .MeshUploader import MeshUploader
 from ..Models import BaseModel
@@ -24,8 +25,7 @@ from .Models.CloudPrintJobResponse import CloudPrintJobResponse
 class CloudApiClient:
 
     # The cloud URL to use for this remote cluster.
-    # TODO: Make sure that this URL goes to the live api before release
-    ROOT_PATH = "https://api-staging.ultimaker.com"
+    ROOT_PATH = CuraConstants.CuraCloudAPIRoot
     CLUSTER_API_ROOT = "{}/connect/v1".format(ROOT_PATH)
     CURA_API_ROOT = "{}/cura/v1".format(ROOT_PATH)