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

Portable settings for config & icon cache.

Browse Source
This commit is contained in:
Martin Rotter 2013-11-14 20:29:23 +01:00
parent 926ac8930b
commit 6762b2b48e
1 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/core/settings.cpp
View File

@ -65,34 +65,42 @@ void Settings::setValue(const QString &section,
} }
QSettings::Status Settings::setupSettings() { QSettings::Status Settings::setupSettings() {
// If settings file exists in executable file working directory, // If settings file exists in executable file working directory
// then use it (portable settings). // (in subdirectory APP_CFG_PATH), then use it (portable settings).
// Otherwise use settings file stored in homePath(); // Otherwise use settings file stored in homePath();
QString home_path = QDir::homePath() + QDir::separator() + QString relative_path = QDir::separator() + APP_CFG_PATH +
APP_LOW_H_NAME; QDir::separator() + APP_CFG_FILE;
QString home_path_file = home_path + QDir::separator() +
APP_CFG_PATH + QDir::separator() + APP_CFG_FILE;
QString app_path = qApp->applicationDirPath(); QString app_path = qApp->applicationDirPath();
QString app_path_file = app_path + QDir::separator() + APP_CFG_FILE; QString app_path_file = app_path + relative_path;
// Check if portable settings are available.
if (QFile(app_path_file).exists()) { if (QFile(app_path_file).exists()) {
s_instance = new Settings(app_path, QSettings::IniFormat, qApp); // Portable settings are available, use them.
s_instance = new Settings(app_path_file, QSettings::IniFormat, qApp);
// Construct icon cache in the same path.
QString web_path = app_path + QDir::separator() + APP_CFG_WEB_PATH; QString web_path = app_path + QDir::separator() + APP_CFG_WEB_PATH;
QDir(web_path).mkpath(web_path); QDir(web_path).mkpath(web_path);
QWebSettings::setIconDatabasePath(web_path); QWebSettings::setIconDatabasePath(web_path);
qDebug("Initializing settings in %s.", qDebug("Initializing settings in %s (portable way).",
qPrintable(QDir::toNativeSeparators(app_path))); qPrintable(QDir::toNativeSeparators(app_path)));
} }
else { else {
// Portable settings are NOT available, store them in
// user's home directory.
QString home_path = QDir::homePath() + QDir::separator() +
APP_LOW_H_NAME;
QString home_path_file = home_path + relative_path;
s_instance = new Settings(home_path_file, QSettings::IniFormat, qApp); s_instance = new Settings(home_path_file, QSettings::IniFormat, qApp);
QString web_path = home_path + QDir::separator() + APP_CFG_WEB_PATH; QString web_path = home_path + QDir::separator() + APP_CFG_WEB_PATH;
QDir(web_path).mkpath(web_path); QDir(web_path).mkpath(web_path);
QWebSettings::setIconDatabasePath(web_path); QWebSettings::setIconDatabasePath(web_path);
qDebug("Initializing settings in %s.", qDebug("Initializing settings in %s (non-portable way).",
qPrintable(QDir::toNativeSeparators(home_path_file))); qPrintable(QDir::toNativeSeparators(home_path_file)));
} }