From 9735daf4974d2ddc22ba9df752fa817751848852 Mon Sep 17 00:00:00 2001
From: Jaime van Kessel <nallath@gmail.com>
Date: Tue, 29 Jun 2021 16:21:39 +0200
Subject: [PATCH] Replace the extruder icon with the new design

CURA-8011
---
 resources/qml/ExtruderIcon.qml                | 51 +++++++------------
 .../cura-light/icons/medium/ExtruderColor.svg | 11 ++++
 2 files changed, 29 insertions(+), 33 deletions(-)
 create mode 100644 resources/themes/cura-light/icons/medium/ExtruderColor.svg

diff --git a/resources/qml/ExtruderIcon.qml b/resources/qml/ExtruderIcon.qml
index 1c93966519..2d21ed9e13 100644
--- a/resources/qml/ExtruderIcon.qml
+++ b/resources/qml/ExtruderIcon.qml
@@ -1,7 +1,7 @@
-// Copyright (c) 2018 Ultimaker B.V.
+// Copyright (c) 2021 Ultimaker B.V.
 // Cura is released under the terms of the LGPLv3 or higher.
 
-import QtQuick 2.7
+import QtQuick 2.11
 import QtQuick.Controls 1.1
 import UM 1.2 as UM
 
@@ -17,29 +17,26 @@ Item
     property alias textColor: extruderNumberText.color
     property bool extruderEnabled: true
 
-    UM.RecolorImage
+    Item
     {
-        id: mainIcon
+        opacity: extruderEnabled ? 1 : 0.4
         anchors.fill: parent
 
-        source: UM.Theme.getIcon("Extruder", "medium")
-        color: extruderEnabled ? materialColor: UM.Theme.getColor("disabled")
-    }
-
-    Rectangle
-    {
-        id: extruderNumberCircle
-
-        width: height
-        height: Math.round(parent.height / 2)
-        radius: Math.round(width)
-        color: UM.Theme.getColor("toolbar_background")
-
-        anchors
+        UM.RecolorImage
         {
-            horizontalCenter: parent.horizontalCenter
-            top: parent.top
-            topMargin: (parent.height - height) / 2
+            id: blorp
+            anchors.fill: parent
+
+            source: UM.Theme.getIcon("ExtruderColor", "medium")
+            color: materialColor
+        }
+        UM.RecolorImage
+        {
+            id: mainIcon
+            anchors.fill: parent
+
+            source: UM.Theme.getIcon("Extruder", "medium")
+            color: UM.Theme.getColor("text")
         }
 
         Label
@@ -51,21 +48,9 @@ Item
             color: UM.Theme.getColor("text")
             width: contentWidth
             height: contentHeight
-            visible: extruderEnabled
             renderType: Text.NativeRendering
             horizontalAlignment: Text.AlignHCenter
             verticalAlignment: Text.AlignVCenter
         }
-
-        UM.RecolorImage
-        {
-            id: disabledIcon
-            anchors.fill: parent
-            anchors.margins: UM.Theme.getSize("thick_lining").width
-            sourceSize.height: width
-            source: UM.Theme.getIcon("Cancel")
-            visible: !extruderEnabled
-            color: UM.Theme.getColor("text")
-        }
     }
 }
diff --git a/resources/themes/cura-light/icons/medium/ExtruderColor.svg b/resources/themes/cura-light/icons/medium/ExtruderColor.svg
new file mode 100644
index 0000000000..c017c69106
--- /dev/null
+++ b/resources/themes/cura-light/icons/medium/ExtruderColor.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 30 30" style="enable-background:new 0 0 30 30;" xml:space="preserve">
+<g id="Layer_1">
+	<path style="fill:#231F20;" d="M15,25C9.486,25,5,20.514,5,15S9.486,5,15,5s10,4.486,10,10S20.514,25,15,25z M15,7
+		c-4.411,0-8,3.589-8,8s3.589,8,8,8s8-3.589,8-8S19.411,7,15,7z"/>
+</g>
+<g id="Comments">
+</g>
+</svg>