Solving issue 2052: "Vignetting, Post-Crop Vignetting and Graduated Filter tool granularity in History" + language strings update

rtdata/languages/Francais

@@ -1,4 +1,3 @@
-
 ABOUT_TAB_BUILD;Version
 ABOUT_TAB_CREDITS;Crédits
 ABOUT_TAB_LICENSE;Licence
@@ -307,7 +306,7 @@ HISTORY_MSG_68;Reconst. HL - Méthode
 HISTORY_MSG_69;Espace de couleur de travail
 HISTORY_MSG_70;Espace de couleur de sortie
 HISTORY_MSG_71;Espace de couleur d'entrée
-HISTORY_MSG_72;Correction du vignettage
+HISTORY_MSG_72;Vignettage - Quantité
 HISTORY_MSG_73;Mixage des canaux
 HISTORY_MSG_74;Redim. - échelle
 HISTORY_MSG_75;Méthode de redimensionnement
@@ -446,6 +445,40 @@ HISTORY_MSG_207;A.C. - Teinte
 HISTORY_MSG_208;Égaliseur Bleu/Rouge
 HISTORY_MSG_210;Filtre Dégradé
 HISTORY_MSG_211;Filtre Dégradé
+HISTORY_MSG_212;Filtre Vignettage
+HISTORY_MSG_213;Filtre Vignettage - Force
+HISTORY_MSG_214;Noir et Blanc
+HISTORY_MSG_215;NB Mixeur Rouge
+HISTORY_MSG_216;NB Mixeur Vert
+HISTORY_MSG_217;NB Mixeur Bleu
+HISTORY_MSG_218;NB Gamma Rouge
+HISTORY_MSG_219;NB Gamma Vert
+HISTORY_MSG_220;NB Gamma Bleu
+HISTORY_MSG_221;NB Filtre de couleur
+HISTORY_MSG_222;NB Préréglages
+HISTORY_MSG_223;NB Mixeur Orange
+HISTORY_MSG_224;NB Mixeur Jaune
+HISTORY_MSG_225;NB Mixeur Cyan
+HISTORY_MSG_226;NB Mixeur Magenta
+HISTORY_MSG_227;NB Mixeur Pourpre
+HISTORY_MSG_228;NB Égaliseur de Luminance
+HISTORY_MSG_229;NB Égaliseur de Luminance
+HISTORY_MSG_230;NB Mode Noir et Blanc
+HISTORY_MSG_231;NB Courbe
+HISTORY_MSG_232;NB Type de courbe
+HISTORY_MSG_233;NB Courbe
+HISTORY_MSG_234;NB Type de courbe
+HISTORY_MSG_235;NB Mixeur Mode Auto
+HISTORY_MSG_236;NB Mixeur Mode Auto
+HISTORY_MSG_237;NB Réinit. Mixeur
+HISTORY_MSG_238;Filtre ND dégradé - Étendu
+HISTORY_MSG_239;Filtre ND dégradé - Force
+HISTORY_MSG_240;Filtre ND dégradé - Centre
+HISTORY_MSG_241;Effet Vignettage - Adoucissement
+HISTORY_MSG_242;Effet Vignettage - Circularité
+HISTORY_MSG_243;Vignettage - Rayon
+HISTORY_MSG_244;Vignettage - Force
+HISTORY_MSG_245;Vignettage - Centre
 HISTORY_NEWSNAPSHOTAS;Sous...
 HISTORY_NEWSNAPSHOT;Ajouter
 HISTORY_NEWSNAPSHOT_TOOLTIP;Raccourci: <b>Alt-s</b>
@@ -618,6 +651,7 @@ OPTIONS_DEFRAW_MISSING;Le profil par défaut pour les <b>images Raw</b> n'a pas
 PARTIALPASTE_BASICGROUP;Réglages de base
 PARTIALPASTE_CACORRECTION;Aberration chromatique
 PARTIALPASTE_CHANNELMIXER;Mixage des canaux
+PARTIALPASTE_CHANNELMIXERBW;Noir et Blanc
 PARTIALPASTE_COARSETRANS;Rotation de 90° / symétrisation
 PARTIALPASTE_COLORAPP;CIE Modèle apparence de la couleur 2002
 PARTIALPASTE_COLORBOOST;Rehaussement couleur
@@ -660,6 +694,7 @@ PARTIALPASTE_LENSPROFILE;Profile de correction d'Objectif
 PARTIALPASTE_LUMADENOISE;Réduction du bruit de luminance
 PARTIALPASTE_LUMINANCEGROUP;Réglages de la luminance
 PARTIALPASTE_METAICMGROUP;Réglages des Métadonnées/ICM
+PARTIALPASTE_PCVIGNETTE;Filtre Vignettage
 PARTIALPASTE_PERSPECTIVE;Perspective
 PARTIALPASTE_PREPROCESS_GREENEQUIL;Équilibrage du vert
 PARTIALPASTE_PREPROCESS_HOTDEADPIXFILT;Filtrage des pixels chauds/morts
@@ -743,10 +778,6 @@ PREFERENCES_EXTERNALEDITOR;Éditeur externe
 PREFERENCES_FBROWSEROPTS;Options du navigateur de fichiers et de vignettes
 PREFERENCES_FILEBROWSERTOOLBARSINGLEROW;Barre de menu de l'explorateur de fichiers uni-ligne (à désactiver pour les écrans de faible résolution)
 PREFERENCES_FILEFORMAT;Format du fichier
-PREFERENCES_FLATFIELDAUTOSELECT;Sélection auto. du Champ Uniforme
-PREFERENCES_FLATFIELDBLURRADIUS;Rayon de floutage du Champ Uniforme
-PREFERENCES_FLATFIELDBLURTYPE;Type de floutage du Champ Uniforme
-PREFERENCES_FLATFIELDFILE;Fichier de Champ Uniforme
 PREFERENCES_FLATFIELDFOUND;Trouvé
 PREFERENCES_FLATFIELDSDIR;Dossier des images de Champ Uniforme
 PREFERENCES_FLATFIELDSHOTS;image(s)
@@ -892,15 +923,11 @@ PROGRESSBAR_SAVEJPEG;Enregistrement du fichier JPEG...
 PROGRESSBAR_SAVEPNG;Enregistrement du fichier PNG...
 PROGRESSBAR_SAVETIFF;Enregistrement du fichier TIFF...
 PROGRESSBAR_SNAPSHOT_ADDED;Signet ajouté
-PROGRESSDLG_LOADING;Chargement du fichier...
-PROGRESSDLG_PROCESSING;Traitement de l'image...
 PROGRESSDLG_PROFILECHANGEDINBROWSER;Profil modifié dans le navigateur
-PROGRESSDLG_SAVING;Enregistrement du fichier...
 QINFO_FOCALLENGTH;Longueur focale
 QINFO_ISO;ISO
 QINFO_LENS;Objectif
 QINFO_NOEXIF;Données EXIF non disponibles.
