From 3fd1cc0e8cec4c77d080860bccd9deb99bb2d62c Mon Sep 17 00:00:00 2001
From: Jaime van Kessel <nallath@gmail.com>
Date: Fri, 16 Nov 2018 14:58:11 +0100
Subject: [PATCH] Ensure that the added labels are also themable

CURA-5785
---
 plugins/PreviewStage/PreviewMenu.qml                          | 2 ++
 resources/qml/ExpandableComponent.qml                         | 2 +-
 resources/qml/MachineSelector.qml                             | 3 +++
 .../Menus/ConfigurationMenu/QuickConfigurationSelector.qml    | 4 ++++
 4 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/plugins/PreviewStage/PreviewMenu.qml b/plugins/PreviewStage/PreviewMenu.qml
index bf162be4e3..90c1cb7c99 100644
--- a/plugins/PreviewStage/PreviewMenu.qml
+++ b/plugins/PreviewStage/PreviewMenu.qml
@@ -74,6 +74,8 @@ Item
                     height: parent.height
                     elide: Text.ElideRight
                     font: UM.Theme.getFont("default")
+                    color: UM.Theme.getColor("text")
+
                 }
 
                 popupItem: Column
diff --git a/resources/qml/ExpandableComponent.qml b/resources/qml/ExpandableComponent.qml
index bbba44f743..c177dc758d 100644
--- a/resources/qml/ExpandableComponent.qml
+++ b/resources/qml/ExpandableComponent.qml
@@ -38,7 +38,7 @@ Item
     // Is the "drawer" open?
     readonly property alias expanded: popup.visible
 
-    property alias expandedHighlightColor: expandedHightlight.color
+    property alias expandedHighlightColor: expandedHighlight.color
 
     function togglePopup()
     {
diff --git a/resources/qml/MachineSelector.qml b/resources/qml/MachineSelector.qml
index b18f427980..1f18e1ab2a 100644
--- a/resources/qml/MachineSelector.qml
+++ b/resources/qml/MachineSelector.qml
@@ -32,6 +32,7 @@ Cura.ExpandableComponent
         height: parent.height
         elide: Text.ElideRight
         font: UM.Theme.getFont("default")
+        color: UM.Theme.getColor("text")
     }
 
     popupItem: Item
@@ -58,6 +59,7 @@ Cura.ExpandableComponent
                     visible: networkedPrintersModel.items.length > 0
                     height: visible ? contentHeight + 2 * UM.Theme.getSize("default_margin").height : 0
                     font: UM.Theme.getFont("medium_bold")
+                    color: UM.Theme.getColor("text")
                     verticalAlignment: Text.AlignVCenter
                 }
 
@@ -99,6 +101,7 @@ Cura.ExpandableComponent
                     visible: virtualPrintersModel.items.length > 0
                     height: visible ? contentHeight + 2 * UM.Theme.getSize("default_margin").height : 0
                     font: UM.Theme.getFont("medium_bold")
+                    color: UM.Theme.getColor("text")
                     verticalAlignment: Text.AlignVCenter
                 }
 
diff --git a/resources/qml/Menus/ConfigurationMenu/QuickConfigurationSelector.qml b/resources/qml/Menus/ConfigurationMenu/QuickConfigurationSelector.qml
index 6f4e58a326..d6b9b1c06a 100644
--- a/resources/qml/Menus/ConfigurationMenu/QuickConfigurationSelector.qml
+++ b/resources/qml/Menus/ConfigurationMenu/QuickConfigurationSelector.qml
@@ -60,6 +60,8 @@ Cura.ExpandableComponent
 
                     text: model.material_brand
                     elide: Text.ElideRight
+                    font: UM.Theme.getFont("default")
+                    color: UM.Theme.getColor("text")
 
                     anchors
                     {
@@ -75,6 +77,8 @@ Cura.ExpandableComponent
                 {
                     text: model.material
                     elide: Text.ElideRight
+                    font: UM.Theme.getFont("default")
+                    color: UM.Theme.getColor("text")
 
                     anchors
                     {