Browse Source

Rename properties in marketplace onboarding banner

CURA-8564
casper 3 years ago
parent
commit
6ca20ba863

+ 1 - 1
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;

+ 4 - 4
plugins/Marketplace/resources/qml/Marketplace.qml

@@ -52,10 +52,10 @@ Window
             OnboardBanner
             {
                 visible: content.item && content.item.bannerVisible
-                bannerText: content.item && content.item.bannerText
-                bannerIcon: content.item && content.item.bannerIcon
-                onRemoveBanner: content.item && content.item.onRemoveBanner
-                readMoreUrl: content.item.readMoreUrl && content.item.readMoreUrl
+                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.

+ 1 - 1
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;

+ 4 - 5
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")

+ 1 - 1
plugins/Marketplace/resources/qml/Packages.qml

@@ -14,7 +14,7 @@ ListView
     property bool bannerVisible
     property var bannerIcon
     property string bannerText
-    property string readMoreUrl
+    property string bannerReadMoreUrl
     property var onRemoveBanner
 
     width: parent.width

+ 1 - 1
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;