From f1ef1c283ea7283c269ec3c13af47420d7fcd4e6 Mon Sep 17 00:00:00 2001 From: casper Date: Sat, 27 Nov 2021 13:48:38 +0100 Subject: [PATCH] Add links to read me support pages Note that since the support pages are not yet ready the "read more" buttons are hidden. Once the correct link is added they become visible again. --- plugins/Marketplace/resources/qml/ManagedPackages.qml | 1 + plugins/Marketplace/resources/qml/Marketplace.qml | 1 + plugins/Marketplace/resources/qml/Materials.qml | 1 + plugins/Marketplace/resources/qml/OnboardBanner.qml | 4 +++- plugins/Marketplace/resources/qml/Packages.qml | 1 + plugins/Marketplace/resources/qml/Plugins.qml | 1 + 6 files changed, 8 insertions(+), 1 deletion(-) diff --git a/plugins/Marketplace/resources/qml/ManagedPackages.qml b/plugins/Marketplace/resources/qml/ManagedPackages.qml index a329d992e5..e8e54d77b5 100644 --- a/plugins/Marketplace/resources/qml/ManagedPackages.qml +++ b/plugins/Marketplace/resources/qml/ManagedPackages.qml @@ -14,6 +14,7 @@ Packages bannerVisible: CuraApplication.shouldShowMarketPlaceManagePackagesBanner() bannerIcon: "ArrowDoubleCircleRight" bannerBody: 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 onRemoveBanner: function() { CuraApplication.closeMarketPlaceManagePackagesBanner(); bannerVisible = false; diff --git a/plugins/Marketplace/resources/qml/Marketplace.qml b/plugins/Marketplace/resources/qml/Marketplace.qml index 14de458e95..2bdd0a509d 100644 --- a/plugins/Marketplace/resources/qml/Marketplace.qml +++ b/plugins/Marketplace/resources/qml/Marketplace.qml @@ -54,6 +54,7 @@ Window bannerBody: content.item && content.item.bannerBody bannerIcon: content.item && content.item.bannerIcon onRemoveBanner: content.item && content.item.onRemoveBanner + readMoreUrl: content.item.readMoreUrl && content.item.readMoreUrl } // Page title. diff --git a/plugins/Marketplace/resources/qml/Materials.qml b/plugins/Marketplace/resources/qml/Materials.qml index 32d2c2213a..fc4869dac5 100644 --- a/plugins/Marketplace/resources/qml/Materials.qml +++ b/plugins/Marketplace/resources/qml/Materials.qml @@ -10,6 +10,7 @@ Packages bannerVisible: CuraApplication.shouldShowMarketPlaceMaterialBanner() bannerIcon: "Spool" bannerBody: 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 onRemoveBanner: function() { CuraApplication.closeMarketPlaceMaterialBanner(); bannerVisible = false; diff --git a/plugins/Marketplace/resources/qml/OnboardBanner.qml b/plugins/Marketplace/resources/qml/OnboardBanner.qml index cbd151bed2..4b5e494be5 100644 --- a/plugins/Marketplace/resources/qml/OnboardBanner.qml +++ b/plugins/Marketplace/resources/qml/OnboardBanner.qml @@ -15,6 +15,7 @@ Rectangle property string bannerIcon property string bannerBody property var onRemoveBanner + property string readMoreUrl visible: bannerVisible @@ -121,6 +122,7 @@ Rectangle Cura.TertiaryButton { + visible: readMoreUrl !== "" id: readMoreButton text: "Learn More" textFont: UM.Theme.getFont("default") @@ -131,6 +133,6 @@ Rectangle isIconOnRightSide: true height: fontMetrics.height - onClicked: print("TODO") + onClicked: Qt.openUrlExternally(readMoreUrl) } } \ No newline at end of file diff --git a/plugins/Marketplace/resources/qml/Packages.qml b/plugins/Marketplace/resources/qml/Packages.qml index 91f6448994..9ef35a31b3 100644 --- a/plugins/Marketplace/resources/qml/Packages.qml +++ b/plugins/Marketplace/resources/qml/Packages.qml @@ -14,6 +14,7 @@ ListView property bool bannerVisible property string bannerIcon property string bannerBody + property string readMoreUrl property var onRemoveBanner width: parent.width diff --git a/plugins/Marketplace/resources/qml/Plugins.qml b/plugins/Marketplace/resources/qml/Plugins.qml index b9d38c6e2b..f0c101153c 100644 --- a/plugins/Marketplace/resources/qml/Plugins.qml +++ b/plugins/Marketplace/resources/qml/Plugins.qml @@ -10,6 +10,7 @@ Packages bannerVisible: CuraApplication.shouldShowMarketPlacePluginBanner() bannerIcon: "Shop" bannerBody: catalog.i18nc("@text", "Select and install material profiles optimised for your Ultimaker 3D printers.") + readMoreUrl: "" // TODO add when support page is ready onRemoveBanner: function() { CuraApplication.closeMarketPlacePluginBanner(); bannerVisible = false;