From 7796abd55b138df767a5aa971e7d54011487d1ba Mon Sep 17 00:00:00 2001
From: Ghostkeeper <rubend@tutanota.com>
Date: Mon, 25 Oct 2021 00:51:26 +0200
Subject: [PATCH] Revert "Revert "Add new button to open the Marketplace""

This reverts commit aa4b7ddb8bce12c4ff2ea8864c1dad63a7a0a7c4.
Apparently it is now in scope again for the button to be there. It's in the requirements and the requirements are holy. Whoopteedoo.

Contributes to issue CURA-8556.
---
 resources/qml/MainWindow/MainWindowHeader.qml | 38 +++++++++++++++++--
 1 file changed, 34 insertions(+), 4 deletions(-)

diff --git a/resources/qml/MainWindow/MainWindowHeader.qml b/resources/qml/MainWindow/MainWindowHeader.qml
index 815ddff732..9112c733f3 100644
--- a/resources/qml/MainWindow/MainWindowHeader.qml
+++ b/resources/qml/MainWindow/MainWindowHeader.qml
@@ -86,7 +86,6 @@ Item
     // Shortcut button to quick access the Toolbox
     Controls2.Button
     {
-        id: marketplaceButton
         text: catalog.i18nc("@action:button", "Marketplace")
         height: Math.round(0.5 * UM.Theme.getSize("main_window_header").height)
         onClicked: Cura.Actions.browsePackages.trigger()
@@ -107,7 +106,7 @@ Item
                 anchors.fill: parent
                 radius: parent.radius
                 color: UM.Theme.getColor("primary_text")
-                opacity: marketplaceButton.hovered ? 0.2 : 0
+                opacity: parent.hovered ? 0.2 : 0
                 Behavior on opacity { NumberAnimation { duration: 100 } }
             }
         }
@@ -115,7 +114,7 @@ Item
         contentItem: Label
         {
             id: label
-            text: marketplaceButton.text
+            text: parent.text
             font: UM.Theme.getFont("default")
             color: UM.Theme.getColor("primary_text")
             width: contentWidth
@@ -125,7 +124,7 @@ Item
 
         anchors
         {
-            right: applicationSwitcher.left
+            right: marketplaceButton.left
             rightMargin: UM.Theme.getSize("default_margin").width
             verticalCenter: parent.verticalCenter
         }
@@ -150,6 +149,37 @@ Item
         }
     }
 
+    Controls2.Button
+    {
+        id: marketplaceButton
+        width: Math.round(0.5 * UM.Theme.getSize("main_window_header").height)
+        height: width
+        anchors
+        {
+            verticalCenter: parent.verticalCenter
+            right: applicationSwitcher.left
+            rightMargin: UM.Theme.getSize("default_margin").width
+        }
+
+        background: UM.RecolorImage
+        {
+            anchors.fill: parent
+            color: UM.Theme.getColor("primary_text")
+            source: UM.Theme.getIcon("Shop")
+
+            Rectangle
+            {
+                anchors.fill: parent
+                radius: UM.Theme.getSize("action_button_radius").width
+                color: UM.Theme.getColor("primary_text")
+                opacity: marketplaceButton.hovered ? 0.2 : 0
+                Behavior on opacity { NumberAnimation { duration: 100; } }
+            }
+        }
+
+        onClicked: Cura.Actions.browsePackages.trigger()
+    }
+
     ApplicationSwitcher
     {
         id: applicationSwitcher