From fe19587b7f657ba88efcb11ff0a748edca5a6608 Mon Sep 17 00:00:00 2001
From: casper <c.lamboo@ultimaker.com>
Date: Mon, 29 Nov 2021 15:09:33 +0100
Subject: [PATCH] Rename properties in marketplace onboarding banner

CURA-8564
---
 plugins/Marketplace/resources/qml/ManagedPackages.qml | 2 +-
 plugins/Marketplace/resources/qml/Materials.qml       | 2 +-
 plugins/Marketplace/resources/qml/OnboardBanner.qml   | 9 ++++-----
 plugins/Marketplace/resources/qml/Plugins.qml         | 2 +-
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/plugins/Marketplace/resources/qml/ManagedPackages.qml b/plugins/Marketplace/resources/qml/ManagedPackages.qml
index 9ce8408f8e..2610f7cd9d 100644
--- a/plugins/Marketplace/resources/qml/ManagedPackages.qml
+++ b/plugins/Marketplace/resources/qml/ManagedPackages.qml
@@ -14,7 +14,7 @@ Packages
     bannerVisible: UM.Preferences.getValue("cura/market_place_show_manage_packages_banner");
     bannerIcon: UM.Theme.getIcon("ArrowDoubleCircleRight")
     bannerText: catalog.i18nc("@text", "Manage your Ultimaker Cura plugins and material profiles here. Make sure to keep your plugins up to date and backup your setup regularly.")
-    readMoreUrl: "" // TODO add when support page is ready
+    bannerReadMoreUrl: "" // TODO add when support page is ready
     onRemoveBanner: function() {
         UM.Preferences.setValue("cura/market_place_show_manage_packages_banner", false);
         bannerVisible = false;
diff --git a/plugins/Marketplace/resources/qml/Materials.qml b/plugins/Marketplace/resources/qml/Materials.qml
index de075af031..2634f7b328 100644
--- a/plugins/Marketplace/resources/qml/Materials.qml
+++ b/plugins/Marketplace/resources/qml/Materials.qml
@@ -11,7 +11,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.")
-    readMoreUrl: "" // TODO add when support page is ready
+    bannerReadMoreUrl: "" // TODO add when support page is ready
     onRemoveBanner: function() {
         UM.Preferences.setValue("cura/market_place_show_material_banner", false);
         bannerVisible = false;
diff --git a/plugins/Marketplace/resources/qml/OnboardBanner.qml b/plugins/Marketplace/resources/qml/OnboardBanner.qml
index 0107d6d816..0dbe2cb897 100644
--- a/plugins/Marketplace/resources/qml/OnboardBanner.qml
+++ b/plugins/Marketplace/resources/qml/OnboardBanner.qml
@@ -11,9 +11,9 @@ import Cura 1.6 as Cura
 // Onboarding banner.
 Rectangle
 {
-    property alias bannerIcon: onboardingIcon.source;
-    property string bannerText
-    property var onRemoveBanner
+    property alias icon: onboardingIcon.source
+    property alias text: infoText.text
+    property var onRemove
     property string readMoreUrl
 
     Layout.preferredHeight: childrenRect.height + 2 * UM.Theme.getSize("default_margin").height
@@ -56,7 +56,7 @@ Rectangle
         hoverColor: UM.Theme.getColor("primary_text_hover")
         iconSource: UM.Theme.getIcon("Cancel")
 
-        onClicked: onRemoveBanner()
+        onClicked: onRemove()
     }
 
     // Body
@@ -71,7 +71,6 @@ Rectangle
         }
 
         font: UM.Theme.getFont("default")
-        text: bannerText
 
         renderType: Text.NativeRendering
         color: UM.Theme.getColor("primary_text")
diff --git a/plugins/Marketplace/resources/qml/Plugins.qml b/plugins/Marketplace/resources/qml/Plugins.qml
index 2922a39c9b..29b264c702 100644
--- a/plugins/Marketplace/resources/qml/Plugins.qml
+++ b/plugins/Marketplace/resources/qml/Plugins.qml
@@ -11,7 +11,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.")
-    readMoreUrl: "" // TODO add when support page is ready
+    bannerReadMoreUrl: "" // TODO add when support page is ready
     onRemoveBanner: function() {
         UM.Preferences.setValue("cura/market_place_show_plugin_banner", false)
         bannerVisible = false;