From b33ce573c1522e8b1864882e2429709de80ab4a0 Mon Sep 17 00:00:00 2001
From: Arjen Hiemstra <ahiemstra@heimr.nl>
Date: Sat, 4 Jun 2016 19:22:42 +0200
Subject: [PATCH] Also filter materials and profiles preference pages by
 machine etc. when desired

Contriubtes to CURA-1612
---
 resources/qml/Preferences/MaterialsPage.qml | 28 +++++++++++++++------
 resources/qml/Preferences/ProfilesPage.qml  | 21 +++++++++++++++-
 2 files changed, 41 insertions(+), 8 deletions(-)

diff --git a/resources/qml/Preferences/MaterialsPage.qml b/resources/qml/Preferences/MaterialsPage.qml
index ed35a32fdf..af0f0c1bd2 100644
--- a/resources/qml/Preferences/MaterialsPage.qml
+++ b/resources/qml/Preferences/MaterialsPage.qml
@@ -14,7 +14,26 @@ UM.ManagementPage
 
     title: catalog.i18nc("@title:tab", "Materials");
 
-    model: UM.InstanceContainersModel { filter: { "type": "material", "definition": Cura.MachineManager.activeDefinitionId } }
+    model: UM.InstanceContainersModel
+    {
+        filter:
+        {
+            var result = { "type": "material" }
+            if(Cura.MachineManager.filterMaterialsByMachine)
+            {
+                result.definition = Cura.MachineManager.activeDefinitionId
+                if(Cura.MachineManager.hasVariants)
+                {
+                    result.variant = Cura.MachineManager.activeVariantId
+                }
+            }
+            else
+            {
+                result.definition = "fdmprinter"
+            }
+            return result
+        }
+    }
 
     activeId: Cura.MachineManager.activeMaterialId
     activeIndex: {
@@ -25,12 +44,7 @@ UM.ManagementPage
         }
         return -1;
     }
-/*
-    onAddObject: { var selectedMaterial = UM.MaterialManager.createProfile(); base.selectMaterial(selectedMaterial); }
-    onRemoveObject: confirmDialog.open();
-    onRenameObject: { renameDialog.open(); renameDialog.selectText(); }
-*/
-//     activateEnabled: false
+
     addEnabled: false
     removeEnabled: false
     renameEnabled: false
diff --git a/resources/qml/Preferences/ProfilesPage.qml b/resources/qml/Preferences/ProfilesPage.qml
index 8182eb1bb6..b7261afcec 100644
--- a/resources/qml/Preferences/ProfilesPage.qml
+++ b/resources/qml/Preferences/ProfilesPage.qml
@@ -15,7 +15,26 @@ UM.ManagementPage
     title: catalog.i18nc("@title:tab", "Profiles");
     addText: catalog.i18nc("@label", "Duplicate")
 
-    model: UM.InstanceContainersModel { filter: { "type": "quality" } }
+    model: UM.InstanceContainersModel
+    {
+        filter:
+        {
+            var result = { "type": "quality" };
+            if(Cura.MachineManager.filterQualityByMachine)
+            {
+                result.definition = Cura.MachineManager.activeDefinitionId;
+                if(Cura.MachineManager.hasMaterials)
+                {
+                    result.material = Cura.MachineManager.activeMaterialId;
+                }
+            }
+            else
+            {
+                result.definition = "fdmprinter"
+            }
+            return result
+        }
+    }
 
     activeId: Cura.MachineManager.activeQualityId
     activeIndex: {