Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-08-18 19:08:35 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Load chat styles also from DATA_DIR/stylesheets

Browse source 
Chat styles were only loaded from user config dir
(or application dir on windows portable)

If a style exists in both folders, it's taken from config dir, so users
can customize chat styles by copying them to ~/.retroshare/stylesheets/
This commit is contained in:
AsamK 2015-08-27 21:43:18 +02:00
parent 66ba687acd
commit 699213af80
1 changed files with 34 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

74
retroshare-gui/src/gui/chat/ChatStyle.cpp
View file

@ -144,35 +144,30 @@ void ChatStyle::styleChanged(int styleType)
} }
} }
static QString getBaseDir() static QStringList getBaseDirList()
{ {
// application path // Search chat styles in config dir and data dir (is application dir for portable)
QString baseDir = QString::fromUtf8(RsAccounts::ConfigDirectory().c_str()); QStringList baseDirs;
baseDirs.append(QString::fromUtf8(RsAccounts::ConfigDirectory().c_str()));
baseDirs.append(QString::fromUtf8(RsAccounts::DataDirectory().c_str()));
#ifdef WIN32 return baseDirs;
if (RsInit::isPortable ()) {
// application dir for portable version
baseDir = QApplication::applicationDirPath();
}
#endif
return baseDir;
} }
bool ChatStyle::setStylePath(const QString &stylePath, const QString &styleVariant) bool ChatStyle::setStylePath(const QString &stylePath, const QString &styleVariant)
{ {
m_styleType = TYPE_UNKNOWN; m_styleType = TYPE_UNKNOWN;
m_styleDir.setPath(getBaseDir()); foreach (QString dir, getBaseDirList()) {
if (m_styleDir.cd(stylePath) == false) { m_styleDir.setPath(dir);
m_styleDir = QDir(""); if (m_styleDir.cd(stylePath)) {
m_styleVariant.clear(); m_styleVariant = styleVariant;
return false; return true;
}
} }
m_styleDir.setPath("");
m_styleVariant = styleVariant; m_styleVariant.clear();
return false;
return true;
} }
bool ChatStyle::setStyleFromSettings(enumStyleType styleType) bool ChatStyle::setStyleFromSettings(enumStyleType styleType)
@ -471,9 +466,6 @@ static bool getStyleInfo(QString stylePath, QString stylePathRelative, ChatStyle
{ {
styles.clear(); styles.clear();
// base dir
QDir baseDir(getBaseDir());
ChatStyleInfo standardInfo; ChatStyleInfo standardInfo;
QString stylePath; QString stylePath;
@ -516,25 +508,27 @@ static bool getStyleInfo(QString stylePath, QString stylePathRelative, ChatStyle
return false; return false;
} }
QDir dir(baseDir); foreach (QDir baseDir, getBaseDirList()) {
if (dir.cd("stylesheets") == false) { QDir dir(baseDir);
// no user styles available if (dir.cd("stylesheets") == false) {
return true; // no user styles available here
}
// get all style directories
QFileInfoList dirList = dir.entryInfoList(QDir::AllDirs | QDir::NoDotAndDotDot, QDir::Name);
// iterate style directories and get info
for (QFileInfoList::iterator it = dirList.begin(); it != dirList.end(); ++it) {
QDir styleDir = QDir(it->absoluteFilePath());
if (styleDir.cd(stylePath) == false) {
// no user styles available
continue; continue;
} }
ChatStyleInfo info;
if (getStyleInfo(styleDir.absolutePath(), baseDir.relativeFilePath(styleDir.absolutePath()), info)) { // get all style directories
styles.append(info); QFileInfoList dirList = dir.entryInfoList(QDir::AllDirs | QDir::NoDotAndDotDot, QDir::Name);
// iterate style directories and get info
for (QFileInfoList::iterator it = dirList.begin(); it != dirList.end(); ++it) {
QDir styleDir = QDir(it->absoluteFilePath());
if (styleDir.cd(stylePath) == false) {
// no user styles available
continue;
}
ChatStyleInfo info;
if (getStyleInfo(styleDir.absolutePath(), baseDir.relativeFilePath(styleDir.absolutePath()), info)) {
styles.append(info);
}
} }
} }