ynkmr/Sourcetrail
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

logic: color scheme fixes (#821)

Browse Source 
* fixed issues where color scheme entries were missing
* removed color scheme entries for nodes and edges that do not exist anymore
This commit is contained in:
Malte Langkabel
2019-12-16 15:53:59 +01:00
committed by Eberhard Graether
parent 3d6b86ec3f
commit bc7178f49d
10 changed files with 52 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/app/data/color_schemes/bad_rainbow.xml
+14 -17
View File
@@ -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>
bin/app/data/color_schemes/bright.xml
+14 -17
View File
@@ -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>
bin/app/data/color_schemes/dark.xml
+14 -17
View File
@@ -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>
bin/app/data/gui/code_view/code_view.css
+1 -1
View File
@@ -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>;
}
bin/app/data/gui/custom_trail_view/custom_trail_view.css
-6
View File
@@ -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;
}
bin/app/data/gui/tooltip_view/tooltip_view.css
+1 -1
View File
@@ -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>;
}
src/lib/settings/ColorScheme.cpp
+1 -1
View File
@@ -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), "");
src/lib_gui/qt/utility/utilityQt.cpp
+5 -1
View File
@@ -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")
src/lib_gui/qt/view/QtErrorView.cpp
+1 -1
View File
@@ -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(
src/lib_gui/qt/view/QtStatusView.cpp
+1 -1
View File
@@ -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(