From a5ba4799f0ce613b92414db66b278036d4e88ffc Mon Sep 17 00:00:00 2001 From: Ian Paschal Date: Mon, 12 Mar 2018 14:48:39 +0100 Subject: [PATCH] CURA-4870 Final icon changes from Luke --- .../qml/Menus/ConfigurationMenu/SyncButton.qml | 6 +++--- resources/qml/Menus/PrinterStatusIcon.qml | 4 ++-- resources/themes/cura-light/icons/connected.svg | 15 +++------------ .../themes/cura-light/icons/disconnected.svg | 15 ++++----------- resources/themes/cura-light/theme.json | 9 +++------ 5 files changed, 15 insertions(+), 34 deletions(-) diff --git a/resources/qml/Menus/ConfigurationMenu/SyncButton.qml b/resources/qml/Menus/ConfigurationMenu/SyncButton.qml index d22dcb1247..3748fd0cb4 100644 --- a/resources/qml/Menus/ConfigurationMenu/SyncButton.qml +++ b/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 } diff --git a/resources/qml/Menus/PrinterStatusIcon.qml b/resources/qml/Menus/PrinterStatusIcon.qml index c76ed8bdcb..f66834d0c0 100644 --- a/resources/qml/Menus/PrinterStatusIcon.qml +++ b/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) } } diff --git a/resources/themes/cura-light/icons/connected.svg b/resources/themes/cura-light/icons/connected.svg index 4f0f10bff4..18423bb6c4 100644 --- a/resources/themes/cura-light/icons/connected.svg +++ b/resources/themes/cura-light/icons/connected.svg @@ -1,14 +1,5 @@ - - Created with Sketch. - - - - - - - - - - + + + \ No newline at end of file diff --git a/resources/themes/cura-light/icons/disconnected.svg b/resources/themes/cura-light/icons/disconnected.svg index 2a045c5f1d..019dff117e 100644 --- a/resources/themes/cura-light/icons/disconnected.svg +++ b/resources/themes/cura-light/icons/disconnected.svg @@ -1,13 +1,6 @@ - - Created with Sketch. - - - - - - - - - + + + + \ No newline at end of file diff --git a/resources/themes/cura-light/theme.json b/resources/themes/cura-light/theme.json index ce6b406d3d..c0b71ac618 100644 --- a/resources/themes/cura-light/theme.json +++ b/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],