Merge from default. Hope I did it right...

This commit is contained in:
Emil Martinec
2012-03-08 20:27:30 -06:00
parent 380728e1f0
commit f47b4b5bb0
262 changed files with 41736 additions and 37104 deletions

View File

@@ -24,13 +24,13 @@ using namespace rtengine::procparams;
RGBCurves::RGBCurves () : Gtk::VBox(), FoldableToolPanel(this) {
curveEditorG = new CurveEditorGroup ();
curveEditorG = new CurveEditorGroup (M("TP_RGBCURVES_CHANNEL"));
curveEditorG->setCurveListener (this);
curveEditorG->setColorProvider (this);
Rshape = (DiagonalCurveEditor*)curveEditorG->addCurve(CT_Diagonal, "R");
Gshape = (DiagonalCurveEditor*)curveEditorG->addCurve(CT_Diagonal, "G");
Bshape = (DiagonalCurveEditor*)curveEditorG->addCurve(CT_Diagonal, "B");
Rshape = static_cast<DiagonalCurveEditor*>(curveEditorG->addCurve(CT_Diagonal, M("TP_RGBCURVES_RED")));
Gshape = static_cast<DiagonalCurveEditor*>(curveEditorG->addCurve(CT_Diagonal, M("TP_RGBCURVES_GREEN")));
Bshape = static_cast<DiagonalCurveEditor*>(curveEditorG->addCurve(CT_Diagonal, M("TP_RGBCURVES_BLUE")));
// This will add the reset button at the end of the curveType buttons
curveEditorG->curveListComplete();