From 82d148d0773ad2ec11041a2b0139f74b1193685c Mon Sep 17 00:00:00 2001 From: casper Date: Tue, 30 Nov 2021 12:08:09 +0100 Subject: [PATCH 1/5] Add correct text to material and plugins onboarding banners CURA-8564 --- plugins/Marketplace/resources/qml/Materials.qml | 2 +- plugins/Marketplace/resources/qml/Plugins.qml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/Marketplace/resources/qml/Materials.qml b/plugins/Marketplace/resources/qml/Materials.qml index 2634f7b328..cbab3a354e 100644 --- a/plugins/Marketplace/resources/qml/Materials.qml +++ b/plugins/Marketplace/resources/qml/Materials.qml @@ -10,7 +10,7 @@ Packages bannerVisible: UM.Preferences.getValue("cura/market_place_show_material_banner") bannerIcon: UM.Theme.getIcon("Spool") - bannerText: catalog.i18nc("@text", "Streamline your workflow and customize your Ultimaker Cura experience with plugins contributed by our amazing community of users.") + bannerText: catalog.i18nc("@text", "Select and install material profiles optimised for your Ultimaker 3D printers.") bannerReadMoreUrl: "" // TODO add when support page is ready onRemoveBanner: function() { UM.Preferences.setValue("cura/market_place_show_material_banner", false); diff --git a/plugins/Marketplace/resources/qml/Plugins.qml b/plugins/Marketplace/resources/qml/Plugins.qml index 29b264c702..635c0a8d22 100644 --- a/plugins/Marketplace/resources/qml/Plugins.qml +++ b/plugins/Marketplace/resources/qml/Plugins.qml @@ -10,7 +10,7 @@ Packages bannerVisible: UM.Preferences.getValue("cura/market_place_show_plugin_banner") bannerIcon: UM.Theme.getIcon("Shop") - bannerText: catalog.i18nc("@text", "Select and install material profiles optimised for your Ultimaker 3D printers.") + bannerText: catalog.i18nc("@text", "Streamline your workflow and customize your Ultimaker Cura experience with plugins contributed by our amazing community of users.") bannerReadMoreUrl: "" // TODO add when support page is ready onRemoveBanner: function() { UM.Preferences.setValue("cura/market_place_show_plugin_banner", false) From ca602067284f48a4b84157d7dc9f2c803f5bd109 Mon Sep 17 00:00:00 2001 From: casper Date: Tue, 30 Nov 2021 12:10:55 +0100 Subject: [PATCH 2/5] Always show read more button in on boarding banner Even if there is no link CURA-8564 --- plugins/Marketplace/resources/qml/OnboardBanner.qml | 1 - 1 file changed, 1 deletion(-) diff --git a/plugins/Marketplace/resources/qml/OnboardBanner.qml b/plugins/Marketplace/resources/qml/OnboardBanner.qml index 0dbe2cb897..90af5f9b4f 100644 --- a/plugins/Marketplace/resources/qml/OnboardBanner.qml +++ b/plugins/Marketplace/resources/qml/OnboardBanner.qml @@ -106,7 +106,6 @@ Rectangle Cura.TertiaryButton { - visible: readMoreUrl !== "" id: readMoreButton anchors.left: infoText.left anchors.bottom: infoText.bottom From 8e6210fb2cb87425221baba7a53d24154a6dbba0 Mon Sep 17 00:00:00 2001 From: casper Date: Tue, 30 Nov 2021 12:11:32 +0100 Subject: [PATCH 3/5] Change margins of read more button in marketplace onboarding banner To comply with UX design CURA-8564 --- plugins/Marketplace/resources/qml/OnboardBanner.qml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/Marketplace/resources/qml/OnboardBanner.qml b/plugins/Marketplace/resources/qml/OnboardBanner.qml index 90af5f9b4f..a2c1613bcb 100644 --- a/plugins/Marketplace/resources/qml/OnboardBanner.qml +++ b/plugins/Marketplace/resources/qml/OnboardBanner.qml @@ -85,8 +85,8 @@ Rectangle if (line.implicitWidth + readMoreButton.width + UM.Theme.getSize("default_margin").width > width) { // If it does place it after the body text - readMoreButton.anchors.bottomMargin = -(fontMetrics.height + UM.Theme.getSize("thin_margin").height); - readMoreButton.anchors.leftMargin = 0; + readMoreButton.anchors.bottomMargin = -(fontMetrics.height); + readMoreButton.anchors.leftMargin = UM.Theme.getSize("thin_margin").width; } else { From 5a148e459f7c5a8284ad592d8079bd5b191fd124 Mon Sep 17 00:00:00 2001 From: casper Date: Tue, 30 Nov 2021 12:19:32 +0100 Subject: [PATCH 4/5] Decrease size of the icons in the marketplace onboarding banners CURA-8564 --- plugins/Marketplace/resources/qml/OnboardBanner.qml | 4 ++-- resources/themes/cura-light/theme.json | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/plugins/Marketplace/resources/qml/OnboardBanner.qml b/plugins/Marketplace/resources/qml/OnboardBanner.qml index a2c1613bcb..f77f8bee97 100644 --- a/plugins/Marketplace/resources/qml/OnboardBanner.qml +++ b/plugins/Marketplace/resources/qml/OnboardBanner.qml @@ -36,8 +36,8 @@ Rectangle left: parent.left margins: UM.Theme.getSize("default_margin").width } - width: UM.Theme.getSize("button_icon").width - height: UM.Theme.getSize("button_icon").height + width: UM.Theme.getSize("banner_icon_size").width + height: UM.Theme.getSize("banner_icon_size").height } // Close button diff --git a/resources/themes/cura-light/theme.json b/resources/themes/cura-light/theme.json index 81885faaf0..c29ddc2a86 100644 --- a/resources/themes/cura-light/theme.json +++ b/resources/themes/cura-light/theme.json @@ -683,6 +683,8 @@ "table_row": [2.0, 2.0], "welcome_wizard_content_image_big": [18, 15], - "welcome_wizard_cloud_content_image": [4, 4] + "welcome_wizard_cloud_content_image": [4, 4], + + "banner_icon_size": [2.0, 2.0] } } From d291ea85a28ff5bea76c7a0fea4f78655d34cbdb Mon Sep 17 00:00:00 2001 From: casper Date: Tue, 30 Nov 2021 12:20:21 +0100 Subject: [PATCH 5/5] Place the on boarding banners in the correct place in the marketplace To comply with the UX design CURA-8564 --- .../Marketplace/resources/qml/Marketplace.qml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/plugins/Marketplace/resources/qml/Marketplace.qml b/plugins/Marketplace/resources/qml/Marketplace.qml index 1866d7512d..53a1f189bc 100644 --- a/plugins/Marketplace/resources/qml/Marketplace.qml +++ b/plugins/Marketplace/resources/qml/Marketplace.qml @@ -49,15 +49,6 @@ Window spacing: UM.Theme.getSize("default_margin").height - OnboardBanner - { - visible: content.item && content.item.bannerVisible - text: content.item && content.item.bannerText - icon: content.item && content.item.bannerIcon - onRemove: content.item && content.item.onRemoveBanner - readMoreUrl: content.item && content.item.bannerReadMoreUrl - } - // Page title. Item { @@ -81,6 +72,15 @@ Window } } + OnboardBanner + { + visible: content.item && content.item.bannerVisible + text: content.item && content.item.bannerText + icon: content.item && content.item.bannerIcon + onRemove: content.item && content.item.onRemoveBanner + readMoreUrl: content.item && content.item.bannerReadMoreUrl + } + // Search & Top-Level Tabs Item {