From 12a98388d9fd00cd9e3b85a2ea060d6c8c9a215e Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Wed, 5 May 2021 14:28:04 +0200 Subject: [PATCH 1/4] Fix typo in icon name CURA-8010 --- plugins/CuraDrive/src/qml/components/BackupListItemDetails.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/CuraDrive/src/qml/components/BackupListItemDetails.qml b/plugins/CuraDrive/src/qml/components/BackupListItemDetails.qml index 33c16853c5..a4f30edd19 100644 --- a/plugins/CuraDrive/src/qml/components/BackupListItemDetails.qml +++ b/plugins/CuraDrive/src/qml/components/BackupListItemDetails.qml @@ -17,7 +17,7 @@ ColumnLayout // Cura version BackupListItemDetailsRow { - iconSource: UM.Theme.getIcon("UltimakeCura") + iconSource: UM.Theme.getIcon("UltimakerCura") label: catalog.i18nc("@backuplist:label", "Cura Version") value: backupDetailsData.metadata.cura_release } From 34f75839c4811eeae946c2fb1c122569c1e75d7a Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Wed, 5 May 2021 15:41:26 +0200 Subject: [PATCH 2/4] Add list for deprecated icons We changed a bunch of names, but we still want to keep it intact for a bit longer. If we don't, a whole bunch of plugins look ugly AF CURA-8010 --- .../cura-light/icons/deprecated_icons.json | 302 ++++++++++++++++++ 1 file changed, 302 insertions(+) create mode 100644 resources/themes/cura-light/icons/deprecated_icons.json diff --git a/resources/themes/cura-light/icons/deprecated_icons.json b/resources/themes/cura-light/icons/deprecated_icons.json new file mode 100644 index 0000000000..7aca3eb3f2 --- /dev/null +++ b/resources/themes/cura-light/icons/deprecated_icons.json @@ -0,0 +1,302 @@ +{ + "notice": { + "new_icon": "Information", + "size": "default" + }, + "info": { + "new_icon": "Information", + "size": "default" + }, + "plus": { + "new_icon": "Plus", + "size": "default" + }, + "cross1": { + "new_icon": "Cancel", + "size": "default" + }, + "application": { + "new_icon": "UltimakerCura", + "size": "default" + }, + "printer_single": { + "new_icon": "Printer", + "size": "default" + }, + "category_material": { + "new_icon": "Spool", + "size": "default" + }, + "settings": { + "new_icon": "Sliders", + "size": "default" + }, + "plugin": { + "new_icon": "Plugin", + "size": "default" + }, + "external_link": { + "new_icon": "LinkExternal", + "size": "default" + }, + "arrow_top": { + "new_icon": "ChevronSingleUp", + "size": "default" + }, + "arrow_bottom": { + "new_icon": "ChevronSingleDown", + "size": "default" + }, + "arrow_right": { + "new_icon": "ChevronSingleRight", + "size": "default" + }, + "pos_normal": { + "new_icon": "Infill0", + "size": "default" + }, + "pos_print_as_support": { + "new_icon": "MeshTypeSupport", + "size": "default" + }, + "pos_modify_overlaps": { + "new_icon": "MeshTypeIntersect", + "size": "default" + }, + "pos_modify_dont_support_overlap": { + "new_icon": "MeshTypeExclude", + "size": "default" + }, + "minus": { + "new_icon": "Minus", + "size": "default" + }, + "load": { + "new_icon": "Folder", + "size": "default" + }, + "extruder_button": { + "new_icon": "Extruder", + "size": "medium" + }, + "category_adhesion": { + "new_icon": "Adhesion", + "size": "default" + }, + "category_machine": { + "new_icon": "Printer", + "size": "default" + }, + "category_layer_height": { + "new_icon": "PrintQuality", + "size": "default" + }, + "category_shell": { + "new_icon": "PrintShell", + "size": "default" + }, + "category_topbottom": { + "new_icon": "PrintTopBottom", + "size": "default" + }, + "category_infill": { + "new_icon": "Infill1", + "size": "default" + }, + "category_speed": { + "new_icon": "SpeedOMeter", + "size": "default" + }, + "category_travel": { + "new_icon": "PrintTravel", + "size": "default" + }, + "category_cool": { + "new_icon": "Fan", + "size": "default" + }, + "category_support": { + "new_icon": "Support", + "size": "default" + }, + "category_dual": { + "new_icon": "DualExtrusion", + "size": "default" + }, + "category_fixes": { + "new_icon": "Bandage", + "size": "default" + }, + "category_blackmagic": { + "new_icon": "BlackMagic", + "size": "default" + }, + "category_experimental": { + "new_icon": "Experiment", + "size": "default" + }, + "circle_outline": { + "new_icon": "CircleOutline", + "size": "default" + }, + "update": { + "new_icon": "ArrowDoubleCircleRight", + "size": "default" + }, + "checked": { + "new_icon": "CheckCircle", + "size": "default" + }, + "warning_light": { + "new_icon": "Warning", + "size": "default" + }, + "clock": { + "new_icon": "Clock", + "size": "default" + }, + "spool": { + "new_icon": "Spool", + "size": "default" + }, + "warning": { + "new_icon": "Warning", + "size": "default" + }, + "check": { + "new_icon": "Check", + "size": "default" + }, + "pencil": { + "new_icon": "Pencil", + "size": "default" + }, + "printing_guideline": { + "new_icon": "Guide", + "size": "default" + }, + "favorites_star_full": { + "new_icon": "StarFilled", + "size": "default" + }, + "favorites_star_empty": { + "new_icon": "Star", + "size": "default" + }, + "resize": { + "new_icon": "ThreeDots", + "size": "default" + }, + "gradual": { + "new_icon": "InfillGradual", + "size": "default" + }, + "hollow": { + "new_icon": "Infill0", + "size": "default" + }, + "sparse": { + "new_icon": "Infill3", + "size": "default" + }, + "dense": { + "new_icon": "Infill2", + "size": "default" + }, + "solid": { + "new_icon": "Solid", + "size": "default" + }, + "reset": { + "new_icon": "ArrowReset", + "size": "default" + }, + "arrow_left": { + "new_icon": "ChevronSingleLeft", + "size": "default" + }, + "home": { + "new_icon": "House", + "size": "default" + }, + "printer_group": { + "new_icon": "PrinterTriple", + "size": "medium" + }, + "formula": { + "new_icon": "Formula", + "size": "default" + }, + "search": { + "new_icon": "Magnifier", + "size": "default" + }, + "menu": { + "new_icon": "Hamburger", + "size": "default" + }, + "view_3d": { + "new_icon": "View3D", + "size": "default" + }, + "view_front": { + "new_icon": "ViewFront", + "size": "default" + }, + "view_top": { + "new_icon": "ViewTop", + "size": "default" + }, + "view_left": { + "new_icon": "ViewLeft", + "size": "default" + }, + "view_right": { + "new_icon": "ViewRight", + "size": "default" + }, + "package": { + "new_icon": "Plugin", + "size": "default" + }, + "material_spool": { + "new_icon": "Spool", + "size": "default" + }, + "dot": { + "new_icon": "Dot", + "size": "low" + }, + "mirror": { + "new_icon": "Mirror", + "size": "default" + }, + "rotate_reset": { + "new_icon": "ArrowReset", + "size": "default" + }, + "rotate_layflat": { + "new_icon": "LayFlat", + "size": "default" + }, + "rotate_face_layflat": { + "new_icon": "LayFlatOnFace", + "size": "default" + }, + "rotate": { + "new_icon": "Rotate", + "size": "default" + }, + "scale_reset": { + "new_icon": "ArrowReset", + "size": "default" + }, + "scale": { + "new_icon": "Scale", + "size": "default" + }, + "translate": { + "new_icon": "ArrowFourWay", + "size": "default" + } +} \ No newline at end of file From 5ad9cd4845ba286687e2bf0e74e947f219b384b9 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Wed, 5 May 2021 15:57:03 +0200 Subject: [PATCH 3/4] Add Function icon CURA-8010 --- resources/themes/cura-light/icons/default/Function.svg | 1 + 1 file changed, 1 insertion(+) create mode 100644 resources/themes/cura-light/icons/default/Function.svg diff --git a/resources/themes/cura-light/icons/default/Function.svg b/resources/themes/cura-light/icons/default/Function.svg new file mode 100644 index 0000000000..8c3e9c883d --- /dev/null +++ b/resources/themes/cura-light/icons/default/Function.svg @@ -0,0 +1 @@ + \ No newline at end of file From 672d6c89cf6b12b01fe27c28622806310b063968 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Wed, 5 May 2021 15:58:42 +0200 Subject: [PATCH 4/4] Switch out inherit icon CURA-8010 --- resources/qml/Settings/SettingItem.qml | 2 +- resources/themes/cura-light/icons/deprecated_icons.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/qml/Settings/SettingItem.qml b/resources/qml/Settings/SettingItem.qml index 56f07f51af..a377d08cfc 100644 --- a/resources/qml/Settings/SettingItem.qml +++ b/resources/qml/Settings/SettingItem.qml @@ -324,7 +324,7 @@ Item color: UM.Theme.getColor("setting_control_button") hoverColor: UM.Theme.getColor("setting_control_button_hover") - iconSource: UM.Theme.getIcon("Formula") + iconSource: UM.Theme.getIcon("Function") onEntered: { hoverTimer.stop(); base.showTooltip(catalog.i18nc("@label", "This setting is normally calculated, but it currently has an absolute value set.\n\nClick to restore the calculated value.")) } onExited: base.showTooltip(base.createTooltipText()) diff --git a/resources/themes/cura-light/icons/deprecated_icons.json b/resources/themes/cura-light/icons/deprecated_icons.json index 7aca3eb3f2..9c6f58473b 100644 --- a/resources/themes/cura-light/icons/deprecated_icons.json +++ b/resources/themes/cura-light/icons/deprecated_icons.json @@ -224,7 +224,7 @@ "size": "medium" }, "formula": { - "new_icon": "Formula", + "new_icon": "Function", "size": "default" }, "search": {