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

merge with dev

Browse Source
This commit is contained in:
Desmis
2018-02-06 16:54:30 +01:00
parent 94eeb923ea e6265cdfef
commit 40cc22f1e1
42 changed files with 576 additions and 255 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
rtgui/editorpanel.cc
View File

@@ -220,7 +220,7 @@ private:
spGamutCheck.set_tooltip_markup (M ("SOFTPROOF_GAMUTCHECK_TOOLTIP"));
spGamutCheck.set_active (false);
spGamutCheck.set_sensitive (false);
spGamutCheck.set_sensitive (true);
spGamutCheck.show ();
}
@@ -300,7 +300,7 @@ private:
intentBox.setItemSensitivity (1, supportsRelativeColorimetric);
intentBox.setItemSensitivity (2, supportsAbsoluteColorimetric);
softProof.set_sensitive (true);
spGamutCheck.set_sensitive (softProof.get_active());
spGamutCheck.set_sensitive (true);
} else {
intentBox.setItemSensitivity (0, true);
intentBox.setItemSensitivity (1, true);
@@ -308,7 +308,7 @@ private:
intentBox.set_sensitive (false);
intentBox.setSelected (1);
softProof.set_sensitive (false);
spGamutCheck.set_sensitive (false);
spGamutCheck.set_sensitive (true);
}
profileBox.set_tooltip_text (profileBox.get_active_text ());
@@ -352,9 +352,9 @@ private:
{
#if !defined(__APPLE__) // monitor profile not supported on apple
softProof.set_sensitive (profileBox.get_active_row_number () > 0);
spGamutCheck.set_sensitive(profileBox.get_active_row_number () > 0);
#endif
spGamutCheck.set_sensitive (softProof.get_sensitive() && softProof.get_active());
#if !defined(__APPLE__) // monitor profile not supported on apple
@@ -366,7 +366,7 @@ private:
processor->beginUpdateParams ();
}
processor->setSoftProofing (softProof.get_sensitive() && softProof.get_active(), spGamutCheck.get_sensitive() && spGamutCheck.get_active());
processor->setSoftProofing (softProof.get_sensitive() && softProof.get_active(), spGamutCheck.get_active());
if (!noEvent) {
processor->endUpdateParams (rtengine::EvMonitorTransform);

3
rtgui/imagearea.cc
View File

@@ -505,8 +505,9 @@ void ImageArea::addCropWindow ()
mainCropWindow->setObservedCropWin (cropWins.front());
if(cropWins.size() == 1) { // after first detail window we already have high quality
if(!ipc->getHighQualComputed()) {
ipc->startProcessing(M_HIGHQUAL);
ipc->setHighQualComputed();
}
}