Merge branch 'main' into CURA-11031_only_start_services_when_required

Aurelius-Nero · Sep 13, 2023 · 043fb3f · 043fb3f
2 parents 9b51c6b + 70873ff
commit 043fb3f
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 5 deletions.
diff --git 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/FoodBeverages.svg b/resources/themes/cura-light/icons/default/FoodBeverages.svg
diff --git a/resources/themes/cura-light/icons/default/Nozzle.svg b/resources/themes/cura-light/icons/default/Nozzle.svg
diff --git 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"
     }
 }
diff --git 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