mirror-github-bspeice/fractorium
1
0
Fork 0
mirror of https://bitbucket.org/mfeemster/fractorium.git synced 2025-02-01 18:40:12 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

--Bug fixes

Browse Source 
-Make config dir use lowercase "fractorium" on Linux.
This commit is contained in:
mfeemster 2016-03-08 20:55:01 -08:00
parent 787388a3dd
commit f22d0503d0
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/EmberCommon/EmberCommon.h
View File

@ -117,7 +117,7 @@ static bool InitPaletteList(const string& filename)
"./", "./",
#ifndef _WIN32 #ifndef _WIN32
"~" "~"
"~/.config/Fractorium", "~/.config/fractorium",
"/usr/share/fractorium", "/usr/share/fractorium",
"/usr/local/share/fractorium" "/usr/local/share/fractorium"
#endif #endif

6
Source/Fractorium/FractoriumEmberController.cpp
View File

@ -63,7 +63,7 @@ FractoriumEmberController<T>::FractoriumEmberController(Fractorium* fractorium)
QDir::currentPath().toLocal8Bit().data(), QDir::currentPath().toLocal8Bit().data(),
QDir::homePath().toLocal8Bit().data(), QDir::homePath().toLocal8Bit().data(),
QCoreApplication::applicationDirPath().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/share/fractorium").toLocal8Bit().data(),
QString("/usr/local/share/fractorium").toLocal8Bit().data() QString("/usr/local/share/fractorium").toLocal8Bit().data()
}; };
@ -353,12 +353,12 @@ void FractoriumEmberController<T>::SetEmberPrivate(const Ember<U>& ember, bool v
#ifdef _WIN32 #ifdef _WIN32
string filename = "last.flame"; string filename = "last.flame";
#else #else
QDir dir(QDir::homePath() + "/.config/Fractorium"); QDir dir(QDir::homePath() + "/.config/fractorium");
if (!dir.exists()) if (!dir.exists())
dir.mkpath("."); dir.mkpath(".");
string filename = QDir::homePath().toStdString() + "/.config/Fractorium/last.flame"; string filename = QDir::homePath().toStdString() + "/.config/fractorium/last.flame";
#endif #endif
writer.Save(filename.c_str(), m_Ember, 0, true, false, true); writer.Save(filename.c_str(), m_Ember, 0, true, false, true);
m_GLController->ResetMouseState(); m_GLController->ResetMouseState();

4
Source/Fractorium/FractoriumSettings.cpp
View File

@ -7,7 +7,11 @@
/// </summary> /// </summary>
/// <param name="p">The parent widget</param> /// <param name="p">The parent widget</param>
FractoriumSettings::FractoriumSettings(QObject* p) FractoriumSettings::FractoriumSettings(QObject* p)
#ifdef _WIN32
: QSettings(QSettings::IniFormat, QSettings::UserScope, "Fractorium", "Fractorium", p) : QSettings(QSettings::IniFormat, QSettings::UserScope, "Fractorium", "Fractorium", p)
#else
: QSettings(QSettings::IniFormat, QSettings::UserScope, "fractorium", "fractorium", p)
#endif
{ {
EnsureDefaults(); EnsureDefaults();
} }