Merge remote-tracking branch 'origin/WIP_onboarding' into WIP_onboarding_machine_action

resources/qml/WelcomePages/CloudContent.qml

@@ -28,48 +28,65 @@ Item
         renderType: Text.NativeRendering
     }
 
-    Column
+    // Area where the cloud contents can be put. Pictures, texts and such.
+    Item
     {
+        id: cloudContentsArea
         anchors.top: titleLabel.bottom
-        anchors.topMargin: 80
+        anchors.bottom: finishButton.top
-        anchors.horizontalCenter: parent.horizontalCenter
+        anchors.left: parent.left
-
+        anchors.right: parent.right
-        spacing: 60
+        anchors.margins: UM.Theme.getSize("default_margin").width
-
-        Image
-        {
-            id: cloudImage
-            anchors.horizontalCenter: parent.horizontalCenter
-            source: UM.Theme.getImage("first_run_ultimaker_cloud")
-        }
 
+        // Pictures and texts are arranged using Columns with spacing. The whole picture and text area is centered in
+        // the cloud contents area.
         Column
         {
-            anchors.horizontalCenter: parent.horizontalCenter
+            anchors.centerIn: parent
+            width: childrenRect.width
+            height: childrenRect.height
 
-            spacing: 30
+            spacing: 20 * screenScaleFactor
 
-            Label
+            Image  // Cloud image
+            {
+                id: cloudImage
+                anchors.horizontalCenter: parent.horizontalCenter
+                source: UM.Theme.getImage("first_run_ultimaker_cloud")
+            }
+
+            Label  // A title-ish text
             {
                 id: highlightTextLabel
                 anchors.horizontalCenter: parent.horizontalCenter
                 horizontalAlignment: Text.AlignHCenter
                 text: catalog.i18nc("@text", "The next generation 3D printing workflow")
                 textFormat: Text.RichText
-                color: UM.Theme.getColor("text_light_blue")
+                color: UM.Theme.getColor("primary")
                 font: UM.Theme.getFont("medium")
                 renderType: Text.NativeRendering
             }
 
-            Label
+            Label  // A number of text items
             {
                 id: textLabel
                 anchors.horizontalCenter: parent.horizontalCenter
-                text: {
+                text:
-                    var t = "<p>- Send print jobs to Ultimaker printers outside your local network<p>"
+                {
-                    t += "<p>- Store your Ultimaker Cura settings in the cloud for use anywhere</p>"
+                    // There are 3 text items, each of which is translated separately as a single piece of text.
-                    t += "<p>- Get exclusive access to material profiles from leading brands</p>"
+                    var full_text = ""
-                    catalog.i18nc("@text", t)
+                    var t = ""
+
+                    t = catalog.i18nc("@text", "- Send print jobs to Ultimaker printers outside your local network")
+                    full_text += "<p>" + t + "</p>"
+
+                    t = catalog.i18nc("@text", "- Store your Ultimaker Cura settings in the cloud for use anywhere")
+                    full_text += "<p>" + t + "</p>"
+
+                    t = catalog.i18nc("@text", "- Get exclusive access to material profiles from leading brands")
+                    full_text += "<p>" + t + "</p>"
+
+                    return full_text
                 }
                 textFormat: Text.RichText
                 font: UM.Theme.getFont("medium")
@@ -78,6 +95,7 @@ Item
         }
     }
 
+    // Bottom buttons go here
     Cura.PrimaryButton
     {
         id: finishButton
@@ -112,7 +130,7 @@ Item
         shadowEnabled: false
         color: "transparent"
         hoverColor: "transparent"
-        textHoverColor: UM.Theme.getColor("text_light_blue")
+        textHoverColor: UM.Theme.getColor("primary")
         fixedWidthMode: true
         onClicked: Cura.API.account.login()
     }

resources/themes/cura-light/theme.json

@@ -193,8 +193,6 @@
 
         "window_disabled_background": [0, 0, 0, 255],
 
-        "text_light_blue": [50, 130, 255, 255],
-
         "text": [25, 25, 25, 255],
         "text_detail": [174, 174, 174, 128],
         "text_link": [50, 130, 255, 255],