Skip to content

Only load valid themes, fallback to "Light" theme otherwise #3285

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 3 commits into from
Jan 14, 2020
Merged

Only load valid themes, fallback to "Light" theme otherwise #3285

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
528e249
Only load valid themes, fallback to "light" otherwise
UdjinM6 Jan 13, 2020
8dce542
Refactor PR3285 a bit
nmarley Jan 14, 2020
07f3018
fix
UdjinM6 Jan 14, 2020
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
8 changes: 5 additions & 3 deletions src/qt/dash.qrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,12 @@
<file alias="network_disabled">res/icons/network_disabled.png</file>
</qresource>
<qresource prefix="/css">
<file alias="dark">res/css/dark.css</file>
<file alias="light">res/css/light.css</file>
<file alias="scrollbars">res/css/scrollbars.css</file>
<file alias="trad">res/css/trad.css</file>
</qresource>
<qresource prefix="/themes">
<file alias="Dark">res/css/dark.css</file>
<file alias="Light">res/css/light.css</file>
<file alias="Traditional">res/css/trad.css</file>
</qresource>
<qresource prefix="/images">
<file alias="arrow_down">res/images/arrow_down.png</file>
Expand Down
20 changes: 9 additions & 11 deletions src/qt/guiutil.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -941,25 +941,23 @@ void migrateQtSettings()
// Open CSS when configured
QString loadStyleSheet()
{
QString styleSheet;
QSettings settings;
QString cssName;
QString theme = settings.value("theme", "").toString();

if(!theme.isEmpty()){
cssName = QString(":/css/") + theme;
}
else {
cssName = QString(":/css/light");
settings.setValue("theme", "light");
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";
settings.setValue("theme", theme);
}

QFile qFile(cssName);
QFile qFile(":themes/" + theme);
if (qFile.open(QFile::ReadOnly)) {
styleSheet = QLatin1String(qFile.readAll());
return QLatin1String(qFile.readAll());
}

return styleSheet;
return QString();
}

void setClipboard(const QString& str)
Expand Down
7 changes: 4 additions & 3 deletions src/qt/optionsdialog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,9 +89,10 @@ OptionsDialog::OptionsDialog(QWidget *parent, bool enableWallet) :
}

/* Theme selector */
ui->theme->addItem(QString("Dark"), QVariant("dark"));
ui->theme->addItem(QString("Light"), QVariant("light"));
ui->theme->addItem(QString("Traditional"), QVariant("trad"));
QDir themes(":themes");
for (const QString &entry : themes.entryList()) {
ui->theme->addItem(entry, QVariant(entry));
}

/* Language selector */
QDir translations(":translations");
Expand Down