Merge branch '4.9' of github.com:Ultimaker/Cura into CURA-8110_upgrader

docker/build.sh

@@ -7,7 +7,7 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 PROJECT_DIR="$( cd "${SCRIPT_DIR}/.." && pwd )"
 
 # Make sure that environment variables are set properly
-source /opt/rh/devtoolset-7/enable
+source /opt/rh/devtoolset-8/enable
 export PATH="${CURA_BUILD_ENV_PATH}/bin:${PATH}"
 export PKG_CONFIG_PATH="${CURA_BUILD_ENV_PATH}/lib/pkgconfig:${PKG_CONFIG_PATH}"
 

plugins/Toolbox/src/PackagesModel.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2018 Ultimaker B.V.
+# Copyright (c) 2021 Ultimaker B.V.
 # Cura is released under the terms of the LGPLv3 or higher.
 
 import re
@@ -91,7 +91,7 @@ class PackagesModel(ListModel):
             items.append({
                 "id":                   package["package_id"],
                 "type":                 package["package_type"],
-                "name":                 package["display_name"],
+                "name":                 package["display_name"].strip(),
                 "version":              package["package_version"],
                 "author_id":            package["author"]["author_id"],
                 "author_name":          package["author"]["display_name"],

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
+        source: UM.Theme.getImage("welcome_cura")
-        renderType: Text.NativeRendering
+        width: parent.width / 2
-        text: catalog.i18nc("@label", "Your key to connected 3D printing")
+        fillMode: Image.PreserveAspectFit
-        font: UM.Theme.getFont("default_bold")
+        horizontalAlignment: Image.AlignHCenter
-        color: UM.Theme.getColor("text")
+        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/ChangelogContent.qml

@@ -21,7 +21,7 @@ Item
         anchors.top: parent.top
         anchors.horizontalCenter: parent.horizontalCenter
         horizontalAlignment: Text.AlignHCenter
-        text: catalog.i18nc("@label", "Release Notes / 'Changelog'")
+        text: catalog.i18nc("@label", "Release Notes")
         color: UM.Theme.getColor("primary_button")
         font: UM.Theme.getFont("huge")
         renderType: Text.NativeRendering

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/qml/WelcomePages/WhatsNewContent.qml

@@ -93,8 +93,8 @@ Item
                             top: parent.top
                             topMargin: UM.Theme.getSize("default_margin").width
                         }
-                        width: parent.width - (UM.Theme.getSize("default_margin").width * 2)
+                        width: Math.round(parent.width - (UM.Theme.getSize("default_margin").width * 2))
-                        height: (parent.height - UM.Theme.getSize("default_margin").height) * 0.75
+                        height: Math.round((parent.height - UM.Theme.getSize("default_margin").height) * 0.75)
                         fillMode: Image.PreserveAspectFit
 
                         source: manager.getSubpageImageSource(index)
@@ -110,7 +110,7 @@ Item
                             bottom: parent.bottom
                             horizontalCenter: parent.horizontalCenter
                         }
-                        width: parent.width - (UM.Theme.getSize("default_margin").width * 2)
+                        width: Math.round(parent.width - (UM.Theme.getSize("default_margin").width * 2))
 
                         ScrollBar.horizontal.policy: ScrollBar.AlwaysOff
 

resources/qml/WelcomePages/WizardDialog.qml

@@ -24,6 +24,8 @@ Window
 
     minimumWidth: UM.Theme.getSize("modal_window_minimum").width
     minimumHeight: UM.Theme.getSize("modal_window_minimum").height
+    maximumWidth: minimumWidth
+    maximumHeight: minimumHeight
 
     color: UM.Theme.getColor("main_background")
 

