From aa4b7ddb8bce12c4ff2ea8864c1dad63a7a0a7c4 Mon Sep 17 00:00:00 2001
From: Ghostkeeper <rubend@tutanota.com>
Date: Tue, 19 Oct 2021 13:09:22 +0200
Subject: [PATCH] Revert "Add new button to open the Marketplace"

This reverts commit 648aa3d84cd11439b6457aa81285ea9a5ac202f0.
Apparently we don't want to retain the old Toolbox alongside, not even during development.

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

diff --git a/resources/qml/MainWindow/MainWindowHeader.qml b/resources/qml/MainWindow/MainWindowHeader.qml
index 9112c733f3..815ddff732 100644
--- a/resources/qml/MainWindow/MainWindowHeader.qml
+++ b/resources/qml/MainWindow/MainWindowHeader.qml
@@ -86,6 +86,7 @@ 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()
@@ -106,7 +107,7 @@ Item
                 anchors.fill: parent
                 radius: parent.radius
                 color: UM.Theme.getColor("primary_text")
-                opacity: parent.hovered ? 0.2 : 0
+                opacity: marketplaceButton.hovered ? 0.2 : 0
                 Behavior on opacity { NumberAnimation { duration: 100 } }
             }
         }
@@ -114,7 +115,7 @@ Item
         contentItem: Label
         {
             id: label
-            text: parent.text
+            text: marketplaceButton.text
             font: UM.Theme.getFont("default")
             color: UM.Theme.getColor("primary_text")
             width: contentWidth
@@ -124,7 +125,7 @@ Item
 
         anchors
         {
-            right: marketplaceButton.left
+            right: applicationSwitcher.left
             rightMargin: UM.Theme.getSize("default_margin").width
             verticalCenter: parent.verticalCenter
         }
@@ -149,37 +150,6 @@ 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