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

Solving issue 2263: "Settings of some tools are lost when enabling some option from File Browser"

Browse Source
This commit is contained in:
Hombrenatureh.510
2014-03-11 18:33:19 +01:00
parent aeeaf4de3c
commit 1d8061ed9a
5 changed files with 25 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
rtgui/adjuster.cc
View File

@@ -450,6 +450,7 @@ void Adjuster::showEditedCB () {
hbox->pack_start (*editedCheckBox, Gtk::PACK_SHRINK, 2); hbox->pack_start (*editedCheckBox, Gtk::PACK_SHRINK, 2);
hbox->reorder_child (*editedCheckBox, 0); hbox->reorder_child (*editedCheckBox, 0);
editedChange = editedCheckBox->signal_toggled().connect( sigc::mem_fun(*this, &Adjuster::editedToggled) ); editedChange = editedCheckBox->signal_toggled().connect( sigc::mem_fun(*this, &Adjuster::editedToggled) );
editedCheckBox->show();
} }
} }

9
rtgui/colorappearance.cc
View File

@@ -1167,19 +1167,18 @@ void ColorAppearance::setBatchMode (bool batchMode) {
wbmodel->append_text (M("GENERAL_UNCHANGED")); wbmodel->append_text (M("GENERAL_UNCHANGED"));
algo->append_text (M("GENERAL_UNCHANGED")); algo->append_text (M("GENERAL_UNCHANGED"));
toneCurveMode->append_text (M("GENERAL_UNCHANGED")); toneCurveMode->append_text (M("GENERAL_UNCHANGED"));
// toneCurveMode2->append_text (M("GENERAL_UNCHANGED")); toneCurveMode2->append_text (M("GENERAL_UNCHANGED"));
// toneCurveMode3->append_text (M("GENERAL_UNCHANGED")); toneCurveMode3->append_text (M("GENERAL_UNCHANGED"));
curveEditorG->setBatchMode (batchMode); curveEditorG->setBatchMode (batchMode);
// curveEditorG2->setBatchMode (batchMode); curveEditorG2->setBatchMode (batchMode);
// curveEditorG3->setBatchMode (batchMode); curveEditorG3->setBatchMode (batchMode);
} }
void ColorAppearance::updateCurveBackgroundHistogram (LUTu & histToneCurve, LUTu & histLCurve, LUTu & histCCurve, LUTu & histCLurve, LUTu & histLLCurve, LUTu & histLCAM, LUTu & histCCAM, LUTu & histRed, LUTu & histGreen, LUTu & histBlue, LUTu & histLuma){ void ColorAppearance::updateCurveBackgroundHistogram (LUTu & histToneCurve, LUTu & histLCurve, LUTu & histCCurve, LUTu & histCLurve, LUTu & histLLCurve, LUTu & histLCAM, LUTu & histCCAM, LUTu & histRed, LUTu & histGreen, LUTu & histBlue, LUTu & histLuma){
shape->updateBackgroundHistogram (histLCAM); shape->updateBackgroundHistogram (histLCAM);
shape3->updateBackgroundHistogram (histCCAM); shape3->updateBackgroundHistogram (histCCAM);
} }

19
rtgui/crop.cc
View File

