From 652e8fbe7734c35fc3f053418d0e824824bc9618 Mon Sep 17 00:00:00 2001 From: "saumya.jain" Date: Tue, 5 Sep 2023 16:05:18 +0200 Subject: [PATCH 1/3] printjob icon CURA-10997 --- .../qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml | 2 +- resources/themes/cura-light/icons/default/Nozzle.svg | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 resources/themes/cura-light/icons/default/Nozzle.svg diff --git a/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml b/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml index a42239056cd..b1acec12515 100644 --- a/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml +++ b/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml @@ -44,7 +44,7 @@ Popup }, { displayName: catalog.i18nc("@label:button", "Print jobs"), - thumbnail: UM.Theme.getIcon("FoodBeverages"), + thumbnail: UM.Theme.getIcon("Nozzle"), description: catalog.i18nc("@tooltip:button", "Monitor print jobs and reprint from your print history."), link: "https://digitalfactory.ultimaker.com/app/print-jobs?utm_source=cura&utm_medium=software&utm_campaign=switcher-digital-factory-printjobs", permissionsRequired: ["digital-factory.print-job.read"] diff --git a/resources/themes/cura-light/icons/default/Nozzle.svg b/resources/themes/cura-light/icons/default/Nozzle.svg new file mode 100644 index 00000000000..616a6b8f3d2 --- /dev/null +++ b/resources/themes/cura-light/icons/default/Nozzle.svg @@ -0,0 +1,4 @@ + + + + From d14c8c56c1159ca09f9be566742a7418073cfae4 Mon Sep 17 00:00:00 2001 From: "saumya.jain" Date: Wed, 13 Sep 2023 10:14:55 +0200 Subject: [PATCH 2/3] icon removed added in depricated icon CURA-10997 --- resources/themes/cura-light/icons/default/FoodBeverages.svg | 3 --- resources/themes/cura-light/icons/deprecated_icons.json | 4 ++++ 2 files changed, 4 insertions(+), 3 deletions(-) delete mode 100644 resources/themes/cura-light/icons/default/FoodBeverages.svg diff --git a/resources/themes/cura-light/icons/default/FoodBeverages.svg b/resources/themes/cura-light/icons/default/FoodBeverages.svg deleted file mode 100644 index 1e74b339557..00000000000 --- a/resources/themes/cura-light/icons/default/FoodBeverages.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/resources/themes/cura-light/icons/deprecated_icons.json b/resources/themes/cura-light/icons/deprecated_icons.json index 28abf119aec..08812c6759c 100644 --- a/resources/themes/cura-light/icons/deprecated_icons.json +++ b/resources/themes/cura-light/icons/deprecated_icons.json @@ -398,5 +398,9 @@ "viewmode": { "new_icon": "Eye", "size": "default" + }, + "FoodBeverages": { + "new_icon": "Nozzle", + "size": "default" } } \ No newline at end of file From 70873ff2df69e4d438a9c95497cf8c3c29368f24 Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Wed, 13 Sep 2023 11:18:16 +0200 Subject: [PATCH 3/3] Fix UT Materials `brand` is a required property --- tests/Machines/TestMaterialNode.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Machines/TestMaterialNode.py b/tests/Machines/TestMaterialNode.py index a04c8b253b3..82575118b7c 100644 --- a/tests/Machines/TestMaterialNode.py +++ b/tests/Machines/TestMaterialNode.py @@ -47,7 +47,7 @@ def getInstanceContainerSideEffect(*args, **kwargs): def container_registry(): result = MagicMock() result.findInstanceContainersMetadata = MagicMock(side_effect=getInstanceContainerSideEffect) - result.findContainersMetadata = MagicMock(return_value = [{"base_file": "material_1", "material": "test_material_type", "GUID": "omg zomg"}]) + result.findContainersMetadata = MagicMock(return_value = [{"base_file": "material_1", "material": "test_material_type", "GUID": "omg zomg", "brand": "test_brand"}]) return result