-REFERENCES_CUSTPROFBUILDPATH;Chemin de l'exécutable
 SAVEDLG_AUTOSUFFIX;Ajouter automatiquement un suffixe si le fichier existe déjà
 SAVEDLG_FILEFORMAT;Format de fichier
 SAVEDLG_FORCEFORMATOPTS;Forcer les options d'enregistrement
@@ -940,8 +967,77 @@ TP_CHMIXER_BLUE;Bleu
 TP_CHMIXER_GREEN;Vert
 TP_CHMIXER_LABEL;Mixage des canaux
 TP_CHMIXER_RED;Rouge
+TP_BWMIX_LABEL;Noir&amp;Blanc
+TP_BWMIX_CC_ENABLED;Couleur complémentaire
+TP_BWMIX_CHANNEL;Égaliseur de Luminance
+TP_BWMIX_VAL;L
+TP_BWMIX_CC_TOOLTIP;Activer pour permettre l'ajustage automatique des couleur complémentaire dans le mode ROJVCBMP
+TP_BWMIX_SETTING_TOOLTIP;Différents préréglages (films, paysage, ...) ou réglages manuel du mixeur de canaux
+TP_BWMIX_FILTER_TOOLTIP;Le filtre de couleur simule les prises de vue avec un filtre coloré placé devant l'objectif. Les filtre color réduisent la transmission d'une plage de couleur spécifique et en affectent donc leur luminosité. Ex: un filtre rouge assombri les ciels bleus.
+TP_BWMIX_AUTOCH;Auto
+TP_BWMIX_AUTOCH_TIP;Calcul les valeurs optimales du mixeur de canaux
+TP_BWMIX_NEUTRAL;Réinit. Mixeur
+TP_BWMIX_NEUTRAL_TIP;Réinitialise tous les paramètres du mixeur de canaux
+TP_BWMIX_RED;Rouge
+TP_BWMIX_GREEN;Vert
+TP_BWMIX_BLUE;Bleu
+TP_BWMIX_ORA;Filtre Orange
+TP_BWMIX_YEL;Filtre Jaune
+TP_BWMIX_CYAN;Filtre Cyan
+TP_BWMIX_MAG;Filtre Magenta
+TP_BWMIX_PUR;Filtre Pourpre
+TP_BWMIX_RGB_TOOLTIP;Mixe les canaux RVB. Utilisez les Préréglages pour vous guider.\nAttention aux valeurs négatives qui peuvent causer des artefacts ou un comportement erratique.
+TP_BWMIX_GAM_RED;Canal Rouge
+TP_BWMIX_GAM_GREEN;Canal Vert
+TP_BWMIX_GAM_BLUE;Canl Bleu
+TP_BWMIX_MIXC;Mixeur
+TP_BWMIX_MIXF;Mixeur de Filtres
+TP_BWMIX_FILTER;Filtre de couleur
+TP_BWMIX_FILTER0;Aucun
+TP_BWMIX_FILTER1;Rouge
+TP_BWMIX_FILTER2;Rouge-Jaune
+TP_BWMIX_FILTER3;Juane
+TP_BWMIX_FILTER4;Vert-Jaune
+TP_BWMIX_FILTER5;Vert
+TP_BWMIX_FILTER6;Bleu-Vert
+TP_BWMIX_FILTER7;Bleu
+TP_BWMIX_FILTER8;Pourpre
+TP_BWMIX_SETTING;Préréglages
+TP_BWMIX_SET0;Contrast Normal
+TP_BWMIX_SET7;Panchromatique
+TP_BWMIX_SET8;Hyper Panchromatique
+TP_BWMIX_SET5;Basse Sensibilité
+TP_BWMIX_SET6;Haute Sensibilité
+TP_BWMIX_SET9;Orthochromatique
+TP_BWMIX_SET1;Contraste Élevé
+TP_BWMIX_SET2;Luminance
+TP_BWMIX_SET3;Paysage
+TP_BWMIX_SET4;Portrait
+TP_BWMIX_SET10;Mixeur de Canaux - RVB Absolu
+TP_BWMIX_SET11;Mixeur de Canaux - RVB Relatif
+TP_BWMIX_SET12;Mixeur de Canaux - ROJVCBMP absolu
+TP_BWMIX_SET13;Mixeur de Canaux - ROJVCBMP
+TP_BWMIX_SET14;Infrarouge
+TP_BWMIX_GAMMA;Correction Gamma
+TP_BWMIX_GAM_TOOLTIP;Corrige le gamma pour chaque canaux RVB via une courbe TRC de profil ICC
+TP_BWMIX_MET;Méthode
+TP_BWMIX_MET_TOOLTIP;Permet de coisir entre désaturation - mixeur de luminance - mixeur de canaux
+TP_BWMIX_MET0;Aucun
+TP_BWMIX_MET1;Désaturation
+TP_BWMIX_MET2;Égaliseur de Luminance
+TP_BWMIX_MET3;Mixeur de Canaux
+TP_BWMIX_CURVEEDITOR_LH_TOOLTIP;Modifie la luminance en fonction de la teinte\nFaites attention aux valeurs extrêmes qui peuvent causer des artefacts
+TP_BWMIX_CURVEEDITOR_AFTER_TOOLTIP;Courbe tonale, après la conversion en N&amp;B, à la fin du traitement
+TP_BWMIX_CURVEEDITOR_BEFORE_TOOLTIP;Courbe tonale, juste avant la conversion en N&amp;B\nPeut prendre en compte les composantes couleur
+TP_BWMIX_CURVEEDITOR1;Avant Conv. en N&B
+TP_BWMIX_CURVEEDITOR2;Après Conv. en N&B
+TP_BWMIX_TCMODE_FILMLIKE;N&B Similaire Film
+TP_BWMIX_TCMODE_LABEL1;N&B Courbe Avant
+TP_BWMIX_TCMODE_LABEL2;N&B Courbe Après
+TP_BWMIX_TCMODE_SATANDVALBLENDING;N&B Mixage Saturation et Valeur
+TP_BWMIX_TCMODE_STANDARD;N&B Standard
+TP_BWMIX_TCMODE_WEIGHTEDSTD;N&B Standard Pondéré
 TP_CHROMATABERR_LABEL;Aberration Chromatique
-TP_COARSETRAF_DEGREE;degré:
 TP_COARSETRAF_TOOLTIP_HFLIP;Symétriser / axe vertical
 TP_COARSETRAF_TOOLTIP_ROTLEFT;Rotation vers la gauche\nRaccourci: <b>[</b>\n\nRaccourci en mode Éditeur unique: <b>Alt-[</b>
 TP_COARSETRAF_TOOLTIP_ROTRIGHT;Rotation vers la droite\nRaccourci: <b>]</b>\n\nRaccourci en mode Éditeur unique: <b>Alt-]</b>
@@ -1074,13 +1170,7 @@ TP_EPD_REWEIGHTINGITERATES;Itérations de la pondération
 TP_EPD_SCALE;Échelle
 TP_EPD_STRENGTH;Force
 TP_EPD_TOOLTIP;Vous pouvez choisir entre le mode Lab (standard) ou le mode CIECAM02.\n En activant "Compression tonale avec brillance Q CIECAM" dans le menu "Brillance + Niveau de couleur CIECAM"
