From 12a120f04407a1b54770c884c14d6e642984df11 Mon Sep 17 00:00:00 2001
From: Jaime van Kessel <nallath@gmail.com>
Date: Thu, 17 Jan 2019 14:21:11 +0100
Subject: [PATCH] Slightly modify the variant label to match more with the
 monitor tab

CURA-6100
---
 .../ConfigurationMenu/ConfigurationMenu.qml   | 63 +++++++------------
 1 file changed, 22 insertions(+), 41 deletions(-)

diff --git a/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml b/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml
index 89d753463a..1e3b48b1df 100644
--- a/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml
+++ b/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml
@@ -61,6 +61,26 @@ Cura.ExpandablePopup
                     width: height
                 }
 
+                // Label for the brand of the material
+                Label
+                {
+                    id: typeAndBrandNameLabel
+
+                    text: model.material_brand + " " + model.material
+                    elide: Text.ElideRight
+                    font: UM.Theme.getFont("default")
+                    color: UM.Theme.getColor("text")
+                    renderType: Text.NativeRendering
+
+                    anchors
+                    {
+                        top: extruderIcon.top
+                        left: extruderIcon.right
+                        leftMargin: UM.Theme.getSize("default_margin").width
+                        right: parent.right
+                        rightMargin: UM.Theme.getSize("default_margin").width
+                    }
+                }
                 // Label that shows the name of the variant
                 Label
                 {
@@ -70,7 +90,7 @@ Cura.ExpandablePopup
 
                     text: model.variant
                     elide: Text.ElideRight
-                    font: UM.Theme.getFont("medium")
+                    font: UM.Theme.getFont("default_bold")
                     color: UM.Theme.getColor("text")
                     renderType: Text.NativeRendering
 
@@ -78,46 +98,7 @@ Cura.ExpandablePopup
                     {
                         left: extruderIcon.right
                         leftMargin: UM.Theme.getSize("default_margin").width
-                        verticalCenter: parent.verticalCenter
-                    }
-                }
-
-                // Label for the brand of the material
-                Label
-                {
-                    id: brandNameLabel
-
-                    text: model.material_brand
-                    elide: Text.ElideRight
-                    font: UM.Theme.getFont("default")
-                    color: UM.Theme.getColor("text_inactive")
-                    renderType: Text.NativeRendering
-
-                    anchors
-                    {
-                        left: variantLabel.visible ? variantLabel.right : extruderIcon.right
-                        leftMargin: UM.Theme.getSize("default_margin").width
-                        right: parent.right
-                        rightMargin: UM.Theme.getSize("default_margin").width
-                    }
-                }
-
-                // Label that shows the name of the material
-                Label
-                {
-                    text: model.material
-                    elide: Text.ElideRight
-                    font: UM.Theme.getFont("medium")
-                    color: UM.Theme.getColor("text")
-                    renderType: Text.NativeRendering
-
-                    anchors
-                    {
-                        left: variantLabel.visible ? variantLabel.right : extruderIcon.right
-                        leftMargin: UM.Theme.getSize("default_margin").width
-                        right: parent.right
-                        rightMargin: UM.Theme.getSize("default_margin").width
-                        top: brandNameLabel.bottom
+                        top: typeAndBrandNameLabel.bottom
                     }
                 }
             }