Merge pull request #9490 from Ultimaker/CURA-8107_signin_screen_new_advertisement

New advertisement screen to log in

resources/qml/Account/GeneralOperations.qml

@@ -11,35 +11,26 @@ Column
 {
     spacing: UM.Theme.getSize("default_margin").width
     padding: UM.Theme.getSize("default_margin").width
-    Image
-    {
-        id: machinesImage
-        anchors.horizontalCenter: parent.horizontalCenter
-        source: UM.Theme.getIcon("sign_in_to_cloud")
-        horizontalAlignment: Image.AlignHCenter
-        verticalAlignment: Image.AlignVCenter
-    }
 
     Label
     {
         id: title
         anchors.horizontalCenter: parent.horizontalCenter
-        horizontalAlignment: Text.AlignHCenter
         renderType: Text.NativeRendering
-        text: "Ultimaker Account"
+        text: catalog.i18nc("@label",  "Sign in to the Ultimaker platform")
         font: UM.Theme.getFont("large_bold")
         color: UM.Theme.getColor("text")
     }
 
-    Label
+    Image
     {
-        id: generalInformation
+        id: machinesImage
         anchors.horizontalCenter: parent.horizontalCenter
-        horizontalAlignment: Text.AlignHCenter
-        renderType: Text.NativeRendering
-        text: catalog.i18nc("@label", "Your key to connected 3D printing")
-        font: UM.Theme.getFont("default_bold")
-        color: UM.Theme.getColor("text")
+        source: UM.Theme.getImage("welcome_cura")
+        width: parent.width / 2
+        fillMode: Image.PreserveAspectFit
+        horizontalAlignment: Image.AlignHCenter
+        verticalAlignment: Image.AlignVCenter
     }
 
     Label
@@ -48,18 +39,12 @@ Column
         anchors.horizontalCenter: parent.horizontalCenter
         horizontalAlignment: Text.AlignLeft
         renderType: Text.NativeRendering
-        text: catalog.i18nc("@text", "- Customize your experience with more print profiles and plugins\n- Stay flexible by syncing your setup and loading it anywhere\n- Increase efficiency with a remote workflow on Ultimaker printers")
+        text: catalog.i18nc("@text", "- Add material profiles and plug-ins from the Marketplace\n- Back-up and sync your material profiles and plug-ins\n- Share ideas and get help from 48,000+ users in the Ultimaker community")
         lineHeight: 1.4
         font: UM.Theme.getFont("default")
         color: UM.Theme.getColor("text")
     }
 
-    // placeholder
-    Label
-    {
-        text: " "
-    }
-
     Cura.PrimaryButton
     {
         anchors.horizontalCenter: parent.horizontalCenter
@@ -70,13 +55,11 @@ Column
         fixedWidthMode: true
     }
 
-    Cura.SecondaryButton
+    Cura.TertiaryButton
     {
         anchors.horizontalCenter: parent.horizontalCenter
-        width: UM.Theme.getSize("account_button").width
         height: UM.Theme.getSize("account_button").height
-        text: catalog.i18nc("@button", "Create account")
+        text: catalog.i18nc("@button", "Create a free Ultimaker account")
         onClicked: Qt.openUrlExternally(CuraApplication.ultimakerCloudAccountRootUrl + "/app/create")
-        fixedWidthMode: true
     }
-}
+}

resources/qml/WelcomePages/WelcomeContent.qml

