Clean up unused option; restored gray theme as new users default option

for lattern see issue 373
This commit is contained in:
Oliver Duis
2011-08-06 11:00:43 +02:00
parent 829ffe051d
commit f7d5b97428
5 changed files with 1 additions and 8 deletions

View File

@@ -43,7 +43,6 @@ int main (int argc, char* argv[]) {
// create and fill settings // create and fill settings
rtengine::Settings* s = rtengine::Settings::create (); rtengine::Settings* s = rtengine::Settings::create ();
s->dualThreadEnabled = true;
s->demosaicMethod = "hphd"; s->demosaicMethod = "hphd";
s->colorCorrectionSteps = 2; s->colorCorrectionSteps = 2;
s->iccDirectory = ""; s->iccDirectory = "";

View File

@@ -82,7 +82,6 @@ int main (int argc, char* argv[]) {
// create and fill settings // create and fill settings
rtengine::Settings* s = rtengine::Settings::create (); rtengine::Settings* s = rtengine::Settings::create ();
s->dualThreadEnabled = true;
s->demosaicMethod = "hphd"; s->demosaicMethod = "hphd";
s->colorCorrectionSteps = 2; s->colorCorrectionSteps = 2;
s->iccDirectory = ""; s->iccDirectory = "";

View File

@@ -40,7 +40,6 @@ int main (int argc, char* argv[]) {
} }
rtengine::Settings s; rtengine::Settings s;
s.dualThreadEnabled = true;
s.demosaicMethod = "hphd"; s.demosaicMethod = "hphd";
s.colorCorrectionSteps = 2; s.colorCorrectionSteps = 2;
s.iccDirectory = ""; s.iccDirectory = "";

View File

@@ -24,7 +24,6 @@ namespace rtengine {
/** This structure holds the global parameters used by the RT engine. */ /** This structure holds the global parameters used by the RT engine. */
class Settings { class Settings {
public: public:
bool dualThreadEnabled; ///< If true, the image processing operations with utilize two processor cores (if possible)
Glib::ustring iccDirectory; ///< The directory containing the possible output icc profiles Glib::ustring iccDirectory; ///< The directory containing the possible output icc profiles
int colorimetricIntent; ///< Colorimetric intent used at color space conversions int colorimetricIntent; ///< Colorimetric intent used at color space conversions
Glib::ustring monitorProfile; ///< ICC profile of the monitor (full path recommended) Glib::ustring monitorProfile; ///< ICC profile of the monitor (full path recommended)

View File

@@ -110,7 +110,7 @@ void Options::setDefaults () {
languageAutoDetect= langMgr.isOSLanguageDetectSupported(); languageAutoDetect= langMgr.isOSLanguageDetectSupported();
lastSaveAsPath = ""; lastSaveAsPath = "";
overwriteOutputFile = false; // if TRUE, existing output JPGs/PNGs are overwritten, instead of adding ..-1.jpg, -2.jpg etc. overwriteOutputFile = false; // if TRUE, existing output JPGs/PNGs are overwritten, instead of adding ..-1.jpg, -2.jpg etc.
theme = "17-Gray-Red"; theme = "25-Gray-Gray";
slimUI = false; // TODO: Should this be TRUE for worst case screen resolution or FALSE for nicer interface by default ??? slimUI = false; // TODO: Should this be TRUE for worst case screen resolution or FALSE for nicer interface by default ???
useSystemTheme = true; useSystemTheme = true;
maxThumbnailHeight = 400; maxThumbnailHeight = 400;
@@ -206,7 +206,6 @@ void Options::setDefaults () {
}; };
baBehav = std::vector<int> (babehav, babehav+ADDSET_PARAM_NUM); baBehav = std::vector<int> (babehav, babehav+ADDSET_PARAM_NUM);
rtSettings.dualThreadEnabled = true;
rtSettings.darkFramesPath = ""; rtSettings.darkFramesPath = "";
rtSettings.flatFieldsPath = ""; rtSettings.flatFieldsPath = "";
#ifdef WIN32 #ifdef WIN32
@@ -274,7 +273,6 @@ if (keyFile.has_group ("General")) {
if (keyFile.has_key ("General", "DateFormat")) dateFormat = keyFile.get_string ("General", "DateFormat"); if (keyFile.has_key ("General", "DateFormat")) dateFormat = keyFile.get_string ("General", "DateFormat");
if (keyFile.has_key ("General", "AdjusterDelay")) adjusterDelay = keyFile.get_integer ("General", "AdjusterDelay"); if (keyFile.has_key ("General", "AdjusterDelay")) adjusterDelay = keyFile.get_integer ("General", "AdjusterDelay");
if (keyFile.has_key ("General", "StoreLastProfile")) savesParamsAtExit = keyFile.get_boolean ("General", "StoreLastProfile"); if (keyFile.has_key ("General", "StoreLastProfile")) savesParamsAtExit = keyFile.get_boolean ("General", "StoreLastProfile");
if (keyFile.has_key ("General", "DualProcSupport")) rtSettings.dualThreadEnabled = keyFile.get_boolean ("General", "DualProcSupport");
if (keyFile.has_key ("General", "MultiUser")) multiUser = keyFile.get_boolean ("General", "MultiUser"); if (keyFile.has_key ("General", "MultiUser")) multiUser = keyFile.get_boolean ("General", "MultiUser");
if (keyFile.has_key ("General", "Version")) version = keyFile.get_string ("General", "Version"); if (keyFile.has_key ("General", "Version")) version = keyFile.get_string ("General", "Version");
if (keyFile.has_key ("General", "Language")) language = keyFile.get_string ("General", "Language"); if (keyFile.has_key ("General", "Language")) language = keyFile.get_string ("General", "Language");
@@ -451,7 +449,6 @@ int Options::saveToFile (Glib::ustring fname) {
keyFile.set_string ("General", "StartupPath", startupPath); keyFile.set_string ("General", "StartupPath", startupPath);
keyFile.set_string ("General", "DateFormat", dateFormat); keyFile.set_string ("General", "DateFormat", dateFormat);
keyFile.set_integer ("General", "AdjusterDelay", adjusterDelay); keyFile.set_integer ("General", "AdjusterDelay", adjusterDelay);
keyFile.set_boolean ("General", "DualProcSupport", rtSettings.dualThreadEnabled);
keyFile.set_boolean ("General", "MultiUser", multiUser); keyFile.set_boolean ("General", "MultiUser", multiUser);
keyFile.set_string ("General", "Language", language); keyFile.set_string ("General", "Language", language);
keyFile.set_boolean ("General", "LanguageAutoDetect", languageAutoDetect); keyFile.set_boolean ("General", "LanguageAutoDetect", languageAutoDetect);