From ca12866fa8e6f95d9efadab26952a58540eec939 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Thu, 14 Jan 2016 15:59:03 +0300 Subject: Add palettesDir option in paths.xml for set directory for GIMP palettes. --- src/defaults.cpp | 1 + src/resources/db/palettedb.cpp | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/defaults.cpp b/src/defaults.cpp index 47253b5dd..82540150b 100644 --- a/src/defaults.cpp +++ b/src/defaults.cpp @@ -625,6 +625,7 @@ DefaultsData* getPathsDefaults() AddDEF("inactivebadge", "inactive.xml"); AddDEF("awaybadge", "away.xml"); + AddDEF("palettesDir", ""); AddDEF("defaultPaletteFile", "palette.gpl"); return configData; diff --git a/src/resources/db/palettedb.cpp b/src/resources/db/palettedb.cpp index 3c7abe6af..3ad2b13fa 100644 --- a/src/resources/db/palettedb.cpp +++ b/src/resources/db/palettedb.cpp @@ -49,8 +49,8 @@ void PaletteDB::loadPalette() { mLoaded = true; StringVect lines; - Files::loadTextFile(paths.getStringValue( - "defaultPaletteFile"), + Files::loadTextFile(paths.getStringValue("palettesDir") + + paths.getStringValue("defaultPaletteFile"), lines); StringVectCIter it = lines.begin(); if (it == lines.end()) -- cgit v1.2.3-70-g09d2