diff --git a/rtdata/languages/default b/rtdata/languages/default index de577d96e..a6b2a6d16 100644 --- a/rtdata/languages/default +++ b/rtdata/languages/default @@ -2189,7 +2189,7 @@ TP_LOCALLAB_BUTTON_DEL;Delete TP_LOCALLAB_BUTTON_DUPL;Duplicate TP_LOCALLAB_BUTTON_REN;Rename TP_LOCALLAB_BUTTON_VIS;Show/Hide -TP_LOCALLAB_CBDL;Contrast by detail levels - Big defects : grease.. +TP_LOCALLAB_CBDL;Contrast by detail levels - Big defects TP_LOCALLAB_CENTER_X;Center X TP_LOCALLAB_CENTER_Y;Center Y TP_LOCALLAB_CH;Curves CL - LC @@ -2207,7 +2207,7 @@ TP_LOCALLAB_CLARISOFT;Soft radius TP_LOCALLAB_CLARITYML;Clarity TP_LOCALLAB_CLARI_TOOLTIP;Under or equal level wavelet 4, 'Sharp mask' is enabled.\nAbove level wavelet 5 'Clarity' is enabled. TP_LOCALLAB_CLIPTM;Clip Restored datas (gain) -TP_LOCALLAB_COFR;Color & Light - Small defects : red eyes, dust +TP_LOCALLAB_COFR;Color & Light - Small defects TP_LOCALLAB_COL_NAME;Name TP_LOCALLAB_COL_VIS;Status TP_LOCALLAB_COMPLEX_METHOD;Software Complexity @@ -2398,12 +2398,12 @@ TP_LOCALLAB_MRTWO;Short Curves 'L' Mask TP_LOCALLAB_NEIGH;Radius TP_LOCALLAB_NOISECHROCOARSE;Chroma coarse (Wav) TP_LOCALLAB_NOISECHROC_TOOLTIP;If superior to zero, high quality algorithm is enabled.\nCoarse is for slider >=0.02 -TP_LOCALLAB_NOISECHRODETAIL;Chroma detail recovery(DCT) +TP_LOCALLAB_NOISECHRODETAIL;Chroma detail recovery (DCT) TP_LOCALLAB_NOISECHROFINE;Chroma fine (Wav) TP_LOCALLAB_NOISEDETAIL_TOOLTIP;Disabled if slider = 100 TP_LOCALLAB_NOISELEQUAL;Equalizer white-black TP_LOCALLAB_NOISELUMCOARSE;Luminance coarse (Wav) -TP_LOCALLAB_NOISELUMDETAIL;Luminance detail recovery(DCT) +TP_LOCALLAB_NOISELUMDETAIL;Luminance detail recovery (DCT) TP_LOCALLAB_NOISELUMFINE;Luminance fine 1 (Wav) TP_LOCALLAB_NOISELUMFINETWO;Luminance fine 2 (Wav) TP_LOCALLAB_NOISELUMFINEZERO;Luminance fine 0 (Wav) @@ -2466,7 +2466,7 @@ TP_LOCALLAB_SH1;Shadows Highlights TP_LOCALLAB_SH2;Equalizer TP_LOCALLAB_SHADEX;Shadows TP_LOCALLAB_SHADEXCOMP;Shadows compression & tonal width -TP_LOCALLAB_SHADHIGH;Shadows Highlights-Gradient- Tone Equalizer-TRC +TP_LOCALLAB_SHADHIGH;Shadows Highlights-Gradient - Tone Equalizer - TRC TP_LOCALLAB_SHADOWHIGHLIGHT_TOOLTIP;Can be used instead - or in complement - of exposure module in difficult cases.\nThe use of Denoise may be necessary : lightening the shadows.\n\nCan be used as graduated filter (increase Scope) TP_LOCALLAB_SHAMASKCOL;Shadows mask TP_LOCALLAB_SHAPETYPE;Shape RT-spot area @@ -2504,7 +2504,7 @@ TP_LOCALLAB_SHOWVI;3 - Mask and modifications TP_LOCALLAB_SIM;Simple TP_LOCALLAB_SLOMASKCOL;Slope mask TP_LOCALLAB_SLOSH;Slope -TP_LOCALLAB_SOFT;Soft Light and Original Retinex +TP_LOCALLAB_SOFT;Soft Light & Original Retinex TP_LOCALLAB_SOFTM;Soft Light TP_LOCALLAB_SOFTMETHOD_TOOLTIP;Original Retinex is very different from others Retinex method.\nIts acts on grey and balance luminance. TP_LOCALLAB_SOFTRADIUSCOL;Soft radius diff --git a/rtgui/locallab.cc b/rtgui/locallab.cc index f7ebc6d73..d65dd9570 100644 --- a/rtgui/locallab.cc +++ b/rtgui/locallab.cc @@ -768,6 +768,7 @@ pe(nullptr) setExpandAlignProperties(expmaskcol, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_START); expmaskcol->signal_button_release_event().connect_notify(sigc::bind(sigc::mem_fun(this, &Locallab::foldAllButMe), expmaskcol)); expmaskcol->setLevel(2); + setExpandAlignProperties(expmaskcol1, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_START); expmaskcol1->signal_button_release_event().connect_notify(sigc::bind(sigc::mem_fun(this, &Locallab::foldAllButMe), expmaskcol1)); expmaskcol1->setLevel(2); @@ -776,6 +777,10 @@ pe(nullptr) expmaskcol->set_tooltip_markup(M("TP_LOCALLAB_MASK_TOOLTIP")); } + + + + curvactivConn = curvactiv->signal_toggled().connect(sigc::mem_fun(*this, &Locallab::curvactivChanged)); lightness->setAdjusterListener(this); @@ -1324,10 +1329,10 @@ pe(nullptr) expmaskcol->add(*mergecolFrame, false); if (complexsoft < 2) { - colorBox->pack_start(*expmaskcol1); + colorBox->pack_start(*expmaskcol1, false, false); } - colorBox->pack_start(*expmaskcol); + colorBox->pack_start(*expmaskcol, false, false); expcolor->add(*colorBox, false); expcolor->setLevel(2); @@ -1662,7 +1667,7 @@ pe(nullptr) maskexpBox->pack_start(*mask2expCurveEditorG, Gtk::PACK_SHRINK, 4); // Padding is mandatory to correct behavior of curve editor expmaskexp->add(*maskexpBox, false); - exposeBox->pack_start(*expmaskexp); + exposeBox->pack_start(*expmaskexp, false, false); expexpose->add(*exposeBox, false); expexpose->setLevel(2); @@ -1890,7 +1895,7 @@ pe(nullptr) } expmasksh->add(*maskSHBox, false); - shadhighBox->pack_start(*expmasksh); + shadhighBox->pack_start(*expmasksh, false, false); expshadhigh->add(*shadhighBox, false); @@ -2115,7 +2120,7 @@ pe(nullptr) maskvibBox->pack_start(*mask2vibCurveEditorG, Gtk::PACK_SHRINK, 4); // Padding is mandatory to correct behavior of curve editor expmaskvib->add(*maskvibBox, false); - vibranceBox->pack_start(*expmaskvib); + vibranceBox->pack_start(*expmaskvib, false, false); expvibrance->add(*vibranceBox, false); expvibrance->setLevel(2); @@ -2354,7 +2359,7 @@ pe(nullptr) // tmBox->pack_start(*softradiustm);//always bad with TM ?? tmBox->pack_start(*sensitm); - tmBox->pack_start(*expmasktm); + tmBox->pack_start(*expmasktm, false, false); exptonemap->add(*tmBox, false); exptonemap->setLevel(2); @@ -2628,7 +2633,7 @@ pe(nullptr) retiBox->pack_start(*transLabels2); retiBox->pack_start(*LocalcurveEditortransT, Gtk::PACK_SHRINK, 4); // Padding is mandatory to correct behavior of curve editor retiBox->pack_start(*LocalcurveEditorgainT, Gtk::PACK_SHRINK, 4); // Padding is mandatory to correct behavior of curve editor - retiBox->pack_start(*expmaskreti); + retiBox->pack_start(*expmaskreti, false, false); // retiBox->pack_start(*inversret); retitoolFrame->add(*retiBox); genBox->pack_start(*retitoolFrame); @@ -2998,7 +3003,7 @@ pe(nullptr) // } cbdlBox->pack_start(*sensicb); - cbdlBox->pack_start(*expmaskcb); + cbdlBox->pack_start(*expmaskcb, false, false); expcbdl->add(*cbdlBox, false); expcbdl->setLevel(2); @@ -3239,7 +3244,9 @@ pe(nullptr) maskblBox->pack_start(*toolblFrame); expmaskbl->add(*maskblBox, false); - panel->pack_start(*expmaskbl); + panel->pack_start(*expmaskbl, false, false); + + grainFrame->set_label_align(0.025, 0.5);