diff --git a/rtdata/languages/Francais b/rtdata/languages/Francais index 1d79c7628..d3e365f8b 100644 --- a/rtdata/languages/Francais +++ b/rtdata/languages/Francais @@ -2134,7 +2134,7 @@ TP_LOCALLAB_RESIDHITHR;Hautes lumières seuil TP_LOCALLAB_RESIDSHA;Ombres TP_LOCALLAB_RESIDSHATHR;Ombres seuil TP_LOCALLAB_RETI;De-brume - Retinex Fort contraste -TP_LOCALLAB_RETIFRA;Retinexfr +TP_LOCALLAB_RETIFRA;Retinex TP_LOCALLAB_RETIM;Original Retinex TP_LOCALLAB_RETITOOLFRA;Retinex Outils TP_LOCALLAB_RETI_FFTW_TOOLTIP;FFT améliore la qualité et autorise de grands rayons, mais accroît les temps de traitement.\nCe temps dépends de la surface traitée\nLe temps de traitements dépend de "scale" (échelle) (soyez prudent avec les hautes valeurs ).\nA utiliser de préférence avec de grand rayons.\n\nLes Dimensions peuvent être réduites de quelques pixels pour optimiser FFTW.\nCette optimisation peut réduire le temps de traitement d'un facteur de 1.5 à 10.\nOptimisation pas utilsée en prévisualisation diff --git a/rtdata/languages/default b/rtdata/languages/default index 0eef7b003..1bdbd3047 100644 --- a/rtdata/languages/default +++ b/rtdata/languages/default @@ -2603,6 +2603,7 @@ TP_LOCALLAB_LUMADARKEST;Darkest TP_LOCALLAB_LUMASK;Luminance Background Mask TP_LOCALLAB_LUMASK_TOOLTIP;Adjust the gray of the mask background in Show Mask (Mask and modifications) TP_LOCALLAB_LUMAWHITESEST;Whiteest +TP_LOCALLAB_LUMFRA;L*a*b* standard TP_LOCALLAB_LUMONLY;Luminance only TP_LOCALLAB_MASKCOM;Common Color Mask TP_LOCALLAB_MASKCOM_TOOLTIP;These masks works as all tools, they take into account scope color.\nThey are different from others masks which complete a tool (Color and Light, Exposure...) diff --git a/rtgui/locallabtools.cc b/rtgui/locallabtools.cc index 5310a2d2f..663735520 100644 --- a/rtgui/locallabtools.cc +++ b/rtgui/locallabtools.cc @@ -388,6 +388,7 @@ LocallabColor::LocallabColor(): LocallabTool(this, M("TP_LOCALLAB_COLOR_TOOLNAME"), M("TP_LOCALLAB_COFR"), false), // Color & Light specific widgets + lumFrame(Gtk::manage(new Gtk::Frame(M("TP_LOCALLAB_LUMFRA")))), curvactiv(Gtk::manage(new Gtk::CheckButton(M("TP_LOCALLAB_CURV")))), lightness(Gtk::manage(new Adjuster(M("TP_LOCALLAB_LIGHTNESS"), -100, 500, 1, 0))), contrast(Gtk::manage(new Adjuster(M("TP_LOCALLAB_CONTRAST"), -100, 100, 1, 0))), @@ -477,6 +478,7 @@ LocallabColor::LocallabColor(): // Parameter Color & Light specific widgets curvactivConn = curvactiv->signal_toggled().connect(sigc::mem_fun(*this, &LocallabColor::curvactivChanged)); + lumFrame->set_label_align(0.025, 0.5); lightness->setAdjusterListener(this); @@ -730,10 +732,14 @@ LocallabColor::LocallabColor(): Gtk::Frame* const superFrame = Gtk::manage(new Gtk::Frame()); superFrame->set_label_align(0.025, 0.5); // superFrame->set_label_widget(*curvactiv); + ToolParamBlock* const lumBox = Gtk::manage(new ToolParamBlock()); + lumBox->pack_start(*lightness); + lumBox->pack_start(*contrast); + lumBox->pack_start(*chroma); + lumFrame->add(*lumBox); + pack_start(*lumFrame); ToolParamBlock* const superBox = Gtk::manage(new ToolParamBlock()); - superBox->pack_start(*lightness); - superBox->pack_start(*contrast); - superBox->pack_start(*chroma); + ToolParamBlock* const gridBox = Gtk::manage(new ToolParamBlock()); gridBox->pack_start(*labgrid); gridBox->pack_start(*gridMethod); @@ -875,7 +881,7 @@ void LocallabColor::getMaskView(int &colorMask, int &colorMaskinv, int &expMask, void LocallabColor::updateAdviceTooltips(const bool showTooltips) { if (showTooltips) { - exp->set_tooltip_text(M("TP_LOCALLAB_EXPCOLOR_TOOLTIP")); + lumFrame->set_tooltip_text(M("TP_LOCALLAB_EXPCOLOR_TOOLTIP")); lightness->set_tooltip_text(M("TP_LOCALLAB_LIGHTN_TOOLTIP")); structcol->set_tooltip_text(M("TP_LOCALLAB_STRUCT_TOOLTIP")); sensi->set_tooltip_text(M("TP_LOCALLAB_SENSI_TOOLTIP")); @@ -904,6 +910,7 @@ void LocallabColor::updateAdviceTooltips(const bool showTooltips) special->set_tooltip_text(M("TP_LOCALLAB_SPECIAL_TOOLTIP")); } else { exp->set_tooltip_text(""); + lumFrame->set_tooltip_text(M("")); lightness->set_tooltip_text(""); structcol->set_tooltip_text(""); sensi->set_tooltip_text(""); diff --git a/rtgui/locallabtools.h b/rtgui/locallabtools.h index d3672b819..9ec9322d4 100644 --- a/rtgui/locallabtools.h +++ b/rtgui/locallabtools.h @@ -174,6 +174,7 @@ class LocallabColor: { private: // Color & Light specific widgets + Gtk::Frame* const lumFrame; Gtk::CheckButton* const curvactiv; Adjuster* const lightness; Adjuster* const contrast;