From bc7178f49d4c4331e1cdc0c973eb01400e821229 Mon Sep 17 00:00:00 2001
From: Malte Langkabel <malte.langkabel@gmail.com>
Date: Tue, 3 Dec 2019 14:46:11 +0100
Subject: [PATCH] logic: color scheme fixes (#821)

* fixed issues where color scheme entries were missing
* removed color scheme entries for nodes and edges that do not exist anymore
---
 bin/app/data/color_schemes/bad_rainbow.xml    | 31 +++++++++----------
 bin/app/data/color_schemes/bright.xml         | 31 +++++++++----------
 bin/app/data/color_schemes/dark.xml           | 31 +++++++++----------
 bin/app/data/gui/code_view/code_view.css      |  2 +-
 .../custom_trail_view/custom_trail_view.css   |  6 ----
 .../data/gui/tooltip_view/tooltip_view.css    |  2 +-
 src/lib/settings/ColorScheme.cpp              |  2 +-
 src/lib_gui/qt/utility/utilityQt.cpp          |  6 +++-
 src/lib_gui/qt/view/QtErrorView.cpp           |  2 +-
 src/lib_gui/qt/view/QtStatusView.cpp          |  2 +-
 10 files changed, 52 insertions(+), 63 deletions(-)

diff --git a/bin/app/data/color_schemes/bad_rainbow.xml b/bin/app/data/color_schemes/bad_rainbow.xml
index e8e4868d..efa60252 100644
--- a/bin/app/data/color_schemes/bad_rainbow.xml
+++ b/bin/app/data/color_schemes/bad_rainbow.xml
@@ -2,6 +2,7 @@
 
 <config>
 	<window>
+		<background>#494949</background>
 		<separator>#CCCCCC</separator>
 		<scrollbar>
 			<background>transparent</background>
@@ -284,9 +285,6 @@
 			<typedef>
 				<like>type</like>
 			</typedef>
-			<template_parameter>
-				<like>type</like>
-			</template_parameter>
 			<type_parameter>
 				<like>type</like>
 			</type_parameter>
@@ -483,6 +481,14 @@
 				<normal>#797979</normal>
 			</default>
 
+			<type_use>
+				<like>default</like>
+			</type_use>
+
+			<inheritance>
+				<like>default</like>
+			</inheritance>
+
 			<override>
 				<normal>#BA5ECC</normal>
 			</override>
@@ -496,33 +502,24 @@
 				<normal>#00A0B6</normal>
 			</use>
 
-			<template_argument>
-				<normal>#D93D5F</normal>
-			</template_argument>
 			<type_argument>
-				<like>template_argument</like>
+				<normal>#D93D5F</normal>
 			</type_argument>
-			<template_default_argument>
-				<like>template_argument</like>
-			</template_default_argument>
 			<template_specialization>
-				<like>template_argument</like>
+				<like>type_argument</like>
 			</template_specialization>
-			<template_member_specialization>
-				<like>template_argument</like>
-			</template_member_specialization>
 
 			<include>
 				<normal>#4E82F6</normal>
 			</include>
 			<import>
-				<normal>#4E82F6</normal>
+				<like>include</like>
 			</import>
 			<macro_use>
-				<normal>#4E82F6</normal>
+				<like>include</like>
 			</macro_use>
 			<annotation_use>
-				<normal>#4E82F6</normal>
+				<like>include</like>
 			</annotation_use>
 
 			<aggregation>
diff --git a/bin/app/data/color_schemes/bright.xml b/bin/app/data/color_schemes/bright.xml
index dd049e8e..c90db38d 100644
--- a/bin/app/data/color_schemes/bright.xml
+++ b/bin/app/data/color_schemes/bright.xml
@@ -2,6 +2,7 @@
 
 <config>
 	<window>
+		<background>white</background>
 		<separator>#A2A2A2</separator>
 		<scrollbar>
 			<background>transparent</background>
@@ -276,9 +277,6 @@
 			<typedef>
 				<like>type</like>
 			</typedef>
-			<template_parameter>
-				<like>type</like>
-			</template_parameter>
 			<type_parameter>
 				<like>type</like>
 			</type_parameter>
@@ -457,6 +455,14 @@
 				<normal>#878787</normal>
 			</default>
 
+			<type_use>
+				<like>default</like>
+			</type_use>
+
+			<inheritance>
+				<like>default</like>
+			</inheritance>
+
 			<override>
 				<normal>#A37ACC</normal>
 			</override>
@@ -470,33 +476,24 @@
 				<normal>#4B9FC4</normal>
 			</use>
 
-			<template_argument>
-				<normal>#CF6B7C</normal>
-			</template_argument>
 			<type_argument>
-				<like>template_argument</like>
+				<like>#CF6B7C</like>
 			</type_argument>
-			<template_default_argument>
-				<like>template_argument</like>
-			</template_default_argument>
 			<template_specialization>
-				<like>template_argument</like>
+				<like>type_argument</like>
 			</template_specialization>
-			<template_member_specialization>
-				<like>template_argument</like>
-			</template_member_specialization>
 
 			<include>
 				<normal>#719660</normal>
 			</include>
 			<import>
-				<normal>#719660</normal>
+				<like>include</like>
 			</import>
 			<macro_use>
-				<normal>#719660</normal>
+				<like>include</like>
 			</macro_use>
 			<annotation_use>
-				<normal>#719660</normal>
+				<like>include</like>
 			</annotation_use>
 
 			<aggregation>
diff --git a/bin/app/data/color_schemes/dark.xml b/bin/app/data/color_schemes/dark.xml
index 488302b7..2c093a94 100644
--- a/bin/app/data/color_schemes/dark.xml
+++ b/bin/app/data/color_schemes/dark.xml
@@ -2,6 +2,7 @@
 
 <config>
 	<window>
+		<background>#272728</background>
 		<separator>#CCC</separator>
 		<scrollbar>
 			<background>transparent</background>
@@ -279,9 +280,6 @@
 			<typedef>
 				<like>type</like>
 			</typedef>
-			<template_parameter>
-				<like>type</like>
-			</template_parameter>
 			<type_parameter>
 				<like>type</like>
 			</type_parameter>
@@ -460,6 +458,14 @@
 				<normal>#797979</normal>
 			</default>
 
+			<type_use>
+				<like>default</like>
+			</type_use>
+
+			<inheritance>
+				<like>default</like>
+			</inheritance>
+
 			<override>
 				<normal>#8A5A94</normal>
 			</override>
@@ -473,33 +479,24 @@
 				<normal>#2D6A8C</normal>
 			</use>
 
-			<template_argument>
-				<normal>#C14057</normal>
-			</template_argument>
 			<type_argument>
-				<like>template_argument</like>
+				<normal>#C14057</normal>
 			</type_argument>
-			<template_default_argument>
-				<like>template_argument</like>
-			</template_default_argument>
 			<template_specialization>
-				<like>template_argument</like>
+				<like>type_argument</like>
 			</template_specialization>
-			<template_member_specialization>
-				<like>template_argument</like>
-			</template_member_specialization>
 
 			<include>
 				<normal>#247368</normal>
 			</include>
 			<import>
-				<normal>#247368</normal>
+				<like>include</like>
 			</import>
 			<macro_use>
-				<normal>#247368</normal>
+				<like>include</like>
 			</macro_use>
 			<annotation_use>
-				<normal>#247368</normal>
+				<like>include</like>
 			</annotation_use>
 
 			<aggregation>
diff --git a/bin/app/data/gui/code_view/code_view.css b/bin/app/data/gui/code_view/code_view.css
index 0d9ffb79..dfea9af5 100644
--- a/bin/app/data/gui/code_view/code_view.css
+++ b/bin/app/data/gui/code_view/code_view.css
@@ -228,7 +228,7 @@
 
 #code_area {
 	background-color: <color:code/snippet/background>;
-	color: <color:code/snippet/syntax/normal>;
+	color: <color:code/snippet/syntax/text>;
 	selection-color: <color:code/snippet/selection/text>;
 	selection-background-color: <color:code/snippet/selection/background>;
 }
