From 8014f11d6b48ea67b1325fa1d893d3eef95acefa Mon Sep 17 00:00:00 2001 From: Kostas Karmas Date: Fri, 14 May 2021 09:11:27 +0200 Subject: [PATCH 1/4] Add missing entry to the deprecated_icons dict CURA-8205 --- resources/themes/cura-light/icons/deprecated_icons.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/resources/themes/cura-light/icons/deprecated_icons.json b/resources/themes/cura-light/icons/deprecated_icons.json index 9c6f58473b..9b11955fc8 100644 --- a/resources/themes/cura-light/icons/deprecated_icons.json +++ b/resources/themes/cura-light/icons/deprecated_icons.json @@ -239,6 +239,10 @@ "new_icon": "View3D", "size": "default" }, + "view_layer": { + "new_icon": "Layers", + "size": "default" + }, "view_front": { "new_icon": "ViewFront", "size": "default" From 7feba688476d7c62c56a01df359238d91068fa67 Mon Sep 17 00:00:00 2001 From: Kostas Karmas Date: Fri, 14 May 2021 09:16:43 +0200 Subject: [PATCH 2/4] Add new icon for block support overlaps CURA-8205 --- plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml | 2 +- .../themes/cura-light/icons/default/BlockSupportOverlaps.svg | 1 + resources/themes/cura-light/icons/deprecated_icons.json | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 resources/themes/cura-light/icons/default/BlockSupportOverlaps.svg diff --git a/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml b/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml index c0c4e252ed..f7a555cc61 100644 --- a/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml +++ b/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml @@ -116,7 +116,7 @@ Item { id: antiOverhangMeshButton text: catalog.i18nc("@label", "Don't support overlaps") - iconSource: UM.Theme.getIcon("MeshTypeExclude"); + iconSource: UM.Theme.getIcon("BlockSupportOverlaps"); property bool needBorder: true checkable: true onClicked: setMeshType(antiOverhangMeshType) diff --git a/resources/themes/cura-light/icons/default/BlockSupportOverlaps.svg b/resources/themes/cura-light/icons/default/BlockSupportOverlaps.svg new file mode 100644 index 0000000000..a6d250c80a --- /dev/null +++ b/resources/themes/cura-light/icons/default/BlockSupportOverlaps.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/themes/cura-light/icons/deprecated_icons.json b/resources/themes/cura-light/icons/deprecated_icons.json index 9b11955fc8..df286cffc7 100644 --- a/resources/themes/cura-light/icons/deprecated_icons.json +++ b/resources/themes/cura-light/icons/deprecated_icons.json @@ -64,7 +64,7 @@ "size": "default" }, "pos_modify_dont_support_overlap": { - "new_icon": "MeshTypeExclude", + "new_icon": "BlockSupportOverlaps", "size": "default" }, "minus": { From b5a3bfbf505748b61a062db15ebb51ed15a5bff4 Mon Sep 17 00:00:00 2001 From: Kostas Karmas Date: Fri, 14 May 2021 10:10:56 +0200 Subject: [PATCH 3/4] Remove old "MeshTypeExclude" icon It was used by the "Don't support overlaps" tool in the "Per Model settings" but it is now replaced by the icon "BlockSupportOverlaps" CURA-8205 --- .../themes/cura-light/icons/default/MeshTypeExclude.svg | 7 ------- 1 file changed, 7 deletions(-) delete mode 100755 resources/themes/cura-light/icons/default/MeshTypeExclude.svg diff --git a/resources/themes/cura-light/icons/default/MeshTypeExclude.svg b/resources/themes/cura-light/icons/default/MeshTypeExclude.svg deleted file mode 100755 index f31de41aad..0000000000 --- a/resources/themes/cura-light/icons/default/MeshTypeExclude.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - From 9d284d9c6ffd2dfc9013b173865b09c603470c90 Mon Sep 17 00:00:00 2001 From: Kostas Karmas Date: Fri, 14 May 2021 10:42:37 +0200 Subject: [PATCH 4/4] Use new icon for "Block support overlap" models in the object menu CURA-8205 --- resources/qml/ObjectItemButton.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/qml/ObjectItemButton.qml b/resources/qml/ObjectItemButton.qml index 2b998e0438..7d8988fde4 100644 --- a/resources/qml/ObjectItemButton.qml +++ b/resources/qml/ObjectItemButton.qml @@ -173,7 +173,7 @@ Button case "infill_mesh": return UM.Theme.getIcon("MeshTypeIntersect"); case "anti_overhang_mesh": - return UM.Theme.getIcon("MeshTypeExclude"); + return UM.Theme.getIcon("BlockSupportOverlaps"); } return ""; }