@@ -34,7 +34,7 @@ Item
         {
             id: curaImage
             anchors.horizontalCenter: parent.horizontalCenter
-            source: UM.Theme.getImage("first_run_welcome_cura")
+            source: UM.Theme.getImage("welcome_cura")
             fillMode: Image.PreserveAspectFit
             width: UM.Theme.getSize("welcome_wizard_content_image_big").width
             sourceSize.width: width

resources/themes/cura-light/images/first_run_welcome_cura.svg

@@ -1,17 +0,0 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 325.48 197.18">
-    <defs>
-        <style type="text/css">.cls-1,.cls-4{fill:#f3f8fe;}.cls-1,.cls-5{stroke:#061884;}.cls-1,.cls-6{stroke-miterlimit:10;}.cls-1,.cls-5,.cls-6,.cls-7{stroke-width:2px;}.cls-2,.cls-5{fill:#fff;}.cls-3{fill:#061884;}.cls-5,.cls-7{stroke-linecap:round;stroke-linejoin:round;}.cls-6,.cls-7{fill:none;stroke:#2c3278;}</style>
-    </defs>
-    <g id="Software">
-        <path class="cls-1" d="M47.68,9.26H277.81a6.1,6.1,0,0,1,6.1,6.1V172.48a0,0,0,0,1,0,0H41.57a0,0,0,0,1,0,0V15.36a6.1,6.1,0,0,1,6.1-6.1Z"/>
-        <path class="cls-2" d="M50.88,173.48a1,1,0,0,1-1-1V19.57a2,2,0,0,1,2-2H272.61a3,3,0,0,1,3,3V172.48a1,1,0,0,1-1,1Z"/>
-        <path class="cls-3" d="M272.61,18.57a2,2,0,0,1,2,2V172.48H50.88V19.57a1,1,0,0,1,1-1H272.61m0-2H51.88a3,3,0,0,0-3,3V172.48a2,2,0,0,0,2,2H274.61a2,2,0,0,0,2-2V20.57a4,4,0,0,0-4-4Z"/>
-        <path class="cls-4" d="M272.61,20.57V170.48H52.88V20.57H272.61m0-2H51.88a1,1,0,0,0-1,1V172.48H274.61V20.57a2,2,0,0,0-2-2Z"/>
-        <line class="cls-5" x1="14.64" y1="187.91" x2="310.85" y2="187.91"/>
-        <path class="cls-4" d="M35.34,187.91a15.49,15.49,0,0,1-15.48-15.48,1,1,0,0,1,1-1H304.63a1,1,0,0,1,1,1,15.5,15.5,0,0,1-15.49,15.48Z"/>
-        <path class="cls-3" d="M304.63,172.43h0a14.48,14.48,0,0,1-14.49,14.48H35.34a14.48,14.48,0,0,1-14.48-14.48H304.63m0-2H20.86a2,2,0,0,0-2,2,16.49,16.49,0,0,0,16.48,16.48h254.8a16.5,16.5,0,0,0,16.49-16.48,2,2,0,0,0-2-2Z"/>
-        <path class="cls-3" d="M185.24,172.43h-45v.6a4.4,4.4,0,0,0,4.4,4.4h36.21a4.4,4.4,0,0,0,4.39-4.4Z"/>
-        <polygon class="cls-6" points="180.22 140.51 117.36 140.51 117.36 77.7 144.3 50.78 207.16 50.78 207.16 113.59 180.22 140.51"/>
-        <path class="cls-7" d="M175.73,73.21H162.26a22.44,22.44,0,1,0,0,44.87h13.47"/>
-    </g>
-</svg>

resources/themes/cura-light/images/welcome_cura.svg

@@ -0,0 +1,14 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 325.48 197.18">
+    <g fill="none" stroke="#061884" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+        <rect fill="#F3F8FE" x="41.57" y="9.26" width="242.34" height="169.32" rx="6.1" /> <!-- Border of screen. -->
+        <rect fill="white" stroke="none" x="52.88" y="20.57" width="219.73" height="155.91" /> <!-- Screen background colour. -->
+        <rect x="49.88" y="17.57" width="225.73" height="155.91" rx="2" /> <!-- Screen inner bezel. -->
+        <line x1="14.64" y1="187.91" x2="310.85" y2="187.91" /> <!-- Table. -->
+        <path fill="#F3F8FE" d="M305.63,172.43 a15.48,15.48, 0,0,1, -15.48,15.48 H35.34 a15.48,15.48, 0,0,1, -15.48,-15.48 a1,1, 0,0,1, 1,-1 H304.63 a1,1, 0,0,1, 1,1 Z" /> <!-- Body. -->
+    </g>
+    <path fill="#061884" d="M185.24,172.43 h-45 v0.6 a4.4,4.4, 0,0,0, 4.4,4.4 h36.21 a4.4,4.4, 0,0,0, 4.4-4.4 Z" /> <!-- Touchpad. -->
+    <g fill="none" stroke="#2C3278" stroke-width="2" stroke-linecap="round">
+        <polygon points="180.22,140.51 117.36,140.51 117.36,77.7 144.3,50.78 207.16,50.78 207.16,113.59 180.22,140.51" /> <!-- Cura logo border. -->
+        <path class="cls-7" d="M175.73,73.21 H162.26 a22.44,22.44, 0,1,0, 0,44.87 H175.73" /> <!-- Letter C. -->
+    </g>
+</svg>