kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Use relative path to stylesheet fix #4130

Browse Source
This commit is contained in:
triplus
2020-03-17 14:39:10 +01:00
committed by wwmayer
parent 3079fea303
commit 873769d021
3 changed files with 64 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/Gui/DlgGeneralImp.cpp
View File

@@ -171,7 +171,24 @@ void DlgGeneralImp::saveSettings()
hGrp->SetASCII("StyleSheet", (const char*)sheet.toByteArray());
if (!sheet.toString().isEmpty()) {
QFile f(sheet.toString());
// Search for stylesheet in user, system and resources location
QString user = QString::fromUtf8((App::Application::getUserAppDataDir() + "Gui/Stylesheets/").c_str());
QString system = QString::fromUtf8((App::Application::getResourceDir() + "Gui/Stylesheets/").c_str());
QString resources = QLatin1String(":/stylesheets/");
QFile f;
if (QFile::exists(user + sheet.toString())) {
f.setFileName(user + sheet.toString());
}
else if (QFile::exists(system + sheet.toString())) {
f.setFileName(system + sheet.toString());
}
else if (QFile::exists(resources + sheet.toString())) {
f.setFileName(resources + sheet.toString());
}
else {
}
if (f.open(QFile::ReadOnly)) {
mdi->setBackground(QBrush(Qt::NoBrush));
QTextStream str(&f);
@@ -307,7 +324,7 @@ void DlgGeneralImp::loadSettings()
fileNames = dir.entryInfoList(filter, QDir::Files, QDir::Name);
for (QFileInfoList::iterator jt = fileNames.begin(); jt != fileNames.end(); ++jt) {
if (cssFiles.find(jt->baseName()) == cssFiles.end()) {
cssFiles[jt->baseName()] = jt->absoluteFilePath();
cssFiles[jt->baseName()] = jt->fileName();
}
}
}