From f22d0503d07f795345c4d06570a0508ad655e421 Mon Sep 17 00:00:00 2001 From: mfeemster Date: Tue, 8 Mar 2016 20:55:01 -0800 Subject: [PATCH] --Bug fixes -Make config dir use lowercase "fractorium" on Linux. --- Source/EmberCommon/EmberCommon.h | 2 +- Source/Fractorium/FractoriumEmberController.cpp | 6 +++--- Source/Fractorium/FractoriumSettings.cpp | 4 ++++ 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Source/EmberCommon/EmberCommon.h b/Source/EmberCommon/EmberCommon.h index 42ce4e3..5307a17 100644 --- a/Source/EmberCommon/EmberCommon.h +++ b/Source/EmberCommon/EmberCommon.h @@ -117,7 +117,7 @@ static bool InitPaletteList(const string& filename) "./", #ifndef _WIN32 "~" - "~/.config/Fractorium", + "~/.config/fractorium", "/usr/share/fractorium", "/usr/local/share/fractorium" #endif diff --git a/Source/Fractorium/FractoriumEmberController.cpp b/Source/Fractorium/FractoriumEmberController.cpp index 734cfe6..551bf45 100644 --- a/Source/Fractorium/FractoriumEmberController.cpp +++ b/Source/Fractorium/FractoriumEmberController.cpp @@ -63,7 +63,7 @@ FractoriumEmberController::FractoriumEmberController(Fractorium* fractorium) QDir::currentPath().toLocal8Bit().data(), QDir::homePath().toLocal8Bit().data(), QCoreApplication::applicationDirPath().toLocal8Bit().data(), - QString("~/.config/Fractorium").toLocal8Bit().data(), + QString(QDir::homePath() + "/.config/fractorium").toLocal8Bit().data(), QString("/usr/share/fractorium").toLocal8Bit().data(), QString("/usr/local/share/fractorium").toLocal8Bit().data() }; @@ -353,12 +353,12 @@ void FractoriumEmberController::SetEmberPrivate(const Ember& ember, bool v #ifdef _WIN32 string filename = "last.flame"; #else - QDir dir(QDir::homePath() + "/.config/Fractorium"); + QDir dir(QDir::homePath() + "/.config/fractorium"); if (!dir.exists()) dir.mkpath("."); - string filename = QDir::homePath().toStdString() + "/.config/Fractorium/last.flame"; + string filename = QDir::homePath().toStdString() + "/.config/fractorium/last.flame"; #endif writer.Save(filename.c_str(), m_Ember, 0, true, false, true); m_GLController->ResetMouseState(); diff --git a/Source/Fractorium/FractoriumSettings.cpp b/Source/Fractorium/FractoriumSettings.cpp index a45b6a5..1d42aeb 100644 --- a/Source/Fractorium/FractoriumSettings.cpp +++ b/Source/Fractorium/FractoriumSettings.cpp @@ -7,7 +7,11 @@ /// /// The parent widget FractoriumSettings::FractoriumSettings(QObject* p) +#ifdef _WIN32 : QSettings(QSettings::IniFormat, QSettings::UserScope, "Fractorium", "Fractorium", p) +#else + : QSettings(QSettings::IniFormat, QSettings::UserScope, "fractorium", "fractorium", p) +#endif { EnsureDefaults(); }