diff --git a/bin/app/data/gui/custom_trail_view/custom_trail_view.css b/bin/app/data/gui/custom_trail_view/custom_trail_view.css
index 5748ce51..2acb7a5c 100644
--- a/bin/app/data/gui/custom_trail_view/custom_trail_view.css
+++ b/bin/app/data/gui/custom_trail_view/custom_trail_view.css
@@ -53,12 +53,6 @@
 	color: <color:custom_trail/button/hover/text>;
 }
 
-#button:disabled, #button_small:disabled {
-	background: <color:custom_trail/button/disabled/background>;
-	border-color: <color:custom_trail/button/disabled/border>;
-	color: <color:custom_trail/button/disabled/text>;
-}
-
 #error {
 	color: red;
 }
diff --git a/bin/app/data/gui/tooltip_view/tooltip_view.css b/bin/app/data/gui/tooltip_view/tooltip_view.css
index 9a1b4b46..908fff33 100644
--- a/bin/app/data/gui/tooltip_view/tooltip_view.css
+++ b/bin/app/data/gui/tooltip_view/tooltip_view.css
@@ -24,5 +24,5 @@
 	background-color: <color:code/snippet/background>;
 	border-bottom: 1px solid <color:code/file/background>;
 	padding: 3px;
-	color: <color:code/snippet/syntax/normal>;
+	color: <color:code/snippet/syntax/text>;
 }
