diff --git a/rtdata/languages/default b/rtdata/languages/default index 99a142d53..503c38e0e 100644 --- a/rtdata/languages/default +++ b/rtdata/languages/default @@ -885,7 +885,7 @@ TP_ICM_BLENDCMSMATRIX;Blend highlights with matrix TP_ICM_BLENDCMSMATRIX_TOOLTIP;Enable to recover blown highlights when using LUT based ICC profiles TP_ICM_FILEDLGFILTERANY;Any files TP_ICM_FILEDLGFILTERICM;ICC Profile Files -TP_ICM_INPUTCAMERAICC;Camera standard or ICC +TP_ICM_INPUTCAMERAICC;Auto-matched camera-specific ICC TP_ICM_INPUTCAMERAICC_TOOLTIP;Use RawTherapees default ICC color profile. More precise than simple matrix, but only available for some cameras. TP_ICM_INPUTCAMERA;Camera standard TP_ICM_INPUTCAMERA_TOOLTIP;Use simple default color matrix by DCRAW or embedded in DNG diff --git a/rtgui/icmpanel.cc b/rtgui/icmpanel.cc index 24549a1a3..a8a651c02 100644 --- a/rtgui/icmpanel.cc +++ b/rtgui/icmpanel.cc @@ -207,6 +207,12 @@ void ICMPanel::read (const ProcParams* pp, const ParamsEdited* pedited) { icameraICC->set_active (true); ckbBlendCMSMatrix->set_sensitive (true); } + else if ((pp->icm.input == "(cameraICC)") && icameraICC->get_state()==Gtk::STATE_INSENSITIVE) { + // this is the case when (cameraICC) is instructed by packaged profiles, but ICC file is not found + // therefore falling back UI to explicitly reflect the (camera) option + icamera->set_active (true); + ckbBlendCMSMatrix->set_sensitive (false); + } else if ((pp->icm.input == "(camera)" || pp->icm.input=="") && icamera->get_state()!=Gtk::STATE_INSENSITIVE) { icamera->set_active (true); ckbBlendCMSMatrix->set_sensitive (false);