Backed out changeset bce43bcbc451 (dark frame subtraction)

rtgui/preferences.h

@@ -52,6 +52,7 @@ class Preferences : public Gtk::Dialog {
   protected:
     Gtk::ComboBoxText* rprofiles;
     Gtk::ComboBoxText* iprofiles;
+    Gtk::ComboBoxText* dmethod;
     Gtk::ComboBoxText* languages;
     Gtk::Entry* dateformat;
     Gtk::Entry* startupdir;
@@ -65,12 +66,22 @@ class Preferences : public Gtk::Dialog {
     Gtk::RadioButton* edGimp;
     Gtk::RadioButton* edPS;
     Gtk::RadioButton* edOther;
-    Gtk::FileChooserButton* darkFrameDir;
-    Gtk::Label *dfLabel;
+    
 
     Gtk::CheckButton* showDateTime;
     Gtk::CheckButton* showBasicExif;
 
+    Gtk::SpinButton*  ccSteps;
+    Gtk::Label* dcbIterationsLabel;
+    Gtk::SpinButton*  dcbIterations;
+    Gtk::CheckButton* dcbEnhance;
+	Gtk::CheckButton* caAutoCorrect;//Emil's CA correction
+	Gtk::CheckButton* HotDeadPixFilt;//Emil's hot/dead pixel filter
+	Gtk::Label* LineDenoiseLabel;//Emil's line denoise
+	Gtk::SpinButton*  LineDenoise;
+	Gtk::Label* GreenEquilLabel;//Emil's Green equilibration
+	Gtk::SpinButton*  GreenEquil;
+
     Gtk::FileChooserButton* iccDir;
     Gtk::FileChooserButton* monProfile;
 
@@ -99,12 +110,13 @@ class Preferences : public Gtk::Dialog {
     Gtk::ComboBoxText* loadParamsPreference;
 	
     Options moptions;
-    sigc::connection tconn, addc, setc, dfconn;
+    sigc::connection dmconn, tconn, addc, setc;
 
     void fillPreferences ();
     void storePreferences ();
     void parseDir       (Glib::ustring dirname, std::vector<Glib::ustring>& items, Glib::ustring ext);
-    void updateDFinfos ();
+    void dmethodChanged ();
+
     void themeChanged ();
 
     void appendBehavList (Gtk::TreeModel::iterator& parent, Glib::ustring label, int id, bool set);
@@ -127,7 +139,7 @@ class Preferences : public Gtk::Dialog {
     void selectStartupDir ();
     void addExtPressed ();
     void delExtPressed ();
-    void darkFrameChanged ();
+
     void clearProfilesPressed ();
     void clearThumbImagesPressed ();
     void clearAllPressed ();