Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
31 changes: 23 additions & 8 deletions src/qt/guiutil.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -806,6 +806,11 @@ void restoreWindowGeometry(const QString& strSetting, const QSize& defaultSize,
parent->move(pos);
}

// Check whether a theme is not build-in
bool isExternal(QString theme){
return (theme.operator !=("drk")) && (theme.operator !=("drk-1")) && (theme.operator !=("drkblue")) && (theme.operator !=("trad"));
}

// Open CSS when configured
QString loadStyleSheet()
{
Expand All @@ -814,19 +819,29 @@ QString loadStyleSheet()
QString cssName;
QString theme = settings.value("theme", "").toString();

if(!theme.isEmpty()){
cssName = QString(":/css/") + theme;
}
else {
cssName = QString(":/css/drk-1");
settings.setValue("theme", "drk-1");
if(isExternal(theme)){
// External CSS
settings.setValue("fCSSexternal", true);
boost::filesystem::path pathAddr = GetDataDir() / "themes/";
cssName = pathAddr.c_str() + theme + "/css/theme.css";
}
else{
// Build-in CSS
settings.setValue("fCSSexternal", false);
if(!theme.isEmpty()){
cssName = QString(":/css/") + theme;
}
else {
cssName = QString(":/css/drk-1");
settings.setValue("theme", "drk-1");
}
}

QFile qFile(cssName);
if (qFile.open(QFile::ReadOnly)) {
styleSheet = QLatin1String(qFile.readAll());
}

return styleSheet;
}

Expand Down
5 changes: 4 additions & 1 deletion src/qt/guiutil.h
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,10 @@ namespace GUIUtil

/** Load global CSS theme */
QString loadStyleSheet();


/** Check whether a theme is not build-in */
bool isExternal(QString theme);

/* Convert QString to OS specific boost path through UTF-8 */
boost::filesystem::path qstringToBoostPath(const QString &path);

Expand Down
12 changes: 11 additions & 1 deletion src/qt/optionsdialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -81,12 +81,22 @@ OptionsDialog::OptionsDialog(QWidget *parent, bool enableWallet) :
ui->digits->addItem(digits, digits);
}

/* Theme selector */
/* Theme selector static themes */
ui->theme->addItem(QString("DNET-dark"), QVariant("drk"));
ui->theme->addItem(QString("DNET-dark-1"), QVariant("drk-1"));
ui->theme->addItem(QString("DNET-blue"), QVariant("drkblue"));
ui->theme->addItem(QString("DNET-traditional"), QVariant("trad"));

/* Theme selector external themes */
boost::filesystem::path pathAddr = GetDataDir() / "themes";
QDir dir(pathAddr.c_str());
dir.setFilter(QDir::Dirs | QDir::NoSymLinks | QDir::NoDotAndDotDot);
QFileInfoList list = dir.entryInfoList();

for (int i = 0; i < list.size(); ++i){
QFileInfo fileInfo = list.at(i);
ui->theme->addItem(fileInfo.fileName(), QVariant(fileInfo.fileName()));
}

/* Language selector */
QDir translations(":translations");
Expand Down
2 changes: 2 additions & 0 deletions src/qt/optionsmodel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,8 @@ void OptionsModel::Init()
settings.setValue("digits", "2");
if (!settings.contains("theme"))
settings.setValue("theme", "");
if (!settings.contains("fCSSexternal"))
settings.setValue("fCSSexternal", false);
if (!settings.contains("language"))
settings.setValue("language", "");
if (!SoftSetArg("-lang", settings.value("language").toString().toStdString()))
Expand Down