liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge with dev

Browse Source
This commit is contained in:
Desmis
2017-09-15 08:46:19 +02:00
parent 9786ec0687 952ada554a
commit 99353cae14
8 changed files with 42 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
rtgui/options.cc
View File

@@ -24,6 +24,7 @@
#include "addsetids.h"
#include "guiutils.h"
#include "version.h"
#include "config.h"
#ifdef _OPENMP
#include <omp.h>
@@ -744,6 +745,8 @@ void Options::setDefaults ()
lastLensProfileDir = "";
gimpPluginShowInfoDialog = true;
maxRecentFolders = 15;
rtSettings.lensfunDbDirectory = LENSFUN_DB_PATH;
}
Options* Options::copyFrom (Options* other)
@@ -1920,6 +1923,12 @@ void Options::readFromFile (Glib::ustring fname)
}
}
if (keyFile.has_group ("Lensfun")) {
if (keyFile.has_key ("Lensfun", "DBDirectory")) {
rtSettings.lensfunDbDirectory = keyFile.get_string ("Lensfun", "DBDirectory");
}
}
// --------------------------------------------------------------------------------------------------------
filterOutParsedExtensions ();
@@ -2302,6 +2311,8 @@ void Options::saveToFile (Glib::ustring fname)
keyFile.set_string ("Dialogs", "LastLensProfileDir", lastLensProfileDir);
keyFile.set_boolean ("Dialogs", "GimpPluginShowInfoDialog", gimpPluginShowInfoDialog);
keyFile.set_string ("Lensfun", "DBDirectory", rtSettings.lensfunDbDirectory);
keyData = keyFile.to_data ();
} catch (Glib::KeyFileError &e) {