FreshRSS/rssguard
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed #25.

Browse Source
This commit is contained in:
Martin Rotter 2016-06-25 21:02:14 +02:00
parent 0eb2830b3b
commit e8a75c6436
2 changed files with 29 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
resources/text/CHANGELOG
View File

@ -1,3 +1,9 @@
3.3.2
—————
Fixed:
▪ Fixed problem with skin loading. (bug #25)
3.3.1 3.3.1
————— —————

33
src/miscellaneous/skinfactory.cpp
View File

@ -32,21 +32,34 @@ SkinFactory::~SkinFactory() {
} }
void SkinFactory::loadCurrentSkin() { void SkinFactory::loadCurrentSkin() {
const QString skin_name_from_settings = selectedSkinName(); QList<QString> skin_names_to_try;
skin_names_to_try.append(selectedSkinName());
skin_names_to_try.append(APP_SKIN_DEFAULT);
bool skin_parsed; bool skin_parsed;
const Skin skin_data = skinInfo(skin_name_from_settings, &skin_parsed); Skin skin_data;
QString skin_name;
if (skin_parsed) { while (!skin_names_to_try.isEmpty()) {
loadSkinFromData(skin_data); skin_name = skin_names_to_try.takeFirst();
skin_data = skinInfo(skin_name, &skin_parsed);
// Set this 'Skin' object as active one. if (skin_parsed) {
m_currentSkin = skin_data; loadSkinFromData(skin_data);
qDebug("Skin '%s' loaded.", qPrintable(skin_name_from_settings)); // Set this 'Skin' object as active one.
} m_currentSkin = skin_data;
else {
qFatal("Skin '%s' not loaded because its data are corrupted. No skin is loaded now!", qPrintable(skin_name_from_settings)); qDebug("Skin '%s' loaded.", qPrintable(skin_name));
return;
}
else {
qWarning("Failed to load skin '%s'.", qPrintable(skin_name));
}
} }
qFatal("Failed to load selected or default skin(s). Quitting!");
} }
void SkinFactory::loadSkinFromData(const Skin &skin) { void SkinFactory::loadSkinFromData(const Skin &skin) {