aji/ScreenTranslator
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Explicit portable mode paths

Browse Source
This commit is contained in:
Gres 2021-01-10 16:13:45 +03:00
parent 75a04beffa
commit abdf15aaaf
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/settings.cpp
View File

@ -9,7 +9,10 @@
namespace namespace
{ {
const QString iniFileName = "settings.ini"; const QString iniFileName()
{
return QApplication::applicationDirPath() + "/" + "settings.ini";
}
const QString qs_guiGroup = "GUI"; const QString qs_guiGroup = "GUI";
const QString qs_captureHotkey = "captureHotkey"; const QString qs_captureHotkey = "captureHotkey";
@ -134,11 +137,12 @@ void cleanupOutdated(QSettings& settings)
void Settings::save() const void Settings::save() const
{ {
std::unique_ptr<QSettings> ptr; std::unique_ptr<QSettings> ptr;
const auto iniName = iniFileName();
if (isPortable_) { if (isPortable_) {
ptr = std::make_unique<QSettings>(iniFileName, QSettings::IniFormat); ptr = std::make_unique<QSettings>(iniName, QSettings::IniFormat);
} else { } else {
ptr = std::make_unique<QSettings>(); ptr = std::make_unique<QSettings>();
QFile::remove(iniFileName); QFile::remove(iniName);
} }
auto& settings = *ptr; auto& settings = *ptr;
@ -213,8 +217,9 @@ void Settings::save() const
void Settings::load() void Settings::load()
{ {
std::unique_ptr<QSettings> ptr; std::unique_ptr<QSettings> ptr;
if (QFile::exists(iniFileName)) { const auto iniName = iniFileName();
ptr = std::make_unique<QSettings>(iniFileName, QSettings::IniFormat); if (QFile::exists(iniName)) {
ptr = std::make_unique<QSettings>(iniName, QSettings::IniFormat);
setPortable(true); setPortable(true);
} else { } else {
ptr = std::make_unique<QSettings>(); ptr = std::make_unique<QSettings>();
@ -309,8 +314,9 @@ void Settings::load()
void Settings::saveLastUpdateCheck() void Settings::saveLastUpdateCheck()
{ {
std::unique_ptr<QSettings> ptr; std::unique_ptr<QSettings> ptr;
if (QFile::exists(iniFileName)) { const auto iniName = iniFileName();
ptr = std::make_unique<QSettings>(iniFileName, QSettings::IniFormat); if (QFile::exists(iniName)) {
ptr = std::make_unique<QSettings>(iniName, QSettings::IniFormat);
} else { } else {
ptr = std::make_unique<QSettings>(); ptr = std::make_unique<QSettings>();
} }
@ -331,7 +337,7 @@ void Settings::setPortable(bool isPortable)
isPortable_ = isPortable; isPortable_ = isPortable;
const auto baseDataPath = const auto baseDataPath =
(isPortable ? QDir().absolutePath() (isPortable ? QApplication::applicationDirPath()
: QStandardPaths::writableLocation( : QStandardPaths::writableLocation(
QStandardPaths::AppDataLocation)) + QStandardPaths::AppDataLocation)) +
"/assets"; "/assets";