From 06d4c95975ad4c13d7b2e342238190a61982d176 Mon Sep 17 00:00:00 2001 From: Gambhiro Date: Thu, 10 Dec 2015 18:02:24 +0000 Subject: [PATCH] look harder for a palette --- Source/Fractorium/FractoriumEmberController.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Source/Fractorium/FractoriumEmberController.cpp b/Source/Fractorium/FractoriumEmberController.cpp index 866f53c..7c903f1 100644 --- a/Source/Fractorium/FractoriumEmberController.cpp +++ b/Source/Fractorium/FractoriumEmberController.cpp @@ -78,18 +78,19 @@ FractoriumEmberController::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."; }