diff --git a/docker/build.sh b/docker/build.sh
index be1c5f9be3..990d28d2e8 100755
--- a/docker/build.sh
+++ b/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}"
diff --git a/plugins/Toolbox/src/PackagesModel.py b/plugins/Toolbox/src/PackagesModel.py
index 282f63a12e..b11661c51e 100644
--- a/plugins/Toolbox/src/PackagesModel.py
+++ b/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"],
diff --git a/resources/qml/Account/GeneralOperations.qml b/resources/qml/Account/GeneralOperations.qml
index 9562f940a4..c78e9ad828 100644
--- a/resources/qml/Account/GeneralOperations.qml
+++ b/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
}
-}
\ No newline at end of file
+}
diff --git a/resources/qml/WelcomePages/ChangelogContent.qml b/resources/qml/WelcomePages/ChangelogContent.qml
index d3eebe72e4..9e290dcf54 100644
--- a/resources/qml/WelcomePages/ChangelogContent.qml
+++ b/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
diff --git a/resources/qml/WelcomePages/WelcomeContent.qml b/resources/qml/WelcomePages/WelcomeContent.qml
index 45a0bf4a7c..619780435d 100644
--- a/resources/qml/WelcomePages/WelcomeContent.qml
+++ b/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
diff --git a/resources/qml/WelcomePages/WhatsNewContent.qml b/resources/qml/WelcomePages/WhatsNewContent.qml
index 68be6379d6..4a3afe66c1 100644
--- a/resources/qml/WelcomePages/WhatsNewContent.qml
+++ b/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)
- height: (parent.height - UM.Theme.getSize("default_margin").height) * 0.75
+ width: Math.round(parent.width - (UM.Theme.getSize("default_margin").width * 2))
+ 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
diff --git a/resources/qml/WelcomePages/WizardDialog.qml b/resources/qml/WelcomePages/WizardDialog.qml
index cfa03352b0..8629f47115 100644
--- a/resources/qml/WelcomePages/WizardDialog.qml
+++ b/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")
diff --git a/resources/themes/cura-light/icons/sign_in_to_cloud.svg b/resources/themes/cura-light/icons/sign_in_to_cloud.svg
deleted file mode 100644
index 27471fddce..0000000000
--- a/resources/themes/cura-light/icons/sign_in_to_cloud.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
\ No newline at end of file
diff --git a/resources/themes/cura-light/images/first_run_welcome_cura.svg b/resources/themes/cura-light/images/first_run_welcome_cura.svg
deleted file mode 100644
index 3d957884b4..0000000000
--- a/resources/themes/cura-light/images/first_run_welcome_cura.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-
diff --git a/resources/themes/cura-light/images/welcome_cura.svg b/resources/themes/cura-light/images/welcome_cura.svg
new file mode 100644
index 0000000000..33816dbd18
--- /dev/null
+++ b/resources/themes/cura-light/images/welcome_cura.svg
@@ -0,0 +1,14 @@
+