From 812017c8140b0990451b6f9fb0f39c62b5783a38 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 28 Jan 2020 11:29:01 +0100 Subject: [PATCH] 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 @@ + + + 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 {