From 51ec8a539fa22390b9bea607e610e1ed1d5105c3 Mon Sep 17 00:00:00 2001
From: Dimitriovski <d.dimitriovski@ultimaker.com>
Date: Thu, 16 Jan 2020 16:30:11 +0100
Subject: [PATCH 01/16] Added a 'Marketplace' icon in the header of the Toolbox

CURA-7071
---
 cura/ApplicationMetadata.py                   |  4 +-
 .../qml/components/ToolboxHeader.qml          | 56 +++++++++++++------
 plugins/Toolbox/src/Toolbox.py                |  4 ++
 3 files changed, 46 insertions(+), 18 deletions(-)

diff --git a/cura/ApplicationMetadata.py b/cura/ApplicationMetadata.py
index 8da64beead..449cc6848a 100644
--- a/cura/ApplicationMetadata.py
+++ b/cura/ApplicationMetadata.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2018 Ultimaker B.V.
+# Copyright (c) 2020 Ultimaker B.V.
 # Cura is released under the terms of the LGPLv3 or higher.
 
 # ---------
@@ -56,3 +56,5 @@ try:
 
 except ImportError:
     CuraAppDisplayName = DEFAULT_CURA_DISPLAY_NAME
+
+WEB_MARKETPLACE_URL = "https://marketplace.ultimaker.com/app/cura/materials"
\ No newline at end of file
diff --git a/plugins/Toolbox/resources/qml/components/ToolboxHeader.qml b/plugins/Toolbox/resources/qml/components/ToolboxHeader.qml
index 491567eb5f..de64eefff1 100644
--- a/plugins/Toolbox/resources/qml/components/ToolboxHeader.qml
+++ b/plugins/Toolbox/resources/qml/components/ToolboxHeader.qml
@@ -51,32 +51,25 @@ Item
                 toolbox.viewPage = "overview"
             }
         }
-    }
 
-    ToolboxTabButton
-    {
-        id: installedTabButton
-        text: catalog.i18nc("@title:tab", "Installed")
-        active: toolbox.viewCategory == "installed"
-        enabled: !toolbox.isDownloading
-        anchors
+        ToolboxTabButton
         {
-            right: parent.right
-            rightMargin: UM.Theme.getSize("default_margin").width
+            id: installedTabButton
+            text: catalog.i18nc("@title:tab", "Installed")
+            active: toolbox.viewCategory == "installed"
+            enabled: !toolbox.isDownloading
+            onClicked: toolbox.viewCategory = "installed"
+            width: UM.Theme.getSize("toolbox_header_tab").width + marketplaceNotificationIcon.width - UM.Theme.getSize("default_margin").width
         }
-        onClicked: toolbox.viewCategory = "installed"
-        width: UM.Theme.getSize("toolbox_header_tab").width + marketplaceNotificationIcon.width - UM.Theme.getSize("default_margin").width
+
+
     }
 
     Cura.NotificationIcon
     {
         id: marketplaceNotificationIcon
-
         visible: CuraApplication.getPackageManager().packagesWithUpdate.length > 0
-
-        anchors.right: installedTabButton.right
-        anchors.verticalCenter: installedTabButton.verticalCenter
-
+        anchors.right: bar.right
         labelText:
         {
             const itemCount = CuraApplication.getPackageManager().packagesWithUpdate.length
@@ -84,6 +77,35 @@ Item
         }
     }
 
