liz/rawTherapee
liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix merge issues

Browse Source 
Adapt tone equalizer to favorites tab changes.
This commit is contained in:
Lawrence Lee 2023-02-06 21:44:57 -08:00
parent f236a7edb7
commit 12ef477a6d
No known key found for this signature in database
GPG Key ID: 048FF2B76A63895F
5 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
rtgui/toneequalizer.cc
View File

@ -25,8 +25,9 @@
using namespace rtengine; using namespace rtengine;
using namespace rtengine::procparams; 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(); auto m = ProcEventMapper::getInstance();
EvEnabled = m->newEvent(AUTOEXP, "HISTORY_MSG_TONE_EQUALIZER_ENABLED"); EvEnabled = m->newEvent(AUTOEXP, "HISTORY_MSG_TONE_EQUALIZER_ENABLED");

2
rtgui/toneequalizer.h
View File

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

2
rtgui/toollocationpref.cc
View File

@ -70,6 +70,8 @@ Glib::ustring getToolTitleKey(Tool tool)
return "TP_EXPOSURE_LABEL"; return "TP_EXPOSURE_LABEL";
case Tool::SHADOWS_HIGHLIGHTS: case Tool::SHADOWS_HIGHLIGHTS:
return "TP_SHADOWSHLIGHTS_LABEL"; return "TP_SHADOWSHLIGHTS_LABEL";
case Tool::TONE_EQUALIZER:
return "TP_TONE_EQUALIZER_LABEL";
case Tool::IMPULSE_DENOISE: case Tool::IMPULSE_DENOISE:
return "TP_IMPULSEDENOISE_LABEL"; return "TP_IMPULSEDENOISE_LABEL";
case Tool::DEFRINGE_TOOL: case Tool::DEFRINGE_TOOL:

7
rtgui/toolpanelcoord.cc
View File

@ -44,6 +44,9 @@ const std::vector<ToolTree> EXPOSURE_PANEL_TOOLS = {
{ {
.id = Tool::SHADOWS_HIGHLIGHTS, .id = Tool::SHADOWS_HIGHLIGHTS,
}, },
{
.id = Tool::TONE_EQUALIZER,
},
{ {
.id = Tool::EPD, .id = Tool::EPD,
}, },
@ -562,6 +565,8 @@ std::string ToolPanelCoordinator::getToolName(Tool tool)
return ToneCurve::TOOL_NAME; return ToneCurve::TOOL_NAME;
case Tool::SHADOWS_HIGHLIGHTS: case Tool::SHADOWS_HIGHLIGHTS:
return ShadowsHighlights::TOOL_NAME; return ShadowsHighlights::TOOL_NAME;
case Tool::TONE_EQUALIZER:
return ToneEqualizer::TOOL_NAME;
case Tool::IMPULSE_DENOISE: case Tool::IMPULSE_DENOISE:
return ImpulseDenoise::TOOL_NAME; return ImpulseDenoise::TOOL_NAME;
case Tool::DEFRINGE_TOOL: case Tool::DEFRINGE_TOOL:
@ -1908,6 +1913,8 @@ FoldableToolPanel *ToolPanelCoordinator::getFoldableToolPanel(Tool tool) const
return toneCurve; return toneCurve;
case Tool::SHADOWS_HIGHLIGHTS: case Tool::SHADOWS_HIGHLIGHTS:
return shadowshighlights; return shadowshighlights;
case Tool::TONE_EQUALIZER:
return toneEqualizer;
case Tool::IMPULSE_DENOISE: case Tool::IMPULSE_DENOISE:
return impulsedenoise; return impulsedenoise;
case Tool::DEFRINGE_TOOL: case Tool::DEFRINGE_TOOL:

1
rtgui/toolpanelcoord.h
View File

@ -247,6 +247,7 @@ public:
enum class Tool { enum class Tool {
TONE_CURVE, TONE_CURVE,
SHADOWS_HIGHLIGHTS, SHADOWS_HIGHLIGHTS,
TONE_EQUALIZER,
IMPULSE_DENOISE, IMPULSE_DENOISE,
DEFRINGE_TOOL, DEFRINGE_TOOL,
SPOT, SPOT,