From c25b94ce3174256f377e0e657d99ff288a27a6a6 Mon Sep 17 00:00:00 2001
From: Ghostkeeper <rubend@tutanota.com>
Date: Fri, 25 Aug 2017 13:02:51 +0200
Subject: [PATCH] Move status icons to the middle-right side of monitor icon

They are actually moved inside the image, rather than in code. This way the theme can still adjust the icon.

Contributes to issue CURA-4148.
---
 resources/themes/cura/icons/tab_monitor.svg          |  2 +-
 resources/themes/cura/icons/tab_status_busy.svg      | 12 +++++++-----
 resources/themes/cura/icons/tab_status_connected.svg |  8 +++++---
 resources/themes/cura/icons/tab_status_paused.svg    | 10 ++++++----
 resources/themes/cura/icons/tab_status_stopped.svg   | 10 ++++++----
 resources/themes/cura/icons/tab_status_unknown.svg   | 10 ++++++----
 6 files changed, 31 insertions(+), 21 deletions(-)

diff --git a/resources/themes/cura/icons/tab_monitor.svg b/resources/themes/cura/icons/tab_monitor.svg
index b01f41897d..99c1a508b9 100644
--- a/resources/themes/cura/icons/tab_monitor.svg
+++ b/resources/themes/cura/icons/tab_monitor.svg
@@ -1,5 +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">
+<svg width="35px" height="28px" viewBox="0 0 35 28" version="1.1" xmlns="http://www.w3.org/2000/svg">
     <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/tab_status_busy.svg b/resources/themes/cura/icons/tab_status_busy.svg
index 7f702132b5..7b5774e71b 100644
--- a/resources/themes/cura/icons/tab_status_busy.svg
+++ b/resources/themes/cura/icons/tab_status_busy.svg
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="18px" height="18px" viewBox="0 0 18 18" version="1.1" xmlns="http://www.w3.org/2000/svg">
-    <circle fill="#0CA9E3" cx="9" cy="9" r="8.5" stroke="#272C30" />
-    <circle fill="#FFFFFF" cx="4" cy="9" r="1.75" />
-    <circle fill="#FFFFFF" cx="9" cy="9" r="1.75" />
-    <circle fill="#FFFFFF" cx="14" cy="9" r="1.75" />
+<svg width="35px" height="28px" viewBox="0 0 35 28" version="1.1" xmlns="http://www.w3.org/2000/svg">
+    <g transform="translate(15.5, 4)">
+        <circle fill="#0CA9E3" cx="9" cy="9" r="8.5" stroke="#272C30" />
+        <circle fill="#FFFFFF" cx="4" cy="9" r="1.75" />
+        <circle fill="#FFFFFF" cx="9" cy="9" r="1.75" />
+        <circle fill="#FFFFFF" cx="14" cy="9" r="1.75" />
+    </g>
 </svg>
\ No newline at end of file
diff --git a/resources/themes/cura/icons/tab_status_connected.svg b/resources/themes/cura/icons/tab_status_connected.svg
index 4f50430b2a..7997ffbee6 100644
--- a/resources/themes/cura/icons/tab_status_connected.svg
+++ b/resources/themes/cura/icons/tab_status_connected.svg
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="18px" height="18px" viewBox="0 0 18 18" version="1.1" xmlns="http://www.w3.org/2000/svg">
-    <circle fill="#10CB00" cx="9" cy="9" r="8.5" stroke="#272C30" />
-    <polyline fill="none" stroke="#FFFFFF" stroke-width="2" points="5.643,8.645 8.116,11.12 12.36,6.88" />
+<svg width="35px" height="28px" viewBox="0 0 35 28" version="1.1" xmlns="http://www.w3.org/2000/svg">
+    <g transform="translate(15.5, 4)">
+        <circle fill="#10CB00" cx="9" cy="9" r="8.5" stroke="#272C30" />
+        <polyline fill="none" stroke="#FFFFFF" stroke-width="2" points="5.643,8.645 8.116,11.12 12.36,6.88" />
+    </g>
 </svg>
\ No newline at end of file
diff --git a/resources/themes/cura/icons/tab_status_paused.svg b/resources/themes/cura/icons/tab_status_paused.svg
index 72f24753b5..606d4cb96c 100644
--- a/resources/themes/cura/icons/tab_status_paused.svg
+++ b/resources/themes/cura/icons/tab_status_paused.svg
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="18px" height="18px" viewBox="0 0 18 18" version="1.1" xmlns="http://www.w3.org/2000/svg">
-    <circle fill="#FF8C10" cx="9" cy="9" r="8.5" stroke="#272C30" />
-    <rect fill="#FFFFFF" x="6" y="6" width="2" height="6" />
-    <rect fill="#FFFFFF" x="10" y="6" width="2" height="6" />
+<svg width="35px" height="28px" viewBox="0 0 35 28" version="1.1" xmlns="http://www.w3.org/2000/svg">
+    <g transform="translate(15.5, 4)">
+        <circle fill="#FF8C10" cx="9" cy="9" r="8.5" stroke="#272C30" />
+        <rect fill="#FFFFFF" x="6" y="6" width="2" height="6" />
+        <rect fill="#FFFFFF" x="10" y="6" width="2" height="6" />
+    </g>
 </svg>