diff --git a/src/lib/settings/ColorScheme.cpp b/src/lib/settings/ColorScheme.cpp
index db8a9161..8d3a6505 100644
--- a/src/lib/settings/ColorScheme.cpp
+++ b/src/lib/settings/ColorScheme.cpp
@@ -41,7 +41,7 @@ std::string ColorScheme::getNodeTypeColor(
 {
 	disableWarnings();
 
-	std::string type = getValue<std::string>("graph/node/" + typeStr + "/like", typeStr);
+	const std::string type = getValue<std::string>("graph/node/" + typeStr + "/like", typeStr);
 	std::string color = getValue<std::string>(
 		"graph/node/" + type + "/" + key + "/" + stateToString(state), "");
 
diff --git a/src/lib_gui/qt/utility/utilityQt.cpp b/src/lib_gui/qt/utility/utilityQt.cpp
index 2a0fec78..e7368e39 100644
--- a/src/lib_gui/qt/utility/utilityQt.cpp
+++ b/src/lib_gui/qt/utility/utilityQt.cpp
@@ -91,7 +91,7 @@ std::string getStyleSheet(const FilePath& path)
 			return "";
 		}
 
-		std::string key = seq.front();
+		const std::string key = seq.front();
 		std::string val = seq.back();
 
 		if (key == "setting")
@@ -168,6 +168,10 @@ std::string getStyleSheet(const FilePath& path)
 		}
 		else if (key == "color")
 		{
+			if (!ColorScheme::getInstance()->hasColor(val))
+			{
+				LOG_WARNING("Color scheme does not provide value for key \"" + val + "\" requested by style \"" + path.str() + "\".");
+			}
 			val = ColorScheme::getInstance()->getColor(val);
 		}
 		else if (key == "platform_wml")
diff --git a/src/lib_gui/qt/view/QtErrorView.cpp b/src/lib_gui/qt/view/QtErrorView.cpp
index e0baea50..bbc6e5c3 100644
--- a/src/lib_gui/qt/view/QtErrorView.cpp
+++ b/src/lib_gui/qt/view/QtErrorView.cpp
@@ -293,7 +293,7 @@ void QtErrorView::setStyleSheet() const
 {
 	QWidget* widget = QtViewWidgetWrapper::getWidgetOfView(this);
 	utility::setWidgetBackgroundColor(
-		widget, ColorScheme::getInstance()->getColor("error/background"));
+		widget, ColorScheme::getInstance()->getColor("window/background"));
 
 	QPalette palette(m_showErrors->palette());
 	palette.setColor(
diff --git a/src/lib_gui/qt/view/QtStatusView.cpp b/src/lib_gui/qt/view/QtStatusView.cpp
index def2c2ac..f0fb2fea 100644
--- a/src/lib_gui/qt/view/QtStatusView.cpp
+++ b/src/lib_gui/qt/view/QtStatusView.cpp
@@ -68,7 +68,7 @@ void QtStatusView::refreshView()
 	m_onQtThread([this]() {
 		QWidget* widget = QtViewWidgetWrapper::getWidgetOfView(this);
 		utility::setWidgetBackgroundColor(
-			widget, ColorScheme::getInstance()->getColor("error/background"));
+			widget, ColorScheme::getInstance()->getColor("window/background"));
 
 		QPalette palette(m_showErrors->palette());
 		palette.setColor(