From fa4c69cb2b5f5d85613c9dbd5dc146e33a688063 Mon Sep 17 00:00:00 2001
From: Ghostkeeper <rubend@tutanota.com>
Date: Mon, 5 Jul 2021 15:09:15 +0200
Subject: [PATCH] Merge CloudBlueBG and CloudGreyBG into one icon without
 colour

We don't use the colour of icons. The colour is determined by the theme, and recoloured by UM.RecolorImage.

Contributes to issue CURA-8247.
---
 resources/qml/PrinterSelector/MachineSelector.qml         | 8 ++------
 .../icons/low/{CloudBlueBG.svg => CloudBadge.svg}         | 2 +-
 resources/themes/cura-light/icons/low/CloudGreyBG.svg     | 5 -----
 3 files changed, 3 insertions(+), 12 deletions(-)
 rename resources/themes/cura-light/icons/low/{CloudBlueBG.svg => CloudBadge.svg} (59%)
 delete mode 100644 resources/themes/cura-light/icons/low/CloudGreyBG.svg

diff --git a/resources/qml/PrinterSelector/MachineSelector.qml b/resources/qml/PrinterSelector/MachineSelector.qml
index 7c74be1605..56728aeea0 100644
--- a/resources/qml/PrinterSelector/MachineSelector.qml
+++ b/resources/qml/PrinterSelector/MachineSelector.qml
@@ -124,13 +124,9 @@ Cura.ExpandablePopup
                 {
                     return UM.Theme.getIcon("CheckBlueBG", "low")
                 }
-                else if (connectionStatus == "printer_cloud_connected")
+                else if (connectionStatus == "printer_cloud_connected" || connectionStatus == "printer_cloud_not_available")
                 {
-                    return UM.Theme.getIcon("CloudBlueBG", "low")
-                }
-                else if (connectionStatus == "printer_cloud_not_available")
-                {
-                    return UM.Theme.getIcon("CloudGreyBG", "low")
+                    return UM.Theme.getIcon("CloudBadge", "low")
                 }
                 else
                 {
diff --git a/resources/themes/cura-light/icons/low/CloudBlueBG.svg b/resources/themes/cura-light/icons/low/CloudBadge.svg
similarity index 59%
rename from resources/themes/cura-light/icons/low/CloudBlueBG.svg
rename to resources/themes/cura-light/icons/low/CloudBadge.svg
index a3c092992d..e37fb324d4 100644
--- a/resources/themes/cura-light/icons/low/CloudBlueBG.svg
+++ b/resources/themes/cura-light/icons/low/CloudBadge.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 12 12">
-<path fill="#196EF0" d="M6,0C2.7,0,0,2.7,0,6s2.7,6,6,6s6-2.7,6-6S9.3,0,6,0z M7,9H4C2.9,9,2,8.1,2,7s0.9-2,2-2c0.1,0,0.1,0,0.2,0
+<path d="M6,0C2.7,0,0,2.7,0,6s2.7,6,6,6s6-2.7,6-6S9.3,0,6,0z M7,9H4C2.9,9,2,8.1,2,7s0.9-2,2-2c0.1,0,0.1,0,0.2,0
 	C4.6,3.8,5.7,3,7,3c1.7,0,3,1.3,3,3S8.7,9,7,9z" />
 </svg>
diff --git a/resources/themes/cura-light/icons/low/CloudGreyBG.svg b/resources/themes/cura-light/icons/low/CloudGreyBG.svg
deleted file mode 100644
index 0637dd7de9..0000000000
--- a/resources/themes/cura-light/icons/low/CloudGreyBG.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 12 12">
-<path fill="#6C6C6C" d="M6,0C2.7,0,0,2.7,0,6s2.7,6,6,6s6-2.7,6-6S9.3,0,6,0z M7,9H4C2.9,9,2,8.1,2,7s0.9-2,2-2c0.1,0,0.1,0,0.2,0
-	C4.6,3.8,5.7,3,7,3c1.7,0,3,1.3,3,3S8.7,9,7,9z" />
-</svg>