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

Merge pull request #3004 from adamreichold/remove-unused-colortoning-labels

Browse Source 
Remove two unused labels from the color toning tool that were always …
This commit is contained in:
Beep6581
2015-12-04 08:31:00 +01:00
parent 606a1cabc3 871e661a93
commit 7ef35abb57
2 changed files with 0 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
rtgui/colortoning.cc
View File

@@ -36,14 +36,6 @@ ColorToning::ColorToning () : FoldableToolPanel(this, "colortoning", M("TP_COLOR
colorSep = Gtk::manage (new Gtk::HSeparator()); colorSep = Gtk::manage (new Gtk::HSeparator());
pack_start (*colorSep); pack_start (*colorSep);
colLabel = Gtk::manage (new Gtk::Label (M("TP_COLORTONING_LABCOL")));
colLabel->set_tooltip_text (M("TP_COLORTONING_LABCOL_TOOLTIP"));
interLabel = Gtk::manage (new Gtk::Label (M("TP_COLORTONING_LABINT")));
interLabel->set_tooltip_text (M("TP_COLORTONING_LABINT_TOOLTIP"));
pack_start (*colLabel, Gtk::PACK_SHRINK, 4);
pack_start (*interLabel, Gtk::PACK_SHRINK, 4);
colorCurveEditorG = new CurveEditorGroup (options.lastColorToningCurvesDir, M("TP_COLORTONING_COLOR")); colorCurveEditorG = new CurveEditorGroup (options.lastColorToningCurvesDir, M("TP_COLORTONING_COLOR"));
colorCurveEditorG->setCurveListener (this); colorCurveEditorG->setCurveListener (this);
@@ -799,8 +791,6 @@ void ColorToning::methodChanged ()
if (!batchMode) { if (!batchMode) {
if (method->get_active_row_number() == 0) { // Lab if (method->get_active_row_number() == 0) { // Lab
colorSep->show(); colorSep->show();
colLabel->hide();
interLabel->hide();
colorCurveEditorG->show(); colorCurveEditorG->show();
twocolor->show(); twocolor->show();
opacityCurveEditorG->hide(); opacityCurveEditorG->hide();
@@ -838,8 +828,6 @@ void ColorToning::methodChanged ()
twocolorChanged(true); twocolorChanged(true);
} else if (method->get_active_row_number() == 1) { // RGB Sliders } else if (method->get_active_row_number() == 1) { // RGB Sliders
colorSep->hide(); colorSep->hide();
colLabel->hide();
interLabel->hide();
colorCurveEditorG->hide(); colorCurveEditorG->hide();
twocolor->hide(); twocolor->hide();
twocolor->set_active (false); twocolor->set_active (false);
@@ -873,8 +861,6 @@ void ColorToning::methodChanged ()
} else if (method->get_active_row_number() == 2) { // RGB Curves } else if (method->get_active_row_number() == 2) { // RGB Curves
colorSep->hide(); colorSep->hide();
colLabel->hide();
interLabel->hide();
colorCurveEditorG->show(); colorCurveEditorG->show();
twocolor->hide(); twocolor->hide();
twocolor->set_active (false); twocolor->set_active (false);
@@ -908,8 +894,6 @@ void ColorToning::methodChanged ()
lumamode->hide(); lumamode->hide();
} else if (method->get_active_row_number() == 3) { // Split LR } else if (method->get_active_row_number() == 3) { // Split LR
colorSep->hide(); colorSep->hide();
colLabel->hide();
interLabel->hide();
colorCurveEditorG->hide(); colorCurveEditorG->hide();
twocolor->hide(); twocolor->hide();
twocolor->set_active (false); twocolor->set_active (false);
@@ -932,8 +916,6 @@ void ColorToning::methodChanged ()
lumamode->show(); lumamode->show();
} else if (method->get_active_row_number() == 4) { // Split Color } else if (method->get_active_row_number() == 4) { // Split Color
colorSep->show(); colorSep->show();
colLabel->hide();
interLabel->hide();
colorCurveEditorG->hide(); colorCurveEditorG->hide();
twocolor->hide(); twocolor->hide();
opacityCurveEditorG->hide(); opacityCurveEditorG->hide();

2
rtgui/colortoning.h
View File

@@ -60,8 +60,6 @@ protected:
//Gtk::Button* neutralCurves; //Gtk::Button* neutralCurves;
Gtk::HBox* neutrHBox; Gtk::HBox* neutrHBox;
Gtk::HBox* chromaHbox; Gtk::HBox* chromaHbox;
Gtk::Label* colLabel;
Gtk::Label* interLabel;
Gtk::Label* chroLabel; Gtk::Label* chroLabel;
int nextbw; int nextbw;
int nextsatth; int nextsatth;