@@ -23,7 +23,6 @@
using namespace rtengine; using namespace rtengine;
using namespace rtengine::procparams; using namespace rtengine::procparams;
extern Glib::ustring argv0;
extern Options options; extern Options options;
class RefreshSpinHelper { class RefreshSpinHelper {
@@ -323,11 +322,11 @@ void Crop::read (const ProcParams* pp, const ParamsEdited* pedited) {
xDirty = pedited->crop.x; xDirty = pedited->crop.x;
yDirty = pedited->crop.y; yDirty = pedited->crop.y;
if (!pedited->crop.ratio) if (!pedited->crop.ratio)
ratio->set_active (8); ratio->set_active_text (M("GENERAL_UNCHANGED"));
if (!pedited->crop.orientation) if (!pedited->crop.orientation)
orientation->set_active (2); orientation->set_active_text (M("GENERAL_UNCHANGED"));
if (!pedited->crop.guide) if (!pedited->crop.guide)
guide->set_active (7); guide->set_active_text (M("GENERAL_UNCHANGED"));
enabled->set_inconsistent (!pedited->crop.enabled); enabled->set_inconsistent (!pedited->crop.enabled);
fixr->set_inconsistent (!pedited->crop.fixratio); fixr->set_inconsistent (!pedited->crop.fixratio);
} }
@@ -386,9 +385,9 @@ void Crop::write (ProcParams* pp, ParamsEdited* pedited) {
if (pedited) { if (pedited) {
pedited->crop.enabled = !enabled->get_inconsistent(); pedited->crop.enabled = !enabled->get_inconsistent();
pedited->crop.ratio = ratio->get_active_row_number() != 9; pedited->crop.ratio = ratio->get_active_text() != M("GENERAL_UNCHANGED");
pedited->crop.orientation = orientation->get_active_row_number() != 2; pedited->crop.orientation = orientation->get_active_text() != M("GENERAL_UNCHANGED");
pedited->crop.guide = guide->get_active_row_number() != 9; pedited->crop.guide = guide->get_active_text() != M("GENERAL_UNCHANGED");
pedited->crop.fixratio = !fixr->get_inconsistent(); pedited->crop.fixratio = !fixr->get_inconsistent();
pedited->crop.w = wDirty; pedited->crop.w = wDirty;
pedited->crop.h = hDirty; pedited->crop.h = hDirty;
@@ -1056,8 +1055,8 @@ void Crop::setBatchMode (bool batchMode) {
ToolPanel::setBatchMode (batchMode); ToolPanel::setBatchMode (batchMode);
ratio->append_text ("(Unchanged)"); ratio->append_text (M("GENERAL_UNCHANGED"));
orientation->append_text ("(Unchanged)"); orientation->append_text (M("GENERAL_UNCHANGED"));
guide->append_text ("(Unchanged)"); guide->append_text (M("GENERAL_UNCHANGED"));
removeIfThere (this, ppibox); removeIfThere (this, ppibox);
} }

2
rtgui/gradient.cc
View File

@@ -56,7 +56,7 @@ void Gradient::read (const ProcParams* pp, const ParamsEdited* pedited)
strength->setEditedState (pedited->gradient.strength ? Edited : UnEdited); strength->setEditedState (pedited->gradient.strength ? Edited : UnEdited);
centerX->setEditedState (pedited->gradient.centerX ? Edited : UnEdited); centerX->setEditedState (pedited->gradient.centerX ? Edited : UnEdited);
centerY->setEditedState (pedited->gradient.centerY ? Edited : UnEdited); centerY->setEditedState (pedited->gradient.centerY ? Edited : UnEdited);
enabled->set_inconsistent (!pedited->gradient.enabled); enabled->set_inconsistent (multiImage && !pedited->gradient.enabled);
} }
enaConn.block (true); enaConn.block (true);

6
rtgui/tonecurve.cc
View File

@@ -599,6 +599,8 @@ void ToneCurve::waitForAutoExp () {
saturation->setEnabled (false); saturation->setEnabled (false);
curveEditorG->set_sensitive (false); curveEditorG->set_sensitive (false);
toneCurveMode->set_sensitive (false); toneCurveMode->set_sensitive (false);
curveEditorG2->set_sensitive (false);
toneCurveMode2->set_sensitive (false);
hrenabled->set_sensitive(false); hrenabled->set_sensitive(false);
method->set_sensitive(false); method->set_sensitive(false);
} }
@@ -633,6 +635,8 @@ void ToneCurve::enableAll () {
saturation->setEnabled (true); saturation->setEnabled (true);
curveEditorG->set_sensitive (true); curveEditorG->set_sensitive (true);
toneCurveMode->set_sensitive (true); toneCurveMode->set_sensitive (true);
curveEditorG2->set_sensitive (true);
toneCurveMode2->set_sensitive (true);
hrenabled->set_sensitive(true); hrenabled->set_sensitive(true);
method->set_sensitive(true); method->set_sensitive(true);
} }
@@ -682,8 +686,10 @@ void ToneCurve::setBatchMode (bool batchMode) {
saturation->showEditedCB (); saturation->showEditedCB ();
toneCurveMode->append_text (M("GENERAL_UNCHANGED")); toneCurveMode->append_text (M("GENERAL_UNCHANGED"));
toneCurveMode2->append_text (M("GENERAL_UNCHANGED"));
curveEditorG->setBatchMode (batchMode); curveEditorG->setBatchMode (batchMode);
curveEditorG2->setBatchMode (batchMode);
} }
void ToneCurve::setAdjusterBehavior (bool expadd, bool hlcompadd, bool hlcompthreshadd, bool bradd, bool blackadd, bool shcompadd, bool contradd, bool satadd) { void ToneCurve::setAdjusterBehavior (bool expadd, bool hlcompadd, bool hlcompthreshadd, bool bradd, bool blackadd, bool shcompadd, bool contradd, bool satadd) {