CURA-4870 Final icon changes from Luke

resources/qml/Menus/ConfigurationMenu/SyncButton.qml

@@ -70,11 +70,11 @@ Button
                 anchors.leftMargin: UM.Theme.getSize("default_margin").width
                 anchors.verticalCenter: parent.verticalCenter;
 
-                width: UM.Theme.getSize("printer_status_icon").width
-                height: UM.Theme.getSize("printer_status_icon").height
+                width: UM.Theme.getSize("printer_sync_icon").width
+                height: UM.Theme.getSize("printer_sync_icon").height
 
                 color:  control.matched ? UM.Theme.getColor("printer_config_matched") : UM.Theme.getColor("printer_config_mismatch")
-                source: control.matched ? UM.Theme.getIcon("tab_status_connected") : UM.Theme.getIcon("tab_status_unknown")
+                source: UM.Theme.getIcon("tab_status_connected")
                 sourceSize.width: width
                 sourceSize.height: height
             }

resources/qml/Menus/PrinterStatusIcon.qml

@@ -16,8 +16,8 @@ Item {
         height: UM.Theme.getSize("printer_status_icon").height
         sourceSize.width: width
         sourceSize.height: width
-        color: UM.Theme.getColor("tab_status_" + parent.status )
-        source: UM.Theme.getIcon( parent.status )
+        color: UM.Theme.getColor("tab_status_" + parent.status)
+        source: UM.Theme.getIcon(parent.status)
     }
 }
 

resources/themes/cura-light/icons/connected.svg

@@ -1,14 +1,5 @@
 <svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 49 (51002) - http://www.bohemiancoding.com/sketch -->
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="connected_24" fill="#00B8E9">
-            <g id="Connected" transform="translate(1.500000, 1.500000)">
-                <path d="M15,12 C11.6862915,12 9,9.3137085 9,6 C9,2.6862915 11.6862915,0 15,0 C18.3137085,0 21,2.6862915 21,6 C21,9.3137085 18.3137085,12 15,12 Z M15,9 C16.6568542,9 18,7.65685425 18,6 C18,4.34314575 16.6568542,3 15,3 C13.3431458,3 12,4.34314575 12,6 C12,7.65685425 13.3431458,9 15,9 Z" id="Combined-Shape" fill-rule="evenodd"></path>
-                <path d="M6,21 C2.6862915,21 0,18.3137085 0,15 C0,11.6862915 2.6862915,9 6,9 C9.3137085,9 12,11.6862915 12,15 C12,18.3137085 9.3137085,21 6,21 Z M6,18 C7.65685425,18 9,16.6568542 9,15 C9,13.3431458 7.65685425,12 6,12 C4.34314575,12 3,13.3431458 3,15 C3,16.6568542 4.34314575,18 6,18 Z" id="Combined-Shape" fill-rule="evenodd"></path>
-                <path d="M7.06066017,16.0606602 C6.47487373,16.6464466 5.52512627,16.6464466 4.93933983,16.0606602 C4.35355339,15.4748737 4.35355339,14.5251263 4.93933983,13.9393398 L13.9393398,4.93933983 C14.5251263,4.35355339 15.4748737,4.35355339 16.0606602,4.93933983 C16.6464466,5.52512627 16.6464466,6.47487373 16.0606602,7.06066017 L7.06066017,16.0606602 Z" id="Path" fill-rule="nonzero"></path>
-            </g>
-        </g>
-    </g>
+    <polygon id="Polygon" points="15 8 16 9 9 16 8 15"></polygon>
+    <circle id="Oval-2" cx="6" cy="18" r="4"></circle>
+    <circle id="Oval-2-Copy" cx="18" cy="6" r="4"></circle>
 </svg>

resources/themes/cura-light/icons/disconnected.svg

@@ -1,13 +1,6 @@
 <svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 49 (51002) - http://www.bohemiancoding.com/sketch -->
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="disconnected_24" fill="#FFA34E">
-            <g id="Disconnected">
-                <path d="M18,12 C14.6862915,12 12,9.3137085 12,6 C12,2.6862915 14.6862915,0 18,0 C21.3137085,0 24,2.6862915 24,6 C24,9.3137085 21.3137085,12 18,12 Z M18,9 C19.6568542,9 21,7.65685425 21,6 C21,4.34314575 19.6568542,3 18,3 C16.3431458,3 15,4.34314575 15,6 C15,7.65685425 16.3431458,9 18,9 Z" id="Combined-Shape"></path>
-                <path d="M6,24 C2.6862915,24 0,21.3137085 0,18 C0,14.6862915 2.6862915,12 6,12 C9.3137085,12 12,14.6862915 12,18 C12,21.3137085 9.3137085,24 6,24 Z M6,21 C7.65685425,21 9,19.6568542 9,18 C9,16.3431458 7.65685425,15 6,15 C4.34314575,15 3,16.3431458 3,18 C3,19.6568542 4.34314575,21 6,21 Z" id="Combined-Shape"></path>
-            </g>
-        </g>
-    </g>
+    <circle id="Oval-2" stroke="#FFFFFF" cx="4" cy="20" r="3.5"></circle>
+    <circle id="Oval-2-Copy" stroke="#FFFFFF" cx="20" cy="4" r="3.5"></circle>
+    <polygon id="Polygon" fill="#FFFFFF" points="11 12 12 13 9 16 8 15"></polygon>
+    <polygon id="Polygon-Copy" fill="#FFFFFF" points="15 8 16 9 13 12 12 11"></polygon>
 </svg>

resources/themes/cura-light/theme.json

@@ -309,15 +309,11 @@
         "configuration_item_border_active": [12, 169, 227, 32],
         "configuration_item_border_hover": [12, 169, 227, 255],
 
-        "tab_status_busy": [255, 255, 255, 255],
         "tab_status_connected": [12, 169, 227, 255],
-        "tab_status_finished": [255, 255, 255, 255],
-        "tab_status_paused": [255, 255, 255, 255],
-        "tab_status_stopped": [255, 255, 255, 255],
         "tab_status_disconnected": [200, 200, 200, 255],
 
         "printer_config_matched": [12, 169, 227, 255],
-        "printer_config_mismatch": [255, 145, 62, 255]
+        "printer_config_mismatch": [127, 127, 127, 255]
     },
 
     "sizes": {
@@ -370,7 +366,8 @@
         "small_button": [2, 2],
         "small_button_icon": [1.5, 1.5],
 
-        "printer_status_icon": [1.2, 1.2],
+        "printer_status_icon": [1.8, 1.8],
+        "printer_sync_icon": [1.2, 1.2],
 
         "topbar_logo_right_margin": [3, 0],
         "topbar_button": [8, 4],