-TP_EQUALIZER_CONTRAST_MINUS;Contraste-
+TP_EXPOSCORR_LABEL;Points Noir &amp; Blanc Raw
-TP_EQUALIZER_CONTRAST_PLUS;Contraste+
-TP_EQUALIZER_FINEST;les plus petites
-TP_EQUALIZER_LABEL;Égaliseur d'ondelette
-TP_EQUALIZER_LARGEST;les plus grandes
-TP_EQUALIZER_NEUTRAL;Neutre
-TP_EXPOSCORR_LABEL;Exposition
 TP_EXPOSURE_AUTOLEVELS;Niveaux Auto
 TP_EXPOSURE_AUTOLEVELS_TIP;Bascule l'usage de <b>Niveaux automatiques</b> afin de régler\nautomatiquement les valeurs basé sur l'analyse de l'image  
 TP_EXPOSURE_BLACKLEVEL;Noir
@@ -1103,7 +1193,6 @@ TP_EXPOSURE_TCMODE_LABEL2;Mode courbe 2
 TP_EXPOSURE_TCMODE_SATANDVALBLENDING;Mixage Saturation et Valeur
 TP_EXPOSURE_TCMODE_STANDARD;Standard
 TP_EXPOSURE_TCMODE_WEIGHTEDSTD;Standard Pondéré
-TP_EXPO_AFTER; Après l'interpolation (avant la conversion RVB)
 TP_FLATFIELD_AUTOSELECT;Sélection automatique
 TP_FLATFIELD_BLURRADIUS;Rayon de floutage
 TP_FLATFIELD_BLURTYPE;Type de floutage
@@ -1144,7 +1233,6 @@ TP_ICM_BLENDCMSMATRIX;Mélange des hautes lumières\ndu profil ICC avec la matri
 TP_ICM_BLENDCMSMATRIX_TOOLTIP;Activer la récupération des zones brûlées lorsque les profils ICC basés sur la LUT sont utilisés
 TP_ICM_FILEDLGFILTERANY;Tous les fichiers
 TP_ICM_FILEDLGFILTERICM;Fichiers de profil
