From 6b41f3a5cdad02f031744a29ea4003a517e69087 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 1 Apr 2021 18:19:18 +0200 Subject: [PATCH 1/5] Make the welcome screen a re-usable image It's not good to name a resource after where it's used if it could be necessary in multiple places. Contributes to issue CURA-8107. --- resources/qml/WelcomePages/WelcomeContent.qml | 2 +- .../images/{first_run_welcome_cura.svg => welcome_cura.svg} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename resources/themes/cura-light/images/{first_run_welcome_cura.svg => welcome_cura.svg} (100%) 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/themes/cura-light/images/first_run_welcome_cura.svg b/resources/themes/cura-light/images/welcome_cura.svg similarity index 100% rename from resources/themes/cura-light/images/first_run_welcome_cura.svg rename to resources/themes/cura-light/images/welcome_cura.svg From 3e4098cffaaaf85fb351965f58b33a84b6f99d6f Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 1 Apr 2021 19:09:55 +0200 Subject: [PATCH 2/5] Clean up unreadable mess of SVG code It's now documented and written down in human terms. Since it doesn't involve encoding contours as 0-width paths any more, the rendering should also be a bit faster. Contributes to issue CURA-8107. --- .../themes/cura-light/images/welcome_cura.svg | 27 +++++++++---------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/resources/themes/cura-light/images/welcome_cura.svg b/resources/themes/cura-light/images/welcome_cura.svg index 3d957884b4..33816dbd18 100644 --- a/resources/themes/cura-light/images/welcome_cura.svg +++ b/resources/themes/cura-light/images/welcome_cura.svg @@ -1,17 +1,14 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + From 9ebb5e4cee6037827eeecd8ac47f6d147378dc43 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 1 Apr 2021 19:33:35 +0200 Subject: [PATCH 3/5] Redesign log-in advertisement This is a new text and new ordering. The title is above the image now, and the sign in has become a tertiary button. Contributes to issue CURA-8107. --- resources/qml/Account/GeneralOperations.qml | 39 ++++++--------------- 1 file changed, 11 insertions(+), 28 deletions(-) diff --git a/resources/qml/Account/GeneralOperations.qml b/resources/qml/Account/GeneralOperations.qml index 9562f940a4..da2e323828 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: "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 From 7f353d72a76ab1dd87f896365d80b087796a05ec Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 1 Apr 2021 19:36:00 +0200 Subject: [PATCH 4/5] Remove now unused image of printers Contributes to issue CURA-8107. --- .../themes/cura-light/icons/sign_in_to_cloud.svg | 16 ---------------- 1 file changed, 16 deletions(-) delete mode 100644 resources/themes/cura-light/icons/sign_in_to_cloud.svg 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 @@ - - - - Group-cloud - Created with Sketch. - - - - - - - - - - - \ No newline at end of file From e6951327bba2139ccad30cb89bd077743cc7f2f9 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 2 Apr 2021 11:09:24 +0200 Subject: [PATCH 5/5] Translate title of sign in screen Formerly this probably wasn't translated because it's like a name or term. But now it definitely needs to be translated. Contributes to issue CURA-8107. Co-authored-by: Jaime van Kessel --- resources/qml/Account/GeneralOperations.qml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/qml/Account/GeneralOperations.qml b/resources/qml/Account/GeneralOperations.qml index da2e323828..c78e9ad828 100644 --- a/resources/qml/Account/GeneralOperations.qml +++ b/resources/qml/Account/GeneralOperations.qml @@ -17,7 +17,7 @@ Column id: title anchors.horizontalCenter: parent.horizontalCenter renderType: Text.NativeRendering - text: "Sign in to the Ultimaker platform" + text: catalog.i18nc("@label", "Sign in to the Ultimaker platform") font: UM.Theme.getFont("large_bold") color: UM.Theme.getColor("text") } @@ -62,4 +62,4 @@ Column text: catalog.i18nc("@button", "Create a free Ultimaker account") onClicked: Qt.openUrlExternally(CuraApplication.ultimakerCloudAccountRootUrl + "/app/create") } -} \ No newline at end of file +}