From d96ba0dcf35f1270d4dfadc7112799090b85fd35 Mon Sep 17 00:00:00 2001 From: casper Date: Tue, 30 Nov 2021 10:51:43 +0100 Subject: [PATCH 1/5] Easy navigation to Cloud marketplace CURA-8563 --- plugins/Marketplace/resources/qml/ManagedPackages.qml | 1 + plugins/Marketplace/resources/qml/Marketplace.qml | 11 +++++++++++ plugins/Marketplace/resources/qml/Materials.qml | 1 + plugins/Marketplace/resources/qml/Packages.qml | 1 + plugins/Marketplace/resources/qml/Plugins.qml | 1 + 5 files changed, 15 insertions(+) diff --git a/plugins/Marketplace/resources/qml/ManagedPackages.qml b/plugins/Marketplace/resources/qml/ManagedPackages.qml index 2610f7cd9d..b90bffd723 100644 --- a/plugins/Marketplace/resources/qml/ManagedPackages.qml +++ b/plugins/Marketplace/resources/qml/ManagedPackages.qml @@ -19,6 +19,7 @@ Packages UM.Preferences.setValue("cura/market_place_show_manage_packages_banner", false); bannerVisible = false; } + searchInBrowserUrl: "https://marketplace.ultimaker.com/app/cura/plugins" model: Marketplace.LocalPackageList { diff --git a/plugins/Marketplace/resources/qml/Marketplace.qml b/plugins/Marketplace/resources/qml/Marketplace.qml index 1866d7512d..4fd8c9e999 100644 --- a/plugins/Marketplace/resources/qml/Marketplace.qml +++ b/plugins/Marketplace/resources/qml/Marketplace.qml @@ -162,6 +162,17 @@ Window } } + Cura.TertiaryButton + { + text: catalog.i18nc("@info", "Search in the browser") + iconSource: UM.Theme.getIcon("LinkExternal") + + isIconOnRightSide: true + font: UM.Theme.getFont("default") + + onClicked: content.item && Qt.openUrlExternally(content.item.searchInBrowserUrl) + } + // Page contents. Rectangle { diff --git a/plugins/Marketplace/resources/qml/Materials.qml b/plugins/Marketplace/resources/qml/Materials.qml index 2634f7b328..3afe7b412a 100644 --- a/plugins/Marketplace/resources/qml/Materials.qml +++ b/plugins/Marketplace/resources/qml/Materials.qml @@ -16,6 +16,7 @@ Packages UM.Preferences.setValue("cura/market_place_show_material_banner", false); bannerVisible = false; } + searchInBrowserUrl: "https://marketplace.ultimaker.com/app/cura/materials" model: Marketplace.RemotePackageList { diff --git a/plugins/Marketplace/resources/qml/Packages.qml b/plugins/Marketplace/resources/qml/Packages.qml index 46ebe8a661..c192cc5dd9 100644 --- a/plugins/Marketplace/resources/qml/Packages.qml +++ b/plugins/Marketplace/resources/qml/Packages.qml @@ -11,6 +11,7 @@ ListView id: packages property string pageTitle + property string searchInBrowserUrl property bool bannerVisible property var bannerIcon property string bannerText diff --git a/plugins/Marketplace/resources/qml/Plugins.qml b/plugins/Marketplace/resources/qml/Plugins.qml index 29b264c702..c473a3a48e 100644 --- a/plugins/Marketplace/resources/qml/Plugins.qml +++ b/plugins/Marketplace/resources/qml/Plugins.qml @@ -16,6 +16,7 @@ Packages UM.Preferences.setValue("cura/market_place_show_plugin_banner", false) bannerVisible = false; } + searchInBrowserUrl: "https://marketplace.ultimaker.com/app/cura/plugins" model: Marketplace.RemotePackageList { From 49db5be3aa731f8c9be6fe39f77ccbb8ee26f622 Mon Sep 17 00:00:00 2001 From: casper Date: Tue, 30 Nov 2021 10:52:15 +0100 Subject: [PATCH 2/5] Decrease margin sizes They were way bigger compared to the UX design CURA-8563 --- plugins/Marketplace/resources/qml/Marketplace.qml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/Marketplace/resources/qml/Marketplace.qml b/plugins/Marketplace/resources/qml/Marketplace.qml index 4fd8c9e999..a825e712f7 100644 --- a/plugins/Marketplace/resources/qml/Marketplace.qml +++ b/plugins/Marketplace/resources/qml/Marketplace.qml @@ -47,7 +47,7 @@ Window { anchors.fill: parent - spacing: UM.Theme.getSize("default_margin").height + spacing: UM.Theme.getSize("thin_margin").height OnboardBanner { @@ -89,7 +89,7 @@ Window RowLayout { width: parent.width - height: UM.Theme.getSize("button_icon").height + UM.Theme.getSize("default_margin").height + height: UM.Theme.getSize("button_icon").height + UM.Theme.getSize("thin_margin").height spacing: UM.Theme.getSize("thin_margin").width Rectangle From c62b21ad44b5c9adb4619f949a7876d226d74957 Mon Sep 17 00:00:00 2001 From: casper Date: Tue, 30 Nov 2021 12:57:22 +0100 Subject: [PATCH 3/5] Revert "Decrease margin sizes" This reverts commit 49db5be3aa731f8c9be6fe39f77ccbb8ee26f622. --- plugins/Marketplace/resources/qml/Marketplace.qml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/Marketplace/resources/qml/Marketplace.qml b/plugins/Marketplace/resources/qml/Marketplace.qml index a825e712f7..4fd8c9e999 100644 --- a/plugins/Marketplace/resources/qml/Marketplace.qml +++ b/plugins/Marketplace/resources/qml/Marketplace.qml @@ -47,7 +47,7 @@ Window { anchors.fill: parent - spacing: UM.Theme.getSize("thin_margin").height + spacing: UM.Theme.getSize("default_margin").height OnboardBanner { @@ -89,7 +89,7 @@ Window RowLayout { width: parent.width - height: UM.Theme.getSize("button_icon").height + UM.Theme.getSize("thin_margin").height + height: UM.Theme.getSize("button_icon").height + UM.Theme.getSize("default_margin").height spacing: UM.Theme.getSize("thin_margin").width Rectangle From 97ba4489ffc47360be7c51a0ac96c5b3915be1ed Mon Sep 17 00:00:00 2001 From: casper Date: Tue, 30 Nov 2021 13:01:45 +0100 Subject: [PATCH 4/5] Remove unneeded margin from search bar Cura 8563 --- plugins/Marketplace/resources/qml/Marketplace.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/Marketplace/resources/qml/Marketplace.qml b/plugins/Marketplace/resources/qml/Marketplace.qml index 4fd8c9e999..7b975e1c2f 100644 --- a/plugins/Marketplace/resources/qml/Marketplace.qml +++ b/plugins/Marketplace/resources/qml/Marketplace.qml @@ -89,7 +89,7 @@ Window RowLayout { width: parent.width - height: UM.Theme.getSize("button_icon").height + UM.Theme.getSize("default_margin").height + height: UM.Theme.getSize("button_icon").height spacing: UM.Theme.getSize("thin_margin").width Rectangle From b0275cfba9e9150adc6af952f4c40a0a39774d5c Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Tue, 30 Nov 2021 14:17:40 +0100 Subject: [PATCH 5/5] Add campaign links CURA-8563 --- plugins/Marketplace/resources/qml/ManagedPackages.qml | 2 +- plugins/Marketplace/resources/qml/Materials.qml | 2 +- plugins/Marketplace/resources/qml/Plugins.qml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/Marketplace/resources/qml/ManagedPackages.qml b/plugins/Marketplace/resources/qml/ManagedPackages.qml index b90bffd723..f44fbd0a9b 100644 --- a/plugins/Marketplace/resources/qml/ManagedPackages.qml +++ b/plugins/Marketplace/resources/qml/ManagedPackages.qml @@ -19,7 +19,7 @@ Packages UM.Preferences.setValue("cura/market_place_show_manage_packages_banner", false); bannerVisible = false; } - searchInBrowserUrl: "https://marketplace.ultimaker.com/app/cura/plugins" + searchInBrowserUrl: "https://marketplace.ultimaker.com/app/cura/plugins?utm_source=cura&utm_medium=software&utm_campaign=marketplace-search-plugins-browser" model: Marketplace.LocalPackageList { diff --git a/plugins/Marketplace/resources/qml/Materials.qml b/plugins/Marketplace/resources/qml/Materials.qml index 3afe7b412a..489915aa10 100644 --- a/plugins/Marketplace/resources/qml/Materials.qml +++ b/plugins/Marketplace/resources/qml/Materials.qml @@ -16,7 +16,7 @@ Packages UM.Preferences.setValue("cura/market_place_show_material_banner", false); bannerVisible = false; } - searchInBrowserUrl: "https://marketplace.ultimaker.com/app/cura/materials" + searchInBrowserUrl: "https://marketplace.ultimaker.com/app/cura/materials?utm_source=cura&utm_medium=software&utm_campaign=marketplace-search-materials-browser" model: Marketplace.RemotePackageList { diff --git a/plugins/Marketplace/resources/qml/Plugins.qml b/plugins/Marketplace/resources/qml/Plugins.qml index c473a3a48e..3b0b5d7c23 100644 --- a/plugins/Marketplace/resources/qml/Plugins.qml +++ b/plugins/Marketplace/resources/qml/Plugins.qml @@ -16,7 +16,7 @@ Packages UM.Preferences.setValue("cura/market_place_show_plugin_banner", false) bannerVisible = false; } - searchInBrowserUrl: "https://marketplace.ultimaker.com/app/cura/plugins" + searchInBrowserUrl: "https://marketplace.ultimaker.com/app/cura/plugins?utm_source=cura&utm_medium=software&utm_campaign=marketplace-search-plugins-browser" model: Marketplace.RemotePackageList {