From 6c16d82736d59d4b677fe45fba3413e97ac87966 Mon Sep 17 00:00:00 2001
From: fieldOfView <aldo@fieldofview.com>
Date: Mon, 29 Aug 2016 16:35:10 +0200
Subject: [PATCH] Add material type as a column in the Material manager

...and a color swatch for good measure.
---
 resources/qml/Preferences/MaterialsPage.qml | 57 ++++++++++++++++++++-
 1 file changed, 55 insertions(+), 2 deletions(-)

diff --git a/resources/qml/Preferences/MaterialsPage.qml b/resources/qml/Preferences/MaterialsPage.qml
index 43182ef581..954809fa44 100644
--- a/resources/qml/Preferences/MaterialsPage.qml
+++ b/resources/qml/Preferences/MaterialsPage.qml
@@ -37,6 +37,58 @@ UM.ManagementPage
         sectionProperty: "brand"
     }
 
+    delegate: Rectangle
+    {
+        width: objectList.width;
+        height: childrenRect.height;
+        color: isCurrentItem ? palette.highlight : index % 2 ? palette.base : palette.alternateBase
+        property bool isCurrentItem: ListView.isCurrentItem
+
+        Row
+        {
+            spacing: UM.Theme.getSize("default_margin").width / 2;
+            anchors.left: parent.left;
+            anchors.leftMargin: UM.Theme.getSize("default_margin").width;
+            anchors.right: parent.right;
+            Rectangle
+            {
+                width: parent.height * 0.8
+                height: parent.height * 0.8
+                color: model.metadata.color_code
+                border.color: isCurrentItem ? palette.highlightedText : palette.text;
+                anchors.verticalCenter: parent.verticalCenter
+            }
+            Label
+            {
+                width: parent.width * 0.3
+                text: model.metadata.material
+                elide: Text.ElideRight
+                font.italic: model.id == activeId
+                color: isCurrentItem ? palette.highlightedText : palette.text;
+            }
+            Label
+            {
+                text: (model.name != model.metadata.material) ? model.metadata.color_name : ""
+                elide: Text.ElideRight
+                font.italic: model.id == activeId
+                color: isCurrentItem ? palette.highlightedText : palette.text;
+            }
+        }
+
+        MouseArea
+        {
+            anchors.fill: parent;
+            onClicked:
+            {
+                if(!parent.ListView.isCurrentItem)
+                {
+                    parent.ListView.view.currentIndex = index;
+                    base.itemActivated();
+                }
+            }
+        }
+    }
+
     activeId: Cura.MachineManager.activeMaterialId
     activeIndex: {
         for(var i = 0; i < model.rowCount(); i++) {
@@ -123,8 +175,6 @@ UM.ManagementPage
     ]
 
     Item {
-        UM.I18nCatalog { id: catalog; name: "cura"; }
-
         visible: base.currentItem != null
         anchors.fill: parent
 
@@ -274,6 +324,9 @@ UM.ManagementPage
         {
             id: messageDialog
         }
+
+        UM.I18nCatalog { id: catalog; name: "cura"; }
+        SystemPalette { id: palette }
     }
 
     onCurrentItemChanged: