Fix merge issues

Adapt tone equalizer to favorites tab changes.
2023-02-06 21:44:57 -08:00
parent f236a7edb7
commit 12ef477a6d
5 changed files with 14 additions and 1 deletions
--- a/rtgui/toneequalizer.cc
+++ b/rtgui/toneequalizer.cc
@@ -25,8 +25,9 @@
 using namespace rtengine;
 using namespace rtengine::procparams;

+const Glib::ustring ToneEqualizer::TOOL_NAME = "toneequalizer";

-ToneEqualizer::ToneEqualizer(): FoldableToolPanel(this, "toneequalizer", M("TP_TONE_EQUALIZER_LABEL"), false, true)
+ToneEqualizer::ToneEqualizer(): FoldableToolPanel(this, TOOL_NAME, M("TP_TONE_EQUALIZER_LABEL"), false, true)
 {
    auto m = ProcEventMapper::getInstance();
    EvEnabled = m->newEvent(AUTOEXP, "HISTORY_MSG_TONE_EQUALIZER_ENABLED");