-TP_ICM_GAMMABEFOREINPUT;Appliquer le Gamma du profil
 TP_ICM_INPUTCAMERAICC;Profil spécifique à l'APN\nsélectionné automatiquement
 TP_ICM_INPUTCAMERAICC_TOOLTIP;Utilise les profils d'entrée DCP ou ICC spécifiques à RawTherapee, qui sont plus précis qu'une simple matrice.\nDisponible pour certains appareils photo, ces profils sont stoqués dans le dossier /iccprofiles/input.\nCelui dont le nom de fichier correspond au champ EXIF "Modèle" (de l'appareil) est automatiquement sélectionné.
 TP_ICM_INPUTCAMERA;Celui de l'appareil photo
@@ -1217,6 +1305,13 @@ TP_LUMADENOISE_LABEL;Réduction du bruit de luminance
 TP_LUMADENOISE_RADIUS;Rayon
 TP_NEUTRAL;Neutre
 TP_NEUTRAL_TIP;Réinitialise les valeurs de l'exposition à des valeurs neutres
+TP_PCVIGNETTE_FEATHER;Étendue
+TP_PCVIGNETTE_FEATHER_TOOLTIP;Étendue: 0=bords uniquement, 50=mi-chemin du centre, 100=jusqu'au centre
+TP_PCVIGNETTE_LABEL;Filtre Vignettage
+TP_PCVIGNETTE_ROUNDNESS;Circularité
+TP_PCVIGNETTE_ROUNDNESS_TOOLTIP;Circularité: 0=rectangulaire, 50=elliptique, 100=circulaire
+TP_PCVIGNETTE_STRENGTH;Force
+TP_PCVIGNETTE_STRENGTH_TOOLTIP;Force du filtre en EV (maximum dans les coins)
 TP_PERSPECTIVE_HORIZONTAL;Horizontale
 TP_PERSPECTIVE_LABEL;Perspective
 TP_PERSPECTIVE_VERTICAL;Verticale
@@ -1225,7 +1320,6 @@ TP_PFCURVE_CURVEEDITOR_CH_TOOLTIP;Contrôle la force du défrangeage en fonction
 TP_PREPROCESS_GREENEQUIL;Équilibrage du vert
 TP_PREPROCESS_HOTDEADPIXFILT;Filtrer les pixels chauds/morts
 TP_PREPROCESS_HOTDEADPIXFILT_TOOLTIP;Essaie de supprimer les pixels chauds/morts
-TP_PREPROCESS_HOTDEADPIXTHRESH;Seuil de détection des pixels morts
 TP_PREPROCESS_LABEL;Traitement pre-dématriçage
 TP_PREPROCESS_LINEDENOISE;Filtre de bruit de ligne
 TP_PREPROCESS_NO_FOUND;Aucun trouvé
@@ -1257,8 +1351,6 @@ TP_RESIZE_BICUBICSH;Bicubique (Plus net)
 TP_RESIZE_BICUBIC;Bicubique
 TP_RESIZE_BILINEAR;Bilinéaire
 TP_RESIZE_CROPPEDAREA;La zone recadrée
-TP_RESIZE_DOWNSCALEB;Diminuer (Meilleur)
-TP_RESIZE_DOWNSCALEF;Diminuer (Plus rapide)
 TP_RESIZE_FITBOX;Boîte englobante
 TP_RESIZE_FULLIMAGE;L'image entière
 TP_RESIZE_FULLSIZE;Dimensions finales de l'image:
@@ -1398,8 +1490,3 @@ ZOOMPANEL_ZOOMIN;Zoom <b>+</b>
 ZOOMPANEL_ZOOMOUT;Zoom <b>-</b>
 #00 Français
 #01 1.3.2008: Initial translation by Hombre
-
-!!!!!!!!!!!!!!!!!!!!!!!!!
-! Untranslated keys follow; remove the ! prefix after an entry is translated.
-!!!!!!!!!!!!!!!!!!!!!!!!!
-

rtdata/languages/default

@@ -306,7 +306,7 @@ HISTORY_MSG_68;Highlight Recovery Method
 HISTORY_MSG_69;Working Color Space
 HISTORY_MSG_70;Output Color Space
 HISTORY_MSG_71;Input Color Space
-HISTORY_MSG_72;Vignetting correction
+HISTORY_MSG_72;Vignetting - Amount
 HISTORY_MSG_73;Channel Mixer
 HISTORY_MSG_74;Resize Scale
 HISTORY_MSG_75;Resize Method
@@ -434,7 +434,7 @@ HISTORY_MSG_196;CAM02 - Tone curve 2
 HISTORY_MSG_197;CAM02 - Color curve
 HISTORY_MSG_198;CAM02 - Color curve
 HISTORY_MSG_199;CAM02 - Show CIECAM02 output histograms in curves
-HISTORY_MSG_200;CAMO2 - Tone mapping using CIECAM02 Q
+HISTORY_MSG_200;CAM02 - Tone mapping using CIECAM02 Q
 HISTORY_MSG_201;NR - Delta Chrominance red
 HISTORY_MSG_202;NR - Delta Chrominance blue
 HISTORY_MSG_203;NR - Method
@@ -446,31 +446,39 @@ HISTORY_MSG_208;Blue/Red Equalizer
 HISTORY_MSG_210;Graduated Filter
 HISTORY_MSG_211;Graduated Filter
 HISTORY_MSG_212;Vignette Filter
-HISTORY_MSG_213;Vignette Filter
+HISTORY_MSG_213;Vignette Filter - Strength
-HISTORY_MSG_214;Black and white
+HISTORY_MSG_214;Black and White
-HISTORY_MSG_215;BW Channel Mixer red
+HISTORY_MSG_215;BW Channel Mixer Red
-HISTORY_MSG_216;BW Channel Mixer green
+HISTORY_MSG_216;BW Channel Mixer Green
-HISTORY_MSG_217;BW Channel Mixer blue
+HISTORY_MSG_217;BW Channel Mixer Blue
-HISTORY_MSG_218;BW red gamma
+HISTORY_MSG_218;BW Red Gamma
-HISTORY_MSG_219;BW green gamma
+HISTORY_MSG_219;BW Green Gamma
-HISTORY_MSG_220;BW blue gamma
+HISTORY_MSG_220;BW Blue Gamma
-HISTORY_MSG_221;BW Color filter
+HISTORY_MSG_221;BW Color Filter
 HISTORY_MSG_222;BW Presets
-HISTORY_MSG_223;BW Channel Mixer orange
+HISTORY_MSG_223;BW Channel Mixer Orange
-HISTORY_MSG_224;BW Channel Mixer yellow
+HISTORY_MSG_224;BW Channel Mixer Yellow
-HISTORY_MSG_225;BW Channel Mixer cyan
+HISTORY_MSG_225;BW Channel Mixer Cyan
-HISTORY_MSG_226;BW Channel Mixer magenta
+HISTORY_MSG_226;BW Channel Mixer Magenta
-HISTORY_MSG_227;BW Channel Mixer purple
+HISTORY_MSG_227;BW Channel Mixer Purple
-HISTORY_MSG_228;BW Luminance equalizer
+HISTORY_MSG_228;BW Luminance Equalizer
-HISTORY_MSG_229;BW Luminance equalizer
+HISTORY_MSG_229;BW Luminance Equalizer
-HISTORY_MSG_230;BW Black and white mode
+HISTORY_MSG_230;BW Black and White Mode
-HISTORY_MSG_231;BW curve
+HISTORY_MSG_231;BW Curve
-HISTORY_MSG_232;BW curve type
+HISTORY_MSG_232;BW Curve Type
-HISTORY_MSG_233;BW curve
+HISTORY_MSG_233;BW Curve
-HISTORY_MSG_234;BW curve type
+HISTORY_MSG_234;BW Curve Type
-HISTORY_MSG_235;BW Auto Channel mixer
+HISTORY_MSG_235;BW Auto Channel Mixer
-HISTORY_MSG_236;BW Auto Channel mixer
+HISTORY_MSG_236;BW Auto Channel Mixer
-HISTORY_MSG_237;BW Reset mixer
+HISTORY_MSG_237;BW Reset Mixer
+HISTORY_MSG_238;Gradient - Feather
+HISTORY_MSG_239;Gradient - Strength
+HISTORY_MSG_240;Gradient - Center
+HISTORY_MSG_241;Vignette Filter - Feather
+HISTORY_MSG_242;Vignette Filter - Roundness
+HISTORY_MSG_243;Vignetting - Rayon
+HISTORY_MSG_244;Vignetting - Strength
+HISTORY_MSG_245;Vignetting - Center
 HISTORY_NEWSNAPSHOTAS;As...
 HISTORY_NEWSNAPSHOT;Add
 HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: <b>Alt-s</b>
@@ -958,32 +966,31 @@ TP_CACORRECTION_RED;Red
 TP_CHMIXER_BLUE;Blue Channel
 TP_CHMIXER_GREEN;Green Channel
 TP_CHMIXER_LABEL;Channel Mixer
-TP_CHMIXERBW_LABEL;Black and White
 TP_CHMIXER_RED;Red Channel
+TP_BWMIX_LABEL;Black&amp;White
 TP_BWMIX_CC_ENABLED;Complementary color
-TP_BWMIX_CHANNEL;Luminance equalizer
+TP_BWMIX_CHANNEL;Luminance Equalizer
 TP_BWMIX_VAL;L
 TP_BWMIX_CC_TOOLTIP;Enable to allow automatic adjustment of complementary colors in ROYGCBMP mode
-TP_BWMIX_SETTING_TOOLTIP;Different presets - films - landscape - or manual settings of channel-mixer 
+TP_BWMIX_SETTING_TOOLTIP;Different presets (films, landscape, ...) or manual settings of channel-mixer
-TP_BWMIX_FILTER_TOOLTIP;Effect of the color filter is similar to film photography when filter is placed in front of the lens. Color filters reduce transmission of specific range of colors and correspondingly effect their lightness. E.g. Red filter would darken the Blue sky.
+TP_BWMIX_FILTER_TOOLTIP;The color filter simulate shots taken with a colored filter placed in front of the lens. Colored filters reduce transmission of specific range of colors and correspondingly affect their lightness. E.g. a Red filter darkens Blue skies.
 TP_BWMIX_AUTOCH;Auto
 TP_BWMIX_AUTOCH_TIP;Calculate values optimizing channel-mixer
 TP_BWMIX_NEUTRAL;Reset mixer
 TP_BWMIX_NEUTRAL_TIP;Reset all values - sliders - filters - channel-mixer to default
-TP_BWMIX_RED;Mixer red
+TP_BWMIX_RED;Red
-TP_BWMIX_GREEN;Mixer green
+TP_BWMIX_GREEN;Green
-TP_BWMIX_BLUE;Mixer blue
+TP_BWMIX_BLUE;Blue
-TP_BWMIX_ORA;Mixer orange filter
+TP_BWMIX_ORA;Orange Filter
-TP_BWMIX_YEL;Mixer yellow filter
+TP_BWMIX_YEL;Yellow Filter
-TP_BWMIX_CYAN;Mixer cyan filter
+TP_BWMIX_CYAN;Cyan Filter
-TP_BWMIX_MAG;Mixer magenta filter
+TP_BWMIX_MAG;Magenta Filter
-TP_BWMIX_PUR;Mixer purple filter
+TP_BWMIX_PUR;Purple Filter
-TP_BWMIX_RGB_TOOLTIP;Mix the RGB channels in desire proportions. Use Presets for guidance.\nPay attention to negative values that may cause artifacts or erratic behavior.
+TP_BWMIX_RGB_TOOLTIP;Mix the RGB channels. Use Presets for guidance.\nPay attention to negative values that may cause artifacts or erratic behavior.
-TP_BWMIX_GAM_RED;Red Channel gamma correction
+TP_BWMIX_GAM_RED;Red Channel
-TP_BWMIX_GAM_GREEN;Green Channel gamma correction
+TP_BWMIX_GAM_GREEN;Green Channel
-TP_BWMIX_GAM_BLUE;Blue Channel gamma correction
+TP_BWMIX_GAM_BLUE;Blue Channel
 TP_BWMIX_MIXC;Mixer
-TP_BWMIX_GAMM;Gamma Correction
 TP_BWMIX_MIXF;Mixer Filters
 TP_BWMIX_FILTER;Color Filter
 TP_BWMIX_FILTER0;None
@@ -996,7 +1003,7 @@ TP_BWMIX_FILTER6;Blue-Green
 TP_BWMIX_FILTER7;Blue
 TP_BWMIX_FILTER8;Purple
 TP_BWMIX_SETTING;Presets
-TP_BWMIX_SET0;Normal contrast
+TP_BWMIX_SET0;Normal Contrast
 TP_BWMIX_SET7;Panchromatic
 TP_BWMIX_SET8;Hyper Panchromatic
 TP_BWMIX_SET5;Low Sensitivity
@@ -1011,25 +1018,25 @@ TP_BWMIX_SET11;Channel-Mixer relative RGB
 TP_BWMIX_SET12;Channel-Mixer absolute ROYGCBMP
 TP_BWMIX_SET13;Channel-Mixer relative ROYGCBMP
 TP_BWMIX_SET14;Infrared
-TP_BWMIX_GAMMA;Gamma correction
+TP_BWMIX_GAMMA;Gamma Correction
-TP_BWMIX_GAM_TOOLTIP;Correct gamma for each channel R G B as an ICC TRC curve
+TP_BWMIX_GAM_TOOLTIP;Correct gamma for each channel RGB as an ICC TRC curve
 TP_BWMIX_MET;Method
 TP_BWMIX_MET_TOOLTIP;Select between desaturation - mixer luminance - channel mixer
 TP_BWMIX_MET0;None
 TP_BWMIX_MET1;Desaturation
 TP_BWMIX_MET2;Luminance Equalizer
 TP_BWMIX_MET3;Channel Mixer
-TP_BWMIX_CURVEEDITOR_LH_TOOLTIP;Modify luminance in function of hue\n Pay attention to extreme values that may cause artifacts
+TP_BWMIX_CURVEEDITOR_LH_TOOLTIP;Modify luminance in function of hue\nPay attention to extreme values that may cause artifacts
-TP_BWMIX_CURVEEDITOR_AFTER_TOOLTIP;Tone curve, after black and white conversion, at the end of treatment
+TP_BWMIX_CURVEEDITOR_AFTER_TOOLTIP;Tone curve, after B&amp;W conversion, at the end of treatment
-TP_BWMIX_CURVEEDITOR_BEFORE_TOOLTIP;Tone curve, just before black and white conversion\n May take into account the color components
+TP_BWMIX_CURVEEDITOR_BEFORE_TOOLTIP;Tone curve, just before B&amp;W conversion\nMay take into account the color components
-TP_BWMIX_CURVEEDITOR1;Before BW conv.
+TP_BWMIX_CURVEEDITOR1;Before B&W conv.
-TP_BWMIX_CURVEEDITOR2;After   BW conv.
+TP_BWMIX_CURVEEDITOR2;After B&W conv.
-TP_BWMIX_TCMODE_FILMLIKE;BW Film-like
+TP_BWMIX_TCMODE_FILMLIKE;B&W Film-like
-TP_BWMIX_TCMODE_LABEL1;BW Curve before
+TP_BWMIX_TCMODE_LABEL1;B&W Curve Before
-TP_BWMIX_TCMODE_LABEL2;BW Curve after
+TP_BWMIX_TCMODE_LABEL2;B&W Curve After
-TP_BWMIX_TCMODE_SATANDVALBLENDING;BW Saturation and Value Blending
+TP_BWMIX_TCMODE_SATANDVALBLENDING;B&W Saturation and Value Blending
-TP_BWMIX_TCMODE_STANDARD;BW Standard
+TP_BWMIX_TCMODE_STANDARD;B&W Standard
-TP_BWMIX_TCMODE_WEIGHTEDSTD;BW Weighted Standard
+TP_BWMIX_TCMODE_WEIGHTEDSTD;B&W Weighted Standard
 TP_CHROMATABERR_LABEL;Chromatic Aberration
 TP_COARSETRAF_TOOLTIP_HFLIP;Flip horizontally
 TP_COARSETRAF_TOOLTIP_ROTLEFT;Rotate left.\nShortcut: <b>[</b>\n\nShortcut in Single Editor Tab: <b>Alt-[</b>

rtengine/procevents.h

@@ -93,7 +93,7 @@ enum ProcEvent {
     EvWProfile=68,
     EvOProfile=69,
     EvIProfile=70,
-    EvVignetting=71,
+    EvVignettingAmount=71,
     EvChMixer=72,
     EvResizeScale=73,
     EvResizeMethod=74,
@@ -229,14 +229,14 @@ enum ProcEvent {
 	EvDemosaicLMMSEIter=203,
 	EvCATbadpix=204,
 	EvCATAutoAdap=205,
-	EvPFCurve=206,	
+	EvPFCurve=206,
 	EvWBequal=207,
 	EvWBequalbo=208,
-        EvGradient=209,
+	EvGradientDegree=209,
-        EvGradientEnabled=210,
+	EvGradientEnabled=210,
-        EvPCVignette=211,
+	EvPCVignetteStrength=211,
-        EvPCVignetteEnabled=212,
+	EvPCVignetteEnabled=212,
-	EvBWChmixEnabled=213,	
+	EvBWChmixEnabled=213,
 	EvBWred=214,
 	EvBWgreen=215,
 	EvBWblue=216,
@@ -254,13 +254,21 @@ enum ProcEvent {
 	EvBWChmixEnabledLm=228,
 	EvBWmet=229,
 	EvToneCurvebw1=230,
-	EvToneCurveBWMode1=231,	
+	EvToneCurveBWMode1=231,
 	EvToneCurvebw2=232,
-	EvToneCurveBWMode2=233,	
+	EvToneCurveBWMode2=233,
-	EvAutoch=234,	
+	EvAutoch=234,
-	EvFixedch=235,	
+	EvFixedch=235,
 	EvNeutralBW=236,
-	NUMOFEVENTS=237
+	EvGradientFeather=237,
+	EvGradientStrength=238,
+	EvGradientCenter=239,
+	EvPCVignetteFeather=240,
+	EvPCVignetteRoundness=241,
+	EvVignettingRadius=242,
+	EvVignettingStrenght=243,
+	EvVignettingCenter=244,
+	NUMOFEVENTS=245
 };
 }
 #endif

rtengine/refreshmap.cc

@@ -91,7 +91,7 @@ ALLNORAW,         // EvHRMethod,
 ALL,              // EvWProfile,
 OUTPUTPROFIL,     // EvOProfile,
 ALL,              // EvIProfile,
-TRANSFORM,        // EvVignetting,
+TRANSFORM,        // EvVignettingAmount,
 RGBCURVE,         // EvChMixer,
 RESIZE,           // EvResizeScale,
 RESIZE,           // EvResizeMethod,
@@ -229,10 +229,10 @@ LUMINANCECURVE,   // EvCATAutoadap
 DEFRINGE,         // EvPFCurve,
 WHITEBALANCE,     // EvWBequal,
 WHITEBALANCE,     // EvWBequalbo,
-TRANSFORM,        // EvGradient
+TRANSFORM,        // EvGradientDegree
 TRANSFORM,        // EvGradientEnabled
-TRANSFORM,        // EvPCVignette
+TRANSFORM,        // EvPCVignetteStrength
-TRANSFORM,         // EvPCVignetteEnabled
+TRANSFORM,        // EvPCVignetteEnabled
 RGBCURVE,         // EvBWChmixEnabled
 RGBCURVE,         // EvBWred
 RGBCURVE,         // EvBWgreen
@@ -241,22 +241,31 @@ RGBCURVE,         // EvBWredgam
 RGBCURVE,         // EvBWgreengam
 RGBCURVE,         // EvBWbluegam
 RGBCURVE,         // EvBWfil
-RGBCURVE,      	  // EvBWset
+RGBCURVE,         // EvBWset
 RGBCURVE,         // EvBWoran
-RGBCURVE,       	  // EvBWyell
+RGBCURVE,         // EvBWyell
 RGBCURVE,         // EvBWcyan
-RGBCURVE,      	  // EvBWmag
+RGBCURVE,         // EvBWmag
 RGBCURVE,         // EvBpur
-RGBCURVE,          //EvBWequalV
+RGBCURVE,         // EvBWequalV
-RGBCURVE,			//EvBWChmixEnabledLm
+RGBCURVE,         // EvBWChmixEnabledLm
-RGBCURVE,      	  // EvBWmet
+RGBCURVE,         // EvBWmet
-RGBCURVE, 			//EvToneCurvebw1
+RGBCURVE,         // EvToneCurvebw1
-RGBCURVE,			//EvToneCurveBWMode1
+RGBCURVE,         // EvToneCurveBWMode1
-RGBCURVE,			//EvToneCurvebw2
+RGBCURVE,         // EvToneCurvebw2
-RGBCURVE,			//EvToneCurveBWMode2
+RGBCURVE,         // EvToneCurveBWMode2
-RGBCURVE,  			//	EvAutoch,	
+RGBCURVE,         // EvAutoch,
-RGBCURVE,		//	EvFixedch,	
+RGBCURVE,         // EvFixedch,
-RGBCURVE 			//EvNeutralBW
+RGBCURVE,         // EvNeutralBW
+TRANSFORM,        // EvGradientFeather
+TRANSFORM,        // EvGradientStrength
+TRANSFORM,        // EvGradientCenter
+TRANSFORM,        // EvPCVignetteFeather
+TRANSFORM,        // EvPCVignetteRoundness
+TRANSFORM,        // EvVignettingRadius,
+TRANSFORM,        // EvVignettingStrength,
+TRANSFORM         // EvVignettingCenter,
+
 
 //LUMINANCECURVE    // EvCATsharpcie
 

rtgui/chmixerbw.cc

@@ -356,6 +356,14 @@ ChMixerbw::ChMixerbw (): Gtk::VBox(), FoldableToolPanel(this) {
   toneCurveBW2->set_active (0);
   toneCurveBW2->set_tooltip_text(M("TP_BWMIX_TCMODE_LABEL2"));
 
+
+
+  // Delete this line when toneCurveBW2 will have more than one entry
+  toneCurveBW2->hide();
+
+
+
+
   curveEditorGBW2 = new CurveEditorGroup (options.lastBWCurvesDir, M("TP_BWMIX_CURVEEDITOR2"));
   curveEditorGBW2->setCurveListener (this);
 

rtgui/gradient.cc

@@ -76,10 +76,10 @@ void Gradient::read (const ProcParams* pp, const ParamsEdited* pedited)
 void Gradient::write (ProcParams* pp, ParamsEdited* pedited)
 {
 	pp->gradient.degree = degree->getValue ();
-	pp->gradient.feather = (int)feather->getValue ();
+	pp->gradient.feather = feather->getIntValue ();
 	pp->gradient.strength = strength->getValue ();
-	pp->gradient.centerX = (int)centerX->getValue ();
+	pp->gradient.centerX = centerX->getIntValue ();
-	pp->gradient.centerY = (int)centerY->getValue ();
+	pp->gradient.centerY = centerY->getIntValue ();
 	pp->gradient.enabled = enabled->get_active();
 
 	if (pedited) {
@@ -118,30 +118,37 @@ void Gradient::setDefaults (const ProcParams* defParams, const ParamsEdited* ped
 void Gradient::adjusterChanged (Adjuster* a, double newval) {
 
 	if (listener && enabled->get_active()) {
-		listener->panelChanged (EvGradient, Glib::ustring::compose ("%1=%5\n%2=%6\n%3=%7\n%4=%8 %9", M("TP_GRADIENT_DEGREE"), M("TP_GRADIENT_FEATHER"), M("TP_GRADIENT_STRENGTH"), M("TP_GRADIENT_CENTER"), degree->getValue(), (int)feather->getValue(), strength->getValue(), (int)centerX->getValue(), (int)centerY->getValue()));
+		if (a == degree)
+			listener->panelChanged (EvGradientDegree, degree->getTextValue());
+		else if (a == feather)
+			listener->panelChanged (EvGradientFeather, feather->getTextValue());
+		else if (a == strength)
+			listener->panelChanged (EvGradientStrength, strength->getTextValue());
+		else if (a == centerX || a == centerY)
+			listener->panelChanged (EvGradientCenter, Glib::ustring::compose ("X=%1\nY=%2", centerX->getTextValue(), centerY->getTextValue()));
 	}
 }
 
 void Gradient::enabledChanged () {
 
-    if (batchMode) {
+	if (batchMode) {
-        if (enabled->get_inconsistent()) {
+		if (enabled->get_inconsistent()) {
-            enabled->set_inconsistent (false);
+			enabled->set_inconsistent (false);
-            enaConn.block (true);
+			enaConn.block (true);
-            enabled->set_active (false);
+			enabled->set_active (false);
-            enaConn.block (false);
+			enaConn.block (false);
-        }
+		}
 	else if (lastEnabled)
-            enabled->set_inconsistent (true);
+		enabled->set_inconsistent (true);
 
-        lastEnabled = enabled->get_active ();
+		lastEnabled = enabled->get_active ();
-    }
+	}
-    if (listener) {
+	if (listener) {
-        if (enabled->get_active())
+		if (enabled->get_active())
-            listener->panelChanged (EvGradientEnabled, M("GENERAL_ENABLED"));
+			listener->panelChanged (EvGradientEnabled, M("GENERAL_ENABLED"));
-        else
+		else
-            listener->panelChanged (EvGradientEnabled, M("GENERAL_DISABLED"));
+			listener->panelChanged (EvGradientEnabled, M("GENERAL_DISABLED"));
-    }
+	}
 }
 
 void Gradient::setAdjusterBehavior (bool degreeadd, bool featheradd, bool strengthadd, bool centeradd)

rtgui/paramsedited.cc

@@ -801,17 +801,17 @@ void ParamsEdited::combine (rtengine::procparams::ProcParams& toEdit, const rten
 		if (chmixer.green[i])	toEdit.chmixer.green[i]	= dontforceSet && options.baBehav[ADDSET_CHMIXER] ? toEdit.chmixer.green[i] + mods.chmixer.green[i] : mods.chmixer.green[i];
 		if (chmixer.blue[i])	toEdit.chmixer.blue[i] 	= dontforceSet && options.baBehav[ADDSET_CHMIXER] ? toEdit.chmixer.blue[i] + mods.chmixer.blue[i] : mods.chmixer.blue[i];
 	}
-	if (chmixerbw.bwred)			toEdit.chmixerbw.bwred 	= dontforceSet && options.baBehav[ADDSET_CHMIXER_BW] ? toEdit.chmixerbw.bwred + mods.chmixerbw.bwred : mods.chmixerbw.bwred;
+	if (chmixerbw.bwred)		toEdit.chmixerbw.bwred 		= dontforceSet && options.baBehav[ADDSET_CHMIXER_BW] ? toEdit.chmixerbw.bwred + mods.chmixerbw.bwred : mods.chmixerbw.bwred;
 	if (chmixerbw.bwgreen)		toEdit.chmixerbw.bwgreen 	= dontforceSet && options.baBehav[ADDSET_CHMIXER_BW] ? toEdit.chmixerbw.bwgreen + mods.chmixerbw.bwgreen : mods.chmixerbw.bwgreen;
-	if (chmixerbw.bwblue)			toEdit.chmixerbw.bwblue 	= dontforceSet && options.baBehav[ADDSET_CHMIXER_BW] ? toEdit.chmixerbw.bwblue + mods.chmixerbw.bwblue : mods.chmixerbw.bwblue;
+	if (chmixerbw.bwblue)		toEdit.chmixerbw.bwblue 	= dontforceSet && options.baBehav[ADDSET_CHMIXER_BW] ? toEdit.chmixerbw.bwblue + mods.chmixerbw.bwblue : mods.chmixerbw.bwblue;
-	if (chmixerbw.bwredgam)			toEdit.chmixerbw.bwredgam 	= dontforceSet && options.baBehav[ADDSET_CHMIXER_BWG] ? toEdit.chmixerbw.bwredgam + mods.chmixerbw.bwredgam : mods.chmixerbw.bwredgam;
+	if (chmixerbw.bwredgam)		toEdit.chmixerbw.bwredgam 	= dontforceSet && options.baBehav[ADDSET_CHMIXER_BWG] ? toEdit.chmixerbw.bwredgam + mods.chmixerbw.bwredgam : mods.chmixerbw.bwredgam;
-	if (chmixerbw.bwgreengam)		toEdit.chmixerbw.bwgreengam 	= dontforceSet && options.baBehav[ADDSET_CHMIXER_BWG] ? toEdit.chmixerbw.bwgreengam + mods.chmixerbw.bwgreengam : mods.chmixerbw.bwgreengam;
+	if (chmixerbw.bwgreengam)	toEdit.chmixerbw.bwgreengam = dontforceSet && options.baBehav[ADDSET_CHMIXER_BWG] ? toEdit.chmixerbw.bwgreengam + mods.chmixerbw.bwgreengam : mods.chmixerbw.bwgreengam;
-	if (chmixerbw.bwbluegam)			toEdit.chmixerbw.bwbluegam 	= dontforceSet && options.baBehav[ADDSET_CHMIXER_BWG] ? toEdit.chmixerbw.bwbluegam + mods.chmixerbw.bwbluegam : mods.chmixerbw.bwbluegam;
+	if (chmixerbw.bwbluegam)	toEdit.chmixerbw.bwbluegam 	= dontforceSet && options.baBehav[ADDSET_CHMIXER_BWG] ? toEdit.chmixerbw.bwbluegam + mods.chmixerbw.bwbluegam : mods.chmixerbw.bwbluegam;
-	if (chmixerbw.bworan)			toEdit.chmixerbw.bworan 	= dontforceSet && options.baBehav[ADDSET_CHMIXER_BWF] ? toEdit.chmixerbw.bworan + mods.chmixerbw.bworan : mods.chmixerbw.bworan;
+	if (chmixerbw.bworan)		toEdit.chmixerbw.bworan 	= dontforceSet && options.baBehav[ADDSET_CHMIXER_BWF] ? toEdit.chmixerbw.bworan + mods.chmixerbw.bworan : mods.chmixerbw.bworan;
 	if (chmixerbw.bwyell)		toEdit.chmixerbw.bwyell 	= dontforceSet && options.baBehav[ADDSET_CHMIXER_BWF] ? toEdit.chmixerbw.bwyell + mods.chmixerbw.bwyell : mods.chmixerbw.bwyell;
-	if (chmixerbw.bwcyan)			toEdit.chmixerbw.bwcyan 	= dontforceSet && options.baBehav[ADDSET_CHMIXER_BWF] ? toEdit.chmixerbw.bwcyan + mods.chmixerbw.bwcyan : mods.chmixerbw.bwcyan;
+	if (chmixerbw.bwcyan)		toEdit.chmixerbw.bwcyan 	= dontforceSet && options.baBehav[ADDSET_CHMIXER_BWF] ? toEdit.chmixerbw.bwcyan + mods.chmixerbw.bwcyan : mods.chmixerbw.bwcyan;
-	if (chmixerbw.bwmag)		toEdit.chmixerbw.bwmag 	= dontforceSet && options.baBehav[ADDSET_CHMIXER_BWF] ? toEdit.chmixerbw.bwmag + mods.chmixerbw.bwmag : mods.chmixerbw.bwmag;
+	if (chmixerbw.bwmag)		toEdit.chmixerbw.bwmag 		= dontforceSet && options.baBehav[ADDSET_CHMIXER_BWF] ? toEdit.chmixerbw.bwmag + mods.chmixerbw.bwmag : mods.chmixerbw.bwmag;
-	if (chmixerbw.bwpur)		toEdit.chmixerbw.bwpur 	= dontforceSet && options.baBehav[ADDSET_CHMIXER_BWF] ? toEdit.chmixerbw.bwpur + mods.chmixerbw.bwpur : mods.chmixerbw.bwpur;
+	if (chmixerbw.bwpur)		toEdit.chmixerbw.bwpur 		= dontforceSet && options.baBehav[ADDSET_CHMIXER_BWF] ? toEdit.chmixerbw.bwpur + mods.chmixerbw.bwpur : mods.chmixerbw.bwpur;
 	
 	if (hlrecovery.enabled)	toEdit.hlrecovery.enabled 	= mods.hlrecovery.enabled;
 	if (hlrecovery.method)	toEdit.hlrecovery.method 	= mods.hlrecovery.method;

rtgui/pcvignette.cc

@@ -62,8 +62,8 @@ void PCVignette::read (const ProcParams* pp, const ParamsEdited* pedited)
 void PCVignette::write (ProcParams* pp, ParamsEdited* pedited)
 {
 	pp->pcvignette.strength = strength->getValue ();
-	pp->pcvignette.feather = (int)feather->getValue ();
+	pp->pcvignette.feather = feather->getIntValue ();
-	pp->pcvignette.roundness = (int)roundness->getValue ();
+	pp->pcvignette.roundness = roundness->getIntValue ();
 	pp->pcvignette.enabled = enabled->get_active();
 
 	if (pedited) {
@@ -94,7 +94,12 @@ void PCVignette::setDefaults (const ProcParams* defParams, const ParamsEdited* p
 void PCVignette::adjusterChanged (Adjuster* a, double newval) {
 
 	if (listener && enabled->get_active()) {
-		listener->panelChanged (EvPCVignette, Glib::ustring::compose ("%1=%4\n%2=%5\n%3=%6", M("TP_PCVIGNETTE_STRENGTH"), M("TP_PCVIGNETTE_FEATHER"), M("TP_PCVIGNETTE_ROUNDNESS"), strength->getValue(), (int)feather->getValue(), (int)roundness->getValue()));
+		if (a == strength)
+			listener->panelChanged (EvPCVignetteStrength, strength->getTextValue());
+		else if (a == feather)
+			listener->panelChanged (EvPCVignetteFeather, feather->getTextValue());
+		else if (a == roundness)
+			listener->panelChanged (EvPCVignetteRoundness, roundness->getTextValue());
 	}
 }
 

rtgui/preferences.cc

@@ -237,9 +237,9 @@ Gtk::Widget* Preferences::getBatchProcPanel () {
     appendBehavList (mi, M("TP_CHMIXER_RED")+", "+M("TP_CHMIXER_GREEN")+", "+M("TP_CHMIXER_BLUE"), ADDSET_CHMIXER, false);
     
 	mi = behModel->append ();
-    mi->set_value (behavColumns.label, M("TP_CHMIXERBW_LABEL"));	
+    mi->set_value (behavColumns.label, M("TP_BWMIX_LABEL"));
     appendBehavList (mi, M("TP_BWMIX_MIXC"), ADDSET_CHMIXER_BW, false);
-    appendBehavList (mi, M("TP_BWMIX_GAMM"), ADDSET_CHMIXER_BWG, false);
+    appendBehavList (mi, M("TP_BWMIX_GAMMA"), ADDSET_CHMIXER_BWG, false);
     appendBehavList (mi, M("TP_BWMIX_MIXF"),ADDSET_CHMIXER_BWF, false);
 
     mi = behModel->append ();

rtgui/toolpanelcoord.cc

@@ -85,7 +85,7 @@ ToolPanelCoordinator::ToolPanelCoordinator () : ipc(NULL)  {
     addPanel (exposurePanel, hlrecovery,        M("TP_HLREC_LABEL"));          toolPanels.push_back (hlrecovery);
     addPanel (colorPanel, vibrance,             M("TP_VIBRANCE_LABEL"));       toolPanels.push_back (vibrance);
     addPanel (colorPanel, chmixer,              M("TP_CHMIXER_LABEL"));        toolPanels.push_back (chmixer);
-    addPanel (colorPanel, chmixerbw,            M("TP_CHMIXERBW_LABEL"));      toolPanels.push_back (chmixerbw);
+    addPanel (colorPanel, chmixerbw,            M("TP_BWMIX_LABEL"));          toolPanels.push_back (chmixerbw);
     addPanel (exposurePanel, shadowshighlights, M("TP_SHADOWSHLIGHTS_LABEL")); toolPanels.push_back (shadowshighlights);
     addPanel (detailsPanel, sharpening,         M("TP_SHARPENING_LABEL"));     toolPanels.push_back (sharpening);
     addPanel (detailsPanel, sharpenEdge,        M("TP_SHARPENEDGE_LABEL"));    toolPanels.push_back (sharpenEdge);

rtgui/vignetting.cc

@@ -73,11 +73,11 @@ void Vignetting::read (const ProcParams* pp, const ParamsEdited* pedited) {
 
 void Vignetting::write (ProcParams* pp, ParamsEdited* pedited) {
 
-    pp->vignetting.amount = (int)amount->getValue ();
+    pp->vignetting.amount = amount->getIntValue ();
-    pp->vignetting.radius = (int)radius->getValue ();
+    pp->vignetting.radius = radius->getIntValue ();
-    pp->vignetting.strength = (int)strength->getValue ();
+    pp->vignetting.strength = strength->getIntValue ();
-    pp->vignetting.centerX = (int)centerX->getValue ();
+    pp->vignetting.centerX = centerX->getIntValue ();
-    pp->vignetting.centerY = (int)centerY->getValue ();
+    pp->vignetting.centerY = centerY->getIntValue ();
 
     if (pedited) { 
         pedited->vignetting.amount = amount->getEditedState ();
@@ -114,8 +114,16 @@ void Vignetting::setDefaults (const ProcParams* defParams, const ParamsEdited* p
 
 void Vignetting::adjusterChanged (Adjuster* a, double newval) {
 
-    if (listener) 
+    if (listener)  {
-        listener->panelChanged (EvVignetting, Glib::ustring::compose ("%1=%5\n%2=%6\n%3=%7\n%4=%8 %9", M("TP_VIGNETTING_AMOUNT"), M("TP_VIGNETTING_RADIUS"), M("TP_VIGNETTING_STRENGTH"), M("TP_VIGNETTING_CENTER"), (int)amount->getValue(), (int)radius->getValue(), (int)strength->getValue(), (int)centerX->getValue(), (int)centerY->getValue()));
+        if (a == amount)
+            listener->panelChanged (EvVignettingAmount, amount->getTextValue());
+        else if (a == radius)
+            listener->panelChanged (EvVignettingRadius, radius->getTextValue());
+        else if (a == strength)
+            listener->panelChanged (EvVignettingStrenght, strength->getTextValue());
+        else if (a == centerX || a == centerY)
+            listener->panelChanged (EvVignettingCenter, Glib::ustring::compose ("X=%1\nY=%2", centerX->getTextValue(), centerY->getTextValue()));
+    }
 }
 
 void Vignetting::setAdjusterBehavior (bool amountadd, bool radiusadd, bool strengthadd, bool centeradd) {