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

Merge branch 'master' into 'gtk3'

Browse Source 
Most conflicts seemed to be simple enough. There were a lot of `append_text` to
`append` conversions for `Gtk::ComboBoxText`. The `PopUpCommon` class also saw
a lot of changes with non-trivial conflict resolutions.
This commit is contained in:
Adam Reichold
2016-01-06 23:56:12 +01:00
parent fd553e04e1 a727460f77
commit 8151e0f5ce
167 changed files with 13108 additions and 2410 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
rtgui/colortoning.cc
View File

@@ -3,6 +3,7 @@
*/
#include "colortoning.h"
#include "mycurve.h"
#include "rtimage.h"
using namespace rtengine;
using namespace rtengine::procparams;
@@ -36,14 +37,6 @@ ColorToning::ColorToning () : FoldableToolPanel(this, "colortoning", M("TP_COLOR
colorSep = Gtk::manage (new Gtk::HSeparator());
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->setCurveListener (this);
@@ -796,8 +789,6 @@ void ColorToning::methodChanged ()
if (!batchMode) {
if (method->get_active_row_number() == 0) { // Lab
colorSep->show();
colLabel->hide();
interLabel->hide();
colorCurveEditorG->show();
twocolor->show();
opacityCurveEditorG->hide();
@@ -835,8 +826,6 @@ void ColorToning::methodChanged ()
twocolorChanged(true);
} else if (method->get_active_row_number() == 1) { // RGB Sliders
colorSep->hide();
colLabel->hide();
interLabel->hide();
colorCurveEditorG->hide();
twocolor->hide();
twocolor->set_active (false);
@@ -870,8 +859,6 @@ void ColorToning::methodChanged ()
} else if (method->get_active_row_number() == 2) { // RGB Curves
colorSep->hide();
colLabel->hide();
interLabel->hide();
colorCurveEditorG->show();
twocolor->hide();
twocolor->set_active (false);
@@ -905,8 +892,6 @@ void ColorToning::methodChanged ()
lumamode->hide();
} else if (method->get_active_row_number() == 3) { // Split LR
colorSep->hide();
colLabel->hide();
interLabel->hide();
colorCurveEditorG->hide();
twocolor->hide();
twocolor->set_active (false);
@@ -929,8 +914,6 @@ void ColorToning::methodChanged ()
lumamode->show();
} else if (method->get_active_row_number() == 4) { // Split Color
colorSep->show();
colLabel->hide();
interLabel->hide();
colorCurveEditorG->hide();
twocolor->hide();
opacityCurveEditorG->hide();