From e875d4925aa5684021377fae2362a1a18448c076 Mon Sep 17 00:00:00 2001 From: UdjinM6 Date: Thu, 16 Jan 2020 14:24:45 +0300 Subject: [PATCH] Define defaultTheme and darkThemePrefix as constants and use them instead of plain strings (#3288) --- src/qt/guiutil.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp index cbeb24997d..15690dd88d 100644 --- a/src/qt/guiutil.cpp +++ b/src/qt/guiutil.cpp @@ -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 themedColors = { { ThemedColor::DEFAULT, QColor(0, 0, 0) }, { ThemedColor::UNCONFIRMED, QColor(128, 128, 128) }, @@ -121,13 +126,13 @@ static const std::map 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) @@ -927,9 +932,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); }