Merge branch 'dev' of https://github.com/Beep6581/RawTherapee into spot-removal-tool

rtgui/controlspotpanel.h

@@ -75,9 +75,11 @@ public:
         double balanh;
         double colorde;
         double colorscope;
+        double avoidrad;
         bool hishow;
         bool activ;
         bool avoid;
+        bool avoidmun;
         bool blwh;
         bool recurs;
         bool laplac;
@@ -249,6 +251,7 @@ private:
     void hishowChanged();
     void activChanged();
     void avoidChanged();
+    void avoidmunChanged();
     void blwhChanged();
     void recursChanged();
     void laplacChanged();
@@ -307,9 +310,11 @@ private:
         Gtk::TreeModelColumn<double> balanh;
         Gtk::TreeModelColumn<double> colorde;
         Gtk::TreeModelColumn<double> colorscope;
+        Gtk::TreeModelColumn<double> avoidrad;
         Gtk::TreeModelColumn<bool> hishow;
         Gtk::TreeModelColumn<bool> activ;
         Gtk::TreeModelColumn<bool> avoid;
+        Gtk::TreeModelColumn<bool> avoidmun;
         Gtk::TreeModelColumn<bool> blwh;
         Gtk::TreeModelColumn<bool> recurs;
         Gtk::TreeModelColumn<bool> laplac;
@@ -394,6 +399,7 @@ private:
     Adjuster* const balanh_;
     Adjuster* const colorde_;
     Adjuster* const colorscope_;
+    Adjuster* const avoidrad_;
     Adjuster* const scopemask_;
     Adjuster* const lumask_;
 
@@ -403,6 +409,8 @@ private:
     sigc::connection activConn_;
     Gtk::CheckButton* const avoid_;
     sigc::connection avoidConn_;
+    Gtk::CheckButton* const avoidmun_;
+    sigc::connection avoidmunConn_;
     Gtk::CheckButton* const blwh_;
     sigc::connection blwhConn_;
     Gtk::CheckButton* const recurs_;
@@ -424,8 +432,8 @@ private:
     Gtk::ToggleButton* const preview_;
     sigc::connection previewConn_;
 
-    Gtk::HBox* const ctboxshape;
-    Gtk::HBox* const ctboxshapemethod;
+    Gtk::Box* const ctboxshape;
+    Gtk::Box* const ctboxshapemethod;
 
     // Internal variables
     ControlPanelListener* controlPanelListener;