From 38c9d9e4a12e65ccead5f784feaf9abfd7dab2b0 Mon Sep 17 00:00:00 2001
From: fieldOfView <aldo@fieldofview.com>
Date: Wed, 1 Jun 2016 10:47:04 +0200
Subject: [PATCH] Fix highlighting the currently active
 (printer|quality|material) on their management pages

CURA-1278
---
 resources/qml/MachinesPage.qml              | 10 ++++++++++
 resources/qml/Preferences/MaterialsPage.qml | 10 ++++++++++
 resources/qml/Preferences/ProfilesPage.qml  | 10 ++++++++++
 3 files changed, 30 insertions(+)

diff --git a/resources/qml/MachinesPage.qml b/resources/qml/MachinesPage.qml
index 00ebcfc0af..faef019deb 100644
--- a/resources/qml/MachinesPage.qml
+++ b/resources/qml/MachinesPage.qml
@@ -17,6 +17,16 @@ UM.ManagementPage
         filter: {"type": "machine"}
     }
 
+    activeId: Cura.MachineManager.activeMachineId
+    activeIndex: {
+        for(var i = 0; i < model.rowCount(); i++) {
+            if (model.getItem(i).id == Cura.MachineManager.activeMachineId) {
+                return i;
+            }
+        }
+        return -1;
+    }
+
     onAddObject: Printer.requestAddPrinter()
     onRemoveObject: confirmDialog.open();
     onRenameObject: renameDialog.open();
diff --git a/resources/qml/Preferences/MaterialsPage.qml b/resources/qml/Preferences/MaterialsPage.qml
index 03ede39a5c..0b606ced77 100644
--- a/resources/qml/Preferences/MaterialsPage.qml
+++ b/resources/qml/Preferences/MaterialsPage.qml
@@ -15,6 +15,16 @@ UM.ManagementPage
     title: catalog.i18nc("@title:tab", "Materials");
 
     model: UM.InstanceContainersModel { filter: { "type": "material", "definition": Cura.MachineManager.activeDefinitionId } }
+
+    activeId: Cura.MachineManager.activeMaterialId
+    activeIndex: {
+        for(var i = 0; i < model.rowCount(); i++) {
+            if (model.getItem(i).id == Cura.MachineManager.activeMaterialId) {
+                return i;
+            }
+        }
+        return -1;
+    }
 /*
     onAddObject: { var selectedMaterial = UM.MaterialManager.createProfile(); base.selectMaterial(selectedMaterial); }
     onRemoveObject: confirmDialog.open();
diff --git a/resources/qml/Preferences/ProfilesPage.qml b/resources/qml/Preferences/ProfilesPage.qml
index 10acc8beef..9561bba521 100644
--- a/resources/qml/Preferences/ProfilesPage.qml
+++ b/resources/qml/Preferences/ProfilesPage.qml
@@ -17,6 +17,16 @@ UM.ManagementPage
 
     model: UM.InstanceContainersModel { filter: { "type": "quality" } }
 
+    activeId: Cura.MachineManager.activeQualityId
+    activeIndex: {
+        for(var i = 0; i < model.rowCount(); i++) {
+            if (model.getItem(i).id == Cura.MachineManager.activeQualityId) {
+                return i;
+            }
+        }
+        return -1;
+    }
+
     onActivateObject: Cura.MachineManager.setActiveQuality(currentItem.id)
     onAddObject: {
         var selectedProfile;