From 0da07b55ce7c91286f5ea667bd69a2e5229907cb Mon Sep 17 00:00:00 2001
From: Arjen Hiemstra <ahiemstra@heimr.nl>
Date: Thu, 7 Jul 2016 01:43:18 +0200
Subject: [PATCH] Display brand and color name in the material menu if they are
 different than "generic"

Contributes to CURA-341
---
 resources/qml/Menus/MaterialMenu.qml | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/resources/qml/Menus/MaterialMenu.qml b/resources/qml/Menus/MaterialMenu.qml
index 4af8246930..be2ef4a551 100644
--- a/resources/qml/Menus/MaterialMenu.qml
+++ b/resources/qml/Menus/MaterialMenu.qml
@@ -36,7 +36,22 @@ Menu
         }
         MenuItem
         {
-            text: model.name;
+            text:
+            {
+                var result = model.name
+
+                if(model.metadata.brand != undefined && model.metadata.brand != "Generic")
+                {
+                    result = model.metadata.brand + " " + result
+                }
+
+                if(model.metadata.color_name != undefined && model.metadata.color_name != "Generic")
+                {
+                    result = result + " (%1)".arg(model.metadata.color_name)
+                }
+
+                return result
+            }
             checkable: true;
             checked: model.id == Cura.MachineManager.activeMaterialId;
             exclusiveGroup: group;