resources/themes/cura-light/icons/sign_in_to_cloud.svg

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="78px" height="53px" viewBox="0 0 78 53" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 52.6 (67491) - http://www.bohemiancoding.com/sketch -->
-    <title>Group-cloud</title>
-    <desc>Created with Sketch.</desc>
-    <g id="Sign-in-/Message-restyle" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Artboard" transform="translate(-22.000000, -16.000000)">
-            <g id="Group-cloud" transform="translate(22.000000, 16.000000)">
-                <path d="M71.6139989,39.7264219 C71.5196898,37.5579439 70.9711289,35.5059663 70.0601048,33.6613194 L71.6937566,33.6613194 C72.8434847,33.6613194 73.787904,32.731337 73.787904,31.5991845 L73.8289659,31.5991845 L73.8289659,6.57052798 C73.8289659,6.1257538 73.4594104,5.80228166 73.0487931,5.80228166 L58.158788,5.80228166 L58.158788,25.1687374 C57.4862997,25.0807183 56.800231,25.0352941 56.103441,25.0352941 C55.374501,25.0352941 54.6572944,25.0850068 53.9550947,25.1811929 L53.9550947,5.80228166 L53.8935021,5.80228166 L53.8935021,4.68260671 C53.7612249,4.35507342 53.4329996,4.13943248 53.0774006,4.13943248 L24.4830482,4.13943248 C23.9749094,4.13943248 23.605354,4.54882691 23.605354,5.0037096 L23.605354,33.1609482 C23.605354,34.4346197 24.6678259,35.4808499 25.9612699,35.4808499 L41.3906551,35.4808499 C40.8638727,37.0247578 40.5782993,38.67857 40.5782993,40.3983852 C40.5782993,41.0436856 40.6185041,41.6796936 40.6965701,42.3040902 L25.2683535,42.3040902 C24.7602147,42.3495785 24.252076,42.5315316 23.8825205,42.8499495 L23.605354,43.122879 C23.3281874,43.5777618 22.7738542,43.6687383 22.219521,43.6687383 L19.7250218,43.6687383 C19.5864385,43.6687383 19.4478552,43.5322734 19.4478552,43.3958088 L19.4478552,39.7264219 L5.21483793,39.7264219 C4.76315904,39.7668558 4.31148018,39.928592 3.98298644,40.2116301 L3.73661615,40.4542343 C3.49024586,40.8585745 2.99750527,40.9394424 2.50476467,40.9394424 L0.287432013,40.9394424 C0.164246864,40.9394424 0.0410617159,40.8181403 0.0410617159,40.6968382 L0.0410617159,2.5675603 C0.0410617159,2.44625825 0.164246864,2.3249562 0.287432013,2.3249562 L19.4478552,2.3249562 L19.4478552,0.50037096 C19.4478552,0.363906153 19.5864385,0.227441345 19.7250218,0.227441345 L57.8816214,0.227441345 C58.0202046,0.227441345 58.158788,0.363906153 58.158788,0.50037096 L58.158788,2.3249562 L77.3192117,2.3249562 C77.4423969,2.3249562 77.565582,2.44625825 77.565582,2.5675603 L77.565582,40.6968382 C77.565582,40.8181403 77.4423969,40.9394424 77.3192117,40.9394424 L75.101879,40.9394424 C74.6502001,40.8990083 74.1985212,40.7372724 73.8700276,40.4542343 L73.6236573,40.2116301 C73.377287,39.8072899 72.8845464,39.7264219 72.3918058,39.7264219 L71.6139989,39.7264219 Z M19.4478552,5.80228166 L4.51678875,5.80228166 C4.06510989,5.80228166 3.73661615,6.16618781 3.73661615,6.57052798 L3.73661615,31.5991845 C3.73661615,32.731337 4.68103562,33.6613194 5.83076366,33.6613194 L19.4478552,33.6613194 L19.4478552,5.80228166 Z" id="Combined-Shape" fill="#08073F" fill-rule="nonzero"></path>
-                <g id="Group" transform="translate(43.578299, 28.035294)" fill="#3282FF">
-                    <path d="M12.5251415,24.7888094 C5.60769686,24.7888094 1.77635684e-14,19.2396454 1.77635684e-14,12.3944047 C1.77635684e-14,5.54916401 5.60769686,-4.26325641e-14 12.5251415,-4.26325641e-14 C19.4425861,-4.26325641e-14 25.050283,5.54916401 25.050283,12.3944047 C25.050283,19.2396454 19.4425861,24.7888094 12.5251415,24.7888094 Z M17.9438152,10.4266859 C17.7896596,9.07601357 16.6334927,8.04314651 15.2460924,8.04314651 C14.8607034,8.04314651 14.5523922,8.12259783 14.244081,8.28150044 C13.5503809,7.16918208 12.3171362,6.45412027 11.0068137,6.45412027 C8.84863548,6.45412027 7.15292402,8.20204914 7.15292402,10.4266859 C7.15292402,10.4266859 7.15292402,10.4266859 7.15292402,10.5061372 C5.84260152,10.6650398 4.8405902,11.8568095 4.8405902,13.2074818 C4.8405902,14.7170567 6.0738349,15.9882777 7.53831299,15.9882777 C8.69447989,15.9882777 16.1710259,15.9882777 17.5584262,15.9882777 C19.0229043,15.9882777 20.256149,14.7170567 20.256149,13.2074818 C20.256149,11.7773582 19.2541376,10.6650398 17.9438152,10.4266859 Z" id="Combined-Shape"></path>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>

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>