From 1003066ce175828812d0ea73dd89cfb9d8c6edf0 Mon Sep 17 00:00:00 2001
From: fieldOfView <aldo@fieldofview.com>
Date: Mon, 22 Aug 2016 11:31:31 +0200
Subject: [PATCH] Show qualities for the material associated with the currently
 selected quality

CURA-2095
---
 cura/Settings/MachineManager.py     | 9 +++++++++
 resources/qml/Menus/ProfileMenu.qml | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py
index a59b85c8df..d4ccad5bae 100644
--- a/cura/Settings/MachineManager.py
+++ b/cura/Settings/MachineManager.py
@@ -477,6 +477,15 @@ class MachineManager(QObject):
 
         return ""
 
+    @pyqtProperty(str, notify=activeQualityChanged)
+    def activeQualityMaterialId(self):
+        if self._active_container_stack:
+            quality = self._active_container_stack.findContainer({"type": "quality"})
+            if quality:
+                return quality.getMetaDataEntry("material")
+
+        return ""
+
     @pyqtProperty(str, notify=activeQualityChanged)
     def activeQualityName(self):
         if self._active_container_stack:
diff --git a/resources/qml/Menus/ProfileMenu.qml b/resources/qml/Menus/ProfileMenu.qml
index 68f83305d7..fcc97e5ea2 100644
--- a/resources/qml/Menus/ProfileMenu.qml
+++ b/resources/qml/Menus/ProfileMenu.qml
@@ -83,7 +83,7 @@ import Cura 1.0 as Cura
             result.definition = Cura.MachineManager.activeDefinitionId;
             if(Cura.MachineManager.hasMaterials)
             {
-                result.material = Cura.MachineManager.activeMaterialId;
+                result.material = Cura.MachineManager.activeQualityMaterialId;
             }
         }
         else