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

ui: Defined colors for fulltext search and fulltext code highlights

Browse Source
This commit is contained in:
Eberhard Graether
2016-06-07 15:10:09 +02:00
parent b10c55e7f9
commit c6fa1f0969
11 changed files with 230 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/settings/ColorScheme.cpp
+34 -2
View File
@@ -21,6 +21,11 @@ std::string ColorScheme::getColor(const std::string& key) const
return getValue<std::string>(key, "");
}
std::string ColorScheme::getColor(const std::string& key, const std::string& defaultColor) const
{
return getValue<std::string>(key, defaultColor);
}
std::string ColorScheme::getNodeTypeColor(Node::NodeType type, const std::string& key, ColorState state) const
{
return getNodeTypeColor(Node::getTypeString(type), key, state);
@@ -85,9 +90,10 @@ std::string ColorScheme::getEdgeTypeColor(const std::string& typeStr, ColorState
return color;
}
std::string ColorScheme::getSearchTypeColor(const std::string& searchTypeName, const std::string& state) const
std::string ColorScheme::getSearchTypeColor(
const std::string& searchTypeName, const std::string& key, const std::string& state) const
{
std::string path = "search/query/" + searchTypeName + "/" + state;
std::string path = "search/query/" + searchTypeName + "/" + state + "/" + key;
return getValue<std::string>(path, "#FFFFFF");
}
@@ -96,6 +102,31 @@ std::string ColorScheme::getSyntaxColor(const std::string& key) const
return getValue<std::string>("code/snippet/syntax/" + key, "#FFFFFF");
}
std::string ColorScheme::getCodeSelectionTypeColor(const std::string& typeStr, const std::string& key, ColorState state) const
{
disableWarnings();
std::string color = getValue<std::string>("code/snippet/selection/" + typeStr + "/" + stateToString(state) + "/" + key, "");
if (!color.size() && state == ACTIVE)
{
color = getValue<std::string>("code/snippet/selection/" + typeStr + "/" + stateToString(FOCUS) + "/" + key, "");
}
if (!color.size() && state != NORMAL)
{
color = getValue<std::string>("code/snippet/selection/" + typeStr + "/" + stateToString(NORMAL) + "/" + key, "");
}
if (!color.size())
{
color = "transparent";
}
enableWarnings();
return color;
}
ColorScheme::ColorScheme()
{
}
@@ -106,6 +137,7 @@ std::string ColorScheme::stateToString(ColorState state)
{
case NORMAL: return "normal";
case FOCUS: return "focus";
case ACTIVE: return "active";
}
return "";