From 17e62ea6c1183595345c5a0cbb13d94affc4efa9 Mon Sep 17 00:00:00 2001
From: Ghostkeeper <rubend@tutanota.com>
Date: Wed, 23 Aug 2017 13:35:47 +0200
Subject: [PATCH] Let theme decide upon coloured icons

We shouldn't colour the icons themselves, but rather let UM.RecolourImage choose the colours for just the outlines of the icons.

Contributes to issue CURA-4148.
---
 resources/themes/cura/icons/drop_down_button.svg | 2 +-
 resources/themes/cura/icons/notice.svg           | 2 +-
 resources/themes/cura/icons/tab_monitor.svg      | 6 ++----
 resources/themes/cura/icons/viewmode.svg         | 2 +-
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/resources/themes/cura/icons/drop_down_button.svg b/resources/themes/cura/icons/drop_down_button.svg
index 57124329a6..18748e6d70 100644
--- a/resources/themes/cura/icons/drop_down_button.svg
+++ b/resources/themes/cura/icons/drop_down_button.svg
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <svg width="7px" height="5px" viewBox="0 0 7 5" version="1.1" xmlns="http://www.w3.org/2000/svg">
-    <polygon fill="#FFFFFF" opacity="0.75" points="3.5 5 7 0 0 0" />
+    <polygon points="3.5 5 7 0 0 0" />
 </svg>
\ No newline at end of file
diff --git a/resources/themes/cura/icons/notice.svg b/resources/themes/cura/icons/notice.svg
index 9283161ffd..36154d6729 100644
--- a/resources/themes/cura/icons/notice.svg
+++ b/resources/themes/cura/icons/notice.svg
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="15" height="15" viewBox="0 0 15 15" xmlns="http://www.w3.org/2000/svg">
-    <path fill="#959799" d="M7.5 15C11.641 15 15 11.643 15 7.5 15 3.358 11.641 0 7.5 0 3.358 0 0 3.358 0 7.5 0 11.643 3.358 15 7.5 15ZM8.6 12.369L6.472 12.369 6.472 4.57 8.6 4.57 8.6 12.369ZM7.541 1.514C8.313 1.514 8.697 1.861 8.697 2.553 8.697 2.885 8.6 3.141 8.409 3.325 8.216 3.509 7.926 3.601 7.541 3.601 6.767 3.601 6.382 3.252 6.382 2.553 6.382 1.861 6.767 1.514 7.541 1.514Z"/>
+    <path d="M7.5 15C11.641 15 15 11.643 15 7.5 15 3.358 11.641 0 7.5 0 3.358 0 0 3.358 0 7.5 0 11.643 3.358 15 7.5 15ZM8.6 12.369L6.472 12.369 6.472 4.57 8.6 4.57 8.6 12.369ZM7.541 1.514C8.313 1.514 8.697 1.861 8.697 2.553 8.697 2.885 8.6 3.141 8.409 3.325 8.216 3.509 7.926 3.601 7.541 3.601 6.767 3.601 6.382 3.252 6.382 2.553 6.382 1.861 6.767 1.514 7.541 1.514Z"/>
 </svg>
