diff --git a/rtgui/options.cc b/rtgui/options.cc index 906c356d1..03c653c45 100644 --- a/rtgui/options.cc +++ b/rtgui/options.cc @@ -155,6 +155,7 @@ void Options::setDefaults () { FileBrowserToolbarSingleRow = true; hideTPVScrollbar = false; UseIconNoText = true; + whiteBalanceSpotSize = 8; squareDetailWindow = false; menuGroupRank = true; menuGroupLabel = true; @@ -422,6 +423,8 @@ if (keyFile.has_group ("Color Management")) { if (keyFile.has_key ("Color Management", "Intent")) rtSettings.colorimetricIntent = keyFile.get_integer("Color Management", "Intent"); + if (keyFile.has_key ("Color Management", "WhiteBalanceSpotSize")) whiteBalanceSpotSize = keyFile.get_integer("Color Management", "WhiteBalanceSpotSize"); + // Disabled (default is true) till issues are sorted out //if (keyFile.has_key ("Color Management", "LCMSSafeMode")) rtSettings.LCMSSafeMode = keyFile.get_boolean ("Color Management", "LCMSSafeMode"); } @@ -598,6 +601,7 @@ int Options::saveToFile (Glib::ustring fname) { keyFile.set_string ("Color Management", "B_eta", rtSettings.beta); keyFile.set_string ("Color Management", "B_est", rtSettings.best); keyFile.set_string ("Color Management", "B_ruce", rtSettings.bruce); + keyFile.set_integer ("Color Management", "WhiteBalanceSpotSize", whiteBalanceSpotSize); Glib::ArrayHandle bab = baBehav; keyFile.set_integer_list ("Batch Processing", "AdjusterBehavior", bab); diff --git a/rtgui/options.h b/rtgui/options.h index f6978759a..1d318df03 100644 --- a/rtgui/options.h +++ b/rtgui/options.h @@ -156,6 +156,7 @@ class Options { bool FileBrowserToolbarSingleRow; bool hideTPVScrollbar; bool UseIconNoText; + int whiteBalanceSpotSize; bool menuGroupRank; bool menuGroupLabel; diff --git a/rtgui/whitebalance.cc b/rtgui/whitebalance.cc index 552eba65b..a096610a8 100644 --- a/rtgui/whitebalance.cc +++ b/rtgui/whitebalance.cc @@ -18,6 +18,7 @@ */ #include #include +#include #define MINTEMP 1200 #define MAXTEMP 12000 @@ -62,12 +63,11 @@ WhiteBalance::WhiteBalance () : Gtk::VBox(), FoldableToolPanel(this), wbp(NULL), spotsize = Gtk::manage (new MyComboBoxText ()); spotsize->show (); - spotsize->append_text ("2"); - spotsize->append_text ("4"); - spotsize->append_text ("8"); - spotsize->append_text ("16"); - spotsize->append_text ("32"); - spotsize->set_active (2); + spotsize->append_text ("2"); if (options.whiteBalanceSpotSize==2) spotsize->set_active(0); + spotsize->append_text ("4"); if (options.whiteBalanceSpotSize==4) spotsize->set_active(1); + spotsize->append_text ("8"); if (options.whiteBalanceSpotSize==8) spotsize->set_active(2); + spotsize->append_text ("16"); if (options.whiteBalanceSpotSize==16) spotsize->set_active(3); + spotsize->append_text ("32"); if (options.whiteBalanceSpotSize==32) spotsize->set_active(4); spotbox->pack_end (*spotsize, Gtk::PACK_EXPAND_WIDGET, 4); spotbox->pack_end (*slab, Gtk::PACK_SHRINK, 4); @@ -166,6 +166,7 @@ void WhiteBalance::spotPressed () { } void WhiteBalance::spotSizeChanged () { + options.whiteBalanceSpotSize=getSize(); if (wblistener) wblistener->spotWBRequested (getSize());