From 95a695545b1c3a8e222c0f71ad0a67c948c4a37b Mon Sep 17 00:00:00 2001
From: Adam Goldsmith <adam@adamgoldsmith.name>
Date: Wed, 28 Oct 2015 10:29:06 -0400
Subject: [PATCH] Fix unset text colors on bright backgrounds

Adds a text_default color for use where the background color is set to
something bright. This avoids falling back on the user's theme, in which
the default text color might be also be bright.
---
 resources/qml/ProfileSetup.qml   | 1 +
 resources/qml/SidebarHeader.qml  | 1 +
 resources/qml/SidebarSimple.qml  | 2 ++
 resources/qml/SidebarTooltip.qml | 1 +
 resources/themes/cura/theme.json | 1 +
 5 files changed, 6 insertions(+)

diff --git a/resources/qml/ProfileSetup.qml b/resources/qml/ProfileSetup.qml
index aa4a2b344a..d9869d62b7 100644
--- a/resources/qml/ProfileSetup.qml
+++ b/resources/qml/ProfileSetup.qml
@@ -81,6 +81,7 @@ Item{
             text: catalog.i18nc("@label","Global Profile:");
             width: parent.width/100*45
             font: UM.Theme.fonts.default;
+            color: UM.Theme.colors.text_default;
         }
 
 
diff --git a/resources/qml/SidebarHeader.qml b/resources/qml/SidebarHeader.qml
index 322b9b7a5a..2ce2e7975a 100644
--- a/resources/qml/SidebarHeader.qml
+++ b/resources/qml/SidebarHeader.qml
@@ -100,6 +100,7 @@ Item
             anchors.leftMargin: UM.Theme.sizes.default_margin.width
             anchors.verticalCenter: parent.verticalCenter
             font: UM.Theme.fonts.default;
+            color: UM.Theme.colors.text_default;
         }
 
         ToolButton {
diff --git a/resources/qml/SidebarSimple.qml b/resources/qml/SidebarSimple.qml
index 10b935bbcd..a16b0af225 100644
--- a/resources/qml/SidebarSimple.qml
+++ b/resources/qml/SidebarSimple.qml
@@ -33,6 +33,7 @@ Item
             //: Infill selection label
             text: catalog.i18nc("@label","Infill:");
             font: UM.Theme.fonts.default;
+            color: UM.Theme.colors.text_default;
             anchors.top: parent.top
             anchors.topMargin: UM.Theme.sizes.default_margin.height
             anchors.left: parent.left
@@ -166,6 +167,7 @@ Item
             //: Helpers selection label
             text: catalog.i18nc("@label:listbox","Helpers:");
             font: UM.Theme.fonts.default;
+            color: UM.Theme.colors.text_default;
         }
     }
     Rectangle {
diff --git a/resources/qml/SidebarTooltip.qml b/resources/qml/SidebarTooltip.qml
index 6e0ba74404..8b7cc1c0dc 100644
--- a/resources/qml/SidebarTooltip.qml
+++ b/resources/qml/SidebarTooltip.qml
@@ -47,5 +47,6 @@ Rectangle {
         }
         wrapMode: Text.Wrap;
         font: UM.Theme.fonts.default;
+        color: UM.Theme.colors.text_default;
     }
 }
diff --git a/resources/themes/cura/theme.json b/resources/themes/cura/theme.json
index 63e04c6e6e..8130ec9bd0 100644
--- a/resources/themes/cura/theme.json
+++ b/resources/themes/cura/theme.json
@@ -50,6 +50,7 @@
     },
 
     "colors": {
+		"text_default": [0, 0, 0, 255],
         "sidebar": [255, 255, 255, 255],
         "lining": [208, 210, 211, 255],