neobytes-project/neobytes
neobytes-project/neobytes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Define defaultTheme and darkThemePrefix as constants and use them instead of plain strings (#3288)

Browse Source
This commit is contained in:
UdjinM6 2020-01-16 14:24:45 +03:00 committed by Alexander Block
parent 1d203b422c
commit e875d4925a
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/qt/guiutil.cpp
View File

@ -78,6 +78,11 @@ extern double NSAppKitVersionNumber;
namespace GUIUtil { namespace GUIUtil {
// The theme to set by default if settings are missing or incorrect
static const QString defaultTheme = "Light";
// The prefix a theme name should have if we want to apply dark colors and styles to it
static const QString darkThemePrefix = "Dark";
static const std::map<ThemedColor, QColor> themedColors = { static const std::map<ThemedColor, QColor> themedColors = {
{ ThemedColor::DEFAULT, QColor(0, 0, 0) }, { ThemedColor::DEFAULT, QColor(0, 0, 0) },
{ ThemedColor::UNCONFIRMED, QColor(128, 128, 128) }, { ThemedColor::UNCONFIRMED, QColor(128, 128, 128) },
@ -121,13 +126,13 @@ static const std::map<ThemedStyle, QString> themedDarkStyles = {
QColor getThemedQColor(ThemedColor color) QColor getThemedQColor(ThemedColor color)
{ {
QString theme = QSettings().value("theme", "").toString(); QString theme = QSettings().value("theme", "").toString();
return theme.startsWith("dark") ? themedDarkColors.at(color) : themedColors.at(color); return theme.startsWith(darkThemePrefix) ? themedDarkColors.at(color) : themedColors.at(color);
} }
QString getThemedStyleQString(ThemedStyle style) QString getThemedStyleQString(ThemedStyle style)
{ {
QString theme = QSettings().value("theme", "").toString(); QString theme = QSettings().value("theme", "").toString();
return theme.startsWith("dark") ? themedDarkStyles.at(style) : themedStyles.at(style); return theme.startsWith(darkThemePrefix) ? themedDarkStyles.at(style) : themedStyles.at(style);
} }
QString dateTimeStr(const QDateTime &date) QString dateTimeStr(const QDateTime &date)
@ -927,9 +932,8 @@ QString loadStyleSheet()
QDir themes(":themes"); QDir themes(":themes");
// Make sure settings are pointing to an existent theme // Make sure settings are pointing to an existent theme
// Set "Light" theme by default if settings are missing or incorrect
if (theme.isEmpty() || !themes.exists(theme)) { if (theme.isEmpty() || !themes.exists(theme)) {
theme = "Light"; theme = defaultTheme;
settings.setValue("theme", theme); settings.setValue("theme", theme);
} }