Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
UdjinM6 merged 1 commit into from
Jan 16, 2020
Merged

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

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions src/qt/guiutil.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,11 @@ extern double NSAppKitVersionNumber;

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 = {
{ ThemedColor::DEFAULT, QColor(0, 0, 0) },
{ ThemedColor::UNCONFIRMED, QColor(128, 128, 128) },
Expand Down Expand Up @@ -121,13 +126,13 @@ static const std::map<ThemedStyle, QString> themedDarkStyles = {
QColor getThemedQColor(ThemedColor color)
{
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 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)
Expand Down Expand Up @@ -946,9 +951,8 @@ QString loadStyleSheet()

QDir themes(":themes");
// 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)) {
theme = "Light";
theme = defaultTheme;
settings.setValue("theme", theme);
}

Expand Down