From f887db23f6dc1e9e1b71d88389f8b7582256731b Mon Sep 17 00:00:00 2001 From: Kostas Karmas Date: Wed, 28 Apr 2021 18:53:32 +0200 Subject: [PATCH] Use detail_level to describe the icons (instead of size) Previously the icons were organized according to "size" which could prove to be confusing. This commit fixes that by organizing them according to "detail_level". CURA-8010 --- .../SimulationViewMenuComponent.qml | 2 +- resources/qml/ExtruderIcon.qml | 2 +- resources/qml/ObjectItemButton.qml | 2 +- .../RecommendedSupportSelector.qml | 4 ++-- .../qml/PrinterSelector/MachineSelector.qml | 6 ++--- resources/qml/Settings/SettingExtruder.qml | 4 ++-- .../qml/Settings/SettingOptionalExtruder.qml | 4 ++-- resources/qml/WelcomePages/CloudContent.qml | 2 +- .../cura-light/icons/default/Extruder1.svg | 22 ------------------- .../cura-light/icons/default/Extruder2.svg | 18 --------------- .../icons/default/ExtruderColor.svg | 10 --------- .../icons/{small => low}/CheckBlueBG.svg | 0 .../icons/{small => low}/CloudBlueBG.svg | 0 .../icons/{small => low}/CloudGreyBG.svg | 0 .../cura-light/icons/{small => low}/Dot.svg | 0 .../icons/{large => medium}/Extruder.svg | 0 .../icons/{large => medium}/PrinterTriple.svg | 0 resources/themes/cura-light/styles.qml | 4 ++-- 18 files changed, 15 insertions(+), 65 deletions(-) delete mode 100644 resources/themes/cura-light/icons/default/Extruder1.svg delete mode 100644 resources/themes/cura-light/icons/default/Extruder2.svg delete mode 100644 resources/themes/cura-light/icons/default/ExtruderColor.svg rename resources/themes/cura-light/icons/{small => low}/CheckBlueBG.svg (100%) rename resources/themes/cura-light/icons/{small => low}/CloudBlueBG.svg (100%) rename resources/themes/cura-light/icons/{small => low}/CloudGreyBG.svg (100%) rename resources/themes/cura-light/icons/{small => low}/Dot.svg (100%) rename resources/themes/cura-light/icons/{large => medium}/Extruder.svg (100%) rename resources/themes/cura-light/icons/{large => medium}/PrinterTriple.svg (100%) diff --git a/plugins/SimulationView/SimulationViewMenuComponent.qml b/plugins/SimulationView/SimulationViewMenuComponent.qml index f86110c2b5..7c8e086909 100644 --- a/plugins/SimulationView/SimulationViewMenuComponent.qml +++ b/plugins/SimulationView/SimulationViewMenuComponent.qml @@ -203,7 +203,7 @@ Cura.ExpandableComponent anchors.right: extrudersModelCheckBox.right width: UM.Theme.getSize("layerview_legend_size").width height: UM.Theme.getSize("layerview_legend_size").height - source: UM.Theme.getIcon("Extruder", "large") + source: UM.Theme.getIcon("Extruder", "medium") color: model.color } diff --git a/resources/qml/ExtruderIcon.qml b/resources/qml/ExtruderIcon.qml index 40d5b2362e..1c93966519 100644 --- a/resources/qml/ExtruderIcon.qml +++ b/resources/qml/ExtruderIcon.qml @@ -22,7 +22,7 @@ Item id: mainIcon anchors.fill: parent - source: UM.Theme.getIcon("Extruder", "large") + source: UM.Theme.getIcon("Extruder", "medium") color: extruderEnabled ? materialColor: UM.Theme.getColor("disabled") } diff --git a/resources/qml/ObjectItemButton.qml b/resources/qml/ObjectItemButton.qml index d634927a7e..2b998e0438 100644 --- a/resources/qml/ObjectItemButton.qml +++ b/resources/qml/ObjectItemButton.qml @@ -53,7 +53,7 @@ Button anchors.left: parent.left width: height height: parent.height - UM.Theme.getSize("narrow_margin").height - source: UM.Theme.getIcon("Extruder", "large") + source: UM.Theme.getIcon("Extruder", "medium") color: extruderColor visible: showExtruderSwatches && extruderColor != "" } diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml index ab1b5bf3e9..924dcd5ec4 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml @@ -229,7 +229,7 @@ Item sourceSize.width: width sourceSize.height: height - source: UM.Theme.getIcon("Extruder", "large") + source: UM.Theme.getIcon("Extruder", "medium") color: supportExtruderCombobox.color } } @@ -299,7 +299,7 @@ Item sourceSize.width: width sourceSize.height: height - source: UM.Theme.getIcon("Extruder", "large") + source: UM.Theme.getIcon("Extruder", "medium") color: supportExtruderCombobox.model.getItem(index).color } } diff --git a/resources/qml/PrinterSelector/MachineSelector.qml b/resources/qml/PrinterSelector/MachineSelector.qml index 556bb893cc..7c74be1605 100644 --- a/resources/qml/PrinterSelector/MachineSelector.qml +++ b/resources/qml/PrinterSelector/MachineSelector.qml @@ -122,15 +122,15 @@ Cura.ExpandablePopup { if (connectionStatus == "printer_connected") { - return UM.Theme.getIcon("CheckBlueBG", "small") + return UM.Theme.getIcon("CheckBlueBG", "low") } else if (connectionStatus == "printer_cloud_connected") { - return UM.Theme.getIcon("CloudBlueBG", "small") + return UM.Theme.getIcon("CloudBlueBG", "low") } else if (connectionStatus == "printer_cloud_not_available") { - return UM.Theme.getIcon("CloudGreyBG", "small") + return UM.Theme.getIcon("CloudGreyBG", "low") } else { diff --git a/resources/qml/Settings/SettingExtruder.qml b/resources/qml/Settings/SettingExtruder.qml index 5f0744fe47..995e1103f3 100644 --- a/resources/qml/Settings/SettingExtruder.qml +++ b/resources/qml/Settings/SettingExtruder.qml @@ -171,7 +171,7 @@ SettingItem sourceSize.width: width sourceSize.height: height - source: UM.Theme.getIcon("Extruder", "large") + source: UM.Theme.getIcon("Extruder", "medium") color: control.color } } @@ -240,7 +240,7 @@ SettingItem sourceSize.width: width sourceSize.height: height - source: UM.Theme.getIcon("Extruder", "large") + source: UM.Theme.getIcon("Extruder", "medium") color: control.model.getItem(index).color } } diff --git a/resources/qml/Settings/SettingOptionalExtruder.qml b/resources/qml/Settings/SettingOptionalExtruder.qml index deb8f3d478..5b1da6b785 100644 --- a/resources/qml/Settings/SettingOptionalExtruder.qml +++ b/resources/qml/Settings/SettingOptionalExtruder.qml @@ -172,7 +172,7 @@ SettingItem sourceSize.width: width sourceSize.height: height - source: UM.Theme.getIcon("Extruder", "large") + source: UM.Theme.getIcon("Extruder", "medium") color: control.color } } @@ -237,7 +237,7 @@ SettingItem sourceSize.width: width sourceSize.height: height - source: UM.Theme.getIcon("Extruder", "large") + source: UM.Theme.getIcon("Extruder", "medium") color: control.model.getItem(index).color } } diff --git a/resources/qml/WelcomePages/CloudContent.qml b/resources/qml/WelcomePages/CloudContent.qml index 276d3a1f1d..26e3a2f87c 100644 --- a/resources/qml/WelcomePages/CloudContent.qml +++ b/resources/qml/WelcomePages/CloudContent.qml @@ -172,7 +172,7 @@ Item anchors.horizontalCenter: communityColumn.horizontalCenter fillMode: Image.PreserveAspectFit width: UM.Theme.getSize("welcome_wizard_cloud_content_image").width - source: UM.Theme.getIcon("PrinterTriple", "large") + source: UM.Theme.getIcon("PrinterTriple", "medium") sourceSize.width: width sourceSize.height: height } diff --git a/resources/themes/cura-light/icons/default/Extruder1.svg b/resources/themes/cura-light/icons/default/Extruder1.svg deleted file mode 100644 index b818bab2bc..0000000000 --- a/resources/themes/cura-light/icons/default/Extruder1.svg +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/resources/themes/cura-light/icons/default/Extruder2.svg b/resources/themes/cura-light/icons/default/Extruder2.svg deleted file mode 100644 index 764170753b..0000000000 --- a/resources/themes/cura-light/icons/default/Extruder2.svg +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - diff --git a/resources/themes/cura-light/icons/default/ExtruderColor.svg b/resources/themes/cura-light/icons/default/ExtruderColor.svg deleted file mode 100644 index 08c93163aa..0000000000 --- a/resources/themes/cura-light/icons/default/ExtruderColor.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - diff --git a/resources/themes/cura-light/icons/small/CheckBlueBG.svg b/resources/themes/cura-light/icons/low/CheckBlueBG.svg similarity index 100% rename from resources/themes/cura-light/icons/small/CheckBlueBG.svg rename to resources/themes/cura-light/icons/low/CheckBlueBG.svg diff --git a/resources/themes/cura-light/icons/small/CloudBlueBG.svg b/resources/themes/cura-light/icons/low/CloudBlueBG.svg similarity index 100% rename from resources/themes/cura-light/icons/small/CloudBlueBG.svg rename to resources/themes/cura-light/icons/low/CloudBlueBG.svg diff --git a/resources/themes/cura-light/icons/small/CloudGreyBG.svg b/resources/themes/cura-light/icons/low/CloudGreyBG.svg similarity index 100% rename from resources/themes/cura-light/icons/small/CloudGreyBG.svg rename to resources/themes/cura-light/icons/low/CloudGreyBG.svg diff --git a/resources/themes/cura-light/icons/small/Dot.svg b/resources/themes/cura-light/icons/low/Dot.svg similarity index 100% rename from resources/themes/cura-light/icons/small/Dot.svg rename to resources/themes/cura-light/icons/low/Dot.svg diff --git a/resources/themes/cura-light/icons/large/Extruder.svg b/resources/themes/cura-light/icons/medium/Extruder.svg similarity index 100% rename from resources/themes/cura-light/icons/large/Extruder.svg rename to resources/themes/cura-light/icons/medium/Extruder.svg diff --git a/resources/themes/cura-light/icons/large/PrinterTriple.svg b/resources/themes/cura-light/icons/medium/PrinterTriple.svg similarity index 100% rename from resources/themes/cura-light/icons/large/PrinterTriple.svg rename to resources/themes/cura-light/icons/medium/PrinterTriple.svg diff --git a/resources/themes/cura-light/styles.qml b/resources/themes/cura-light/styles.qml index e7cf39a164..b56080a6c6 100755 --- a/resources/themes/cura-light/styles.qml +++ b/resources/themes/cura-light/styles.qml @@ -422,7 +422,7 @@ QtObject height: Math.round(parent.height / 2.5) sourceSize.height: width color: Theme.getColor("checkbox_mark") - source: control.exclusiveGroup ? Theme.getIcon("Dot", "small") : Theme.getIcon("Check") + source: control.exclusiveGroup ? Theme.getIcon("Dot", "low") : Theme.getIcon("Check") opacity: control.checked Behavior on opacity { NumberAnimation { duration: 100; } } } @@ -472,7 +472,7 @@ QtObject } else { - return control.exclusiveGroup ? Theme.getIcon("Dot", "small") : Theme.getIcon("Check"); + return control.exclusiveGroup ? Theme.getIcon("Dot", "low") : Theme.getIcon("Check"); } } opacity: control.checked