\ No newline at end of file
diff --git a/resources/themes/cura/icons/tab_status_stopped.svg b/resources/themes/cura/icons/tab_status_stopped.svg
index 99dfe0b8d1..6cd0f18b17 100644
--- a/resources/themes/cura/icons/tab_status_stopped.svg
+++ b/resources/themes/cura/icons/tab_status_stopped.svg
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="18px" height="18px" viewBox="0 0 18 18" version="1.1" xmlns="http://www.w3.org/2000/svg">
-    <circle fill="#D0021B" cx="9" cy="9" r="8.5" stroke="#272C30" />
-    <line x1="6" y1="6" x2="12" y2="12" stroke-width="2" stroke="#FFFFFF" />
-    <line x1="6" y1="12" x2="12" y2="6" stroke-width="2" stroke="#FFFFFF" />
+<svg width="35px" height="28px" viewBox="0 0 35 28" version="1.1" xmlns="http://www.w3.org/2000/svg">
+    <g transform="translate(15.5, 4)">
+        <circle fill="#D0021B" cx="9" cy="9" r="8.5" stroke="#272C30" />
+        <line x1="6" y1="6" x2="12" y2="12" stroke-width="2" stroke="#FFFFFF" />
+        <line x1="6" y1="12" x2="12" y2="6" stroke-width="2" stroke="#FFFFFF" />
+    </g>
 </svg>
\ No newline at end of file
diff --git a/resources/themes/cura/icons/tab_status_unknown.svg b/resources/themes/cura/icons/tab_status_unknown.svg
index ec776a2778..5e46eec55b 100644
--- a/resources/themes/cura/icons/tab_status_unknown.svg
+++ b/resources/themes/cura/icons/tab_status_unknown.svg
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="18" height="18" viewBox="0 0 18 18" xmlns="http://www.w3.org/2000/svg">
-    <circle cx="9" cy="9" r="8.5" fill="#8B9595" stroke="#272C30" />
-    <path fill="#FFFFFF" d="M9.013 3.5C7.29 3.5 6.533 4.515 6.236 5.12 5.989 5.623 5.997 6.057 6.001 6.138L7.59 6.058 7.591 6.082C7.591 6.081 7.594 5.964 7.664 5.821 7.905 5.33 8.347 5.091 9.013 5.091 9.47 5.091 9.817 5.217 10.075 5.475 10.477 5.878 10.556 6.485 10.555 6.626 10.554 6.812 10.49 7.77 9.306 8.386 8.318 8.899 7.752 9.906 7.752 11.147L7.752 11.621 9.343 11.618 9.342 11.147C9.342 10.697 9.463 10.097 10.039 9.798 12.035 8.76 12.144 6.98 12.146 6.633 12.148 6.141 11.952 5.106 11.202 4.353 10.647 3.795 9.89 3.5 9.013 3.5Z"/>
-    <rect fill="#FFFFFF" x="7.818" y="13.136" width="1.591" height="1.25" />
+<svg width="35" height="28" viewBox="0 0 35 28" xmlns="http://www.w3.org/2000/svg">
+    <g transform="translate(15.5, 4)">
+        <circle cx="9" cy="9" r="8.5" fill="#8B9595" stroke="#272C30" />
+        <path fill="#FFFFFF" d="M9.013 3.5C7.29 3.5 6.533 4.515 6.236 5.12 5.989 5.623 5.997 6.057 6.001 6.138L7.59 6.058 7.591 6.082C7.591 6.081 7.594 5.964 7.664 5.821 7.905 5.33 8.347 5.091 9.013 5.091 9.47 5.091 9.817 5.217 10.075 5.475 10.477 5.878 10.556 6.485 10.555 6.626 10.554 6.812 10.49 7.77 9.306 8.386 8.318 8.899 7.752 9.906 7.752 11.147L7.752 11.621 9.343 11.618 9.342 11.147C9.342 10.697 9.463 10.097 10.039 9.798 12.035 8.76 12.144 6.98 12.146 6.633 12.148 6.141 11.952 5.106 11.202 4.353 10.647 3.795 9.89 3.5 9.013 3.5Z"/>
+        <rect fill="#FFFFFF" x="7.818" y="13.136" width="1.591" height="1.25" />
+    </g>
 </svg>
\ No newline at end of file