+
+    UM.TooltipArea
+    {
+        width: childrenRect.width;
+        height: childrenRect.height;
+        text: catalog.i18nc("@info:tooltip", "Go to Web Marketplace")
+        anchors
+        {
+            right: parent.right
+            rightMargin: UM.Theme.getSize("default_margin").width
+            verticalCenter: parent.verticalCenter
+        }
+        Image
+        {
+            id: cloudMarketplaceButton
+            source: "../../images/marketplace.png"
+            height: 45
+            width: height
+            //width: UM.Theme.getSize("toolbox_header_tab").width
+            mipmap: true
+            fillMode: Image.PreserveAspectFit
+            MouseArea
+            {
+                anchors.fill: parent
+                onClicked: Qt.openUrlExternally(toolbox.getWebMarketplaceUrl)
+            }
+        }
+    }
+
     ToolboxShadow
     {
         anchors.top: bar.bottom
diff --git a/plugins/Toolbox/src/Toolbox.py b/plugins/Toolbox/src/Toolbox.py
index b1928b4e84..c7ea5bf7cc 100644
--- a/plugins/Toolbox/src/Toolbox.py
+++ b/plugins/Toolbox/src/Toolbox.py
@@ -765,6 +765,10 @@ class Toolbox(QObject, Extension):
     def materialsGenericModel(self) -> PackagesModel:
         return self._materials_generic_model
 
+    @pyqtProperty(str, constant=True)
+    def getWebMarketplaceUrl(self) -> str:
+        return ApplicationMetadata.WEB_MARKETPLACE_URL
+
     # Filter Models:
     # --------------------------------------------------------------------------
     @pyqtSlot(str, str, str)

From ddd2afa08a9769f87daa7d5d8a443a8351692ae6 Mon Sep 17 00:00:00 2001
From: Dimitriovski <d.dimitriovski@ultimaker.com>
Date: Thu, 16 Jan 2020 16:30:58 +0100
Subject: [PATCH 02/16] Added dummy image downloaded from internet for
 presentation only.

CURA-7071
---
 plugins/Toolbox/resources/images/marketplace.png | Bin 0 -> 9916 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 plugins/Toolbox/resources/images/marketplace.png

diff --git a/plugins/Toolbox/resources/images/marketplace.png b/plugins/Toolbox/resources/images/marketplace.png
new file mode 100644
index 0000000000000000000000000000000000000000..ca4f41820ef3728554fedfda67f440f2e8035895
GIT binary patch
literal 9916
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

literal 0
HcmV?d00001


From 812017c8140b0990451b6f9fb0f39c62b5783a38 Mon Sep 17 00:00:00 2001
From: Ghostkeeper <rubend@tutanota.com>
Date: Tue, 28 Jan 2020 11:29:01 +0100
Subject: [PATCH 03/16] Switch out shop icon

The sourceSize needs to be adjusted because this is an SVG that we don't necessarily want to stretch but just want to render directly at the correct size.

Contributes to issue CURA-7071.
---
 plugins/Toolbox/resources/images/marketplace.png | Bin 9916 -> 0 bytes
 plugins/Toolbox/resources/images/shop.svg        |   3 +++
 .../resources/qml/components/ToolboxHeader.qml   |   7 ++++---
 3 files changed, 7 insertions(+), 3 deletions(-)
 delete mode 100644 plugins/Toolbox/resources/images/marketplace.png
 create mode 100644 plugins/Toolbox/resources/images/shop.svg

diff --git a/plugins/Toolbox/resources/images/marketplace.png b/plugins/Toolbox/resources/images/marketplace.png
deleted file mode 100644
index ca4f41820ef3728554fedfda67f440f2e8035895..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9916
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

diff --git a/plugins/Toolbox/resources/images/shop.svg b/plugins/Toolbox/resources/images/shop.svg
new file mode 100644
index 0000000000..64862834b0
--- /dev/null
+++ b/plugins/Toolbox/resources/images/shop.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24">
+    <path d="M19,3H5A2.9,2.9,0,0,0,2,6V9a3.9,3.9,0,0,0,2,3.4V22H20V12.4A3.9,3.9,0,0,0,22,9V6A2.9,2.9,0,0,0,19,3ZM10,5h4V9a2,2,0,0,1-4,0ZM4,9V5H8V9A2,2,0,0,1,4,9ZM18,20H14V15H10v5H6V13a3.7,3.7,0,0,0,3-1.4A3.7,3.7,0,0,0,12,13a3.7,3.7,0,0,0,3-1.4A3.7,3.7,0,0,0,18,13ZM20,9a2,2,0,0,1-4,0V5h4Z" />
+</svg>
diff --git a/plugins/Toolbox/resources/qml/components/ToolboxHeader.qml b/plugins/Toolbox/resources/qml/components/ToolboxHeader.qml
index de64eefff1..48d6c4836b 100644
--- a/plugins/Toolbox/resources/qml/components/ToolboxHeader.qml
+++ b/plugins/Toolbox/resources/qml/components/ToolboxHeader.qml
@@ -1,4 +1,4 @@
-// Copyright (c) 2018 Ultimaker B.V.
+// Copyright (c) 2020 Ultimaker B.V.
 // Toolbox is released under the terms of the LGPLv3 or higher.
 
 import QtQuick 2.10
@@ -92,11 +92,12 @@ Item
         Image
         {
             id: cloudMarketplaceButton
-            source: "../../images/marketplace.png"
+            source: "../../images/shop.svg"
             height: 45
             width: height
+            sourceSize.width: width
+            sourceSize.height: height
             //width: UM.Theme.getSize("toolbox_header_tab").width
-            mipmap: true
             fillMode: Image.PreserveAspectFit
             MouseArea
             {

From 1d110c2c33f6d7970ace3d15b851bbb6b4f4c59b Mon Sep 17 00:00:00 2001
From: Ghostkeeper <rubend@tutanota.com>
Date: Tue, 28 Jan 2020 11:31:10 +0100
Subject: [PATCH 04/16] Reduce size of web marketplace link button

Contributes to issue CURA-7071.
---
 plugins/Toolbox/resources/qml/components/ToolboxHeader.qml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/Toolbox/resources/qml/components/ToolboxHeader.qml b/plugins/Toolbox/resources/qml/components/ToolboxHeader.qml
index 48d6c4836b..e980a063bf 100644
--- a/plugins/Toolbox/resources/qml/components/ToolboxHeader.qml
+++ b/plugins/Toolbox/resources/qml/components/ToolboxHeader.qml
@@ -81,7 +81,7 @@ Item
     UM.TooltipArea
     {
         width: childrenRect.width;
-        height: childrenRect.height;
+        height: parent.height
         text: catalog.i18nc("@info:tooltip", "Go to Web Marketplace")
         anchors
         {
@@ -93,11 +93,11 @@ Item
         {
             id: cloudMarketplaceButton
             source: "../../images/shop.svg"
-            height: 45
+            height: parent.height / 2
             width: height
+            anchors.verticalCenter: parent.verticalCenter
             sourceSize.width: width
             sourceSize.height: height
-            //width: UM.Theme.getSize("toolbox_header_tab").width
             fillMode: Image.PreserveAspectFit
             MouseArea
             {

From e6856b02a4d12b54f10d764202a40f183ebda7eb Mon Sep 17 00:00:00 2001
From: Ghostkeeper <rubend@tutanota.com>
Date: Tue, 28 Jan 2020 11:33:25 +0100
Subject: [PATCH 05/16] Make entire tooltip area clickable

Also saves on another component. And it's more logical, easier to use and fault-tolerant.

Contributes to issue CURA-7071.
---
 .../Toolbox/resources/qml/components/ToolboxHeader.qml    | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/plugins/Toolbox/resources/qml/components/ToolboxHeader.qml b/plugins/Toolbox/resources/qml/components/ToolboxHeader.qml
index e980a063bf..817134590c 100644
--- a/plugins/Toolbox/resources/qml/components/ToolboxHeader.qml
+++ b/plugins/Toolbox/resources/qml/components/ToolboxHeader.qml
@@ -80,7 +80,7 @@ Item
 
     UM.TooltipArea
     {
-        width: childrenRect.width;
+        width: childrenRect.width
         height: parent.height
         text: catalog.i18nc("@info:tooltip", "Go to Web Marketplace")
         anchors
@@ -89,6 +89,7 @@ Item
             rightMargin: UM.Theme.getSize("default_margin").width
             verticalCenter: parent.verticalCenter
         }
+        onClicked: Qt.openUrlExternally(toolbox.getWebMarketplaceUrl)
         Image
         {
             id: cloudMarketplaceButton
@@ -99,11 +100,6 @@ Item
             sourceSize.width: width
             sourceSize.height: height
             fillMode: Image.PreserveAspectFit
-            MouseArea
-            {
-                anchors.fill: parent
-                onClicked: Qt.openUrlExternally(toolbox.getWebMarketplaceUrl)
-            }
         }
     }
 

From 654a28450d789f77837eaef73bf7acc5fdf2536a Mon Sep 17 00:00:00 2001
From: Ghostkeeper <rubend@tutanota.com>
Date: Tue, 28 Jan 2020 11:36:42 +0100
Subject: [PATCH 06/16] Fix dark theme icon colour

Contributes to issue CURA-7071.
---
 plugins/Toolbox/resources/qml/components/ToolboxHeader.qml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/Toolbox/resources/qml/components/ToolboxHeader.qml b/plugins/Toolbox/resources/qml/components/ToolboxHeader.qml
index 817134590c..f751663670 100644
--- a/plugins/Toolbox/resources/qml/components/ToolboxHeader.qml
+++ b/plugins/Toolbox/resources/qml/components/ToolboxHeader.qml
@@ -90,16 +90,16 @@ Item
             verticalCenter: parent.verticalCenter
         }
         onClicked: Qt.openUrlExternally(toolbox.getWebMarketplaceUrl)
-        Image
+        UM.RecolorImage
         {
             id: cloudMarketplaceButton
             source: "../../images/shop.svg"
+            color: UM.Theme.getColor("text")
             height: parent.height / 2
             width: height
             anchors.verticalCenter: parent.verticalCenter
             sourceSize.width: width
             sourceSize.height: height
-            fillMode: Image.PreserveAspectFit
         }
     }
 

From ad2b8f140e085a13f813b56f403d3ef3f4df00af Mon Sep 17 00:00:00 2001
From: Ghostkeeper <rubend@tutanota.com>
Date: Tue, 28 Jan 2020 11:52:46 +0100
Subject: [PATCH 07/16] Make Marketplace link configurable from the build
 system

This way you could set it to marketplace-staging if you like.

Contributes to issue CURA-7071.
---
 CMakeLists.txt                 | 1 +
 cura/CuraVersion.py.in         | 3 ++-
 plugins/Toolbox/src/Toolbox.py | 9 +++++++--
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4954ac46dc..f662c2b50f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,6 +23,7 @@ set(CURA_BUILDTYPE "" CACHE STRING "Build type of Cura, eg. 'PPA'")
 set(CURA_CLOUD_API_ROOT "" CACHE STRING "Alternative Cura cloud API root")
 set(CURA_CLOUD_API_VERSION "" CACHE STRING "Alternative Cura cloud API version")
 set(CURA_CLOUD_ACCOUNT_API_ROOT "" CACHE STRING "Alternative Cura cloud account API version")
+set(CURA_MARKETPLACE_ROOT "" CACHE STRING "Alternative Marketplace location")
 
 configure_file(${CMAKE_SOURCE_DIR}/cura.desktop.in ${CMAKE_BINARY_DIR}/cura.desktop @ONLY)
 
diff --git a/cura/CuraVersion.py.in b/cura/CuraVersion.py.in
index 4583e76f67..32a67b8baa 100644
--- a/cura/CuraVersion.py.in
+++ b/cura/CuraVersion.py.in
@@ -1,4 +1,4 @@
-# Copyright (c) 2018 Ultimaker B.V.
+# Copyright (c) 2020 Ultimaker B.V.
 # Cura is released under the terms of the LGPLv3 or higher.
 
 CuraAppName = "@CURA_APP_NAME@"
@@ -9,3 +9,4 @@ CuraDebugMode = True if "@_cura_debugmode@" == "ON" else False
 CuraCloudAPIRoot = "@CURA_CLOUD_API_ROOT@"
 CuraCloudAPIVersion = "@CURA_CLOUD_API_VERSION@"
 CuraCloudAccountAPIRoot = "@CURA_CLOUD_ACCOUNT_API_ROOT@"
+CuraMarketplaceRoot = "@CURA_MARKETPLACE_ROOT@"
\ No newline at end of file
diff --git a/plugins/Toolbox/src/Toolbox.py b/plugins/Toolbox/src/Toolbox.py
index c7ea5bf7cc..7f4bd919dd 100644
--- a/plugins/Toolbox/src/Toolbox.py
+++ b/plugins/Toolbox/src/Toolbox.py
@@ -4,7 +4,6 @@
 import json
 import os
 import tempfile
-import platform
 from typing import cast, Any, Dict, List, Set, TYPE_CHECKING, Tuple, Optional, Union
 
 from PyQt5.QtCore import QObject, pyqtProperty, pyqtSignal, pyqtSlot
@@ -17,6 +16,7 @@ from UM.i18n import i18nCatalog
 from UM.Version import Version
 
 from cura import ApplicationMetadata
+from cura.CuraVersion import CuraMarketplaceRoot
 from cura.CuraApplication import CuraApplication
 from cura.Machines.ContainerTree import ContainerTree
 from plugins.Toolbox.src.CloudApiModel import CloudApiModel
@@ -33,6 +33,8 @@ if TYPE_CHECKING:
 
 i18n_catalog = i18nCatalog("cura")
 
+DEFAULT_MARKETPLACE_ROOT = "https://marketplace.ultimaker.com"  # type: str
+
 # todo Remove license and download dialog, use SyncOrchestrator instead
 
 ##  Provides a marketplace for users to download plugins an materials
@@ -767,7 +769,10 @@ class Toolbox(QObject, Extension):
 
     @pyqtProperty(str, constant=True)
     def getWebMarketplaceUrl(self) -> str:
-        return ApplicationMetadata.WEB_MARKETPLACE_URL
+        root = CuraMarketplaceRoot
+        if root == "":
+            root = DEFAULT_MARKETPLACE_ROOT
+        return root + "/app/cura/materials"
 
     # Filter Models:
     # --------------------------------------------------------------------------

From 13644f7e41037e3b787fc3ac1b1547be1b592826 Mon Sep 17 00:00:00 2001
From: Ghostkeeper <rubend@tutanota.com>
Date: Tue, 28 Jan 2020 11:57:40 +0100
Subject: [PATCH 08/16] Load different pages of Marketplace depending on
 current tab

Feels intuitive actually, but if you think about it it's weird that the link should change depending on the tab that's next to it.

Contributes to issue CURA-7071.
---
 .../Toolbox/resources/qml/components/ToolboxHeader.qml | 10 +++++++++-
 plugins/Toolbox/src/Toolbox.py                         |  6 +++---
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/plugins/Toolbox/resources/qml/components/ToolboxHeader.qml b/plugins/Toolbox/resources/qml/components/ToolboxHeader.qml
index f751663670..df1a43911e 100644
--- a/plugins/Toolbox/resources/qml/components/ToolboxHeader.qml
+++ b/plugins/Toolbox/resources/qml/components/ToolboxHeader.qml
@@ -89,7 +89,15 @@ Item
             rightMargin: UM.Theme.getSize("default_margin").width
             verticalCenter: parent.verticalCenter
         }
-        onClicked: Qt.openUrlExternally(toolbox.getWebMarketplaceUrl)
+        onClicked:
+        {
+            let page = "plugins"; //Online page to go to on the Marketplace subdomain.
+            if(materialsTabButton.active)
+            {
+                page = "materials";
+            }
+            Qt.openUrlExternally(toolbox.getWebMarketplaceUrl(page));
+        }
         UM.RecolorImage
         {
             id: cloudMarketplaceButton
diff --git a/plugins/Toolbox/src/Toolbox.py b/plugins/Toolbox/src/Toolbox.py
index 7f4bd919dd..c957a0c10c 100644
--- a/plugins/Toolbox/src/Toolbox.py
+++ b/plugins/Toolbox/src/Toolbox.py
@@ -767,12 +767,12 @@ class Toolbox(QObject, Extension):
     def materialsGenericModel(self) -> PackagesModel:
         return self._materials_generic_model
 
-    @pyqtProperty(str, constant=True)
-    def getWebMarketplaceUrl(self) -> str:
+    @pyqtSlot(str, result = str)
+    def getWebMarketplaceUrl(self, page: str) -> str:
         root = CuraMarketplaceRoot
         if root == "":
             root = DEFAULT_MARKETPLACE_ROOT
-        return root + "/app/cura/materials"
+        return root + "/app/cura/" + page
 
     # Filter Models:
     # --------------------------------------------------------------------------

From 1c79193f9a325fd1a564da2ec25edcae8ce18e5c Mon Sep 17 00:00:00 2001
From: Ghostkeeper <rubend@tutanota.com>
Date: Tue, 28 Jan 2020 13:25:27 +0100
Subject: [PATCH 09/16] Always go to plug-ins page regardless of active tab

This was a requirement from UX. Apparently we're adding a link to the materials elsewhere.

Contributes to issue CURA-7071.
---
 .../Toolbox/resources/qml/components/ToolboxHeader.qml | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/plugins/Toolbox/resources/qml/components/ToolboxHeader.qml b/plugins/Toolbox/resources/qml/components/ToolboxHeader.qml
index df1a43911e..e0cdb44d7d 100644
--- a/plugins/Toolbox/resources/qml/components/ToolboxHeader.qml
+++ b/plugins/Toolbox/resources/qml/components/ToolboxHeader.qml
@@ -89,15 +89,7 @@ Item
             rightMargin: UM.Theme.getSize("default_margin").width
             verticalCenter: parent.verticalCenter
         }
-        onClicked:
-        {
-            let page = "plugins"; //Online page to go to on the Marketplace subdomain.
-            if(materialsTabButton.active)
-            {
-                page = "materials";
-            }
-            Qt.openUrlExternally(toolbox.getWebMarketplaceUrl(page));
-        }
+        onClicked: Qt.openUrlExternally(toolbox.getWebMarketplaceUrl("plugins"))
         UM.RecolorImage
         {
             id: cloudMarketplaceButton

From e51a1b18bed3ae320463a9e2848eea73fe303592 Mon Sep 17 00:00:00 2001
From: Ghostkeeper <rubend@tutanota.com>
Date: Tue, 28 Jan 2020 14:19:33 +0100
Subject: [PATCH 10/16] Add link text to marketplace search page

Contributes to issue CURA-7071.
---
 .../components/ToolboxDownloadsShowcase.qml   | 35 ++++++++++++++-----
 1 file changed, 27 insertions(+), 8 deletions(-)

diff --git a/plugins/Toolbox/resources/qml/components/ToolboxDownloadsShowcase.qml b/plugins/Toolbox/resources/qml/components/ToolboxDownloadsShowcase.qml
index 72dd6f91a2..26d691ea8e 100644
--- a/plugins/Toolbox/resources/qml/components/ToolboxDownloadsShowcase.qml
+++ b/plugins/Toolbox/resources/qml/components/ToolboxDownloadsShowcase.qml
@@ -14,17 +14,36 @@ Rectangle
     Column
     {
         height: childrenRect.height + 2 * padding
-        spacing: UM.Theme.getSize("default_margin").width
+        spacing: UM.Theme.getSize("default_margin").height
         width: parent.width
         padding: UM.Theme.getSize("wide_margin").height
-        Label
+        Item
         {
-            id: heading
-            text: catalog.i18nc("@label", "Featured")
-            width: parent.width
-            color: UM.Theme.getColor("text_medium")
-            font: UM.Theme.getFont("large")
-            renderType: Text.NativeRendering
+            width: parent.width - parent.padding * 2
+            height: childrenRect.height
+            Label
+            {
+                id: heading
+                text: catalog.i18nc("@label", "Featured")
+                width: contentWidth
+                height: contentHeight
+                color: UM.Theme.getColor("text_medium")
+                font: UM.Theme.getFont("large")
+                renderType: Text.NativeRendering
+            }
+            Label
+            {
+                text: catalog.i18nc("@label", "Search materials")
+                width: parent.width - heading.width
+                height: contentHeight
+                anchors.right: parent.right
+                horizontalAlignment: Text.AlignRight
+                elide: Text.ElideLeft
+                color: UM.Theme.getColor("text_medium")
+                font: UM.Theme.getFont("medium")
+                renderType: Text.NativeRendering
+                visible: toolbox.viewCategory === "material"
+            }
         }
         Grid
         {

From 38e7a9e4df3555d187ba8d50ceca7c0a2b7b0ed8 Mon Sep 17 00:00:00 2001
From: Ghostkeeper <rubend@tutanota.com>
Date: Tue, 28 Jan 2020 14:37:59 +0100
Subject: [PATCH 11/16] Turn Marketplace link into an actual link

With consistent styling. The original design didn't have the link underlined but since the rest of the Cura UI has it underlined I let that happen here too.

Contributes to issue CURA-7071.
---
 .../components/ToolboxDownloadsShowcase.qml   | 28 ++++++++++++-------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/plugins/Toolbox/resources/qml/components/ToolboxDownloadsShowcase.qml b/plugins/Toolbox/resources/qml/components/ToolboxDownloadsShowcase.qml
index 26d691ea8e..048ef937d1 100644
--- a/plugins/Toolbox/resources/qml/components/ToolboxDownloadsShowcase.qml
+++ b/plugins/Toolbox/resources/qml/components/ToolboxDownloadsShowcase.qml
@@ -31,18 +31,26 @@ Rectangle
                 font: UM.Theme.getFont("large")
                 renderType: Text.NativeRendering
             }
-            Label
+            UM.TooltipArea
             {
-                text: catalog.i18nc("@label", "Search materials")
-                width: parent.width - heading.width
-                height: contentHeight
+                width: childrenRect.width
+                height: childrenRect.height
                 anchors.right: parent.right
-                horizontalAlignment: Text.AlignRight
-                elide: Text.ElideLeft
-                color: UM.Theme.getColor("text_medium")
-                font: UM.Theme.getFont("medium")
-                renderType: Text.NativeRendering
-                visible: toolbox.viewCategory === "material"
+                text: catalog.i18nc("@info:tooltip", "Go to Web Marketplace")
+                Label
+                {
+                    text: "<a href='%2'>".arg(toolbox.getWebMarketplaceUrl("materials")) + catalog.i18nc("@label", "Search materials") + "</a>"
+                    width: contentWidth
+                    height: contentHeight
+                    horizontalAlignment: Text.AlignRight
+                    font: UM.Theme.getFont("medium")
+                    renderType: Text.NativeRendering
+
+                    linkColor: UM.Theme.getColor("text_link")
+                    onLinkActivated: Qt.openUrlExternally(link)
+
+                    visible: toolbox.viewCategory === "material"
+                }
             }
         }
         Grid

From 6553443f3b95527d45a1f2ddc89e948c97f3f1b0 Mon Sep 17 00:00:00 2001
From: Ghostkeeper <rubend@tutanota.com>
Date: Tue, 28 Jan 2020 14:41:29 +0100
Subject: [PATCH 12/16] Make marketplace materials link slightly smaller

Contributes to issue CURA-7071.
---
 .../resources/qml/components/ToolboxDownloadsShowcase.qml       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/Toolbox/resources/qml/components/ToolboxDownloadsShowcase.qml b/plugins/Toolbox/resources/qml/components/ToolboxDownloadsShowcase.qml
index 048ef937d1..9b34952ab6 100644
--- a/plugins/Toolbox/resources/qml/components/ToolboxDownloadsShowcase.qml
+++ b/plugins/Toolbox/resources/qml/components/ToolboxDownloadsShowcase.qml
@@ -43,7 +43,7 @@ Rectangle
                     width: contentWidth
                     height: contentHeight
                     horizontalAlignment: Text.AlignRight
-                    font: UM.Theme.getFont("medium")
+                    font: UM.Theme.getFont("default")
                     renderType: Text.NativeRendering
 
                     linkColor: UM.Theme.getColor("text_link")

From 242da1b3aa27620aaa14812aca21536cf9b71148 Mon Sep 17 00:00:00 2001
From: Ghostkeeper <rubend@tutanota.com>
Date: Tue, 28 Jan 2020 14:47:00 +0100
Subject: [PATCH 13/16] Give web marketplace button a hover colour

It needs to be the same as the bar beneath the marketplace tab buttons when highlit.

Contributes to issue CURA-7071.
---
 plugins/Toolbox/resources/qml/components/ToolboxHeader.qml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/Toolbox/resources/qml/components/ToolboxHeader.qml b/plugins/Toolbox/resources/qml/components/ToolboxHeader.qml
index e0cdb44d7d..3cba9a9ece 100644
--- a/plugins/Toolbox/resources/qml/components/ToolboxHeader.qml
+++ b/plugins/Toolbox/resources/qml/components/ToolboxHeader.qml
@@ -80,6 +80,7 @@ Item
 
     UM.TooltipArea
     {
+        id: webMarketplaceButtonTooltipArea
         width: childrenRect.width
         height: parent.height
         text: catalog.i18nc("@info:tooltip", "Go to Web Marketplace")
@@ -94,7 +95,7 @@ Item
         {
             id: cloudMarketplaceButton
             source: "../../images/shop.svg"
-            color: UM.Theme.getColor("text")
+            color: UM.Theme.getColor(webMarketplaceButtonTooltipArea.containsMouse ? "primary" : "text")
             height: parent.height / 2
             width: height
             anchors.verticalCenter: parent.verticalCenter

From e79b3beed11717cbdec5567ea6e872bfdeefed19 Mon Sep 17 00:00:00 2001
From: Jaime van Kessel <nallath@gmail.com>
Date: Thu, 30 Jan 2020 09:39:56 +0100
Subject: [PATCH 14/16] Remove unused URL

CURA-7071
---
 cura/ApplicationMetadata.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/cura/ApplicationMetadata.py b/cura/ApplicationMetadata.py
index 449cc6848a..85b097c0ba 100644
--- a/cura/ApplicationMetadata.py
+++ b/cura/ApplicationMetadata.py
@@ -56,5 +56,3 @@ try:
 
 except ImportError:
     CuraAppDisplayName = DEFAULT_CURA_DISPLAY_NAME
-
-WEB_MARKETPLACE_URL = "https://marketplace.ultimaker.com/app/cura/materials"
\ No newline at end of file

From 18163af5a355eb7ee997cd5096fb92352b344992 Mon Sep 17 00:00:00 2001
From: Jaime van Kessel <nallath@gmail.com>
Date: Thu, 30 Jan 2020 09:42:51 +0100
Subject: [PATCH 15/16] Ensure that the default default marketplace URL is used
 when not defined

CURA-7071
---
 plugins/Toolbox/src/Toolbox.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/plugins/Toolbox/src/Toolbox.py b/plugins/Toolbox/src/Toolbox.py
index c957a0c10c..d2ce4c9011 100644
--- a/plugins/Toolbox/src/Toolbox.py
+++ b/plugins/Toolbox/src/Toolbox.py
@@ -16,7 +16,7 @@ from UM.i18n import i18nCatalog
 from UM.Version import Version
 
 from cura import ApplicationMetadata
-from cura.CuraVersion import CuraMarketplaceRoot
+
 from cura.CuraApplication import CuraApplication
 from cura.Machines.ContainerTree import ContainerTree
 from plugins.Toolbox.src.CloudApiModel import CloudApiModel
@@ -35,6 +35,11 @@ i18n_catalog = i18nCatalog("cura")
 
 DEFAULT_MARKETPLACE_ROOT = "https://marketplace.ultimaker.com"  # type: str
 
+try:
+    from cura.CuraVersion import CuraMarketplaceRoot
+except ImportError:
+    CuraMarketplaceRoot = DEFAULT_MARKETPLACE_ROOT
+
 # todo Remove license and download dialog, use SyncOrchestrator instead
 
 ##  Provides a marketplace for users to download plugins an materials

From d15e64cc5b81a1caba013361c02d096298d38ebe Mon Sep 17 00:00:00 2001
From: Jaime van Kessel <nallath@gmail.com>
Date: Thu, 30 Jan 2020 09:44:15 +0100
Subject: [PATCH 16/16] Remove unused import

---
 plugins/Toolbox/src/Toolbox.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/plugins/Toolbox/src/Toolbox.py b/plugins/Toolbox/src/Toolbox.py
index d2ce4c9011..dac985c28a 100644
--- a/plugins/Toolbox/src/Toolbox.py
+++ b/plugins/Toolbox/src/Toolbox.py
@@ -24,7 +24,6 @@ from plugins.Toolbox.src.CloudApiModel import CloudApiModel
 from .AuthorsModel import AuthorsModel
 from .CloudSync.LicenseModel import LicenseModel
 from .PackagesModel import PackagesModel
-from .CloudSync.SubscribedPackagesModel import SubscribedPackagesModel
 from .UltimakerCloudScope import UltimakerCloudScope
 
 if TYPE_CHECKING: