Merge with "Beep6581/dev"

2023-03-11 11:02:29 +01:00
parent 0b67f1b7b4 ca08a279d5
commit c28d5aab97
252 changed files with 9021 additions and 3231 deletions
--- a/rtgui/chmixer.cc
+++ b/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"));