From 9ea97f7561698ed1b95cfdd92c372d13cd07b34c Mon Sep 17 00:00:00 2001 From: jelle Spijker Date: Wed, 28 Apr 2021 15:45:20 +0200 Subject: [PATCH] SVG are not correlated to pixel size. Although this deviates from the UX practices. It tended to confuse the programmers ;-) The variances in level of detail for the icons are now placed in the sub-directories. small, default and big. CURA-8010_new_icons --- resources/qml/ExtruderIcon.qml | 2 +- resources/qml/ObjectItemButton.qml | 2 +- .../Recommended/RecommendedSupportSelector.qml | 4 ++-- resources/qml/PrinterSelector/MachineSelector.qml | 6 +++--- resources/qml/Settings/SettingExtruder.qml | 4 ++-- resources/qml/Settings/SettingOptionalExtruder.qml | 4 ++-- .../themes/cura-light/icons/{24 => default}/Adhesion.svg | 0 .../icons/{24 => default}/ArrowDoubleCircleRight.svg | 0 .../cura-light/icons/{24 => default}/ArrowFourWay.svg | 0 .../themes/cura-light/icons/{24 => default}/ArrowReset.svg | 0 .../themes/cura-light/icons/{24 => default}/Bandage.svg | 0 .../themes/cura-light/icons/{24 => default}/BlackMagic.svg | 0 .../themes/cura-light/icons/{24 => default}/Cancel.svg | 0 .../themes/cura-light/icons/{24 => default}/CancelBlock.svg | 0 .../cura-light/icons/{24 => default}/CancelCircle.svg | 0 resources/themes/cura-light/icons/{24 => default}/Check.svg | 0 .../themes/cura-light/icons/{24 => default}/CheckCircle.svg | 0 .../cura-light/icons/{24 => default}/ChevronSingleDown.svg | 0 .../cura-light/icons/{24 => default}/ChevronSingleLeft.svg | 0 .../cura-light/icons/{24 => default}/ChevronSingleRight.svg | 0 .../cura-light/icons/{24 => default}/ChevronSingleUp.svg | 0 .../cura-light/icons/{24 => default}/CircleOutline.svg | 0 resources/themes/cura-light/icons/{24 => default}/Clock.svg | 0 resources/themes/cura-light/icons/{24 => default}/Cloud.svg | 0 .../cura-light/icons/{24 => default}/DualExtrusion.svg | 0 .../themes/cura-light/icons/{24 => default}/Experiment.svg | 0 .../themes/cura-light/icons/{24 => default}/Extruder1.svg | 0 .../themes/cura-light/icons/{24 => default}/Extruder2.svg | 0 .../cura-light/icons/{24 => default}/ExtruderColor.svg | 0 resources/themes/cura-light/icons/{24 => default}/Eye.svg | 0 resources/themes/cura-light/icons/{24 => default}/Fan.svg | 0 .../themes/cura-light/icons/{24 => default}/Folder.svg | 0 .../themes/cura-light/icons/{24 => default}/Formula.svg | 0 resources/themes/cura-light/icons/{24 => default}/Guide.svg | 0 .../themes/cura-light/icons/{24 => default}/Hamburger.svg | 0 resources/themes/cura-light/icons/{24 => default}/House.svg | 0 .../themes/cura-light/icons/{24 => default}/Infill0.svg | 0 .../themes/cura-light/icons/{24 => default}/Infill1.svg | 0 .../themes/cura-light/icons/{24 => default}/Infill2.svg | 0 .../themes/cura-light/icons/{24 => default}/Infill3.svg | 0 .../cura-light/icons/{24 => default}/InfillGradual.svg | 0 .../themes/cura-light/icons/{24 => default}/Information.svg | 0 .../themes/cura-light/icons/{24 => default}/LayFlat.svg | 0 .../cura-light/icons/{24 => default}/LayFlatOnFace.svg | 0 .../themes/cura-light/icons/{24 => default}/Layers.svg | 0 .../themes/cura-light/icons/{24 => default}/Lightning.svg | 0 resources/themes/cura-light/icons/{24 => default}/Link.svg | 0 .../cura-light/icons/{24 => default}/LinkExternal.svg | 0 .../themes/cura-light/icons/{24 => default}/Magnifier.svg | 0 .../themes/cura-light/icons/{24 => default}/MeshType.svg | 0 .../cura-light/icons/{24 => default}/MeshTypeExclude.svg | 0 .../cura-light/icons/{24 => default}/MeshTypeIntersect.svg | 0 .../cura-light/icons/{24 => default}/MeshTypeNormal.svg | 0 .../cura-light/icons/{24 => default}/MeshTypeSupport.svg | 0 resources/themes/cura-light/icons/{24 => default}/Minus.svg | 0 .../themes/cura-light/icons/{24 => default}/Mirror.svg | 0 resources/themes/cura-light/icons/{24 => default}/Pen.svg | 0 .../themes/cura-light/icons/{24 => default}/Plugin.svg | 0 resources/themes/cura-light/icons/{24 => default}/Plus.svg | 0 .../cura-light/icons/{24 => default}/PrintQuality.svg | 0 .../themes/cura-light/icons/{24 => default}/PrintShell.svg | 0 .../cura-light/icons/{24 => default}/PrintTopBottom.svg | 0 .../themes/cura-light/icons/{24 => default}/PrintTravel.svg | 0 .../themes/cura-light/icons/{24 => default}/Printer.svg | 0 .../cura-light/icons/{24 => default}/PrinterTriple.svg | 0 resources/themes/cura-light/icons/{24 => default}/Quick.svg | 0 .../themes/cura-light/icons/{24 => default}/Rotate.svg | 0 resources/themes/cura-light/icons/{24 => default}/Scale.svg | 0 .../themes/cura-light/icons/{24 => default}/ScaleMax.svg | 0 .../themes/cura-light/icons/{24 => default}/Shield.svg | 0 .../themes/cura-light/icons/{24 => default}/Sliders.svg | 0 resources/themes/cura-light/icons/{24 => default}/Solid.svg | 0 .../themes/cura-light/icons/{24 => default}/SpeedOMeter.svg | 0 resources/themes/cura-light/icons/{24 => default}/Spool.svg | 0 .../themes/cura-light/icons/{24 => default}/Sputnik.svg | 0 resources/themes/cura-light/icons/{24 => default}/Star.svg | 0 .../themes/cura-light/icons/{24 => default}/StarFilled.svg | 0 .../themes/cura-light/icons/{24 => default}/Support.svg | 0 .../cura-light/icons/{24 => default}/SupportBlocker.svg | 0 .../themes/cura-light/icons/{24 => default}/ThreeDots.svg | 0 .../cura-light/icons/{24 => default}/UltimakerCura.svg | 0 .../themes/cura-light/icons/{24 => default}/View3D.svg | 0 .../themes/cura-light/icons/{24 => default}/ViewFront.svg | 0 .../themes/cura-light/icons/{24 => default}/ViewLeft.svg | 0 .../themes/cura-light/icons/{24 => default}/ViewRight.svg | 0 .../themes/cura-light/icons/{24 => default}/ViewTop.svg | 0 .../themes/cura-light/icons/{24 => default}/Warning.svg | 0 .../themes/cura-light/icons/{30 => large}/Extruder.svg | 0 .../themes/cura-light/icons/{12 => small}/CheckBlueBG.svg | 0 .../themes/cura-light/icons/{12 => small}/CloudBlueBG.svg | 0 .../themes/cura-light/icons/{12 => small}/CloudGreyBG.svg | 0 resources/themes/cura-light/icons/{12 => small}/Dot.svg | 0 resources/themes/cura-light/styles.qml | 4 ++-- 93 files changed, 13 insertions(+), 13 deletions(-) rename resources/themes/cura-light/icons/{24 => default}/Adhesion.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/ArrowDoubleCircleRight.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/ArrowFourWay.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/ArrowReset.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/Bandage.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/BlackMagic.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/Cancel.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/CancelBlock.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/CancelCircle.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/Check.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/CheckCircle.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/ChevronSingleDown.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/ChevronSingleLeft.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/ChevronSingleRight.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/ChevronSingleUp.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/CircleOutline.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/Clock.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/Cloud.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/DualExtrusion.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/Experiment.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/Extruder1.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/Extruder2.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/ExtruderColor.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/Eye.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/Fan.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/Folder.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/Formula.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/Guide.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/Hamburger.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/House.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/Infill0.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/Infill1.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/Infill2.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/Infill3.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/InfillGradual.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/Information.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/LayFlat.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/LayFlatOnFace.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/Layers.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/Lightning.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/Link.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/LinkExternal.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/Magnifier.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/MeshType.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/MeshTypeExclude.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/MeshTypeIntersect.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/MeshTypeNormal.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/MeshTypeSupport.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/Minus.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/Mirror.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/Pen.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/Plugin.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/Plus.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/PrintQuality.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/PrintShell.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/PrintTopBottom.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/PrintTravel.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/Printer.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/PrinterTriple.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/Quick.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/Rotate.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/Scale.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/ScaleMax.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/Shield.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/Sliders.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/Solid.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/SpeedOMeter.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/Spool.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/Sputnik.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/Star.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/StarFilled.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/Support.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/SupportBlocker.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/ThreeDots.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/UltimakerCura.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/View3D.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/ViewFront.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/ViewLeft.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/ViewRight.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/ViewTop.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/Warning.svg (100%) rename resources/themes/cura-light/icons/{30 => large}/Extruder.svg (100%) rename resources/themes/cura-light/icons/{12 => small}/CheckBlueBG.svg (100%) rename resources/themes/cura-light/icons/{12 => small}/CloudBlueBG.svg (100%) rename resources/themes/cura-light/icons/{12 => small}/CloudGreyBG.svg (100%) rename resources/themes/cura-light/icons/{12 => small}/Dot.svg (100%) diff --git a/resources/qml/ExtruderIcon.qml b/resources/qml/ExtruderIcon.qml index 3ec5922fcd..40d5b2362e 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", "30") + source: UM.Theme.getIcon("Extruder", "large") color: extruderEnabled ? materialColor: UM.Theme.getColor("disabled") } diff --git a/resources/qml/ObjectItemButton.qml b/resources/qml/ObjectItemButton.qml index 07b9b9add6..d634927a7e 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", "30") + source: UM.Theme.getIcon("Extruder", "large") color: extruderColor visible: showExtruderSwatches && extruderColor != "" } diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml index 8b66f9b34e..ab1b5bf3e9 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", "30") + source: UM.Theme.getIcon("Extruder", "large") color: supportExtruderCombobox.color } } @@ -299,7 +299,7 @@ Item sourceSize.width: width sourceSize.height: height - source: UM.Theme.getIcon("Extruder", "30") + source: UM.Theme.getIcon("Extruder", "large") color: supportExtruderCombobox.model.getItem(index).color } } diff --git a/resources/qml/PrinterSelector/MachineSelector.qml b/resources/qml/PrinterSelector/MachineSelector.qml index 51cc3aad19..556bb893cc 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", "12") + return UM.Theme.getIcon("CheckBlueBG", "small") } else if (connectionStatus == "printer_cloud_connected") { - return UM.Theme.getIcon("CloudBlueBG", "12") + return UM.Theme.getIcon("CloudBlueBG", "small") } else if (connectionStatus == "printer_cloud_not_available") { - return UM.Theme.getIcon("CloudGreyBG", "12") + return UM.Theme.getIcon("CloudGreyBG", "small") } else { diff --git a/resources/qml/Settings/SettingExtruder.qml b/resources/qml/Settings/SettingExtruder.qml index c7b57097bc..5f0744fe47 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", "30") + source: UM.Theme.getIcon("Extruder", "large") color: control.color } } @@ -240,7 +240,7 @@ SettingItem sourceSize.width: width sourceSize.height: height - source: UM.Theme.getIcon("Extruder", "30") + source: UM.Theme.getIcon("Extruder", "large") color: control.model.getItem(index).color } } diff --git a/resources/qml/Settings/SettingOptionalExtruder.qml b/resources/qml/Settings/SettingOptionalExtruder.qml index e1bf97f532..deb8f3d478 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", "30") + source: UM.Theme.getIcon("Extruder", "large") color: control.color } } @@ -237,7 +237,7 @@ SettingItem sourceSize.width: width sourceSize.height: height - source: UM.Theme.getIcon("Extruder", "30") + source: UM.Theme.getIcon("Extruder", "large") color: control.model.getItem(index).color } } diff --git a/resources/themes/cura-light/icons/24/Adhesion.svg b/resources/themes/cura-light/icons/default/Adhesion.svg similarity index 100% rename from resources/themes/cura-light/icons/24/Adhesion.svg rename to resources/themes/cura-light/icons/default/Adhesion.svg diff --git a/resources/themes/cura-light/icons/24/ArrowDoubleCircleRight.svg b/resources/themes/cura-light/icons/default/ArrowDoubleCircleRight.svg similarity index 100% rename from resources/themes/cura-light/icons/24/ArrowDoubleCircleRight.svg rename to resources/themes/cura-light/icons/default/ArrowDoubleCircleRight.svg diff --git a/resources/themes/cura-light/icons/24/ArrowFourWay.svg b/resources/themes/cura-light/icons/default/ArrowFourWay.svg similarity index 100% rename from resources/themes/cura-light/icons/24/ArrowFourWay.svg rename to resources/themes/cura-light/icons/default/ArrowFourWay.svg diff --git a/resources/themes/cura-light/icons/24/ArrowReset.svg b/resources/themes/cura-light/icons/default/ArrowReset.svg similarity index 100% rename from resources/themes/cura-light/icons/24/ArrowReset.svg rename to resources/themes/cura-light/icons/default/ArrowReset.svg diff --git a/resources/themes/cura-light/icons/24/Bandage.svg b/resources/themes/cura-light/icons/default/Bandage.svg similarity index 100% rename from resources/themes/cura-light/icons/24/Bandage.svg rename to resources/themes/cura-light/icons/default/Bandage.svg diff --git a/resources/themes/cura-light/icons/24/BlackMagic.svg b/resources/themes/cura-light/icons/default/BlackMagic.svg similarity index 100% rename from resources/themes/cura-light/icons/24/BlackMagic.svg rename to resources/themes/cura-light/icons/default/BlackMagic.svg diff --git a/resources/themes/cura-light/icons/24/Cancel.svg b/resources/themes/cura-light/icons/default/Cancel.svg similarity index 100% rename from resources/themes/cura-light/icons/24/Cancel.svg rename to resources/themes/cura-light/icons/default/Cancel.svg diff --git a/resources/themes/cura-light/icons/24/CancelBlock.svg b/resources/themes/cura-light/icons/default/CancelBlock.svg similarity index 100% rename from resources/themes/cura-light/icons/24/CancelBlock.svg rename to resources/themes/cura-light/icons/default/CancelBlock.svg diff --git a/resources/themes/cura-light/icons/24/CancelCircle.svg b/resources/themes/cura-light/icons/default/CancelCircle.svg similarity index 100% rename from resources/themes/cura-light/icons/24/CancelCircle.svg rename to resources/themes/cura-light/icons/default/CancelCircle.svg diff --git a/resources/themes/cura-light/icons/24/Check.svg b/resources/themes/cura-light/icons/default/Check.svg similarity index 100% rename from resources/themes/cura-light/icons/24/Check.svg rename to resources/themes/cura-light/icons/default/Check.svg diff --git a/resources/themes/cura-light/icons/24/CheckCircle.svg b/resources/themes/cura-light/icons/default/CheckCircle.svg similarity index 100% rename from resources/themes/cura-light/icons/24/CheckCircle.svg rename to resources/themes/cura-light/icons/default/CheckCircle.svg diff --git a/resources/themes/cura-light/icons/24/ChevronSingleDown.svg b/resources/themes/cura-light/icons/default/ChevronSingleDown.svg similarity index 100% rename from resources/themes/cura-light/icons/24/ChevronSingleDown.svg rename to resources/themes/cura-light/icons/default/ChevronSingleDown.svg diff --git a/resources/themes/cura-light/icons/24/ChevronSingleLeft.svg b/resources/themes/cura-light/icons/default/ChevronSingleLeft.svg similarity index 100% rename from resources/themes/cura-light/icons/24/ChevronSingleLeft.svg rename to resources/themes/cura-light/icons/default/ChevronSingleLeft.svg diff --git a/resources/themes/cura-light/icons/24/ChevronSingleRight.svg b/resources/themes/cura-light/icons/default/ChevronSingleRight.svg similarity index 100% rename from resources/themes/cura-light/icons/24/ChevronSingleRight.svg rename to resources/themes/cura-light/icons/default/ChevronSingleRight.svg diff --git a/resources/themes/cura-light/icons/24/ChevronSingleUp.svg b/resources/themes/cura-light/icons/default/ChevronSingleUp.svg similarity index 100% rename from resources/themes/cura-light/icons/24/ChevronSingleUp.svg rename to resources/themes/cura-light/icons/default/ChevronSingleUp.svg diff --git a/resources/themes/cura-light/icons/24/CircleOutline.svg b/resources/themes/cura-light/icons/default/CircleOutline.svg similarity index 100% rename from resources/themes/cura-light/icons/24/CircleOutline.svg rename to resources/themes/cura-light/icons/default/CircleOutline.svg diff --git a/resources/themes/cura-light/icons/24/Clock.svg b/resources/themes/cura-light/icons/default/Clock.svg similarity index 100% rename from resources/themes/cura-light/icons/24/Clock.svg rename to resources/themes/cura-light/icons/default/Clock.svg diff --git a/resources/themes/cura-light/icons/24/Cloud.svg b/resources/themes/cura-light/icons/default/Cloud.svg similarity index 100% rename from resources/themes/cura-light/icons/24/Cloud.svg rename to resources/themes/cura-light/icons/default/Cloud.svg diff --git a/resources/themes/cura-light/icons/24/DualExtrusion.svg b/resources/themes/cura-light/icons/default/DualExtrusion.svg similarity index 100% rename from resources/themes/cura-light/icons/24/DualExtrusion.svg rename to resources/themes/cura-light/icons/default/DualExtrusion.svg diff --git a/resources/themes/cura-light/icons/24/Experiment.svg b/resources/themes/cura-light/icons/default/Experiment.svg similarity index 100% rename from resources/themes/cura-light/icons/24/Experiment.svg rename to resources/themes/cura-light/icons/default/Experiment.svg diff --git a/resources/themes/cura-light/icons/24/Extruder1.svg b/resources/themes/cura-light/icons/default/Extruder1.svg similarity index 100% rename from resources/themes/cura-light/icons/24/Extruder1.svg rename to resources/themes/cura-light/icons/default/Extruder1.svg diff --git a/resources/themes/cura-light/icons/24/Extruder2.svg b/resources/themes/cura-light/icons/default/Extruder2.svg similarity index 100% rename from resources/themes/cura-light/icons/24/Extruder2.svg rename to resources/themes/cura-light/icons/default/Extruder2.svg diff --git a/resources/themes/cura-light/icons/24/ExtruderColor.svg b/resources/themes/cura-light/icons/default/ExtruderColor.svg similarity index 100% rename from resources/themes/cura-light/icons/24/ExtruderColor.svg rename to resources/themes/cura-light/icons/default/ExtruderColor.svg diff --git a/resources/themes/cura-light/icons/24/Eye.svg b/resources/themes/cura-light/icons/default/Eye.svg similarity index 100% rename from resources/themes/cura-light/icons/24/Eye.svg rename to resources/themes/cura-light/icons/default/Eye.svg diff --git a/resources/themes/cura-light/icons/24/Fan.svg b/resources/themes/cura-light/icons/default/Fan.svg similarity index 100% rename from resources/themes/cura-light/icons/24/Fan.svg rename to resources/themes/cura-light/icons/default/Fan.svg diff --git a/resources/themes/cura-light/icons/24/Folder.svg b/resources/themes/cura-light/icons/default/Folder.svg similarity index 100% rename from resources/themes/cura-light/icons/24/Folder.svg rename to resources/themes/cura-light/icons/default/Folder.svg diff --git a/resources/themes/cura-light/icons/24/Formula.svg b/resources/themes/cura-light/icons/default/Formula.svg similarity index 100% rename from resources/themes/cura-light/icons/24/Formula.svg rename to resources/themes/cura-light/icons/default/Formula.svg diff --git a/resources/themes/cura-light/icons/24/Guide.svg b/resources/themes/cura-light/icons/default/Guide.svg similarity index 100% rename from resources/themes/cura-light/icons/24/Guide.svg rename to resources/themes/cura-light/icons/default/Guide.svg diff --git a/resources/themes/cura-light/icons/24/Hamburger.svg b/resources/themes/cura-light/icons/default/Hamburger.svg similarity index 100% rename from resources/themes/cura-light/icons/24/Hamburger.svg rename to resources/themes/cura-light/icons/default/Hamburger.svg diff --git a/resources/themes/cura-light/icons/24/House.svg b/resources/themes/cura-light/icons/default/House.svg similarity index 100% rename from resources/themes/cura-light/icons/24/House.svg rename to resources/themes/cura-light/icons/default/House.svg diff --git a/resources/themes/cura-light/icons/24/Infill0.svg b/resources/themes/cura-light/icons/default/Infill0.svg similarity index 100% rename from resources/themes/cura-light/icons/24/Infill0.svg rename to resources/themes/cura-light/icons/default/Infill0.svg diff --git a/resources/themes/cura-light/icons/24/Infill1.svg b/resources/themes/cura-light/icons/default/Infill1.svg similarity index 100% rename from resources/themes/cura-light/icons/24/Infill1.svg rename to resources/themes/cura-light/icons/default/Infill1.svg diff --git a/resources/themes/cura-light/icons/24/Infill2.svg b/resources/themes/cura-light/icons/default/Infill2.svg similarity index 100% rename from resources/themes/cura-light/icons/24/Infill2.svg rename to resources/themes/cura-light/icons/default/Infill2.svg diff --git a/resources/themes/cura-light/icons/24/Infill3.svg b/resources/themes/cura-light/icons/default/Infill3.svg similarity index 100% rename from resources/themes/cura-light/icons/24/Infill3.svg rename to resources/themes/cura-light/icons/default/Infill3.svg diff --git a/resources/themes/cura-light/icons/24/InfillGradual.svg b/resources/themes/cura-light/icons/default/InfillGradual.svg similarity index 100% rename from resources/themes/cura-light/icons/24/InfillGradual.svg rename to resources/themes/cura-light/icons/default/InfillGradual.svg diff --git a/resources/themes/cura-light/icons/24/Information.svg b/resources/themes/cura-light/icons/default/Information.svg similarity index 100% rename from resources/themes/cura-light/icons/24/Information.svg rename to resources/themes/cura-light/icons/default/Information.svg diff --git a/resources/themes/cura-light/icons/24/LayFlat.svg b/resources/themes/cura-light/icons/default/LayFlat.svg similarity index 100% rename from resources/themes/cura-light/icons/24/LayFlat.svg rename to resources/themes/cura-light/icons/default/LayFlat.svg diff --git a/resources/themes/cura-light/icons/24/LayFlatOnFace.svg b/resources/themes/cura-light/icons/default/LayFlatOnFace.svg similarity index 100% rename from resources/themes/cura-light/icons/24/LayFlatOnFace.svg rename to resources/themes/cura-light/icons/default/LayFlatOnFace.svg diff --git a/resources/themes/cura-light/icons/24/Layers.svg b/resources/themes/cura-light/icons/default/Layers.svg similarity index 100% rename from resources/themes/cura-light/icons/24/Layers.svg rename to resources/themes/cura-light/icons/default/Layers.svg diff --git a/resources/themes/cura-light/icons/24/Lightning.svg b/resources/themes/cura-light/icons/default/Lightning.svg similarity index 100% rename from resources/themes/cura-light/icons/24/Lightning.svg rename to resources/themes/cura-light/icons/default/Lightning.svg diff --git a/resources/themes/cura-light/icons/24/Link.svg b/resources/themes/cura-light/icons/default/Link.svg similarity index 100% rename from resources/themes/cura-light/icons/24/Link.svg rename to resources/themes/cura-light/icons/default/Link.svg diff --git a/resources/themes/cura-light/icons/24/LinkExternal.svg b/resources/themes/cura-light/icons/default/LinkExternal.svg similarity index 100% rename from resources/themes/cura-light/icons/24/LinkExternal.svg rename to resources/themes/cura-light/icons/default/LinkExternal.svg diff --git a/resources/themes/cura-light/icons/24/Magnifier.svg b/resources/themes/cura-light/icons/default/Magnifier.svg similarity index 100% rename from resources/themes/cura-light/icons/24/Magnifier.svg rename to resources/themes/cura-light/icons/default/Magnifier.svg diff --git a/resources/themes/cura-light/icons/24/MeshType.svg b/resources/themes/cura-light/icons/default/MeshType.svg similarity index 100% rename from resources/themes/cura-light/icons/24/MeshType.svg rename to resources/themes/cura-light/icons/default/MeshType.svg diff --git a/resources/themes/cura-light/icons/24/MeshTypeExclude.svg b/resources/themes/cura-light/icons/default/MeshTypeExclude.svg similarity index 100% rename from resources/themes/cura-light/icons/24/MeshTypeExclude.svg rename to resources/themes/cura-light/icons/default/MeshTypeExclude.svg diff --git a/resources/themes/cura-light/icons/24/MeshTypeIntersect.svg b/resources/themes/cura-light/icons/default/MeshTypeIntersect.svg similarity index 100% rename from resources/themes/cura-light/icons/24/MeshTypeIntersect.svg rename to resources/themes/cura-light/icons/default/MeshTypeIntersect.svg diff --git a/resources/themes/cura-light/icons/24/MeshTypeNormal.svg b/resources/themes/cura-light/icons/default/MeshTypeNormal.svg similarity index 100% rename from resources/themes/cura-light/icons/24/MeshTypeNormal.svg rename to resources/themes/cura-light/icons/default/MeshTypeNormal.svg diff --git a/resources/themes/cura-light/icons/24/MeshTypeSupport.svg b/resources/themes/cura-light/icons/default/MeshTypeSupport.svg similarity index 100% rename from resources/themes/cura-light/icons/24/MeshTypeSupport.svg rename to resources/themes/cura-light/icons/default/MeshTypeSupport.svg diff --git a/resources/themes/cura-light/icons/24/Minus.svg b/resources/themes/cura-light/icons/default/Minus.svg similarity index 100% rename from resources/themes/cura-light/icons/24/Minus.svg rename to resources/themes/cura-light/icons/default/Minus.svg diff --git a/resources/themes/cura-light/icons/24/Mirror.svg b/resources/themes/cura-light/icons/default/Mirror.svg similarity index 100% rename from resources/themes/cura-light/icons/24/Mirror.svg rename to resources/themes/cura-light/icons/default/Mirror.svg diff --git a/resources/themes/cura-light/icons/24/Pen.svg b/resources/themes/cura-light/icons/default/Pen.svg similarity index 100% rename from resources/themes/cura-light/icons/24/Pen.svg rename to resources/themes/cura-light/icons/default/Pen.svg diff --git a/resources/themes/cura-light/icons/24/Plugin.svg b/resources/themes/cura-light/icons/default/Plugin.svg similarity index 100% rename from resources/themes/cura-light/icons/24/Plugin.svg rename to resources/themes/cura-light/icons/default/Plugin.svg diff --git a/resources/themes/cura-light/icons/24/Plus.svg b/resources/themes/cura-light/icons/default/Plus.svg similarity index 100% rename from resources/themes/cura-light/icons/24/Plus.svg rename to resources/themes/cura-light/icons/default/Plus.svg diff --git a/resources/themes/cura-light/icons/24/PrintQuality.svg b/resources/themes/cura-light/icons/default/PrintQuality.svg similarity index 100% rename from resources/themes/cura-light/icons/24/PrintQuality.svg rename to resources/themes/cura-light/icons/default/PrintQuality.svg diff --git a/resources/themes/cura-light/icons/24/PrintShell.svg b/resources/themes/cura-light/icons/default/PrintShell.svg similarity index 100% rename from resources/themes/cura-light/icons/24/PrintShell.svg rename to resources/themes/cura-light/icons/default/PrintShell.svg diff --git a/resources/themes/cura-light/icons/24/PrintTopBottom.svg b/resources/themes/cura-light/icons/default/PrintTopBottom.svg similarity index 100% rename from resources/themes/cura-light/icons/24/PrintTopBottom.svg rename to resources/themes/cura-light/icons/default/PrintTopBottom.svg diff --git a/resources/themes/cura-light/icons/24/PrintTravel.svg b/resources/themes/cura-light/icons/default/PrintTravel.svg similarity index 100% rename from resources/themes/cura-light/icons/24/PrintTravel.svg rename to resources/themes/cura-light/icons/default/PrintTravel.svg diff --git a/resources/themes/cura-light/icons/24/Printer.svg b/resources/themes/cura-light/icons/default/Printer.svg similarity index 100% rename from resources/themes/cura-light/icons/24/Printer.svg rename to resources/themes/cura-light/icons/default/Printer.svg diff --git a/resources/themes/cura-light/icons/24/PrinterTriple.svg b/resources/themes/cura-light/icons/default/PrinterTriple.svg similarity index 100% rename from resources/themes/cura-light/icons/24/PrinterTriple.svg rename to resources/themes/cura-light/icons/default/PrinterTriple.svg diff --git a/resources/themes/cura-light/icons/24/Quick.svg b/resources/themes/cura-light/icons/default/Quick.svg similarity index 100% rename from resources/themes/cura-light/icons/24/Quick.svg rename to resources/themes/cura-light/icons/default/Quick.svg diff --git a/resources/themes/cura-light/icons/24/Rotate.svg b/resources/themes/cura-light/icons/default/Rotate.svg similarity index 100% rename from resources/themes/cura-light/icons/24/Rotate.svg rename to resources/themes/cura-light/icons/default/Rotate.svg diff --git a/resources/themes/cura-light/icons/24/Scale.svg b/resources/themes/cura-light/icons/default/Scale.svg similarity index 100% rename from resources/themes/cura-light/icons/24/Scale.svg rename to resources/themes/cura-light/icons/default/Scale.svg diff --git a/resources/themes/cura-light/icons/24/ScaleMax.svg b/resources/themes/cura-light/icons/default/ScaleMax.svg similarity index 100% rename from resources/themes/cura-light/icons/24/ScaleMax.svg rename to resources/themes/cura-light/icons/default/ScaleMax.svg diff --git a/resources/themes/cura-light/icons/24/Shield.svg b/resources/themes/cura-light/icons/default/Shield.svg similarity index 100% rename from resources/themes/cura-light/icons/24/Shield.svg rename to resources/themes/cura-light/icons/default/Shield.svg diff --git a/resources/themes/cura-light/icons/24/Sliders.svg b/resources/themes/cura-light/icons/default/Sliders.svg similarity index 100% rename from resources/themes/cura-light/icons/24/Sliders.svg rename to resources/themes/cura-light/icons/default/Sliders.svg diff --git a/resources/themes/cura-light/icons/24/Solid.svg b/resources/themes/cura-light/icons/default/Solid.svg similarity index 100% rename from resources/themes/cura-light/icons/24/Solid.svg rename to resources/themes/cura-light/icons/default/Solid.svg diff --git a/resources/themes/cura-light/icons/24/SpeedOMeter.svg b/resources/themes/cura-light/icons/default/SpeedOMeter.svg similarity index 100% rename from resources/themes/cura-light/icons/24/SpeedOMeter.svg rename to resources/themes/cura-light/icons/default/SpeedOMeter.svg diff --git a/resources/themes/cura-light/icons/24/Spool.svg b/resources/themes/cura-light/icons/default/Spool.svg similarity index 100% rename from resources/themes/cura-light/icons/24/Spool.svg rename to resources/themes/cura-light/icons/default/Spool.svg diff --git a/resources/themes/cura-light/icons/24/Sputnik.svg b/resources/themes/cura-light/icons/default/Sputnik.svg similarity index 100% rename from resources/themes/cura-light/icons/24/Sputnik.svg rename to resources/themes/cura-light/icons/default/Sputnik.svg diff --git a/resources/themes/cura-light/icons/24/Star.svg b/resources/themes/cura-light/icons/default/Star.svg similarity index 100% rename from resources/themes/cura-light/icons/24/Star.svg rename to resources/themes/cura-light/icons/default/Star.svg diff --git a/resources/themes/cura-light/icons/24/StarFilled.svg b/resources/themes/cura-light/icons/default/StarFilled.svg similarity index 100% rename from resources/themes/cura-light/icons/24/StarFilled.svg rename to resources/themes/cura-light/icons/default/StarFilled.svg diff --git a/resources/themes/cura-light/icons/24/Support.svg b/resources/themes/cura-light/icons/default/Support.svg similarity index 100% rename from resources/themes/cura-light/icons/24/Support.svg rename to resources/themes/cura-light/icons/default/Support.svg diff --git a/resources/themes/cura-light/icons/24/SupportBlocker.svg b/resources/themes/cura-light/icons/default/SupportBlocker.svg similarity index 100% rename from resources/themes/cura-light/icons/24/SupportBlocker.svg rename to resources/themes/cura-light/icons/default/SupportBlocker.svg diff --git a/resources/themes/cura-light/icons/24/ThreeDots.svg b/resources/themes/cura-light/icons/default/ThreeDots.svg similarity index 100% rename from resources/themes/cura-light/icons/24/ThreeDots.svg rename to resources/themes/cura-light/icons/default/ThreeDots.svg diff --git a/resources/themes/cura-light/icons/24/UltimakerCura.svg b/resources/themes/cura-light/icons/default/UltimakerCura.svg similarity index 100% rename from resources/themes/cura-light/icons/24/UltimakerCura.svg rename to resources/themes/cura-light/icons/default/UltimakerCura.svg diff --git a/resources/themes/cura-light/icons/24/View3D.svg b/resources/themes/cura-light/icons/default/View3D.svg similarity index 100% rename from resources/themes/cura-light/icons/24/View3D.svg rename to resources/themes/cura-light/icons/default/View3D.svg diff --git a/resources/themes/cura-light/icons/24/ViewFront.svg b/resources/themes/cura-light/icons/default/ViewFront.svg similarity index 100% rename from resources/themes/cura-light/icons/24/ViewFront.svg rename to resources/themes/cura-light/icons/default/ViewFront.svg diff --git a/resources/themes/cura-light/icons/24/ViewLeft.svg b/resources/themes/cura-light/icons/default/ViewLeft.svg similarity index 100% rename from resources/themes/cura-light/icons/24/ViewLeft.svg rename to resources/themes/cura-light/icons/default/ViewLeft.svg diff --git a/resources/themes/cura-light/icons/24/ViewRight.svg b/resources/themes/cura-light/icons/default/ViewRight.svg similarity index 100% rename from resources/themes/cura-light/icons/24/ViewRight.svg rename to resources/themes/cura-light/icons/default/ViewRight.svg diff --git a/resources/themes/cura-light/icons/24/ViewTop.svg b/resources/themes/cura-light/icons/default/ViewTop.svg similarity index 100% rename from resources/themes/cura-light/icons/24/ViewTop.svg rename to resources/themes/cura-light/icons/default/ViewTop.svg diff --git a/resources/themes/cura-light/icons/24/Warning.svg b/resources/themes/cura-light/icons/default/Warning.svg similarity index 100% rename from resources/themes/cura-light/icons/24/Warning.svg rename to resources/themes/cura-light/icons/default/Warning.svg diff --git a/resources/themes/cura-light/icons/30/Extruder.svg b/resources/themes/cura-light/icons/large/Extruder.svg similarity index 100% rename from resources/themes/cura-light/icons/30/Extruder.svg rename to resources/themes/cura-light/icons/large/Extruder.svg diff --git a/resources/themes/cura-light/icons/12/CheckBlueBG.svg b/resources/themes/cura-light/icons/small/CheckBlueBG.svg similarity index 100% rename from resources/themes/cura-light/icons/12/CheckBlueBG.svg rename to resources/themes/cura-light/icons/small/CheckBlueBG.svg diff --git a/resources/themes/cura-light/icons/12/CloudBlueBG.svg b/resources/themes/cura-light/icons/small/CloudBlueBG.svg similarity index 100% rename from resources/themes/cura-light/icons/12/CloudBlueBG.svg rename to resources/themes/cura-light/icons/small/CloudBlueBG.svg diff --git a/resources/themes/cura-light/icons/12/CloudGreyBG.svg b/resources/themes/cura-light/icons/small/CloudGreyBG.svg similarity index 100% rename from resources/themes/cura-light/icons/12/CloudGreyBG.svg rename to resources/themes/cura-light/icons/small/CloudGreyBG.svg diff --git a/resources/themes/cura-light/icons/12/Dot.svg b/resources/themes/cura-light/icons/small/Dot.svg similarity index 100% rename from resources/themes/cura-light/icons/12/Dot.svg rename to resources/themes/cura-light/icons/small/Dot.svg diff --git a/resources/themes/cura-light/styles.qml b/resources/themes/cura-light/styles.qml index 766d22914c..e7cf39a164 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", "12") : Theme.getIcon("Check") + source: control.exclusiveGroup ? Theme.getIcon("Dot", "small") : Theme.getIcon("Check") opacity: control.checked Behavior on opacity { NumberAnimation { duration: 100; } } } @@ -472,7 +472,7 @@ QtObject } else { - return control.exclusiveGroup ? Theme.getIcon("Dot", "12") : Theme.getIcon("Check"); + return control.exclusiveGroup ? Theme.getIcon("Dot", "small") : Theme.getIcon("Check"); } } opacity: control.checked