From aed52cea74621fb3789f655ddf3bc861d273ef56 Mon Sep 17 00:00:00 2001
From: Ghostkeeper <rubend@tutanota.com>
Date: Mon, 25 Oct 2021 01:11:26 +0200
Subject: [PATCH] Split functionality of the two marketplace buttons

One now opens the old one again. One still opens the new one (but with a new name).

Contributes to issue CURA-8556.
---
 resources/qml/Actions.qml                     | 8 ++++++++
 resources/qml/MainWindow/ApplicationMenu.qml  | 8 ++++++++
 resources/qml/MainWindow/MainWindowHeader.qml | 2 +-
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/resources/qml/Actions.qml b/resources/qml/Actions.qml
index aa88c9176d..a440741dc0 100644
--- a/resources/qml/Actions.qml
+++ b/resources/qml/Actions.qml
@@ -72,6 +72,7 @@ Item
     property alias configureSettingVisibility: configureSettingVisibilityAction
 
     property alias browsePackages: browsePackagesAction
+    property alias openMarketplace: openMarketplaceAction
 
     UM.I18nCatalog{id: catalog; name: "cura"}
 
@@ -483,4 +484,11 @@ Item
         text: catalog.i18nc("@action:menu", "&Marketplace")
         iconName: "plugins_browse"
     }
+
+    Action
+    {
+        id: openMarketplaceAction
+        text: catalog.i18nc("@action:menu", "&Marketplace")
+        iconName: "plugins_browse"
+    }
 }
diff --git a/resources/qml/MainWindow/ApplicationMenu.qml b/resources/qml/MainWindow/ApplicationMenu.qml
index b7a016fabc..2924ae518f 100644
--- a/resources/qml/MainWindow/ApplicationMenu.qml
+++ b/resources/qml/MainWindow/ApplicationMenu.qml
@@ -201,6 +201,14 @@ Item
     {
         target: Cura.Actions.browsePackages
         function onTriggered()
+        {
+            curaExtensions.callExtensionMethod("Toolbox", "launch")
+        }
+    }
+    Connections
+    {
+        target: Cura.Actions.openMarketplace
+        function onTriggered()
         {
             curaExtensions.callExtensionMethod("Marketplace", "show")
         }
diff --git a/resources/qml/MainWindow/MainWindowHeader.qml b/resources/qml/MainWindow/MainWindowHeader.qml
index 9112c733f3..48761c8c70 100644
--- a/resources/qml/MainWindow/MainWindowHeader.qml
+++ b/resources/qml/MainWindow/MainWindowHeader.qml
@@ -177,7 +177,7 @@ Item
             }
         }
 
-        onClicked: Cura.Actions.browsePackages.trigger()
+        onClicked: Cura.Actions.openMarketplace.trigger()
     }
 
     ApplicationSwitcher