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

look harder for a palette

Browse Source
This commit is contained in:
Gambhiro 2015-12-10 18:02:24 +00:00
parent 88724376da
commit 06d4c95975
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Source/Fractorium/FractoriumEmberController.cpp
View File

@ -78,18 +78,19 @@ FractoriumEmberController<T>::FractoriumEmberController(Fractorium* fractorium)
//Initial combo change event to fill the palette table will be called automatically later.
// Look for a palette in:
// - the folder where the binary is, QCoreApplication::applicationDirPath()
// - shared data folder, QStandardPaths::DataLocation()
// - /usr/local/share/fractorium
// - /usr/share/fractorium
// Look hard for a palette.
// TODO: use QStandardPaths::DataLocation too.
// TODO
// QStandardPaths::AppConfigLocation -- errors out, not a member.
// QStandardPaths::DataLocation -- how to parse this? It should include "/usr/share/fractorium" on Linux.
if ( ! (InitPaletteList(QCoreApplication::applicationDirPath().toLocal8Bit().data()) ||
if ( ! (InitPaletteList(QDir::currentPath().toLocal8Bit().data()) ||
InitPaletteList(QDir::homePath().toLocal8Bit().data()) ||
InitPaletteList(QCoreApplication::applicationDirPath().toLocal8Bit().data()) ||
InitPaletteList(QString("/usr/local/share/fractorium").toLocal8Bit().data()) ||
InitPaletteList(QString("/usr/share/fractorium").toLocal8Bit().data())) )
{
// TODO better error dialog
throw "No palettes found, exiting.";
}