Refactor tool name code

rtgui/bayerpreprocess.cc

@@ -28,7 +28,9 @@
 using namespace rtengine;
 using namespace rtengine::procparams;
 
-BayerPreProcess::BayerPreProcess() : FoldableToolPanel(this, "bayerpreprocess", M("TP_PREPROCESS_LABEL"), options.prevdemo != PD_Sidecar)
+const Glib::ustring BayerPreProcess::TOOL_NAME = "bayerpreprocess";
+
+BayerPreProcess::BayerPreProcess() : FoldableToolPanel(this, TOOL_NAME, M("TP_PREPROCESS_LABEL"), options.prevdemo != PD_Sidecar)
 {
     auto m = ProcEventMapper::getInstance();
     EvLineDenoiseDirection = m->newEvent(DARKFRAME, "HISTORY_MSG_PREPROCESS_LINEDENOISE_DIRECTION");

rtgui/bayerpreprocess.h

@@ -37,6 +37,7 @@ protected:
     rtengine::ProcEvent EvPDAFLinesFilter;
     
 public:
+    static const Glib::ustring TOOL_NAME;
 
     BayerPreProcess ();
 

rtgui/bayerprocess.cc

@@ -28,9 +28,10 @@
 using namespace rtengine;
 using namespace rtengine::procparams;
 
+const Glib::ustring BayerProcess::TOOL_NAME = "bayerprocess";
 
 BayerProcess::BayerProcess () :
-    FoldableToolPanel(this, "bayerprocess", M("TP_RAW_LABEL"), options.prevdemo != PD_Sidecar),
+    FoldableToolPanel(this, TOOL_NAME, M("TP_RAW_LABEL"), options.prevdemo != PD_Sidecar),
     oldMethod(-1)
 {
 

rtgui/bayerprocess.h

@@ -76,6 +76,7 @@ protected:
     rtengine::ProcEvent EvDemosaicPixelshiftDemosaicMethod;
     rtengine::ProcEvent EvPixelshiftAverage;
 public:
+    static const Glib::ustring TOOL_NAME;
 
     BayerProcess ();
     ~BayerProcess () override;

rtgui/bayerrawexposure.cc

@@ -26,7 +26,9 @@
 using namespace rtengine;
 using namespace rtengine::procparams;
 
-BayerRAWExposure::BayerRAWExposure () : FoldableToolPanel(this, "bayerrawexposure", M("TP_EXPOS_BLACKPOINT_LABEL"), options.prevdemo != PD_Sidecar)
+const Glib::ustring BayerRAWExposure::TOOL_NAME = "bayerrawexposure";
+
+BayerRAWExposure::BayerRAWExposure () : FoldableToolPanel(this, TOOL_NAME, M("TP_EXPOS_BLACKPOINT_LABEL"), options.prevdemo != PD_Sidecar)
 {
     PexBlack1 = Gtk::manage(new Adjuster (M("TP_RAWEXPOS_BLACK_1"), -2048, 2048, 1.0, 0)); //black level
     PexBlack1->setAdjusterListener (this);

rtgui/bayerrawexposure.h

@@ -31,6 +31,8 @@ class BayerRAWExposure final :
     public FoldableToolPanel
 {
 public:
+    static const Glib::ustring TOOL_NAME;
+
     BayerRAWExposure ();
 
     void read           (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr) override;

rtgui/blackwhite.cc

@@ -34,8 +34,9 @@
 using namespace rtengine;
 using namespace rtengine::procparams;
 
+const Glib::ustring BlackWhite::TOOL_NAME = "blackwhite";
 
-BlackWhite::BlackWhite (): FoldableToolPanel(this, "blackwhite", M("TP_BWMIX_LABEL"), false, true)
+BlackWhite::BlackWhite (): FoldableToolPanel(this, TOOL_NAME, M("TP_BWMIX_LABEL"), false, true)
 {
     CurveListener::setMulti(true);
 

rtgui/blackwhite.h

@@ -40,6 +40,7 @@ class BlackWhite final :
     public ColorProvider
 {
 public:
+    static const Glib::ustring TOOL_NAME;
 
     BlackWhite ();
     ~BlackWhite () override;

rtgui/cacorrection.cc

@@ -27,7 +27,9 @@
 using namespace rtengine;
 using namespace rtengine::procparams;
 
-CACorrection::CACorrection () : FoldableToolPanel(this, "cacorrection", M("TP_CACORRECTION_LABEL"))
+const Glib::ustring CACorrection::TOOL_NAME = "cacorrection";
+
+CACorrection::CACorrection () : FoldableToolPanel(this, TOOL_NAME, M("TP_CACORRECTION_LABEL"))
 {
 
     Gtk::Image* icaredL =   Gtk::manage (new RTImage ("circle-red-cyan-small.png"));

rtgui/cacorrection.h

@@ -34,6 +34,7 @@ protected:
     Adjuster* blue;
 
 public:
+    static const Glib::ustring TOOL_NAME;
 
     CACorrection ();
 

rtgui/chmixer.cc

@@ -25,7 +25,9 @@
 using namespace rtengine;
 using namespace rtengine::procparams;
 
-ChMixer::ChMixer (): FoldableToolPanel(this, "chmixer", M("TP_CHMIXER_LABEL"), false, true)
+const Glib::ustring ChMixer::TOOL_NAME = "chmixer";
+
+ChMixer::ChMixer (): FoldableToolPanel(this, TOOL_NAME, M("TP_CHMIXER_LABEL"), false, true)
 {
 
     imgIcon[0] = Gtk::manage (new RTImage ("circle-red-small.png"));

rtgui/chmixer.h

@@ -36,6 +36,7 @@ protected:
     Gtk::Image *imgIcon[9];
 
 public:
+    static const Glib::ustring TOOL_NAME;
 
     ChMixer ();
 

rtgui/colorappearance.cc

@@ -44,6 +44,8 @@
 using namespace rtengine;
 using namespace rtengine::procparams;
 
+const Glib::ustring ColorAppearance::TOOL_NAME = "colorappearance";
+
 static double wbSlider2Temp (double sval)
 {
 
@@ -212,7 +214,7 @@ static double wbTemp2Slider (double temp)
 }
 
 
-ColorAppearance::ColorAppearance () : FoldableToolPanel (this, "colorappearance", M ("TP_COLORAPP_LABEL"), false, true)
+ColorAppearance::ColorAppearance () : FoldableToolPanel (this, TOOL_NAME, M ("TP_COLORAPP_LABEL"), false, true)
 {
     CurveListener::setMulti (true);
     std::vector<GradientMilestone> milestones;

rtgui/colorappearance.h

@@ -39,6 +39,8 @@ class ColorAppearance final :
     public ColorProvider
 {
 public:
+    static const Glib::ustring TOOL_NAME;
+
     ColorAppearance ();
     ~ColorAppearance () override;
 

rtgui/colortoning.cc

@@ -14,6 +14,7 @@
 using namespace rtengine;
 using namespace rtengine::procparams;
 
+const Glib::ustring ColorToning::TOOL_NAME = "colortoning";
 
 namespace {
 
@@ -33,7 +34,7 @@ inline float round_ab(float v)
 } // namespace
 
 
-ColorToning::ColorToning () : FoldableToolPanel(this, "colortoning", M("TP_COLORTONING_LABEL"), false, true)
+ColorToning::ColorToning () : FoldableToolPanel(this, TOOL_NAME, M("TP_COLORTONING_LABEL"), false, true)
 {
     nextbw = 0;
     CurveListener::setMulti(true);

rtgui/colortoning.h

@@ -30,6 +30,8 @@ class ColorToning final :
     public AdjusterListener
 {
 public:
+    static const Glib::ustring TOOL_NAME;
+
     ColorToning ();
     ~ColorToning() override;
     void read                  (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr) override;

rtgui/crop.cc

@@ -29,6 +29,8 @@
 using namespace rtengine;
 using namespace rtengine::procparams;
 
+const Glib::ustring Crop::TOOL_NAME = "crop";
+
 namespace
 {
 
@@ -124,7 +126,7 @@ private:
 };
 
 Crop::Crop():
-    FoldableToolPanel(this, "crop", M("TP_CROP_LABEL"), false, true),
+    FoldableToolPanel(this, TOOL_NAME, M("TP_CROP_LABEL"), false, true),
     crop_ratios(new CropRatios),
     opt(0),
     wDirty(true),

rtgui/crop.h

@@ -41,6 +41,8 @@ class Crop final :
     public rtengine::SizeListener
 {
 public:
+    static const Glib::ustring TOOL_NAME;
+
     Crop();
     ~Crop() override;
 

rtgui/darkframe.cc

@@ -30,7 +30,9 @@
 using namespace rtengine;
 using namespace rtengine::procparams;
 
-DarkFrame::DarkFrame () : FoldableToolPanel(this, "darkframe", M("TP_DARKFRAME_LABEL")), dfChanged(false), lastDFauto(false), dfp(nullptr), israw(true)
+const Glib::ustring DarkFrame::TOOL_NAME = "darkframe";
+
+DarkFrame::DarkFrame () : FoldableToolPanel(this, TOOL_NAME, M("TP_DARKFRAME_LABEL")), dfChanged(false), lastDFauto(false), dfp(nullptr), israw(true)
 {
     hbdf = Gtk::manage(new Gtk::Box());
     hbdf->set_spacing(4);

rtgui/darkframe.h

@@ -62,6 +62,7 @@ protected:
     bool israw;
 
 public:
+    static const Glib::ustring TOOL_NAME;
 
     DarkFrame ();
 

rtgui/defringe.cc

@@ -30,7 +30,9 @@
 using namespace rtengine;
 using namespace rtengine::procparams;
 
-Defringe::Defringe () : FoldableToolPanel(this, "defringe", M("TP_DEFRINGE_LABEL"), true, true)
+const Glib::ustring Defringe::TOOL_NAME = "defringe";
+
+Defringe::Defringe () : FoldableToolPanel(this, TOOL_NAME, M("TP_DEFRINGE_LABEL"), true, true)
 {
 
     std::vector<GradientMilestone> bottomMilestones;

rtgui/defringe.h

@@ -46,6 +46,7 @@ protected:
     bool edges;
 
 public:
+    static const Glib::ustring TOOL_NAME;
 
     Defringe ();
     ~Defringe () override;

rtgui/dehaze.cc

@@ -29,7 +29,9 @@
 using namespace rtengine;
 using namespace rtengine::procparams;
 
-Dehaze::Dehaze(): FoldableToolPanel(this, "dehaze", M("TP_DEHAZE_LABEL"), false, true)
+const Glib::ustring Dehaze::TOOL_NAME = "dehaze";
+
+Dehaze::Dehaze(): FoldableToolPanel(this, TOOL_NAME, M("TP_DEHAZE_LABEL"), false, true)
 {
     auto m = ProcEventMapper::getInstance();
     EvDehazeEnabled = m->newEvent(HDR, "HISTORY_MSG_DEHAZE_ENABLED");

rtgui/dehaze.h

@@ -39,6 +39,7 @@ private:
     rtengine::ProcEvent EvDehazeSaturation;
     
 public:
+    static const Glib::ustring TOOL_NAME;
 
     Dehaze();
 

rtgui/dirpyrdenoise.cc

@@ -33,7 +33,9 @@
 using namespace rtengine;
 using namespace rtengine::procparams;
 
-DirPyrDenoise::DirPyrDenoise () : FoldableToolPanel(this, "dirpyrdenoise", M("TP_DIRPYRDENOISE_LABEL"), true, true), lastmedian(false)
+const Glib::ustring DirPyrDenoise::TOOL_NAME = "dirpyrdenoise";
+
+DirPyrDenoise::DirPyrDenoise () : FoldableToolPanel(this, TOOL_NAME, M("TP_DIRPYRDENOISE_LABEL"), true, true), lastmedian(false)
 {
     std::vector<GradientMilestone> milestones;
     CurveListener::setMulti(true);

rtgui/dirpyrdenoise.h

@@ -40,6 +40,8 @@ class DirPyrDenoise final :
     public ColorProvider
 {
 public:
+    static const Glib::ustring TOOL_NAME;
+
     DirPyrDenoise ();
     ~DirPyrDenoise () override;
 

rtgui/dirpyrequalizer.cc

@@ -24,7 +24,9 @@
 using namespace rtengine;
 using namespace rtengine::procparams;
 
-DirPyrEqualizer::DirPyrEqualizer () : FoldableToolPanel(this, "dirpyrequalizer", M("TP_DIRPYREQUALIZER_LABEL"), true, true)
+const Glib::ustring DirPyrEqualizer::TOOL_NAME = "dirpyrequalizer";
+
+DirPyrEqualizer::DirPyrEqualizer () : FoldableToolPanel(this, TOOL_NAME, M("TP_DIRPYREQUALIZER_LABEL"), true, true)
 {
 
     std::vector<GradientMilestone> milestones;

rtgui/dirpyrequalizer.h

@@ -56,6 +56,7 @@ protected:
     bool lastgamutlab;
 
 public:
+    static const Glib::ustring TOOL_NAME;
 
     DirPyrEqualizer ();
     ~DirPyrEqualizer () override;

rtgui/distortion.cc

@@ -27,7 +27,9 @@
 using namespace rtengine;
 using namespace rtengine::procparams;
 
-Distortion::Distortion (): FoldableToolPanel(this, "distortion", M("TP_DISTORTION_LABEL"))
+const Glib::ustring Distortion::TOOL_NAME = "distortion";
+
+Distortion::Distortion (): FoldableToolPanel(this, TOOL_NAME, M("TP_DISTORTION_LABEL"))
 {
 
     rlistener = nullptr;

rtgui/distortion.h

@@ -37,6 +37,7 @@ protected:
     LensGeomListener * rlistener;
 
 public:
+    static const Glib::ustring TOOL_NAME;
 
     Distortion ();
 

rtgui/epd.cc

@@ -26,7 +26,9 @@
 using namespace rtengine;
 using namespace rtengine::procparams;
 
-EdgePreservingDecompositionUI::EdgePreservingDecompositionUI () : FoldableToolPanel(this, "epd", M("TP_EPD_LABEL"), true, true)
+const Glib::ustring EdgePreservingDecompositionUI::TOOL_NAME = "epd";
+
+EdgePreservingDecompositionUI::EdgePreservingDecompositionUI () : FoldableToolPanel(this, TOOL_NAME, M("TP_EPD_LABEL"), true, true)
 {
 
     strength = Gtk::manage(new Adjuster (M("TP_EPD_STRENGTH"), -1.0, 2.0, 0.01, 0.5));

rtgui/epd.h

@@ -36,6 +36,7 @@ protected:
     Adjuster *reweightingIterates;
 
 public:
+    static const Glib::ustring TOOL_NAME;
 
     EdgePreservingDecompositionUI();
 

rtgui/fattaltonemap.cc

@@ -31,7 +31,9 @@
 using namespace rtengine;
 using namespace rtengine::procparams;
 
-FattalToneMapping::FattalToneMapping(): FoldableToolPanel(this, "fattal", M("TP_TM_FATTAL_LABEL"), true, true)
+const Glib::ustring FattalToneMapping::TOOL_NAME = "fattal";
+
+FattalToneMapping::FattalToneMapping(): FoldableToolPanel(this, TOOL_NAME, M("TP_TM_FATTAL_LABEL"), true, true)
 {
     auto m = ProcEventMapper::getInstance();
     EvTMFattalAnchor = m->newEvent(HDR, "HISTORY_MSG_TM_FATTAL_ANCHOR");

rtgui/fattaltonemap.h

@@ -33,6 +33,7 @@ protected:
     rtengine::ProcEvent EvTMFattalAnchor;
     
 public:
+    static const Glib::ustring TOOL_NAME;
 
     FattalToneMapping();
 

rtgui/filmnegative.cc

@@ -28,6 +28,8 @@
 #include "../rtengine/procparams.h"
 #include "../rtengine/color.h"
 
+const Glib::ustring FilmNegative::TOOL_NAME = "filmnegative";
+
 namespace
 {
 
@@ -184,7 +186,7 @@ void rgb2temp(const RGB &refOut, double &outLev, double &temp, double &green)
 }
 
 FilmNegative::FilmNegative() :
-    FoldableToolPanel(this, "filmnegative", M("TP_FILMNEGATIVE_LABEL"), false, true),
+    FoldableToolPanel(this, TOOL_NAME, M("TP_FILMNEGATIVE_LABEL"), false, true),
     EditSubscriber(ET_OBJECTS),
     NEUTRAL_TEMP(rtengine::ColorTemp(1., 1., 1., 1.)),
     evFilmNegativeExponents(ProcEventMapper::getInstance()->newEvent(ALLNORAW, "HISTORY_MSG_FILMNEGATIVE_VALUES")),

rtgui/filmnegative.h

@@ -52,6 +52,8 @@ class FilmNegative final :
     public rtengine::FilmNegListener
 {
 public:
+    static const Glib::ustring TOOL_NAME;
+
     FilmNegative();
     ~FilmNegative() override;
 

rtgui/filmsimulation.cc

@@ -12,6 +12,8 @@
 using namespace rtengine;
 using namespace rtengine::procparams;
 
+const Glib::ustring FilmSimulation::TOOL_NAME = "filmsimulation";
+
 namespace
 {
 
@@ -61,7 +63,7 @@ bool notifySlowParseDir (const std::chrono::system_clock::time_point& startedAt)
 }
 
 FilmSimulation::FilmSimulation()
-    :   FoldableToolPanel( this, "filmsimulation", M("TP_FILMSIMULATION_LABEL"), false, true )
+    :   FoldableToolPanel( this, TOOL_NAME, M("TP_FILMSIMULATION_LABEL"), false, true )
 {
     m_clutComboBox = Gtk::manage( new ClutComboBox(options.clutsDir) );
     int foundClutsCount = m_clutComboBox->foundClutsCount();

rtgui/filmsimulation.h

@@ -56,6 +56,8 @@ private:
 class FilmSimulation : public ToolParamBlock, public AdjusterListener, public FoldableToolPanel
 {
 public:
+    static const Glib::ustring TOOL_NAME;
+
     FilmSimulation();
 
     void adjusterChanged(Adjuster* a, double newval) override;

rtgui/flatfield.cc

@@ -30,7 +30,9 @@
 using namespace rtengine;
 using namespace rtengine::procparams;
 
-FlatField::FlatField () : FoldableToolPanel(this, "flatfield", M("TP_FLATFIELD_LABEL"))
+const Glib::ustring FlatField::TOOL_NAME = "flatfield";
+
+FlatField::FlatField () : FoldableToolPanel(this, TOOL_NAME, M("TP_FLATFIELD_LABEL"))
 {
     hbff = Gtk::manage(new Gtk::Box());
     flatFieldFile = Gtk::manage(new MyFileChooserButton(M("TP_FLATFIELD_LABEL"), Gtk::FILE_CHOOSER_ACTION_OPEN));

rtgui/flatfield.h

@@ -67,6 +67,7 @@ protected:
 
     IdleRegister idle_register;
 public:
+    static const Glib::ustring TOOL_NAME;
 
     FlatField ();
     ~FlatField () override;

rtgui/gradient.cc

@@ -25,7 +25,9 @@ enum GeometryIndex {
 
 }
 
-Gradient::Gradient () : FoldableToolPanel(this, "gradient", M("TP_GRADIENT_LABEL"), false, true), EditSubscriber(ET_OBJECTS), lastObject(-1), draggedPointOldAngle(-1000.)
+const Glib::ustring Gradient::TOOL_NAME = "gradient";
+
+Gradient::Gradient () : FoldableToolPanel(this, TOOL_NAME, M("TP_GRADIENT_LABEL"), false, true), EditSubscriber(ET_OBJECTS), lastObject(-1), draggedPointOldAngle(-1000.)
 {
 
     editHBox = Gtk::manage (new Gtk::Box());

rtgui/gradient.h

@@ -38,6 +38,7 @@ protected:
     void releaseEdit();
 
 public:
+    static const Glib::ustring TOOL_NAME;
 
     Gradient ();
     ~Gradient () override;

rtgui/hsvequalizer.cc

@@ -28,9 +28,11 @@
 using namespace rtengine;
 using namespace rtengine::procparams;
 
+const Glib::ustring HSVEqualizer::TOOL_NAME = "hsvequalizer";
+
 //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-HSVEqualizer::HSVEqualizer () : FoldableToolPanel(this, "hsvequalizer", M("TP_HSVEQUALIZER_LABEL"), false, true)
+HSVEqualizer::HSVEqualizer () : FoldableToolPanel(this, TOOL_NAME, M("TP_HSVEQUALIZER_LABEL"), false, true)
 {
 
     std::vector<GradientMilestone> bottomMilestones;

rtgui/hsvequalizer.h

@@ -44,6 +44,7 @@ protected:
     FlatCurveEditor*   vshape;
 
 public:
+    static const Glib::ustring TOOL_NAME;
 
     HSVEqualizer ();
     ~HSVEqualizer () override;

rtgui/icmpanel.cc

@@ -35,7 +35,9 @@
 using namespace rtengine;
 using namespace rtengine::procparams;
 
-ICMPanel::ICMPanel() : FoldableToolPanel(this, "icm", M("TP_ICM_LABEL")), iunchanged(nullptr), icmplistener(nullptr)
+const Glib::ustring ICMPanel::TOOL_NAME = "icm";
+
+ICMPanel::ICMPanel() : FoldableToolPanel(this, TOOL_NAME, M("TP_ICM_LABEL")), iunchanged(nullptr), icmplistener(nullptr)
 {
     auto m = ProcEventMapper::getInstance();
     EvICMprimariMethod = m->newEvent(GAMMA, "HISTORY_MSG_ICM_OUTPUT_PRIMARIES");

rtgui/icmpanel.h

@@ -177,6 +177,8 @@ private:
     float nextwy;
 
 public:
+    static const Glib::ustring TOOL_NAME;
+
     ICMPanel();
     ~ICMPanel() override;
 

rtgui/impulsedenoise.cc

@@ -28,7 +28,9 @@
 using namespace rtengine;
 using namespace rtengine::procparams;
 
-ImpulseDenoise::ImpulseDenoise () : FoldableToolPanel(this, "impulsedenoise", M("TP_IMPULSEDENOISE_LABEL"), true, true)
+const Glib::ustring ImpulseDenoise::TOOL_NAME = "impulsedenoise";
+
+ImpulseDenoise::ImpulseDenoise () : FoldableToolPanel(this, TOOL_NAME, M("TP_IMPULSEDENOISE_LABEL"), true, true)
 {
 
     thresh = Gtk::manage (new Adjuster (M("TP_IMPULSEDENOISE_THRESH"), 0, 100, 1, 50));

rtgui/impulsedenoise.h

@@ -34,6 +34,7 @@ protected:
     //Adjuster* edge;
 
 public:
+    static const Glib::ustring TOOL_NAME;
 
     ImpulseDenoise ();
 

rtgui/labcurve.cc

@@ -32,7 +32,9 @@
 using namespace rtengine;
 using namespace rtengine::procparams;
 
-LCurve::LCurve () : FoldableToolPanel(this, "labcurves", M("TP_LABCURVE_LABEL"), false, true)
+const Glib::ustring LCurve::TOOL_NAME = "labcurves";
+
+LCurve::LCurve () : FoldableToolPanel(this, TOOL_NAME, M("TP_LABCURVE_LABEL"), false, true)
 {
     brightness = Gtk::manage (new Adjuster (M("TP_LABCURVE_BRIGHTNESS"), -100., 100., 1., 0.));
     contrast   = Gtk::manage (new Adjuster (M("TP_LABCURVE_CONTRAST"), -100., 100., 1., 0.));

rtgui/labcurve.h

@@ -69,6 +69,7 @@ protected:
     //%%%%%%%%%%%%%%%%
 
 public:
+    static const Glib::ustring TOOL_NAME;
 
     LCurve ();
     ~LCurve () override;

rtgui/lensgeom.cc

@@ -27,7 +27,9 @@
 using namespace rtengine;
 using namespace rtengine::procparams;
 
-LensGeometry::LensGeometry () : FoldableToolPanel(this, "lensgeom", M("TP_LENSGEOM_LABEL")), rlistener(nullptr), lastFill(false)
+const Glib::ustring LensGeometry::TOOL_NAME = "lensgeom";
+
+LensGeometry::LensGeometry () : FoldableToolPanel(this, TOOL_NAME, M("TP_LENSGEOM_LABEL")), rlistener(nullptr), lastFill(false)
 {
 
     auto m = ProcEventMapper::getInstance();

rtgui/lensgeom.h

@@ -39,6 +39,7 @@ protected:
 
     rtengine::ProcEvent EvTransMethod;
 public:
+    static const Glib::ustring TOOL_NAME;
 
     LensGeometry ();
     ~LensGeometry () override;

rtgui/lensprofile.cc

@@ -36,8 +36,10 @@
 using namespace rtengine;
 using namespace rtengine::procparams;
 
+const Glib::ustring LensProfilePanel::TOOL_NAME = "lensprof";
+
 LensProfilePanel::LensProfilePanel() :
-    FoldableToolPanel(this, "lensprof", M("TP_LENSPROFILE_LABEL")),
+    FoldableToolPanel(this, TOOL_NAME, M("TP_LENSPROFILE_LABEL")),
     lcModeChanged(false),
     lcpFileChanged(false),
     useDistChanged(false),

rtgui/lensprofile.h

@@ -28,6 +28,8 @@ class LensProfilePanel final :
     public FoldableToolPanel
 {
 public:
+    static const Glib::ustring TOOL_NAME;
+
     LensProfilePanel();
 
     void read(const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr) override;

rtgui/localcontrast.cc

@@ -29,7 +29,9 @@
 using namespace rtengine;
 using namespace rtengine::procparams;
 
-LocalContrast::LocalContrast(): FoldableToolPanel(this, "localcontrast", M("TP_LOCALCONTRAST_LABEL"), false, true)
+const Glib::ustring LocalContrast::TOOL_NAME = "localcontrast";
+
+LocalContrast::LocalContrast(): FoldableToolPanel(this, TOOL_NAME, M("TP_LOCALCONTRAST_LABEL"), false, true)
 {
     auto m = ProcEventMapper::getInstance();
 /*    EvLocalContrastEnabled = m->newEvent(RGBCURVE, "HISTORY_MSG_LOCALCONTRAST_ENABLED");

rtgui/localcontrast.h

@@ -38,6 +38,7 @@ private:
     rtengine::ProcEvent EvLocalContrastLightness;
     
 public:
+    static const Glib::ustring TOOL_NAME;
 
     LocalContrast();
 

rtgui/locallab.cc

@@ -29,6 +29,8 @@ using namespace procparams;
 
 extern Options options;
 
+const Glib::ustring Locallab::TOOL_NAME = "locallab";
+
 /* ==== LocallabToolList ==== */
 LocallabToolList::LocallabToolList():
     // Tool list GUI elements
@@ -142,7 +144,7 @@ void LocallabToolList::toolRowSelected()
 
 /* ==== Locallab ==== */
 Locallab::Locallab():
-    FoldableToolPanel(this, "locallab", M("TP_LOCALLAB_LABEL"), false, true),
+    FoldableToolPanel(this, TOOL_NAME, M("TP_LOCALLAB_LABEL"), false, true),
 
     // Spot control panel widget
     expsettings(Gtk::manage(new ControlSpotPanel())),

rtgui/locallab.h

@@ -131,6 +131,8 @@ private:
     Glib::ustring spotName;
 
 public:
+    static const Glib::ustring TOOL_NAME;
+
     Locallab();
 
     // FoldableToolPanel management functions

rtgui/pcvignette.cc

@@ -8,7 +8,9 @@
 using namespace rtengine;
 using namespace rtengine::procparams;
 
-PCVignette::PCVignette () : FoldableToolPanel(this, "pcvignette", M("TP_PCVIGNETTE_LABEL"), false, true)
+const Glib::ustring PCVignette::TOOL_NAME = "pcvignette";
+
+PCVignette::PCVignette () : FoldableToolPanel(this, TOOL_NAME, M("TP_PCVIGNETTE_LABEL"), false, true)
 {
     strength = Gtk::manage (new Adjuster (M("TP_PCVIGNETTE_STRENGTH"), -6, 6, 0.01, 0));
     strength->set_tooltip_text (M("TP_PCVIGNETTE_STRENGTH_TOOLTIP"));

rtgui/pcvignette.h

@@ -20,6 +20,7 @@ protected:
     Adjuster* roundness;
 
 public:
+    static const Glib::ustring TOOL_NAME;
 
     PCVignette ();
 

rtgui/pdsharpening.cc

@@ -31,8 +31,10 @@
 using namespace rtengine;
 using namespace rtengine::procparams;
 
+const Glib::ustring PdSharpening::TOOL_NAME = "capturesharpening";
+
 PdSharpening::PdSharpening() :
-    FoldableToolPanel(this, "capturesharpening", M("TP_PDSHARPENING_LABEL"), false, true),
+    FoldableToolPanel(this, TOOL_NAME, M("TP_PDSHARPENING_LABEL"), false, true),
     lastAutoContrast(true),
     lastAutoRadius(true)
 {

rtgui/pdsharpening.h

@@ -50,6 +50,7 @@ protected:
     IdleRegister idle_register;
 
 public:
+    static const Glib::ustring TOOL_NAME;
 
     PdSharpening ();
     ~PdSharpening () override;

rtgui/perspective.cc

@@ -27,6 +27,8 @@
 using namespace rtengine;
 using namespace rtengine::procparams;
 
+const Glib::ustring PerspCorrection::TOOL_NAME = "perspective";
+
 namespace
 {
 
@@ -84,7 +86,7 @@ std::vector<rtengine::ControlLine> valuesToControlLines(
 
 }
 
-PerspCorrection::PerspCorrection () : FoldableToolPanel(this, "perspective", M("TP_PERSPECTIVE_LABEL"))
+PerspCorrection::PerspCorrection () : FoldableToolPanel(this, TOOL_NAME, M("TP_PERSPECTIVE_LABEL"))
 {
 
     auto mapper = ProcEventMapper::getInstance();

rtgui/perspective.h

@@ -104,6 +104,7 @@ public:
     static constexpr std::size_t MIN_HORIZ_LINES = 2;
     /** Minimum number of vertical lines for vertical/full correction. */
     static constexpr std::size_t MIN_VERT_LINES = 2;
+    static const Glib::ustring TOOL_NAME;
 
     PerspCorrection ();
 

rtgui/preprocess.cc

@@ -28,7 +28,9 @@
 using namespace rtengine;
 using namespace rtengine::procparams;
 
-PreProcess::PreProcess () : FoldableToolPanel(this, "preprocess", M("TP_PREPROCESS_LABEL"), options.prevdemo != PD_Sidecar)
+const Glib::ustring PreProcess::TOOL_NAME = "preprocess";
+
+PreProcess::PreProcess () : FoldableToolPanel(this, TOOL_NAME, M("TP_PREPROCESS_LABEL"), options.prevdemo != PD_Sidecar)
 {
 
     Gtk::Box* hotdeadPixel = Gtk::manage( new Gtk::Box () );

rtgui/preprocess.h

@@ -38,6 +38,7 @@ protected:
     sigc::connection dpixelconn;
     Adjuster* hdThreshold;
 public:
+    static const Glib::ustring TOOL_NAME;
 
     PreProcess ();
 

rtgui/preprocesswb.cc

@@ -29,8 +29,10 @@
 using namespace rtengine;
 using namespace rtengine::procparams;
 
+const Glib::ustring PreprocessWB::TOOL_NAME = "preprocesswb";
+
 PreprocessWB::PreprocessWB() :
-    FoldableToolPanel(this, "preprocesswb", M("TP_PREPROCWB_LABEL")),
+    FoldableToolPanel(this, TOOL_NAME, M("TP_PREPROCWB_LABEL")),
     evPreprocessWBMode(ProcEventMapper::getInstance()->newEvent(FIRST, "HISTORY_MSG_PREPROCWB_MODE")),
     mode(Gtk::manage(new MyComboBoxText()))
 {

rtgui/preprocesswb.h

@@ -34,6 +34,7 @@ private:
     MyComboBoxText* mode;
 
 public:
+    static const Glib::ustring TOOL_NAME;
 
     PreprocessWB();
 

rtgui/prsharpening.cc

@@ -23,7 +23,9 @@
 using namespace rtengine;
 using namespace rtengine::procparams;
 
-PrSharpening::PrSharpening () : FoldableToolPanel(this, "prsharpening", M("TP_PRSHARPENING_LABEL"), false, true)
+const Glib::ustring PrSharpening::TOOL_NAME = "prsharpening";
+
+PrSharpening::PrSharpening () : FoldableToolPanel(this, TOOL_NAME, M("TP_PRSHARPENING_LABEL"), false, true)
 {
 
     auto m = ProcEventMapper::getInstance();

rtgui/prsharpening.h

@@ -59,6 +59,7 @@ protected:
     sigc::connection hcConn;
     rtengine::ProcEvent EvPrShrContrast;
 public:
+    static const Glib::ustring TOOL_NAME;
 
     PrSharpening ();
     ~PrSharpening () override;

rtgui/rawcacorrection.cc

@@ -28,7 +28,9 @@
 using namespace rtengine;
 using namespace rtengine::procparams;
 
-RAWCACorr::RAWCACorr () : FoldableToolPanel(this, "rawcacorrection", M("TP_RAWCACORR_LABEL"))
+const Glib::ustring RAWCACorr::TOOL_NAME = "rawcacorrection";
+
+RAWCACorr::RAWCACorr () : FoldableToolPanel(this, TOOL_NAME, M("TP_RAWCACORR_LABEL"))
 {
     auto m = ProcEventMapper::getInstance();
     EvPreProcessCAAutoiterations = m->newEvent(DARKFRAME, "HISTORY_MSG_RAWCACORR_AUTOIT");

rtgui/rawcacorrection.h

@@ -43,6 +43,7 @@ protected:
     rtengine::ProcEvent EvPreProcessCAColourshiftHistory;
 
 public:
+    static const Glib::ustring TOOL_NAME;
 
     RAWCACorr ();
 

rtgui/rawexposure.cc

@@ -28,7 +28,9 @@
 using namespace rtengine;
 using namespace rtengine::procparams;
 
-RAWExposure::RAWExposure () : FoldableToolPanel(this, "rawexposure", M("TP_EXPOS_WHITEPOINT_LABEL"))
+const Glib::ustring RAWExposure::TOOL_NAME = "rawexposure";
+
+RAWExposure::RAWExposure () : FoldableToolPanel(this, TOOL_NAME, M("TP_EXPOS_WHITEPOINT_LABEL"))
 {
     PexPos = Gtk::manage(new Adjuster (M("TP_RAWEXPOS_LINEAR"), 0.1, 16.0, 0.01, 1));
     PexPos->setAdjusterListener (this);

rtgui/rawexposure.h

@@ -33,6 +33,7 @@ protected:
     Adjuster* PexPos;
 
 public:
+    static const Glib::ustring TOOL_NAME;
 
     RAWExposure ();
 

rtgui/resize.cc

@@ -29,7 +29,9 @@
 using namespace rtengine;
 using namespace rtengine::procparams;
 
-Resize::Resize () : FoldableToolPanel(this, "resize", M("TP_RESIZE_LABEL"), false, true), maxw(100000), maxh(100000)
+const Glib::ustring Resize::TOOL_NAME = "resize";
+
+Resize::Resize () : FoldableToolPanel(this, TOOL_NAME, M("TP_RESIZE_LABEL"), false, true), maxw(100000), maxh(100000)
 {
     auto m = ProcEventMapper::getInstance();
     EvResizeAllowUpscaling = m->newEvent(RESIZE, "HISTORY_MSG_RESIZE_ALLOWUPSCALING");

rtgui/resize.h

@@ -32,6 +32,8 @@ class Resize final :
     public rtengine::SizeListener
 {
 public:
+    static const Glib::ustring TOOL_NAME;
+
     Resize ();
     ~Resize () override;
 

rtgui/retinex.cc

@@ -14,7 +14,9 @@
 using namespace rtengine;
 using namespace rtengine::procparams;
 
-Retinex::Retinex () : FoldableToolPanel (this, "retinex", M ("TP_RETINEX_LABEL"), false, true), lastmedianmap (false)
+const Glib::ustring Retinex::TOOL_NAME = "retinex";
+
+Retinex::Retinex () : FoldableToolPanel (this, TOOL_NAME, M ("TP_RETINEX_LABEL"), false, true), lastmedianmap (false)
 {
     CurveListener::setMulti (true);
     std::vector<GradientMilestone> milestones;

rtgui/retinex.h

@@ -109,6 +109,8 @@ protected:
     sigc::connection medianmapConn;
 
 public:
+    static const Glib::ustring TOOL_NAME;
+
     Retinex();
     ~Retinex() override;
 

rtgui/rgbcurves.cc

@@ -27,7 +27,9 @@
 using namespace rtengine;
 using namespace rtengine::procparams;
 
-RGBCurves::RGBCurves () : FoldableToolPanel(this, "rgbcurves", M("TP_RGBCURVES_LABEL"), false, true), lastLumamode(false)
+const Glib::ustring RGBCurves::TOOL_NAME = "rgbcurves";
+
+RGBCurves::RGBCurves () : FoldableToolPanel(this, TOOL_NAME, M("TP_RGBCURVES_LABEL"), false, true), lastLumamode(false)
 {
 
     lumamode = Gtk::manage (new Gtk::CheckButton (M("TP_RGBCURVES_LUMAMODE")));

rtgui/rgbcurves.h

@@ -45,6 +45,7 @@ protected:
     sigc::connection lumamodeConn;
 
 public:
+    static const Glib::ustring TOOL_NAME;
 
     RGBCurves ();
     ~RGBCurves () override;

rtgui/rotate.cc

@@ -29,7 +29,9 @@
 using namespace rtengine;
 using namespace rtengine::procparams;
 
-Rotate::Rotate () : FoldableToolPanel(this, "rotate", M("TP_ROTATE_LABEL"))
+const Glib::ustring Rotate::TOOL_NAME = "rotate";
+
+Rotate::Rotate () : FoldableToolPanel(this, TOOL_NAME, M("TP_ROTATE_LABEL"))
 {
 
     rlistener = nullptr;

rtgui/rotate.h

@@ -36,6 +36,7 @@ protected:
     LensGeomListener*   rlistener;
 
 public:
+    static const Glib::ustring TOOL_NAME;
 
     Rotate ();
 

rtgui/sensorbayer.cc

@@ -20,7 +20,9 @@
 #include "guiutils.h"
 #include "rtimage.h"
 
-SensorBayer::SensorBayer () : FoldableToolPanel(this, "sensorbayer", M("TP_RAW_SENSOR_BAYER_LABEL"))
+const Glib::ustring SensorBayer::TOOL_NAME = "sensorbayer";
+
+SensorBayer::SensorBayer () : FoldableToolPanel(this, TOOL_NAME, M("TP_RAW_SENSOR_BAYER_LABEL"))
 {
 
     packBox = Gtk::manage (new ToolParamBlock ());

rtgui/sensorbayer.h

@@ -31,6 +31,7 @@ protected:
     ToolParamBlock*     packBox;
 
 public:
+    static const Glib::ustring TOOL_NAME;
 
     SensorBayer ();
 

rtgui/sensorxtrans.cc

@@ -20,7 +20,9 @@
 #include "guiutils.h"
 #include "rtimage.h"
 
-SensorXTrans::SensorXTrans () : FoldableToolPanel(this, "sensorxtrans", M("TP_RAW_SENSOR_XTRANS_LABEL"))
+const Glib::ustring SensorXTrans::TOOL_NAME = "sensorxtrans";
+
+SensorXTrans::SensorXTrans () : FoldableToolPanel(this, TOOL_NAME, M("TP_RAW_SENSOR_XTRANS_LABEL"))
 {
 
     packBox = Gtk::manage (new ToolParamBlock ());

rtgui/sensorxtrans.h

@@ -31,6 +31,7 @@ protected:
     ToolParamBlock*     packBox;
 
 public:
+    static const Glib::ustring TOOL_NAME;
 
     SensorXTrans ();
 

rtgui/shadowshighlights.cc

@@ -25,7 +25,9 @@
 using namespace rtengine;
 using namespace rtengine::procparams;
 
-ShadowsHighlights::ShadowsHighlights () : FoldableToolPanel(this, "shadowshighlights", M("TP_SHADOWSHLIGHTS_LABEL"), false, true)
+const Glib::ustring ShadowsHighlights::TOOL_NAME = "shadowshighlights";
+
+ShadowsHighlights::ShadowsHighlights () : FoldableToolPanel(this, TOOL_NAME, M("TP_SHADOWSHLIGHTS_LABEL"), false, true)
 {
     auto m = ProcEventMapper::getInstance();
     EvSHColorspace = m->newEvent(LUMINANCECURVE, "HISTORY_MSG_SH_COLORSPACE");

rtgui/shadowshighlights.h

@@ -40,6 +40,7 @@ protected:
     rtengine::ProcEvent EvSHColorspace;
 
 public:
+    static const Glib::ustring TOOL_NAME;
 
     ShadowsHighlights ();
 

rtgui/sharpenedge.cc

@@ -28,8 +28,9 @@
 using namespace rtengine;
 using namespace rtengine::procparams;
 
+const Glib::ustring SharpenEdge::TOOL_NAME = "sharpenedge";
 
-SharpenEdge::SharpenEdge () : FoldableToolPanel(this, "sharpenedge", M("TP_SHARPENEDGE_LABEL"), true, true)
+SharpenEdge::SharpenEdge () : FoldableToolPanel(this, TOOL_NAME, M("TP_SHARPENEDGE_LABEL"), true, true)
 {
 
     passes = Gtk::manage(new Adjuster (M("TP_SHARPENEDGE_PASSES"), 1, 4, 1, 2));

rtgui/sharpenedge.h

@@ -44,6 +44,7 @@ protected:
     bool lastchanthree;
 
 public:
+    static const Glib::ustring TOOL_NAME;
 
     SharpenEdge              ();
 

rtgui/sharpening.cc

@@ -23,7 +23,9 @@
 using namespace rtengine;
 using namespace rtengine::procparams;
 
-Sharpening::Sharpening () : FoldableToolPanel(this, "sharpening", M("TP_SHARPENING_LABEL"), true, true)
+const Glib::ustring Sharpening::TOOL_NAME = "sharpening";
+
+Sharpening::Sharpening () : FoldableToolPanel(this, TOOL_NAME, M("TP_SHARPENING_LABEL"), true, true)
 {
     auto m = ProcEventMapper::getInstance();
     EvSharpenContrast = m->newEvent(SHARPENING, "HISTORY_MSG_SHARPENING_CONTRAST");

rtgui/sharpening.h

@@ -62,6 +62,7 @@ protected:
     rtengine::ProcEvent EvSharpenContrast;
     rtengine::ProcEvent EvSharpenBlur;
 public:
+    static const Glib::ustring TOOL_NAME;
 
     Sharpening ();
     ~Sharpening () override;

rtgui/sharpenmicro.cc

@@ -29,8 +29,9 @@
 using namespace rtengine;
 using namespace rtengine::procparams;
 
+const Glib::ustring SharpenMicro::TOOL_NAME = "sharpenmicro";
 
-SharpenMicro::SharpenMicro () : FoldableToolPanel(this, "sharpenmicro", M("TP_SHARPENMICRO_LABEL"), true, true)
+SharpenMicro::SharpenMicro () : FoldableToolPanel(this, TOOL_NAME, M("TP_SHARPENMICRO_LABEL"), true, true)
 {
 
     auto m = ProcEventMapper::getInstance();

rtgui/sharpenmicro.h

@@ -47,6 +47,7 @@ protected:
     bool lastmatrix;
 
 public:
+    static const Glib::ustring TOOL_NAME;
 
     SharpenMicro           ();
 

rtgui/softlight.cc

@@ -29,7 +29,9 @@
 using namespace rtengine;
 using namespace rtengine::procparams;
 
-SoftLight::SoftLight(): FoldableToolPanel(this, "softlight", M("TP_SOFTLIGHT_LABEL"), false, true)
+const Glib::ustring SoftLight::TOOL_NAME = "softlight";
+
+SoftLight::SoftLight(): FoldableToolPanel(this, TOOL_NAME, M("TP_SOFTLIGHT_LABEL"), false, true)
 {
     auto m = ProcEventMapper::getInstance();
     EvSoftLightEnabled = m->newEvent(LUMINANCECURVE, "HISTORY_MSG_SOFTLIGHT_ENABLED");

rtgui/softlight.h

@@ -32,6 +32,7 @@ private:
     rtengine::ProcEvent EvSoftLightStrength;
     
 public:
+    static const Glib::ustring TOOL_NAME;
 
     SoftLight();
 

rtgui/spot.cc

@@ -52,8 +52,10 @@ enum GeometryIndex {
 
 }
 
+const Glib::ustring Spot::TOOL_NAME = "spot";
+
 Spot::Spot() :
-    FoldableToolPanel(this, "spot", M ("TP_SPOT_LABEL"), true, true),
+    FoldableToolPanel(this, TOOL_NAME, M ("TP_SPOT_LABEL"), true, true),
     EditSubscriber(ET_OBJECTS),
     draggedSide(DraggedSide::NONE),
     lastObject(-1),

rtgui/spot.h

@@ -97,6 +97,7 @@ protected:
     Geometry* getVisibleGeometryFromMO (int MOID);
 
 public:
+    static const Glib::ustring TOOL_NAME;
 
     Spot ();
     ~Spot ();

rtgui/tonecurve.cc

@@ -33,7 +33,9 @@
 using namespace rtengine;
 using namespace rtengine::procparams;
 
-ToneCurve::ToneCurve() : FoldableToolPanel(this, "tonecurve", M("TP_EXPOSURE_LABEL"))
+const Glib::ustring ToneCurve::TOOL_NAME = "tonecurve";
+
+ToneCurve::ToneCurve() : FoldableToolPanel(this, TOOL_NAME, M("TP_EXPOSURE_LABEL"))
 {
     auto m = ProcEventMapper::getInstance();
     EvHistMatching = m->newEvent(AUTOEXP, "HISTORY_MSG_HISTMATCHING");

rtgui/tonecurve.h

@@ -97,6 +97,8 @@ protected:
     void setHistmatching(bool enabled);
 
 public:
+    static const Glib::ustring TOOL_NAME;
+
     ToneCurve ();
     ~ToneCurve () override;