\ No newline at end of file
diff --git a/resources/themes/cura/icons/tab_monitor.svg b/resources/themes/cura/icons/tab_monitor.svg
index 108c251eb4..b01f41897d 100644
--- a/resources/themes/cura/icons/tab_monitor.svg
+++ b/resources/themes/cura/icons/tab_monitor.svg
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="26px" height="28px" viewBox="0 0 26 28" version="1.1" xmlns="http://www.w3.org/2000/svg">
-    <g fill="#A8AAAC">
-        <path d="M0,0 L0,28 L2.64086062,28 C2.67335978,28 2.70502317,27.98957 2.73011987,27.97067 C3.38991714,27.47325 4.06401787,27.28831 5.2172244,27.28831 L11.0399455,27.2882365 C10.522729,26.8243931 15.503457,26.273422 15.503457,25.542902 C15.503457,24.7341453 10.59587,23.9048809 11.2128286,23.4394043 L4.98531273,23.4395 C3.60184219,23.4395 2.47633515,22.3615933 2.47633515,21.03668 L2.47633515,3.0926 C2.47633515,2.72470333 2.78754857,2.42536 3.17011207,2.42536 L22.5594744,2.42536 C22.9421334,2.42536 23.2534423,2.72470333 23.2534423,3.0926 L23.2534423,21.03668 C23.2534423,22.3615933 22.1277443,23.4395 20.7440827,23.4395 L14.4892494,23.4399986 C15.106208,23.9054753 15.503457,24.62614 15.503457,25.4348967 C15.503457,26.1654167 15.179349,26.8261576 14.6621325,27.2900009 L20.5125053,27.28831 C21.6655447,27.28831 22.3395977,27.4732033 22.999586,27.97067 C23.0247066,27.9895233 23.0564893,28 23.0888452,28 L25.7297297,28 L25.7297297,0 L0,0 Z" />
-        <polygon points="9.08108108 23.4399986 17.4054054 23.4399986 17.4054054 27.2900009 9.08108108 27.2900009" />
-    </g>
+    <path d="M0,0 L0,28 L2.64086062,28 C2.67335978,28 2.70502317,27.98957 2.73011987,27.97067 C3.38991714,27.47325 4.06401787,27.28831 5.2172244,27.28831 L11.0399455,27.2882365 C10.522729,26.8243931 15.503457,26.273422 15.503457,25.542902 C15.503457,24.7341453 10.59587,23.9048809 11.2128286,23.4394043 L4.98531273,23.4395 C3.60184219,23.4395 2.47633515,22.3615933 2.47633515,21.03668 L2.47633515,3.0926 C2.47633515,2.72470333 2.78754857,2.42536 3.17011207,2.42536 L22.5594744,2.42536 C22.9421334,2.42536 23.2534423,2.72470333 23.2534423,3.0926 L23.2534423,21.03668 C23.2534423,22.3615933 22.1277443,23.4395 20.7440827,23.4395 L14.4892494,23.4399986 C15.106208,23.9054753 15.503457,24.62614 15.503457,25.4348967 C15.503457,26.1654167 15.179349,26.8261576 14.6621325,27.2900009 L20.5125053,27.28831 C21.6655447,27.28831 22.3395977,27.4732033 22.999586,27.97067 C23.0247066,27.9895233 23.0564893,28 23.0888452,28 L25.7297297,28 L25.7297297,0 L0,0 Z" />
+    <polygon points="9.08108108 23.4399986 17.4054054 23.4399986 17.4054054 27.2900009 9.08108108 27.2900009" />
 </svg>
\ No newline at end of file
diff --git a/resources/themes/cura/icons/viewmode.svg b/resources/themes/cura/icons/viewmode.svg
index 50612f49b2..4ecd5661c6 100644
--- a/resources/themes/cura/icons/viewmode.svg
+++ b/resources/themes/cura/icons/viewmode.svg
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="24" height="14" viewBox="0 0 24 14" xmlns="http://www.w3.org/2000/svg">
-    <path fill="#CFCFCF" d="M12.002 0L12 0 12 0C12 0 12 0 11.998 0 6.239 0 1.408 2.974 0 6.999 1.407 11.026 6.238 14 11.998 14 17.76 14 22.594 11.026 24 6.999 22.594 2.974 17.762 0.001 12.002 0ZM11.998 13C6.93 13 2.487 10.679 1 7.305 2.129 4.744 4.964 2.792 8.481 2 7.413 3.034 6.728 4.513 6.728 6.177 6.728 9.293 9.087 11.82 11.999 11.82 14.914 11.82 17.272 9.293 17.272 6.177 17.272 4.514 16.588 3.035 15.52 2.002 19.038 2.794 21.872 4.745 23 7.305 21.515 10.679 17.07 13 11.998 13Z" />
+    <path d="M12.002 0L12 0 12 0C12 0 12 0 11.998 0 6.239 0 1.408 2.974 0 6.999 1.407 11.026 6.238 14 11.998 14 17.76 14 22.594 11.026 24 6.999 22.594 2.974 17.762 0.001 12.002 0ZM11.998 13C6.93 13 2.487 10.679 1 7.305 2.129 4.744 4.964 2.792 8.481 2 7.413 3.034 6.728 4.513 6.728 6.177 6.728 9.293 9.087 11.82 11.999 11.82 14.914 11.82 17.272 9.293 17.272 6.177 17.272 4.514 16.588 3.035 15.52 2.002 19.038 2.794 21.872 4.745 23 7.305 21.515 10.679 17.07 13 11.998 13Z" />
 </svg>
\ No newline at end of file