From c85428ef18f959a7f3897b70999e3cd47d01666a Mon Sep 17 00:00:00 2001 From: Desmis Date: Thu, 19 Dec 2019 12:22:42 +0100 Subject: [PATCH] Another label change --- rtdata/languages/default | 26 +++++++++++++------------- rtgui/locallab.cc | 20 +++++++++++++++----- 2 files changed, 28 insertions(+), 18 deletions(-) diff --git a/rtdata/languages/default b/rtdata/languages/default index fb4857b09..9efd1e29d 100644 --- a/rtdata/languages/default +++ b/rtdata/languages/default @@ -2237,8 +2237,8 @@ TP_LOCALLAB_CONTFRA;Contrast by Level TP_LOCALLAB_CONTRAST;Contrast TP_LOCALLAB_CONTRESID;Contrast TP_LOCALLAB_CONTTHR;Contrast Threshold -TP_LOCALLAB_CSTHRESHOLD;Wavelets Levels -TP_LOCALLAB_CSTHRESHOLDBLUR;Mask Wavelet level +TP_LOCALLAB_CSTHRESHOLD;Ψ Wavelets Levels +TP_LOCALLAB_CSTHRESHOLDBLUR;Ψ Mask Wavelet level TP_LOCALLAB_CURV;Lightness - Contrast - Chrominance "Super" TP_LOCALLAB_CURVCURR;Normal TP_LOCALLAB_CURVEEDITOR_CC_TOOLTIP;If curves at the top, mask is completely black no transformation is made by the mask on the image.\nAs you go down the curve, the mask gradually more colorful and brilliant, the image is changing more and more @@ -2256,7 +2256,7 @@ TP_LOCALLAB_DEHAFRA;Dehaze TP_LOCALLAB_DEHAZ;Strength TP_LOCALLAB_DEHAZ_TOOLTIP;Negative values add haze TP_LOCALLAB_DELTAEC;Mask ΔE Image -TP_LOCALLAB_DENOIS;Denoise +TP_LOCALLAB_DENOIS;Ψ Denoise TP_LOCALLAB_DEPTH;Depth TP_LOCALLAB_DETAIL;Detail (Guided Filter) TP_LOCALLAB_DETAILSH;Details @@ -2304,7 +2304,7 @@ TP_LOCALLAB_FATRES;Amount Residual Image TP_LOCALLAB_FATSHFRA;Dynamic Range Compression Mask TP_LOCALLAB_FEATH_TOOLTIP;Gradient width in percent of the Spot diagonal\n.. TP_LOCALLAB_FEATVALUE;Feather gradient -TP_LOCALLAB_FFTCOL_MASK;FFTW (to test ?) +TP_LOCALLAB_FFTCOL_MASK;FFTW TP_LOCALLAB_FFTW;Use Fast Fourier Transform TP_LOCALLAB_FFTW2;Use Fast Fourier Transform (TIF, JPG,..) TP_LOCALLAB_FFTWBLUR;Always Use Fast Fourier Transform @@ -2352,7 +2352,7 @@ TP_LOCALLAB_LAPMASKCOL;∆ - Laplacian threshold mask TP_LOCALLAB_LAPRAD_TOOLTIP;Avoid using Radius and Laplace Threshold simultaneously TP_LOCALLAB_LC_FFTW_TOOLTIP;FFT improve quality and allow big radius, but increases the treatment time.\nThe treatment time depends on the surface to be treated.\nTo be used preferably for large radius.\n\nDimensions can be reduced by a few pixels to optimize FFTW.\nThis optimization can reduce the treatment time by a factor of 1.5 to 10.\n TP_LOCALLAB_LEVELBLUR;Maximum Blur levels -TP_LOCALLAB_LEVELWAV;Wavelets Levels +TP_LOCALLAB_LEVELWAV;Ψ Wavelets Levels TP_LOCALLAB_LEVELWAV_TOOLTIP;The Level is automatically adapted to the size of the spot and the preview.\nFrom level 9 size max 512 to level 1 size max = 4 TP_LOCALLAB_LIGHTNESS;Lightness TP_LOCALLAB_LIGHTRETI;Lightness @@ -2360,8 +2360,8 @@ TP_LOCALLAB_LINEAR;Linearity TP_LOCALLAB_LMASK_LEVEL_TOOLTIP;Give priority to action on midtones and high lights and by choosing the concerned wavelet levels TP_LOCALLAB_LMASK_LL_TOOLTIP;Give priority to action on midtones and high lights TP_LOCALLAB_LOCCONT;Unsharp Mask -TP_LOCALLAB_LOC_CONTRAST;Local contrast & Wavelet Pyramid -TP_LOCALLAB_LOC_CONTRASTPYR;Wavelet Pyramid +TP_LOCALLAB_LOC_CONTRAST;Local contrast & Wavelet Pyramid Ψ +TP_LOCALLAB_LOC_CONTRASTPYR;Ψ Wavelet Pyramid TP_LOCALLAB_LOG;Encoding log TP_LOCALLAB_LOGAUTO;Automatic TP_LOCALLAB_LOGFRA;Source Gray Point @@ -2588,18 +2588,18 @@ TP_LOCALLAB_USEMASK;Use mask TP_LOCALLAB_VART;Variance (contrast) TP_LOCALLAB_VIBRANCE;Vibrance TP_LOCALLAB_VIS_TOOLTIP;Click to show/hide selected Control Spot.\nCtrl+click to show/hide all Control Spot. -TP_LOCALLAB_WAMASKCOL;Mask Wavelet level +TP_LOCALLAB_WAMASKCOL;Ψ Mask Wavelet level TP_LOCALLAB_WARM;Warm - Cool & Color artifacts TP_LOCALLAB_WARM_TOOLTIP;This slider use Ciecam algorithm and acts as White Balance, it can warm or cool the area selected.\nIt can also in some cases reduce color artifacts. TP_LOCALLAB_WAV;Levels local contrast TP_LOCALLAB_WAVCOMP;Compression by Level TP_LOCALLAB_WAVCON;Contrast by Level -TP_LOCALLAB_WAVE;Wavelet -TP_LOCALLAB_WAVHIGH;Wavelet high +TP_LOCALLAB_WAVE;Ψ Wavelet +TP_LOCALLAB_WAVHIGH;Ψ Wavelet high TP_LOCALLAB_WAVLEV;Blur by Level -TP_LOCALLAB_WAVLOW;Wavelet low -TP_LOCALLAB_WAVMASK;Mask Levels local contrast -TP_LOCALLAB_WAVMED;Wavelet normal +TP_LOCALLAB_WAVLOW;Ψ Wavelet low +TP_LOCALLAB_WAVMASK;Ψ Mask Levels local contrast +TP_LOCALLAB_WAVMED;Ψ Wavelet normal TP_LOCALLAB_WEDIANHI;Median Hi TP_LOCALLAB_WHITE_EV;White Ev TP_LOCAL_HEIGHT;Bottom diff --git a/rtgui/locallab.cc b/rtgui/locallab.cc index 7d011f0c7..bcda0bc98 100644 --- a/rtgui/locallab.cc +++ b/rtgui/locallab.cc @@ -3,7 +3,7 @@ * * Copyright (c) 2004-2010 Gabor Horvath frame * - *F + * * * RawTherapee is free software: you can redistribute it and/or modify * RawTherapee is free software: you can redistribute it and/or modify @@ -227,8 +227,9 @@ Locallab::Locallab(): expreti(Gtk::manage(new MyExpander(true, Gtk::manage(new Gtk::HBox())))), expretitools(Gtk::manage(new MyExpander(false, M("TP_LOCALLAB_EXPRETITOOLS")))), expsharp(Gtk::manage(new MyExpander(true, Gtk::manage(new Gtk::HBox())))), - expcontrastpyr(Gtk::manage(new MyExpander(false, M("TP_LOCALLAB_LOC_CONTRASTPYR")))), - expcontrast(Gtk::manage(new MyExpander(true, M("TP_LOCALLAB_LOC_CONTRAST")))), +// expcontrastpyr(Gtk::manage(new MyExpander(false, M("TP_LOCALLAB_LOC_CONTRASTPYR")))), + expcontrastpyr(Gtk::manage(new MyExpander(false, Gtk::manage(new Gtk::HBox())))), + expcontrast(Gtk::manage(new MyExpander(true,M("TP_LOCALLAB_LOC_CONTRAST")))), expcbdl(Gtk::manage(new MyExpander(true, Gtk::manage(new Gtk::HBox())))), expdenoi(Gtk::manage(new MyExpander(true, Gtk::manage(new Gtk::HBox())))), explog(Gtk::manage(new MyExpander(true, M("TP_LOCALLAB_LOG")))), @@ -972,7 +973,7 @@ pe(nullptr) float R, G, B; - for (int i = 0; i < 7; ++i) + for (int i = 0; i < 6; ++i) { const float x = static_cast(i) * (1.f / 6.f); Color::hsv2rgb01(x, 0.5f, 0.5f, R, G, B); @@ -2920,6 +2921,15 @@ pe(nullptr) compBox->pack_start(*fatres); compFrame->add(*compBox); + Gtk::HBox* const LCTitleHBox = Gtk::manage(new Gtk::HBox()); + Gtk::Label* const LCLabel = Gtk::manage(new Gtk::Label()); +// RTImage* const LCImage2 = Gtk::manage(new RTImage("wavelets.png")); + LCLabel->set_markup(Glib::ustring("") + escapeHtmlChars(M("TP_LOCALLAB_LOC_CONTRASTPYR")) + Glib::ustring("")); + LCLabel->set_alignment(Gtk::ALIGN_START, Gtk::ALIGN_CENTER); +// LCTitleHBox->pack_start(*LCImage2, Gtk::PACK_SHRINK, 0); + LCTitleHBox->pack_start(*LCLabel, Gtk::PACK_EXPAND_WIDGET, 0); + expcontrastpyr->setLabel(LCTitleHBox); + setExpandAlignProperties(expcontrastpyr, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_START); expcontrastpyr->signal_button_release_event().connect_notify(sigc::bind(sigc::mem_fun(this, &Locallab::foldAllButMe), expcontrastpyr)); expcontrastpyr->setLevel(2); @@ -3181,7 +3191,7 @@ pe(nullptr) BLLabel->set_alignment(Gtk::ALIGN_START, Gtk::ALIGN_CENTER); BLTitleHBox->pack_start(*BLLabel, Gtk::PACK_EXPAND_WIDGET, 0); RTImage* const BLImage = Gtk::manage(new RTImage("one-to-one-small.png")); - + if (showtooltip) { BLImage->set_tooltip_text(M("TP_GENERAL_11SCALE_TOOLTIP")); }