diff --git a/rtdata/languages/Catala b/rtdata/languages/Catala index 1ab771789..0c91908d8 100644 --- a/rtdata/languages/Catala +++ b/rtdata/languages/Catala @@ -128,7 +128,6 @@ FILEBROWSER_QUERYBUTTONHINT;Neteja la recerca FILEBROWSER_QUERYHINT;Escriviu part del nom d'un fitxer a cercar o bé llista amb comes com a separadort.\nE.g. 1001,1004,1199 \n\nCtrl-F entra a la finestra de text a cercar (en el gestor de fitxers).\nEnter comença a buscar.\nEscape neteja. FILEBROWSER_QUERYLABEL; Cerca: FILEBROWSER_RENAMEDLGLABEL;Reanomena fitxer -FILEBROWSER_RENAMEDLGMSG;Reanomena fitxer "%1" a: FILEBROWSER_SELECTDARKFRAME;Selecc. marc fosc... FILEBROWSER_SELECTFLATFIELD;Selecc. camp pla... FILEBROWSER_SHOWCOLORLABEL1HINT;Mostra imatges etiqueta vermella.\nDrecera: Alt-1 @@ -1304,6 +1303,7 @@ ZOOMPANEL_ZOOMOUT;Allunya\nDrecera: - !HISTORY_MSG_437;Retinex - M - Method !HISTORY_MSG_438;Retinex - M - Equalizer !HISTORY_MSG_439;Retinex - Preview +!HISTORY_MSG_440;CbDL - Method !HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: Alt-s !MAIN_BUTTON_NAVNEXT_TOOLTIP;Navigate to the next image relative to image opened in the Editor.\nShortcut: Shift-F4\n\nTo navigate to the next image relative to the currently selected thumbnail in the File Browser or Filmstrip:\nShortcut: F4 !MAIN_BUTTON_NAVPREV_TOOLTIP;Navigate to the previous image relative to image opened in the Editor.\nShortcut: Shift-F3\n\nTo navigate to the previous image relative to the currently selected thumbnail in the File Browser or Filmstrip:\nShortcut: F3 @@ -1317,7 +1317,6 @@ ZOOMPANEL_ZOOMOUT;Allunya\nDrecera: - !MAIN_TAB_WAVELET;Wavelet !MAIN_TAB_WAVELET_TOOLTIP;Shortcut: Alt-w !MONITOR_PROFILE_SYSTEM;System default -!MONITOR_SOFTPROOF;Soft-proof !NAVIGATOR_B;B: !NAVIGATOR_G;G: !NAVIGATOR_H;H: @@ -1508,6 +1507,10 @@ ZOOMPANEL_ZOOMOUT;Allunya\nDrecera: - !TP_BWMIX_TCMODE_STANDARD;B&W Standard !TP_BWMIX_TCMODE_WEIGHTEDSTD;B&W Weighted Standard !TP_BWMIX_VAL;L +!TP_CBDL_AFT;After Black-and-White +!TP_CBDL_BEF;Before Black-and-White +!TP_CBDL_METHOD;Process located +!TP_CBDL_METHOD_TOOLTIP;Choose whether the Contrast by Detail Levels tool is to be positioned after the Black-and-White tool, which makes it work in L*a*b* space, or before it, which makes it work in RGB space. !TP_COLORAPP_ADAPTSCENE;Scene luminosity !TP_COLORAPP_ADAPTSCENE_TOOLTIP;Absolute luminance of the scene environement (cd/m²).\n1) Calculated from the Exif data:\nShutter speed - ISO speed - F number - camera exposure correction.\n2) Calculated from the raw white point and RT's Exposure Compensation slider. !TP_COLORAPP_ADAPTVIEWING;Viewing luminosity (cd/m²) @@ -1750,6 +1753,7 @@ ZOOMPANEL_ZOOMOUT;Allunya\nDrecera: - !TP_PREPROCESS_HOTPIXFILT_TOOLTIP;Tries to suppress hot pixels. !TP_PRSHARPENING_LABEL;Post-Resize Sharpening !TP_PRSHARPENING_TOOLTIP;Sharpens the image after resizing. Only works when the "Lanczos" resizing method is used. It is impossible to preview the effects of this tool. See RawPedia for usage instructions. +!TP_RAWCACORR_CASTR;Strength !TP_RAWEXPOS_BLACK_0;Green 1 (lead) !TP_RAWEXPOS_BLACK_1;Red !TP_RAWEXPOS_BLACK_2;Blue @@ -1805,7 +1809,6 @@ ZOOMPANEL_ZOOMOUT;Allunya\nDrecera: - !TP_RETINEX_LABSPACE;L*a*b* !TP_RETINEX_LOW;Low !TP_RETINEX_MAP;Mask method -!TP_RETINEX_MAP_CURV;Curve only !TP_RETINEX_MAP_GAUS;Gaussian mask !TP_RETINEX_MAP_MAPP;Sharp mask (wavelet partial) !TP_RETINEX_MAP_MAPT;Sharp mask (wavelet total) diff --git a/rtdata/languages/Chinese (Simplified) b/rtdata/languages/Chinese (Simplified) index e135a863b..a503de3a8 100644 --- a/rtdata/languages/Chinese (Simplified) +++ b/rtdata/languages/Chinese (Simplified) @@ -107,7 +107,6 @@ FILEBROWSER_RANK3_TOOLTIP;Rank 3 *\nShortcut: Shift-3 FILEBROWSER_RANK4_TOOLTIP;Rank 4 *\nShortcut: Shift-4 FILEBROWSER_RANK5_TOOLTIP;Rank 5 *\nShortcut: Shift-5 FILEBROWSER_RENAMEDLGLABEL;文件重命名 -FILEBROWSER_RENAMEDLGMSG;将"%1"更名为： FILEBROWSER_SELECTDARKFRAME;选择暗幅... FILEBROWSER_SELECTFLATFIELD;选择平场…… FILEBROWSER_SHOWDIRHINT;显示文件夹中所有图片 @@ -1221,6 +1220,7 @@ ZOOMPANEL_ZOOMOUT;缩放拉远\n快捷键: - !HISTORY_MSG_437;Retinex - M - Method !HISTORY_MSG_438;Retinex - M - Equalizer !HISTORY_MSG_439;Retinex - Preview +!HISTORY_MSG_440;CbDL - Method !MAIN_BUTTON_NAVNEXT_TOOLTIP;Navigate to the next image relative to image opened in the Editor.\nShortcut: Shift-F4\n\nTo navigate to the next image relative to the currently selected thumbnail in the File Browser or Filmstrip:\nShortcut: F4 !MAIN_BUTTON_NAVPREV_TOOLTIP;Navigate to the previous image relative to image opened in the Editor.\nShortcut: Shift-F3\n\nTo navigate to the previous image relative to the currently selected thumbnail in the File Browser or Filmstrip:\nShortcut: F3 !MAIN_BUTTON_NAVSYNC_TOOLTIP;Synchronize the File Browser or Filmstrip with the Editor to reveal the thumbnail of the currently opened image, and clear any active filters.\nShortcut: x\n\nAs above, but without clearing active filters:\nShortcut: y\n(Note that the thumbnail of the opened image will not be shown if filtered out). @@ -1245,7 +1245,6 @@ ZOOMPANEL_ZOOMOUT;缩放拉远\n快捷键: - !MAIN_TOOLTIP_PREVIEWG;Preview the Green channel.\nShortcut: g !MAIN_TOOLTIP_PREVIEWL;Preview the Luminosity.\nShortcut: v\n\n0.299*R + 0.587*G + 0.114*B !MONITOR_PROFILE_SYSTEM;System default -!MONITOR_SOFTPROOF;Soft-proof !OPTIONS_DEFIMG_MISSING;The default profile for non-raw photos could not be found or is not set.\n\nPlease check your profiles' directory, it may be missing or damaged.\n\nDefault internal values will be used. !OPTIONS_DEFRAW_MISSING;The default profile for raw photos could not be found or is not set.\n\nPlease check your profiles' directory, it may be missing or damaged.\n\nDefault internal values will be used. !PARTIALPASTE_COLORTONING;Color toning @@ -1448,6 +1447,10 @@ ZOOMPANEL_ZOOMOUT;缩放拉远\n快捷键: - !TP_BWMIX_SET_ROYGCBPMREL;Relative ROYGCBPM !TP_BWMIX_TCMODE_SATANDVALBLENDING;B&W Saturation and Value Blending !TP_BWMIX_TCMODE_WEIGHTEDSTD;B&W Weighted Standard +!TP_CBDL_AFT;After Black-and-White +!TP_CBDL_BEF;Before Black-and-White +!TP_CBDL_METHOD;Process located +!TP_CBDL_METHOD_TOOLTIP;Choose whether the Contrast by Detail Levels tool is to be positioned after the Black-and-White tool, which makes it work in L*a*b* space, or before it, which makes it work in RGB space. !TP_CHROMATABERR_LABEL;Chromatic Aberration !TP_COLORAPP_ADAPTSCENE;Scene luminosity !TP_COLORAPP_ADAPTSCENE_TOOLTIP;Absolute luminance of the scene environement (cd/m²).\n1) Calculated from the Exif data:\nShutter speed - ISO speed - F number - camera exposure correction.\n2) Calculated from the raw white point and RT's Exposure Compensation slider. @@ -1710,6 +1713,7 @@ ZOOMPANEL_ZOOMOUT;缩放拉远\n快捷键: - !TP_PREPROCESS_HOTPIXFILT_TOOLTIP;Tries to suppress hot pixels. !TP_PRSHARPENING_LABEL;Post-Resize Sharpening !TP_PRSHARPENING_TOOLTIP;Sharpens the image after resizing. Only works when the "Lanczos" resizing method is used. It is impossible to preview the effects of this tool. See RawPedia for usage instructions. +!TP_RAWCACORR_CASTR;Strength !TP_RAWEXPOS_BLACKS;Black Levels !TP_RAWEXPOS_BLACK_0;Green 1 (lead) !TP_RAWEXPOS_BLACK_1;Red @@ -1775,7 +1779,6 @@ ZOOMPANEL_ZOOMOUT;缩放拉远\n快捷键: - !TP_RETINEX_LABSPACE;L*a*b* !TP_RETINEX_LOW;Low !TP_RETINEX_MAP;Mask method -!TP_RETINEX_MAP_CURV;Curve only !TP_RETINEX_MAP_GAUS;Gaussian mask !TP_RETINEX_MAP_MAPP;Sharp mask (wavelet partial) !TP_RETINEX_MAP_MAPT;Sharp mask (wavelet total) diff --git a/rtdata/languages/Chinese (Traditional) b/rtdata/languages/Chinese (Traditional) index 8b38b7ded..884b96f8a 100644 --- a/rtdata/languages/Chinese (Traditional) +++ b/rtdata/languages/Chinese (Traditional) @@ -52,7 +52,6 @@ FILEBROWSER_POPUPTRASH;Move to trash FILEBROWSER_POPUPUNRANK;Unrank FILEBROWSER_POPUPUNTRASH;Remove from trash FILEBROWSER_RENAMEDLGLABEL;Rename file -FILEBROWSER_RENAMEDLGMSG;Rename file "%1" to: FILEBROWSER_SHOWDIRHINT;Show all images of the directory FILEBROWSER_SHOWRANK1HINT;Show images ranked as 1 star FILEBROWSER_SHOWRANK2HINT;Show images ranked as 2 star @@ -956,6 +955,7 @@ TP_WBALANCE_TEMPERATURE;色溫 !HISTORY_MSG_437;Retinex - M - Method !HISTORY_MSG_438;Retinex - M - Equalizer !HISTORY_MSG_439;Retinex - Preview +!HISTORY_MSG_440;CbDL - Method !HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: Alt-s !MAIN_BUTTON_FULLSCREEN;Fullscreen !MAIN_BUTTON_NAVNEXT_TOOLTIP;Navigate to the next image relative to image opened in the Editor.\nShortcut: Shift-F4\n\nTo navigate to the next image relative to the currently selected thumbnail in the File Browser or Filmstrip:\nShortcut: F4 @@ -1001,7 +1001,6 @@ TP_WBALANCE_TEMPERATURE;色溫 !MAIN_TOOLTIP_SHOWHIDETP1;Show/Hide the top panel.\nShortcut: Shift-l !MAIN_TOOLTIP_THRESHOLD;Threshold !MONITOR_PROFILE_SYSTEM;System default -!MONITOR_SOFTPROOF;Soft-proof !NAVIGATOR_B;B: !NAVIGATOR_G;G: !NAVIGATOR_H;H: @@ -1306,6 +1305,10 @@ TP_WBALANCE_TEMPERATURE;色溫 !TP_BWMIX_TCMODE_STANDARD;B&W Standard !TP_BWMIX_TCMODE_WEIGHTEDSTD;B&W Weighted Standard !TP_BWMIX_VAL;L +!TP_CBDL_AFT;After Black-and-White +!TP_CBDL_BEF;Before Black-and-White +!TP_CBDL_METHOD;Process located +!TP_CBDL_METHOD_TOOLTIP;Choose whether the Contrast by Detail Levels tool is to be positioned after the Black-and-White tool, which makes it work in L*a*b* space, or before it, which makes it work in RGB space. !TP_CHROMATABERR_LABEL;Chromatic Aberration !TP_COLORAPP_ADAPTSCENE;Scene luminosity !TP_COLORAPP_ADAPTSCENE_TOOLTIP;Absolute luminance of the scene environement (cd/m²).\n1) Calculated from the Exif data:\nShutter speed - ISO speed - F number - camera exposure correction.\n2) Calculated from the raw white point and RT's Exposure Compensation slider. @@ -1668,6 +1671,7 @@ TP_WBALANCE_TEMPERATURE;色溫 !TP_RAWCACORR_AUTO;Auto-correction !TP_RAWCACORR_CABLUE;Blue !TP_RAWCACORR_CARED;Red +!TP_RAWCACORR_CASTR;Strength !TP_RAWEXPOS_BLACKS;Black Levels !TP_RAWEXPOS_BLACK_0;Green 1 (lead) !TP_RAWEXPOS_BLACK_1;Red @@ -1737,7 +1741,6 @@ TP_WBALANCE_TEMPERATURE;色溫 !TP_RETINEX_LABSPACE;L*a*b* !TP_RETINEX_LOW;Low !TP_RETINEX_MAP;Mask method -!TP_RETINEX_MAP_CURV;Curve only !TP_RETINEX_MAP_GAUS;Gaussian mask !TP_RETINEX_MAP_MAPP;Sharp mask (wavelet partial) !TP_RETINEX_MAP_MAPT;Sharp mask (wavelet total) diff --git a/rtdata/languages/Czech b/rtdata/languages/Czech index 8a83bbabf..91fb6a167 100644 --- a/rtdata/languages/Czech +++ b/rtdata/languages/Czech @@ -191,7 +191,6 @@ FILEBROWSER_RANK3_TOOLTIP;Hodnocení 3 *\nZkratka: Shift-3 FILEBROWSER_RANK4_TOOLTIP;Hodnocení 4 *\nZkratka: Shift-4 FILEBROWSER_RANK5_TOOLTIP;Hodnocení 5 *\nZkratka: Shift-5 FILEBROWSER_RENAMEDLGLABEL;Přejmenování souboru -FILEBROWSER_RENAMEDLGMSG;Přejmenovat soubor "%1" na: FILEBROWSER_SELECTDARKFRAME;Výběr tmavého snímku... FILEBROWSER_SELECTFLATFIELD;Výběr Flat Field... FILEBROWSER_SHOWCOLORLABEL1HINT;Ukázat obrázky s červeným štítkem.\nZkratka: Alt-1 @@ -2013,18 +2012,23 @@ ZOOMPANEL_ZOOMOUT;Oddálit\nZkratka: - !HISTORY_MSG_437;Retinex - M - Method !HISTORY_MSG_438;Retinex - M - Equalizer !HISTORY_MSG_439;Retinex - Preview +!HISTORY_MSG_440;CbDL - Method !MAIN_BUTTON_SENDTOEDITOR;Edit image in external editor !MONITOR_PROFILE_SYSTEM;System default -!MONITOR_SOFTPROOF;Soft-proof !PARTIALPASTE_PRSHARPENING;Post-resize sharpening !PREFERENCES_MONINTENT;Default monitor intent !PREFERENCES_MONPROFILE;Default monitor profile !PREFERENCES_PARSEDEXTDOWNHINT;Move selected extension down in the list. !PREFERENCES_PARSEDEXTUPHINT;Move selected extension up in the list. !PREFERENCES_PROFILE_NONE;None +!TP_CBDL_AFT;After Black-and-White +!TP_CBDL_BEF;Before Black-and-White +!TP_CBDL_METHOD;Process located +!TP_CBDL_METHOD_TOOLTIP;Choose whether the Contrast by Detail Levels tool is to be positioned after the Black-and-White tool, which makes it work in L*a*b* space, or before it, which makes it work in RGB space. !TP_FILMSIMULATION_SLOWPARSEDIR;RawTherapee is configured to look for Hald CLUT images, which are used for the Film Simulation tool, in a folder which is taking too long to load.\nGo to Preferences > Image Processing > Film Simulation\nto see which folder is being used. You should either point RawTherapee to a folder which contains only Hald CLUT images and nothing more, or to an empty folder if you don't want to use the Film Simulation tool.\n\nRead the Film Simulation article in RawPedia for more information.\n\nDo you want to cancel the scan now? !TP_ICM_PROFILEINTENT;Rendering Intent !TP_NEUTRAL;Reset +!TP_RAWCACORR_CASTR;Strength !TP_RETINEX_CONTEDIT_MAP;Mask equalizer !TP_RETINEX_CURVEEDITOR_MAP;L=f(L) !TP_RETINEX_CURVEEDITOR_MAP_TOOLTIP;This curve can be applied alone or with a Gaussian mask or wavelet mask.\nBeware of artifacts! @@ -2036,7 +2040,6 @@ ZOOMPANEL_ZOOMOUT;Oddálit\nZkratka: - !TP_RETINEX_ITER_TOOLTIP;Simulate a tone-mapping operator.\nHigh values increase the processing time. !TP_RETINEX_LABEL_MASK;Mask !TP_RETINEX_MAP;Mask method -!TP_RETINEX_MAP_CURV;Curve only !TP_RETINEX_MAP_GAUS;Gaussian mask !TP_RETINEX_MAP_MAPP;Sharp mask (wavelet partial) !TP_RETINEX_MAP_MAPT;Sharp mask (wavelet total) diff --git a/rtdata/languages/Dansk b/rtdata/languages/Dansk index c96f0c1da..176be0485 100644 --- a/rtdata/languages/Dansk +++ b/rtdata/languages/Dansk @@ -50,7 +50,6 @@ FILEBROWSER_POPUPTRASH;Flyt til papirkurv FILEBROWSER_POPUPUNRANK;Fjern vurdering FILEBROWSER_POPUPUNTRASH;Fjern fra papirkurv FILEBROWSER_RENAMEDLGLABEL;Omdøb fil -FILEBROWSER_RENAMEDLGMSG;Omdøb filen "%1" til: FILEBROWSER_SHOWDIRHINT;Vis alle billeder i mappen FILEBROWSER_SHOWRANK1HINT;Vis billeder vurderet med 1 stjerne FILEBROWSER_SHOWRANK2HINT;Vis billeder vurderet med 2 stjerner @@ -952,6 +951,7 @@ TP_WBALANCE_TEMPERATURE;Temperatur !HISTORY_MSG_437;Retinex - M - Method !HISTORY_MSG_438;Retinex - M - Equalizer !HISTORY_MSG_439;Retinex - Preview +!HISTORY_MSG_440;CbDL - Method !HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: Alt-s !MAIN_BUTTON_FULLSCREEN;Fullscreen !MAIN_BUTTON_NAVNEXT_TOOLTIP;Navigate to the next image relative to image opened in the Editor.\nShortcut: Shift-F4\n\nTo navigate to the next image relative to the currently selected thumbnail in the File Browser or Filmstrip:\nShortcut: F4 @@ -999,7 +999,6 @@ TP_WBALANCE_TEMPERATURE;Temperatur !MAIN_TOOLTIP_THRESHOLD;Threshold !MAIN_TOOLTIP_TOGGLE;Toggle the Before/After view.\nShortcut: Shift-b !MONITOR_PROFILE_SYSTEM;System default -!MONITOR_SOFTPROOF;Soft-proof !NAVIGATOR_B;B: !NAVIGATOR_G;G: !NAVIGATOR_H;H: @@ -1304,6 +1303,10 @@ TP_WBALANCE_TEMPERATURE;Temperatur !TP_BWMIX_TCMODE_STANDARD;B&W Standard !TP_BWMIX_TCMODE_WEIGHTEDSTD;B&W Weighted Standard !TP_BWMIX_VAL;L +!TP_CBDL_AFT;After Black-and-White +!TP_CBDL_BEF;Before Black-and-White +!TP_CBDL_METHOD;Process located +!TP_CBDL_METHOD_TOOLTIP;Choose whether the Contrast by Detail Levels tool is to be positioned after the Black-and-White tool, which makes it work in L*a*b* space, or before it, which makes it work in RGB space. !TP_CHROMATABERR_LABEL;Chromatic Aberration !TP_COLORAPP_ADAPTSCENE;Scene luminosity !TP_COLORAPP_ADAPTSCENE_TOOLTIP;Absolute luminance of the scene environement (cd/m²).\n1) Calculated from the Exif data:\nShutter speed - ISO speed - F number - camera exposure correction.\n2) Calculated from the raw white point and RT's Exposure Compensation slider. @@ -1666,6 +1669,7 @@ TP_WBALANCE_TEMPERATURE;Temperatur !TP_RAWCACORR_AUTO;Auto-correction !TP_RAWCACORR_CABLUE;Blue !TP_RAWCACORR_CARED;Red +!TP_RAWCACORR_CASTR;Strength !TP_RAWEXPOS_BLACKS;Black Levels !TP_RAWEXPOS_BLACK_0;Green 1 (lead) !TP_RAWEXPOS_BLACK_1;Red @@ -1736,7 +1740,6 @@ TP_WBALANCE_TEMPERATURE;Temperatur !TP_RETINEX_LABSPACE;L*a*b* !TP_RETINEX_LOW;Low !TP_RETINEX_MAP;Mask method -!TP_RETINEX_MAP_CURV;Curve only !TP_RETINEX_MAP_GAUS;Gaussian mask !TP_RETINEX_MAP_MAPP;Sharp mask (wavelet partial) !TP_RETINEX_MAP_MAPT;Sharp mask (wavelet total) diff --git a/rtdata/languages/Deutsch b/rtdata/languages/Deutsch index aae0ab7c3..4454fac0d 100644 --- a/rtdata/languages/Deutsch +++ b/rtdata/languages/Deutsch @@ -183,7 +183,6 @@ FILEBROWSER_RANK3_TOOLTIP;Bewertung 3 ***\nTaste: Umschalt + 3 FILEBROWSER_RANK4_TOOLTIP;Bewertung 4 ****\nTaste: Umschalt + 4 FILEBROWSER_RANK5_TOOLTIP;Bewertung 5 *****\nTaste: Umschalt + 5 FILEBROWSER_RENAMEDLGLABEL;Datei umbenennen -FILEBROWSER_RENAMEDLGMSG;Umbenennen der Datei "%1" in: FILEBROWSER_SELECTDARKFRAME;Dunkelbild wählen... FILEBROWSER_SELECTFLATFIELD;Weißbild wählen... FILEBROWSER_SHOWCOLORLABEL1HINT;Nur rot markierte Bilder anzeigen\nTaste: Alt + 1 @@ -225,7 +224,6 @@ FILECHOOSER_FILTER_SAME;Gleiche Format wie aktuelles Bild FILECHOOSER_FILTER_TIFF;TIFF-Dateien GENERAL_ABOUT;Über GENERAL_AFTER;Nachher -GENERAL_APPLY;Anwenden GENERAL_ASIMAGE;Als Bild GENERAL_AUTO;Automatisch GENERAL_BEFORE;Vorher @@ -241,7 +239,6 @@ GENERAL_NA;n/a GENERAL_NO;Nein GENERAL_NONE;Keine GENERAL_OK;OK -GENERAL_OPEN;Öffnen GENERAL_PORTRAIT;Portrait GENERAL_SAVE;Speichern GENERAL_UNCHANGED;(Unverändert) @@ -815,7 +812,6 @@ MAIN_TOOLTIP_SHOWHIDETP1;Oberes Bedienfeld ein-/ausblenden\nTaste: UmschaltUmschalt + b MONITOR_PROFILE_SYSTEM;Systemvorgabe -MONITOR_SOFTPROOF;Soft-Proof NAVIGATOR_B;B: NAVIGATOR_G;G: NAVIGATOR_H;H: @@ -1718,7 +1714,6 @@ TP_RETINEX_LABEL_MASK;Maske TP_RETINEX_LABSPACE;L*a*b* TP_RETINEX_LOW;Schatten TP_RETINEX_MAP;Methode -TP_RETINEX_MAP_CURV;Nur Kurve TP_RETINEX_MAP_GAUS;Gaußschenmaske TP_RETINEX_MAP_MAPP;Schärfemaske (Teil-Wavelet) TP_RETINEX_MAP_MAPT;Schärfemaske (Wavelet) @@ -2039,3 +2034,13 @@ ZOOMPANEL_ZOOMFITSCREEN;An Bildschirm anpassen\nTaste: f ZOOMPANEL_ZOOMIN;Hineinzoomen\nTaste: + ZOOMPANEL_ZOOMOUT;Herauszoomen\nTaste: - +!!!!!!!!!!!!!!!!!!!!!!!!! +! Untranslated keys follow; remove the ! prefix after an entry is translated. +!!!!!!!!!!!!!!!!!!!!!!!!! + +!HISTORY_MSG_440;CbDL - Method +!TP_CBDL_AFT;After Black-and-White +!TP_CBDL_BEF;Before Black-and-White +!TP_CBDL_METHOD;Process located +!TP_CBDL_METHOD_TOOLTIP;Choose whether the Contrast by Detail Levels tool is to be positioned after the Black-and-White tool, which makes it work in L*a*b* space, or before it, which makes it work in RGB space. +!TP_RAWCACORR_CASTR;Strength diff --git a/rtdata/languages/English (UK) b/rtdata/languages/English (UK) index 6593af821..aead1b712 100644 --- a/rtdata/languages/English (UK) +++ b/rtdata/languages/English (UK) @@ -256,7 +256,6 @@ TP_WBALANCE_EQBLUERED_TOOLTIP;Allows to deviate from the normal behaviour of "wh !FILEBROWSER_RANK4_TOOLTIP;Rank 4 *\nShortcut: Shift-4 !FILEBROWSER_RANK5_TOOLTIP;Rank 5 *\nShortcut: Shift-5 !FILEBROWSER_RENAMEDLGLABEL;Rename file -!FILEBROWSER_RENAMEDLGMSG;Rename file "%1" to: !FILEBROWSER_SELECTDARKFRAME;Select dark-frame... !FILEBROWSER_SELECTFLATFIELD;Select flat-field... !FILEBROWSER_SHOWCOLORLABEL1HINT;Show images labeled Red.\nShortcut: Alt-1 @@ -750,6 +749,7 @@ TP_WBALANCE_EQBLUERED_TOOLTIP;Allows to deviate from the normal behaviour of "wh !HISTORY_MSG_437;Retinex - M - Method !HISTORY_MSG_438;Retinex - M - Equalizer !HISTORY_MSG_439;Retinex - Preview +!HISTORY_MSG_440;CbDL - Method !HISTORY_NEWSNAPSHOT;Add !HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: Alt-s !HISTORY_SNAPSHOT;Snapshot @@ -864,7 +864,6 @@ TP_WBALANCE_EQBLUERED_TOOLTIP;Allows to deviate from the normal behaviour of "wh !MAIN_TOOLTIP_THRESHOLD;Threshold !MAIN_TOOLTIP_TOGGLE;Toggle the Before/After view.\nShortcut: Shift-b !MONITOR_PROFILE_SYSTEM;System default -!MONITOR_SOFTPROOF;Soft-proof !NAVIGATOR_B;B: !NAVIGATOR_G;G: !NAVIGATOR_H;H: @@ -1261,6 +1260,10 @@ TP_WBALANCE_EQBLUERED_TOOLTIP;Allows to deviate from the normal behaviour of "wh !TP_CACORRECTION_BLUE;Blue !TP_CACORRECTION_LABEL;Chromatic Aberration Correction !TP_CACORRECTION_RED;Red +!TP_CBDL_AFT;After Black-and-White +!TP_CBDL_BEF;Before Black-and-White +!TP_CBDL_METHOD;Process located +!TP_CBDL_METHOD_TOOLTIP;Choose whether the Contrast by Detail Levels tool is to be positioned after the Black-and-White tool, which makes it work in L*a*b* space, or before it, which makes it work in RGB space. !TP_CHMIXER_BLUE;Blue channel !TP_CHMIXER_GREEN;Green channel !TP_CHMIXER_LABEL;Channel Mixer @@ -1627,6 +1630,7 @@ TP_WBALANCE_EQBLUERED_TOOLTIP;Allows to deviate from the normal behaviour of "wh !TP_RAWCACORR_AUTO;Auto-correction !TP_RAWCACORR_CABLUE;Blue !TP_RAWCACORR_CARED;Red +!TP_RAWCACORR_CASTR;Strength !TP_RAWEXPOS_BLACKS;Black Levels !TP_RAWEXPOS_BLACK_0;Green 1 (lead) !TP_RAWEXPOS_BLACK_1;Red @@ -1704,7 +1708,6 @@ TP_WBALANCE_EQBLUERED_TOOLTIP;Allows to deviate from the normal behaviour of "wh !TP_RETINEX_LABSPACE;L*a*b* !TP_RETINEX_LOW;Low !TP_RETINEX_MAP;Mask method -!TP_RETINEX_MAP_CURV;Curve only !TP_RETINEX_MAP_GAUS;Gaussian mask !TP_RETINEX_MAP_MAPP;Sharp mask (wavelet partial) !TP_RETINEX_MAP_MAPT;Sharp mask (wavelet total) diff --git a/rtdata/languages/English (US) b/rtdata/languages/English (US) index c5c99ed26..9501ed895 100644 --- a/rtdata/languages/English (US) +++ b/rtdata/languages/English (US) @@ -159,7 +159,6 @@ !FILEBROWSER_RANK4_TOOLTIP;Rank 4 *\nShortcut: Shift-4 !FILEBROWSER_RANK5_TOOLTIP;Rank 5 *\nShortcut: Shift-5 !FILEBROWSER_RENAMEDLGLABEL;Rename file -!FILEBROWSER_RENAMEDLGMSG;Rename file "%1" to: !FILEBROWSER_SELECTDARKFRAME;Select dark-frame... !FILEBROWSER_SELECTFLATFIELD;Select flat-field... !FILEBROWSER_SHOWCOLORLABEL1HINT;Show images labeled Red.\nShortcut: Alt-1 @@ -673,6 +672,7 @@ !HISTORY_MSG_437;Retinex - M - Method !HISTORY_MSG_438;Retinex - M - Equalizer !HISTORY_MSG_439;Retinex - Preview +!HISTORY_MSG_440;CbDL - Method !HISTORY_NEWSNAPSHOT;Add !HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: Alt-s !HISTORY_SNAPSHOT;Snapshot @@ -791,7 +791,6 @@ !MAIN_TOOLTIP_THRESHOLD;Threshold !MAIN_TOOLTIP_TOGGLE;Toggle the Before/After view.\nShortcut: Shift-b !MONITOR_PROFILE_SYSTEM;System default -!MONITOR_SOFTPROOF;Soft-proof !NAVIGATOR_B;B: !NAVIGATOR_G;G: !NAVIGATOR_H;H: @@ -1209,6 +1208,10 @@ !TP_CACORRECTION_BLUE;Blue !TP_CACORRECTION_LABEL;Chromatic Aberration Correction !TP_CACORRECTION_RED;Red +!TP_CBDL_AFT;After Black-and-White +!TP_CBDL_BEF;Before Black-and-White +!TP_CBDL_METHOD;Process located +!TP_CBDL_METHOD_TOOLTIP;Choose whether the Contrast by Detail Levels tool is to be positioned after the Black-and-White tool, which makes it work in L*a*b* space, or before it, which makes it work in RGB space. !TP_CHMIXER_BLUE;Blue channel !TP_CHMIXER_GREEN;Green channel !TP_CHMIXER_LABEL;Channel Mixer @@ -1616,6 +1619,7 @@ !TP_RAWCACORR_AUTO;Auto-correction !TP_RAWCACORR_CABLUE;Blue !TP_RAWCACORR_CARED;Red +!TP_RAWCACORR_CASTR;Strength !TP_RAWEXPOS_BLACKS;Black Levels !TP_RAWEXPOS_BLACK_0;Green 1 (lead) !TP_RAWEXPOS_BLACK_1;Red @@ -1694,7 +1698,6 @@ !TP_RETINEX_LABSPACE;L*a*b* !TP_RETINEX_LOW;Low !TP_RETINEX_MAP;Mask method -!TP_RETINEX_MAP_CURV;Curve only !TP_RETINEX_MAP_GAUS;Gaussian mask !TP_RETINEX_MAP_MAPP;Sharp mask (wavelet partial) !TP_RETINEX_MAP_MAPT;Sharp mask (wavelet total) diff --git a/rtdata/languages/Espanol b/rtdata/languages/Espanol index bc95740d6..f6f2509df 100644 --- a/rtdata/languages/Espanol +++ b/rtdata/languages/Espanol @@ -210,7 +210,6 @@ FILEBROWSER_RANK3_TOOLTIP;Rango 3 ***\nAtajoShift-3 FILEBROWSER_RANK4_TOOLTIP;Rango 4 ****\nAtajoShift-4 FILEBROWSER_RANK5_TOOLTIP;Rango 5 *****\nAtajoShift-5 FILEBROWSER_RENAMEDLGLABEL;Renombrar archivo -FILEBROWSER_RENAMEDLGMSG;Renombrar archivo "%1"a: FILEBROWSER_SELECTDARKFRAME;Seleccionar Toma Negra… FILEBROWSER_SELECTFLATFIELD;Seleccionar Campo Plano… FILEBROWSER_SHOWCOLORLABEL1HINT;Mostrar imágenes etiquetadas con Rojo Alt-1 @@ -1707,11 +1706,11 @@ ZOOMPANEL_ZOOMOUT;Reducir Zoom\nAtajo: - !HISTORY_MSG_437;Retinex - M - Method !HISTORY_MSG_438;Retinex - M - Equalizer !HISTORY_MSG_439;Retinex - Preview +!HISTORY_MSG_440;CbDL - Method !MAIN_TAB_INSPECT; Inspect !MAIN_TAB_WAVELET;Wavelet !MAIN_TAB_WAVELET_TOOLTIP;Shortcut: Alt-w !MONITOR_PROFILE_SYSTEM;System default -!MONITOR_SOFTPROOF;Soft-proof !NAVIGATOR_B;B: !NAVIGATOR_G;G: !NAVIGATOR_H;H: @@ -1789,6 +1788,10 @@ ZOOMPANEL_ZOOMOUT;Reducir Zoom\nAtajo: - !PREFERENCES_WLTWO;Two levels !PREFERENCES_WLZER;No !SAVEDLG_SUBSAMP_TOOLTIP;Best compression:\nJ:a:b 4:2:0\nh/v 2/2\nChroma halved horizontally and vertically.\n\nBalanced:\nJ:a:b 4:2:2\nh/v 2/1\nChroma halved horizontally.\n\nBest quality:\nJ:a:b 4:4:4\nh/v 1/1\nNo chroma subsampling. +!TP_CBDL_AFT;After Black-and-White +!TP_CBDL_BEF;Before Black-and-White +!TP_CBDL_METHOD;Process located +!TP_CBDL_METHOD_TOOLTIP;Choose whether the Contrast by Detail Levels tool is to be positioned after the Black-and-White tool, which makes it work in L*a*b* space, or before it, which makes it work in RGB space. !TP_CROP_GTHARMMEANS;Harmonic Means !TP_CROP_GTTRIANGLE1;Golden Triangles 1 !TP_CROP_GTTRIANGLE2;Golden Triangles 2 @@ -1839,6 +1842,7 @@ ZOOMPANEL_ZOOMOUT;Reducir Zoom\nAtajo: - !TP_NEUTRAL;Reset !TP_PRSHARPENING_LABEL;Post-Resize Sharpening !TP_PRSHARPENING_TOOLTIP;Sharpens the image after resizing. Only works when the "Lanczos" resizing method is used. It is impossible to preview the effects of this tool. See RawPedia for usage instructions. +!TP_RAWCACORR_CASTR;Strength !TP_RAW_HD;Threshold !TP_RAW_HD_TOOLTIP;Lower values make hot/dead pixel detection more aggressive, but false positives may lead to artifacts. If you notice any artifacts appearing when enabling the Hot/Dead Pixel Filters, gradually increase the threshold value until they disappear. !TP_RETINEX_CONTEDIT_HSL;Histogram equalizer HSL @@ -1878,7 +1882,6 @@ ZOOMPANEL_ZOOMOUT;Reducir Zoom\nAtajo: - !TP_RETINEX_LABSPACE;L*a*b* !TP_RETINEX_LOW;Low !TP_RETINEX_MAP;Mask method -!TP_RETINEX_MAP_CURV;Curve only !TP_RETINEX_MAP_GAUS;Gaussian mask !TP_RETINEX_MAP_MAPP;Sharp mask (wavelet partial) !TP_RETINEX_MAP_MAPT;Sharp mask (wavelet total) diff --git a/rtdata/languages/Euskara b/rtdata/languages/Euskara index 6690d9ece..376ac56b2 100644 --- a/rtdata/languages/Euskara +++ b/rtdata/languages/Euskara @@ -50,7 +50,6 @@ FILEBROWSER_POPUPTRASH;Move to trash FILEBROWSER_POPUPUNRANK;Unrank FILEBROWSER_POPUPUNTRASH;Remove from trash FILEBROWSER_RENAMEDLGLABEL;Rename file -FILEBROWSER_RENAMEDLGMSG;Rename file "%1" to: FILEBROWSER_SHOWDIRHINT;Show all images of the directory FILEBROWSER_SHOWRANK1HINT;Show images ranked as 1 star FILEBROWSER_SHOWRANK2HINT;Show images ranked as 2 star @@ -952,6 +951,7 @@ TP_WBALANCE_TEMPERATURE;Tenperatura !HISTORY_MSG_437;Retinex - M - Method !HISTORY_MSG_438;Retinex - M - Equalizer !HISTORY_MSG_439;Retinex - Preview +!HISTORY_MSG_440;CbDL - Method !HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: Alt-s !MAIN_BUTTON_FULLSCREEN;Fullscreen !MAIN_BUTTON_NAVNEXT_TOOLTIP;Navigate to the next image relative to image opened in the Editor.\nShortcut: Shift-F4\n\nTo navigate to the next image relative to the currently selected thumbnail in the File Browser or Filmstrip:\nShortcut: F4 @@ -999,7 +999,6 @@ TP_WBALANCE_TEMPERATURE;Tenperatura !MAIN_TOOLTIP_THRESHOLD;Threshold !MAIN_TOOLTIP_TOGGLE;Toggle the Before/After view.\nShortcut: Shift-b !MONITOR_PROFILE_SYSTEM;System default -!MONITOR_SOFTPROOF;Soft-proof !NAVIGATOR_B;B: !NAVIGATOR_G;G: !NAVIGATOR_H;H: @@ -1304,6 +1303,10 @@ TP_WBALANCE_TEMPERATURE;Tenperatura !TP_BWMIX_TCMODE_STANDARD;B&W Standard !TP_BWMIX_TCMODE_WEIGHTEDSTD;B&W Weighted Standard !TP_BWMIX_VAL;L +!TP_CBDL_AFT;After Black-and-White +!TP_CBDL_BEF;Before Black-and-White +!TP_CBDL_METHOD;Process located +!TP_CBDL_METHOD_TOOLTIP;Choose whether the Contrast by Detail Levels tool is to be positioned after the Black-and-White tool, which makes it work in L*a*b* space, or before it, which makes it work in RGB space. !TP_CHROMATABERR_LABEL;Chromatic Aberration !TP_COLORAPP_ADAPTSCENE;Scene luminosity !TP_COLORAPP_ADAPTSCENE_TOOLTIP;Absolute luminance of the scene environement (cd/m²).\n1) Calculated from the Exif data:\nShutter speed - ISO speed - F number - camera exposure correction.\n2) Calculated from the raw white point and RT's Exposure Compensation slider. @@ -1666,6 +1669,7 @@ TP_WBALANCE_TEMPERATURE;Tenperatura !TP_RAWCACORR_AUTO;Auto-correction !TP_RAWCACORR_CABLUE;Blue !TP_RAWCACORR_CARED;Red +!TP_RAWCACORR_CASTR;Strength !TP_RAWEXPOS_BLACKS;Black Levels !TP_RAWEXPOS_BLACK_0;Green 1 (lead) !TP_RAWEXPOS_BLACK_1;Red @@ -1736,7 +1740,6 @@ TP_WBALANCE_TEMPERATURE;Tenperatura !TP_RETINEX_LABSPACE;L*a*b* !TP_RETINEX_LOW;Low !TP_RETINEX_MAP;Mask method -!TP_RETINEX_MAP_CURV;Curve only !TP_RETINEX_MAP_GAUS;Gaussian mask !TP_RETINEX_MAP_MAPP;Sharp mask (wavelet partial) !TP_RETINEX_MAP_MAPT;Sharp mask (wavelet total) diff --git a/rtdata/languages/Francais b/rtdata/languages/Francais index 5e78e7fa9..c1ce91384 100644 --- a/rtdata/languages/Francais +++ b/rtdata/languages/Francais @@ -156,7 +156,6 @@ FILEBROWSER_RANK3_TOOLTIP;Rang 3 *\nRaccourci: Shift-3 FILEBROWSER_RANK4_TOOLTIP;Rang 4 *\nRaccourci: Shift-4 FILEBROWSER_RANK5_TOOLTIP;Rang 5 *\nRaccourci: Shift-5 FILEBROWSER_RENAMEDLGLABEL;Renommage du fichier -FILEBROWSER_RENAMEDLGMSG;Renommer le fichier "%1" en: FILEBROWSER_SELECTDARKFRAME;Choisir une image de Trame Noire... FILEBROWSER_SELECTFLATFIELD;Sélectionner un Champ Uniforme... FILEBROWSER_SHOWCOLORLABEL1HINT;Afficher les images avec un label Rouge\nRaccourci: Alt-1 @@ -1926,9 +1925,9 @@ ZOOMPANEL_ZOOMOUT;Zoom Arrière\nRaccourci: - !HISTORY_MSG_437;Retinex - M - Method !HISTORY_MSG_438;Retinex - M - Equalizer !HISTORY_MSG_439;Retinex - Preview +!HISTORY_MSG_440;CbDL - Method !MAIN_BUTTON_SENDTOEDITOR;Edit image in external editor !MONITOR_PROFILE_SYSTEM;System default -!MONITOR_SOFTPROOF;Soft-proof !PARTIALPASTE_PRSHARPENING;Post-resize sharpening !PARTIALPASTE_RETINEX;Retinex !PREFERENCES_MONINTENT;Default monitor intent @@ -1938,11 +1937,16 @@ ZOOMPANEL_ZOOMOUT;Zoom Arrière\nRaccourci: - !PREFERENCES_PROFILE_NONE;None !PREFERENCES_TUNNELMETADATA;Copy Exif/IPTC/XMP unchanged to output file !SAVEDLG_SUBSAMP_TOOLTIP;Best compression:\nJ:a:b 4:2:0\nh/v 2/2\nChroma halved horizontally and vertically.\n\nBalanced:\nJ:a:b 4:2:2\nh/v 2/1\nChroma halved horizontally.\n\nBest quality:\nJ:a:b 4:4:4\nh/v 1/1\nNo chroma subsampling. +!TP_CBDL_AFT;After Black-and-White +!TP_CBDL_BEF;Before Black-and-White +!TP_CBDL_METHOD;Process located +!TP_CBDL_METHOD_TOOLTIP;Choose whether the Contrast by Detail Levels tool is to be positioned after the Black-and-White tool, which makes it work in L*a*b* space, or before it, which makes it work in RGB space. !TP_COLORTONING_NEUTRAL;Reset sliders !TP_DIRPYRDENOISE_PASSES;Median iterations !TP_FILMSIMULATION_SLOWPARSEDIR;RawTherapee is configured to look for Hald CLUT images, which are used for the Film Simulation tool, in a folder which is taking too long to load.\nGo to Preferences > Image Processing > Film Simulation\nto see which folder is being used. You should either point RawTherapee to a folder which contains only Hald CLUT images and nothing more, or to an empty folder if you don't want to use the Film Simulation tool.\n\nRead the Film Simulation article in RawPedia for more information.\n\nDo you want to cancel the scan now? !TP_ICM_PROFILEINTENT;Rendering Intent !TP_NEUTRAL;Reset +!TP_RAWCACORR_CASTR;Strength !TP_RETINEX_CONTEDIT_HSL;Histogram equalizer HSL !TP_RETINEX_CONTEDIT_LAB;Histogram equalizer L*a*b* !TP_RETINEX_CONTEDIT_LH;Hue equalizer @@ -1980,7 +1984,6 @@ ZOOMPANEL_ZOOMOUT;Zoom Arrière\nRaccourci: - !TP_RETINEX_LABSPACE;L*a*b* !TP_RETINEX_LOW;Low !TP_RETINEX_MAP;Mask method -!TP_RETINEX_MAP_CURV;Curve only !TP_RETINEX_MAP_GAUS;Gaussian mask !TP_RETINEX_MAP_MAPP;Sharp mask (wavelet partial) !TP_RETINEX_MAP_MAPT;Sharp mask (wavelet total) diff --git a/rtdata/languages/Greek b/rtdata/languages/Greek index f1ad6a74f..2a575d202 100644 --- a/rtdata/languages/Greek +++ b/rtdata/languages/Greek @@ -50,7 +50,6 @@ FILEBROWSER_POPUPTRASH;Move to trash FILEBROWSER_POPUPUNRANK;Unrank FILEBROWSER_POPUPUNTRASH;Remove from trash FILEBROWSER_RENAMEDLGLABEL;Rename file -FILEBROWSER_RENAMEDLGMSG;Rename file "%1" to: FILEBROWSER_SHOWDIRHINT;Show all images of the directory FILEBROWSER_SHOWRANK1HINT;Show images ranked as 1 star FILEBROWSER_SHOWRANK2HINT;Show images ranked as 2 star @@ -951,6 +950,7 @@ TP_WBALANCE_TEMPERATURE;Θερμοκρασία !HISTORY_MSG_437;Retinex - M - Method !HISTORY_MSG_438;Retinex - M - Equalizer !HISTORY_MSG_439;Retinex - Preview +!HISTORY_MSG_440;CbDL - Method !HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: Alt-s !MAIN_BUTTON_FULLSCREEN;Fullscreen !MAIN_BUTTON_NAVNEXT_TOOLTIP;Navigate to the next image relative to image opened in the Editor.\nShortcut: Shift-F4\n\nTo navigate to the next image relative to the currently selected thumbnail in the File Browser or Filmstrip:\nShortcut: F4 @@ -998,7 +998,6 @@ TP_WBALANCE_TEMPERATURE;Θερμοκρασία !MAIN_TOOLTIP_THRESHOLD;Threshold !MAIN_TOOLTIP_TOGGLE;Toggle the Before/After view.\nShortcut: Shift-b !MONITOR_PROFILE_SYSTEM;System default -!MONITOR_SOFTPROOF;Soft-proof !NAVIGATOR_B;B: !NAVIGATOR_G;G: !NAVIGATOR_H;H: @@ -1303,6 +1302,10 @@ TP_WBALANCE_TEMPERATURE;Θερμοκρασία !TP_BWMIX_TCMODE_STANDARD;B&W Standard !TP_BWMIX_TCMODE_WEIGHTEDSTD;B&W Weighted Standard !TP_BWMIX_VAL;L +!TP_CBDL_AFT;After Black-and-White +!TP_CBDL_BEF;Before Black-and-White +!TP_CBDL_METHOD;Process located +!TP_CBDL_METHOD_TOOLTIP;Choose whether the Contrast by Detail Levels tool is to be positioned after the Black-and-White tool, which makes it work in L*a*b* space, or before it, which makes it work in RGB space. !TP_CHROMATABERR_LABEL;Chromatic Aberration !TP_COLORAPP_ADAPTSCENE;Scene luminosity !TP_COLORAPP_ADAPTSCENE_TOOLTIP;Absolute luminance of the scene environement (cd/m²).\n1) Calculated from the Exif data:\nShutter speed - ISO speed - F number - camera exposure correction.\n2) Calculated from the raw white point and RT's Exposure Compensation slider. @@ -1665,6 +1668,7 @@ TP_WBALANCE_TEMPERATURE;Θερμοκρασία !TP_RAWCACORR_AUTO;Auto-correction !TP_RAWCACORR_CABLUE;Blue !TP_RAWCACORR_CARED;Red +!TP_RAWCACORR_CASTR;Strength !TP_RAWEXPOS_BLACKS;Black Levels !TP_RAWEXPOS_BLACK_0;Green 1 (lead) !TP_RAWEXPOS_BLACK_1;Red @@ -1735,7 +1739,6 @@ TP_WBALANCE_TEMPERATURE;Θερμοκρασία !TP_RETINEX_LABSPACE;L*a*b* !TP_RETINEX_LOW;Low !TP_RETINEX_MAP;Mask method -!TP_RETINEX_MAP_CURV;Curve only !TP_RETINEX_MAP_GAUS;Gaussian mask !TP_RETINEX_MAP_MAPP;Sharp mask (wavelet partial) !TP_RETINEX_MAP_MAPT;Sharp mask (wavelet total) diff --git a/rtdata/languages/Hebrew b/rtdata/languages/Hebrew index 7ec2ae3e2..59f462b42 100644 --- a/rtdata/languages/Hebrew +++ b/rtdata/languages/Hebrew @@ -50,7 +50,6 @@ FILEBROWSER_POPUPTRASH;Move to trash FILEBROWSER_POPUPUNRANK;Unrank FILEBROWSER_POPUPUNTRASH;Remove from trash FILEBROWSER_RENAMEDLGLABEL;Rename file -FILEBROWSER_RENAMEDLGMSG;Rename file "%1" to: FILEBROWSER_SHOWDIRHINT;Show all images of the directory FILEBROWSER_SHOWRANK1HINT;Show images ranked as 1 star FILEBROWSER_SHOWRANK2HINT;Show images ranked as 2 star @@ -952,6 +951,7 @@ TP_WBALANCE_TEMPERATURE;מידת חום !HISTORY_MSG_437;Retinex - M - Method !HISTORY_MSG_438;Retinex - M - Equalizer !HISTORY_MSG_439;Retinex - Preview +!HISTORY_MSG_440;CbDL - Method !HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: Alt-s !MAIN_BUTTON_FULLSCREEN;Fullscreen !MAIN_BUTTON_NAVNEXT_TOOLTIP;Navigate to the next image relative to image opened in the Editor.\nShortcut: Shift-F4\n\nTo navigate to the next image relative to the currently selected thumbnail in the File Browser or Filmstrip:\nShortcut: F4 @@ -999,7 +999,6 @@ TP_WBALANCE_TEMPERATURE;מידת חום !MAIN_TOOLTIP_THRESHOLD;Threshold !MAIN_TOOLTIP_TOGGLE;Toggle the Before/After view.\nShortcut: Shift-b !MONITOR_PROFILE_SYSTEM;System default -!MONITOR_SOFTPROOF;Soft-proof !NAVIGATOR_B;B: !NAVIGATOR_G;G: !NAVIGATOR_H;H: @@ -1304,6 +1303,10 @@ TP_WBALANCE_TEMPERATURE;מידת חום !TP_BWMIX_TCMODE_STANDARD;B&W Standard !TP_BWMIX_TCMODE_WEIGHTEDSTD;B&W Weighted Standard !TP_BWMIX_VAL;L +!TP_CBDL_AFT;After Black-and-White +!TP_CBDL_BEF;Before Black-and-White +!TP_CBDL_METHOD;Process located +!TP_CBDL_METHOD_TOOLTIP;Choose whether the Contrast by Detail Levels tool is to be positioned after the Black-and-White tool, which makes it work in L*a*b* space, or before it, which makes it work in RGB space. !TP_CHROMATABERR_LABEL;Chromatic Aberration !TP_COLORAPP_ADAPTSCENE;Scene luminosity !TP_COLORAPP_ADAPTSCENE_TOOLTIP;Absolute luminance of the scene environement (cd/m²).\n1) Calculated from the Exif data:\nShutter speed - ISO speed - F number - camera exposure correction.\n2) Calculated from the raw white point and RT's Exposure Compensation slider. @@ -1666,6 +1669,7 @@ TP_WBALANCE_TEMPERATURE;מידת חום !TP_RAWCACORR_AUTO;Auto-correction !TP_RAWCACORR_CABLUE;Blue !TP_RAWCACORR_CARED;Red +!TP_RAWCACORR_CASTR;Strength !TP_RAWEXPOS_BLACKS;Black Levels !TP_RAWEXPOS_BLACK_0;Green 1 (lead) !TP_RAWEXPOS_BLACK_1;Red @@ -1736,7 +1740,6 @@ TP_WBALANCE_TEMPERATURE;מידת חום !TP_RETINEX_LABSPACE;L*a*b* !TP_RETINEX_LOW;Low !TP_RETINEX_MAP;Mask method -!TP_RETINEX_MAP_CURV;Curve only !TP_RETINEX_MAP_GAUS;Gaussian mask !TP_RETINEX_MAP_MAPP;Sharp mask (wavelet partial) !TP_RETINEX_MAP_MAPT;Sharp mask (wavelet total) diff --git a/rtdata/languages/Italiano b/rtdata/languages/Italiano index 0313d3937..6287c1ac0 100644 --- a/rtdata/languages/Italiano +++ b/rtdata/languages/Italiano @@ -154,7 +154,6 @@ FILEBROWSER_RANK3_TOOLTIP;Punteggio 3 *\nScorciatoia: Shift-3 FILEBROWSER_RANK4_TOOLTIP;Punteggio 4 *\nScorciatoia: Shift-4 FILEBROWSER_RANK5_TOOLTIP;Punteggio 5 *\nScorciatoia: Shift-5 FILEBROWSER_RENAMEDLGLABEL;Rinomina il file -FILEBROWSER_RENAMEDLGMSG;Rinomina il file "%1" in: FILEBROWSER_SELECTDARKFRAME;Seleziona un Dark Frame... FILEBROWSER_SELECTFLATFIELD;Seleziona un Flat Field... FILEBROWSER_SHOWCOLORLABEL1HINT;Mostra le immagini con etichetta Rossa.\nScorciatoia: Alt-1 @@ -1572,12 +1571,12 @@ ZOOMPANEL_ZOOMOUT;Rimpicciolisci.\nScorciatoia: - !HISTORY_MSG_437;Retinex - M - Method !HISTORY_MSG_438;Retinex - M - Equalizer !HISTORY_MSG_439;Retinex - Preview +!HISTORY_MSG_440;CbDL - Method !MAIN_BUTTON_SENDTOEDITOR;Edit image in external editor !MAIN_TAB_INSPECT; Inspect !MAIN_TAB_WAVELET;Wavelet !MAIN_TAB_WAVELET_TOOLTIP;Shortcut: Alt-w !MONITOR_PROFILE_SYSTEM;System default -!MONITOR_SOFTPROOF;Soft-proof !PARTIALPASTE_COLORTONING;Color toning !PARTIALPASTE_EQUALIZER;Wavelet levels !PARTIALPASTE_FILMSIMULATION;Film simulation @@ -1652,6 +1651,10 @@ ZOOMPANEL_ZOOMOUT;Rimpicciolisci.\nScorciatoia: - !PREFERENCES_WLTWO;Two levels !PREFERENCES_WLZER;No !SAVEDLG_SUBSAMP_TOOLTIP;Best compression:\nJ:a:b 4:2:0\nh/v 2/2\nChroma halved horizontally and vertically.\n\nBalanced:\nJ:a:b 4:2:2\nh/v 2/1\nChroma halved horizontally.\n\nBest quality:\nJ:a:b 4:4:4\nh/v 1/1\nNo chroma subsampling. +!TP_CBDL_AFT;After Black-and-White +!TP_CBDL_BEF;Before Black-and-White +!TP_CBDL_METHOD;Process located +!TP_CBDL_METHOD_TOOLTIP;Choose whether the Contrast by Detail Levels tool is to be positioned after the Black-and-White tool, which makes it work in L*a*b* space, or before it, which makes it work in RGB space. !TP_COLORTONING_AB;o C/L !TP_COLORTONING_AUTOSAT;Automatic !TP_COLORTONING_BALANCE;Balance @@ -1769,6 +1772,7 @@ ZOOMPANEL_ZOOMOUT;Rimpicciolisci.\nScorciatoia: - !TP_PREPROCESS_HOTPIXFILT_TOOLTIP;Tries to suppress hot pixels. !TP_PRSHARPENING_LABEL;Post-Resize Sharpening !TP_PRSHARPENING_TOOLTIP;Sharpens the image after resizing. Only works when the "Lanczos" resizing method is used. It is impossible to preview the effects of this tool. See RawPedia for usage instructions. +!TP_RAWCACORR_CASTR;Strength !TP_RAWEXPOS_BLACK_0;Green 1 (lead) !TP_RAWEXPOS_BLACK_1;Red !TP_RAWEXPOS_BLACK_2;Blue @@ -1819,7 +1823,6 @@ ZOOMPANEL_ZOOMOUT;Rimpicciolisci.\nScorciatoia: - !TP_RETINEX_LABSPACE;L*a*b* !TP_RETINEX_LOW;Low !TP_RETINEX_MAP;Mask method -!TP_RETINEX_MAP_CURV;Curve only !TP_RETINEX_MAP_GAUS;Gaussian mask !TP_RETINEX_MAP_MAPP;Sharp mask (wavelet partial) !TP_RETINEX_MAP_MAPT;Sharp mask (wavelet total) diff --git a/rtdata/languages/Japanese b/rtdata/languages/Japanese index 6c6edc90e..971cae524 100644 --- a/rtdata/languages/Japanese +++ b/rtdata/languages/Japanese @@ -189,7 +189,6 @@ FILEBROWSER_RANK3_TOOLTIP;ランク 3 *\nショートカット: Shift-3 FILEBROWSER_RANK4_TOOLTIP;ランク 4 *\nショートカット: Shift-4 FILEBROWSER_RANK5_TOOLTIP;ランク 5 *\nショートカット: Shift-5 FILEBROWSER_RENAMEDLGLABEL;ファイル名変更 -FILEBROWSER_RENAMEDLGMSG;"%1" にファイル名変更: FILEBROWSER_SELECTDARKFRAME;ダークフレームの選択... FILEBROWSER_SELECTFLATFIELD;フラットフィールドの選択... FILEBROWSER_SHOWCOLORLABEL1HINT;レッド・ラベルの画像を表示\nショートカット: Alt-1 @@ -1960,9 +1959,9 @@ ZOOMPANEL_ZOOMOUT;ズームアウト\nショートカット: - !HISTORY_MSG_437;Retinex - M - Method !HISTORY_MSG_438;Retinex - M - Equalizer !HISTORY_MSG_439;Retinex - Preview +!HISTORY_MSG_440;CbDL - Method !MAIN_BUTTON_SENDTOEDITOR;Edit image in external editor !MONITOR_PROFILE_SYSTEM;System default -!MONITOR_SOFTPROOF;Soft-proof !PARTIALPASTE_PRSHARPENING;Post-resize sharpening !PARTIALPASTE_RETINEX;Retinex !PREFERENCES_MONINTENT;Default monitor intent @@ -1972,9 +1971,14 @@ ZOOMPANEL_ZOOMOUT;ズームアウト\nショートカット: - !PREFERENCES_PROFILE_NONE;None !PREFERENCES_TUNNELMETADATA;Copy Exif/IPTC/XMP unchanged to output file !SAVEDLG_SUBSAMP_TOOLTIP;Best compression:\nJ:a:b 4:2:0\nh/v 2/2\nChroma halved horizontally and vertically.\n\nBalanced:\nJ:a:b 4:2:2\nh/v 2/1\nChroma halved horizontally.\n\nBest quality:\nJ:a:b 4:4:4\nh/v 1/1\nNo chroma subsampling. +!TP_CBDL_AFT;After Black-and-White +!TP_CBDL_BEF;Before Black-and-White +!TP_CBDL_METHOD;Process located +!TP_CBDL_METHOD_TOOLTIP;Choose whether the Contrast by Detail Levels tool is to be positioned after the Black-and-White tool, which makes it work in L*a*b* space, or before it, which makes it work in RGB space. !TP_FILMSIMULATION_SLOWPARSEDIR;RawTherapee is configured to look for Hald CLUT images, which are used for the Film Simulation tool, in a folder which is taking too long to load.\nGo to Preferences > Image Processing > Film Simulation\nto see which folder is being used. You should either point RawTherapee to a folder which contains only Hald CLUT images and nothing more, or to an empty folder if you don't want to use the Film Simulation tool.\n\nRead the Film Simulation article in RawPedia for more information.\n\nDo you want to cancel the scan now? !TP_ICM_PROFILEINTENT;Rendering Intent !TP_NEUTRAL;Reset +!TP_RAWCACORR_CASTR;Strength !TP_RETINEX_CONTEDIT_HSL;Histogram equalizer HSL !TP_RETINEX_CONTEDIT_LAB;Histogram equalizer L*a*b* !TP_RETINEX_CONTEDIT_LH;Hue equalizer @@ -2012,7 +2016,6 @@ ZOOMPANEL_ZOOMOUT;ズームアウト\nショートカット: - !TP_RETINEX_LABSPACE;L*a*b* !TP_RETINEX_LOW;Low !TP_RETINEX_MAP;Mask method -!TP_RETINEX_MAP_CURV;Curve only !TP_RETINEX_MAP_GAUS;Gaussian mask !TP_RETINEX_MAP_MAPP;Sharp mask (wavelet partial) !TP_RETINEX_MAP_MAPT;Sharp mask (wavelet total) diff --git a/rtdata/languages/Latvian b/rtdata/languages/Latvian index 7bdd63598..a7ac81f34 100644 --- a/rtdata/languages/Latvian +++ b/rtdata/languages/Latvian @@ -50,7 +50,6 @@ FILEBROWSER_POPUPTRASH;Izmest atkritnē FILEBROWSER_POPUPUNRANK;Nevērtēt FILEBROWSER_POPUPUNTRASH;Izņemt no atkritnes FILEBROWSER_RENAMEDLGLABEL;Pārsaukt failu -FILEBROWSER_RENAMEDLGMSG;Pārsaukt failu "%1" uz: FILEBROWSER_SHOWDIRHINT;Rādīt visus direktorija attēlus FILEBROWSER_SHOWRANK1HINT;Rādīt attēlus ar 1 zvaigzni FILEBROWSER_SHOWRANK2HINT;Rādīt attēlus ar 2 zvaigznēm @@ -952,6 +951,7 @@ TP_WBALANCE_TEMPERATURE;Temperatūra !HISTORY_MSG_437;Retinex - M - Method !HISTORY_MSG_438;Retinex - M - Equalizer !HISTORY_MSG_439;Retinex - Preview +!HISTORY_MSG_440;CbDL - Method !HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: Alt-s !MAIN_BUTTON_FULLSCREEN;Fullscreen !MAIN_BUTTON_NAVNEXT_TOOLTIP;Navigate to the next image relative to image opened in the Editor.\nShortcut: Shift-F4\n\nTo navigate to the next image relative to the currently selected thumbnail in the File Browser or Filmstrip:\nShortcut: F4 @@ -999,7 +999,6 @@ TP_WBALANCE_TEMPERATURE;Temperatūra !MAIN_TOOLTIP_THRESHOLD;Threshold !MAIN_TOOLTIP_TOGGLE;Toggle the Before/After view.\nShortcut: Shift-b !MONITOR_PROFILE_SYSTEM;System default -!MONITOR_SOFTPROOF;Soft-proof !NAVIGATOR_B;B: !NAVIGATOR_G;G: !NAVIGATOR_H;H: @@ -1304,6 +1303,10 @@ TP_WBALANCE_TEMPERATURE;Temperatūra !TP_BWMIX_TCMODE_STANDARD;B&W Standard !TP_BWMIX_TCMODE_WEIGHTEDSTD;B&W Weighted Standard !TP_BWMIX_VAL;L +!TP_CBDL_AFT;After Black-and-White +!TP_CBDL_BEF;Before Black-and-White +!TP_CBDL_METHOD;Process located +!TP_CBDL_METHOD_TOOLTIP;Choose whether the Contrast by Detail Levels tool is to be positioned after the Black-and-White tool, which makes it work in L*a*b* space, or before it, which makes it work in RGB space. !TP_CHROMATABERR_LABEL;Chromatic Aberration !TP_COLORAPP_ADAPTSCENE;Scene luminosity !TP_COLORAPP_ADAPTSCENE_TOOLTIP;Absolute luminance of the scene environement (cd/m²).\n1) Calculated from the Exif data:\nShutter speed - ISO speed - F number - camera exposure correction.\n2) Calculated from the raw white point and RT's Exposure Compensation slider. @@ -1666,6 +1669,7 @@ TP_WBALANCE_TEMPERATURE;Temperatūra !TP_RAWCACORR_AUTO;Auto-correction !TP_RAWCACORR_CABLUE;Blue !TP_RAWCACORR_CARED;Red +!TP_RAWCACORR_CASTR;Strength !TP_RAWEXPOS_BLACKS;Black Levels !TP_RAWEXPOS_BLACK_0;Green 1 (lead) !TP_RAWEXPOS_BLACK_1;Red @@ -1736,7 +1740,6 @@ TP_WBALANCE_TEMPERATURE;Temperatūra !TP_RETINEX_LABSPACE;L*a*b* !TP_RETINEX_LOW;Low !TP_RETINEX_MAP;Mask method -!TP_RETINEX_MAP_CURV;Curve only !TP_RETINEX_MAP_GAUS;Gaussian mask !TP_RETINEX_MAP_MAPP;Sharp mask (wavelet partial) !TP_RETINEX_MAP_MAPT;Sharp mask (wavelet total) diff --git a/rtdata/languages/Magyar b/rtdata/languages/Magyar index f2de8b0be..42430a066 100644 --- a/rtdata/languages/Magyar +++ b/rtdata/languages/Magyar @@ -123,7 +123,6 @@ FILEBROWSER_QUERYBUTTONHINT;Találati lista ürítése FILEBROWSER_QUERYHINT;Írd be a keresett állomány nevét vagy abból egy töredéket.\nCtrl-F megnyomásával (az állományböngészőben) a fókuszt a keresőmezőre helyezheted.\nEnter indítja a keresést. FILEBROWSER_QUERYLABEL; Keresés: FILEBROWSER_RENAMEDLGLABEL;Fájl átnevezése -FILEBROWSER_RENAMEDLGMSG;%1 új neve: FILEBROWSER_SELECTDARKFRAME;Referencia feketekép kiválasztása... FILEBROWSER_SELECTFLATFIELD;Flat field kép kiválasztása FILEBROWSER_SHOWCOLORLABEL1HINT;Piros címkéjű képek megjelenítése.\nGyorsbillentyű: Alt-1 @@ -1233,6 +1232,7 @@ ZOOMPANEL_ZOOMOUT;Kicsinyítés - !HISTORY_MSG_437;Retinex - M - Method !HISTORY_MSG_438;Retinex - M - Equalizer !HISTORY_MSG_439;Retinex - Preview +!HISTORY_MSG_440;CbDL - Method !HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: Alt-s !MAIN_BUTTON_NAVNEXT_TOOLTIP;Navigate to the next image relative to image opened in the Editor.\nShortcut: Shift-F4\n\nTo navigate to the next image relative to the currently selected thumbnail in the File Browser or Filmstrip:\nShortcut: F4 !MAIN_BUTTON_NAVPREV_TOOLTIP;Navigate to the previous image relative to image opened in the Editor.\nShortcut: Shift-F3\n\nTo navigate to the previous image relative to the currently selected thumbnail in the File Browser or Filmstrip:\nShortcut: F3 @@ -1249,7 +1249,6 @@ ZOOMPANEL_ZOOMOUT;Kicsinyítés - !MAIN_TOOLTIP_BACKCOLOR1;Background color of the preview: Black\nShortcut: 9 !MAIN_TOOLTIP_BACKCOLOR2;Background color of the preview: White\nShortcut: 9 !MONITOR_PROFILE_SYSTEM;System default -!MONITOR_SOFTPROOF;Soft-proof !NAVIGATOR_B;B: !NAVIGATOR_G;G: !NAVIGATOR_H;H: @@ -1459,6 +1458,10 @@ ZOOMPANEL_ZOOMOUT;Kicsinyítés - !TP_BWMIX_TCMODE_STANDARD;B&W Standard !TP_BWMIX_TCMODE_WEIGHTEDSTD;B&W Weighted Standard !TP_BWMIX_VAL;L +!TP_CBDL_AFT;After Black-and-White +!TP_CBDL_BEF;Before Black-and-White +!TP_CBDL_METHOD;Process located +!TP_CBDL_METHOD_TOOLTIP;Choose whether the Contrast by Detail Levels tool is to be positioned after the Black-and-White tool, which makes it work in L*a*b* space, or before it, which makes it work in RGB space. !TP_COLORAPP_ADAPTSCENE;Scene luminosity !TP_COLORAPP_ADAPTSCENE_TOOLTIP;Absolute luminance of the scene environement (cd/m²).\n1) Calculated from the Exif data:\nShutter speed - ISO speed - F number - camera exposure correction.\n2) Calculated from the raw white point and RT's Exposure Compensation slider. !TP_COLORAPP_ADAPTVIEWING;Viewing luminosity (cd/m²) @@ -1743,6 +1746,7 @@ ZOOMPANEL_ZOOMOUT;Kicsinyítés - !TP_PREPROCESS_HOTPIXFILT_TOOLTIP;Tries to suppress hot pixels. !TP_PRSHARPENING_LABEL;Post-Resize Sharpening !TP_PRSHARPENING_TOOLTIP;Sharpens the image after resizing. Only works when the "Lanczos" resizing method is used. It is impossible to preview the effects of this tool. See RawPedia for usage instructions. +!TP_RAWCACORR_CASTR;Strength !TP_RAWEXPOS_BLACK_0;Green 1 (lead) !TP_RAWEXPOS_BLACK_1;Red !TP_RAWEXPOS_BLACK_2;Blue @@ -1798,7 +1802,6 @@ ZOOMPANEL_ZOOMOUT;Kicsinyítés - !TP_RETINEX_LABSPACE;L*a*b* !TP_RETINEX_LOW;Low !TP_RETINEX_MAP;Mask method -!TP_RETINEX_MAP_CURV;Curve only !TP_RETINEX_MAP_GAUS;Gaussian mask !TP_RETINEX_MAP_MAPP;Sharp mask (wavelet partial) !TP_RETINEX_MAP_MAPT;Sharp mask (wavelet total) diff --git a/rtdata/languages/Nederlands b/rtdata/languages/Nederlands index ac9173016..ff404ffa3 100644 --- a/rtdata/languages/Nederlands +++ b/rtdata/languages/Nederlands @@ -169,7 +169,6 @@ FILEBROWSER_RANK3_TOOLTIP;Waardering 3 *\nSneltoets: Shift-3 FILEBROWSER_RANK4_TOOLTIP;Waardering 4 *\nSneltoets: Shift-4 FILEBROWSER_RANK5_TOOLTIP;Waardering 5 *\nSneltoets: Shift-5 FILEBROWSER_RENAMEDLGLABEL;Hernoem bestand -FILEBROWSER_RENAMEDLGMSG;Hernoem bestand "%1" naar: FILEBROWSER_SELECTDARKFRAME;Selecteer donkerframe... FILEBROWSER_SELECTFLATFIELD;Kies vlakveldopname... FILEBROWSER_SHOWCOLORLABEL1HINT;Toon foto's met label Rood\nSneltoets: Alt-1 @@ -1981,15 +1980,19 @@ ZOOMPANEL_ZOOMOUT;Zoom uit\nSneltoets: - !HISTORY_MSG_437;Retinex - M - Method !HISTORY_MSG_438;Retinex - M - Equalizer !HISTORY_MSG_439;Retinex - Preview +!HISTORY_MSG_440;CbDL - Method !MAIN_BUTTON_SENDTOEDITOR;Edit image in external editor !MONITOR_PROFILE_SYSTEM;System default -!MONITOR_SOFTPROOF;Soft-proof !PARTIALPASTE_PRSHARPENING;Post-resize sharpening !PREFERENCES_MONINTENT;Default monitor intent !PREFERENCES_MONPROFILE;Default monitor profile !PREFERENCES_PARSEDEXTDOWNHINT;Move selected extension down in the list. !PREFERENCES_PARSEDEXTUPHINT;Move selected extension up in the list. !PREFERENCES_PROFILE_NONE;None +!TP_CBDL_AFT;After Black-and-White +!TP_CBDL_BEF;Before Black-and-White +!TP_CBDL_METHOD;Process located +!TP_CBDL_METHOD_TOOLTIP;Choose whether the Contrast by Detail Levels tool is to be positioned after the Black-and-White tool, which makes it work in L*a*b* space, or before it, which makes it work in RGB space. !TP_COLORTONING_STR;Strength !TP_DIRPYRDENOISE_CUR;Curve !TP_DIRPYRDENOISE_LAB;L*a*b* @@ -1997,6 +2000,7 @@ ZOOMPANEL_ZOOMOUT;Zoom uit\nSneltoets: - !TP_FILMSIMULATION_SLOWPARSEDIR;RawTherapee is configured to look for Hald CLUT images, which are used for the Film Simulation tool, in a folder which is taking too long to load.\nGo to Preferences > Image Processing > Film Simulation\nto see which folder is being used. You should either point RawTherapee to a folder which contains only Hald CLUT images and nothing more, or to an empty folder if you don't want to use the Film Simulation tool.\n\nRead the Film Simulation article in RawPedia for more information.\n\nDo you want to cancel the scan now? !TP_ICM_PROFILEINTENT;Rendering Intent !TP_NEUTRAL;Reset +!TP_RAWCACORR_CASTR;Strength !TP_RETINEX_CONTEDIT_MAP;Mask equalizer !TP_RETINEX_CURVEEDITOR_MAP;L=f(L) !TP_RETINEX_CURVEEDITOR_MAP_TOOLTIP;This curve can be applied alone or with a Gaussian mask or wavelet mask.\nBeware of artifacts! @@ -2010,7 +2014,6 @@ ZOOMPANEL_ZOOMOUT;Zoom uit\nSneltoets: - !TP_RETINEX_ITER_TOOLTIP;Simulate a tone-mapping operator.\nHigh values increase the processing time. !TP_RETINEX_LABEL_MASK;Mask !TP_RETINEX_MAP;Mask method -!TP_RETINEX_MAP_CURV;Curve only !TP_RETINEX_MAP_GAUS;Gaussian mask !TP_RETINEX_MAP_MAPP;Sharp mask (wavelet partial) !TP_RETINEX_MAP_MAPT;Sharp mask (wavelet total) diff --git a/rtdata/languages/Norsk BM b/rtdata/languages/Norsk BM index 8916f0bee..2447f705a 100644 --- a/rtdata/languages/Norsk BM +++ b/rtdata/languages/Norsk BM @@ -50,7 +50,6 @@ FILEBROWSER_POPUPTRASH;Flytt til søpla FILEBROWSER_POPUPUNRANK;Fjern rangering FILEBROWSER_POPUPUNTRASH;Fjern fra søpla FILEBROWSER_RENAMEDLGLABEL;Bytt filnavn -FILEBROWSER_RENAMEDLGMSG;Bytt filnavn "%1" til: FILEBROWSER_SHOWDIRHINT;Vis alle bildene i folderen FILEBROWSER_SHOWRANK1HINT;Vis bilder rangert med 1 stjerne FILEBROWSER_SHOWRANK2HINT;Vis bilder rangert med 2 stjerne @@ -951,6 +950,7 @@ TP_WBALANCE_TEMPERATURE;Temperatur !HISTORY_MSG_437;Retinex - M - Method !HISTORY_MSG_438;Retinex - M - Equalizer !HISTORY_MSG_439;Retinex - Preview +!HISTORY_MSG_440;CbDL - Method !HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: Alt-s !MAIN_BUTTON_FULLSCREEN;Fullscreen !MAIN_BUTTON_NAVNEXT_TOOLTIP;Navigate to the next image relative to image opened in the Editor.\nShortcut: Shift-F4\n\nTo navigate to the next image relative to the currently selected thumbnail in the File Browser or Filmstrip:\nShortcut: F4 @@ -998,7 +998,6 @@ TP_WBALANCE_TEMPERATURE;Temperatur !MAIN_TOOLTIP_THRESHOLD;Threshold !MAIN_TOOLTIP_TOGGLE;Toggle the Before/After view.\nShortcut: Shift-b !MONITOR_PROFILE_SYSTEM;System default -!MONITOR_SOFTPROOF;Soft-proof !NAVIGATOR_B;B: !NAVIGATOR_G;G: !NAVIGATOR_H;H: @@ -1303,6 +1302,10 @@ TP_WBALANCE_TEMPERATURE;Temperatur !TP_BWMIX_TCMODE_STANDARD;B&W Standard !TP_BWMIX_TCMODE_WEIGHTEDSTD;B&W Weighted Standard !TP_BWMIX_VAL;L +!TP_CBDL_AFT;After Black-and-White +!TP_CBDL_BEF;Before Black-and-White +!TP_CBDL_METHOD;Process located +!TP_CBDL_METHOD_TOOLTIP;Choose whether the Contrast by Detail Levels tool is to be positioned after the Black-and-White tool, which makes it work in L*a*b* space, or before it, which makes it work in RGB space. !TP_CHROMATABERR_LABEL;Chromatic Aberration !TP_COLORAPP_ADAPTSCENE;Scene luminosity !TP_COLORAPP_ADAPTSCENE_TOOLTIP;Absolute luminance of the scene environement (cd/m²).\n1) Calculated from the Exif data:\nShutter speed - ISO speed - F number - camera exposure correction.\n2) Calculated from the raw white point and RT's Exposure Compensation slider. @@ -1665,6 +1668,7 @@ TP_WBALANCE_TEMPERATURE;Temperatur !TP_RAWCACORR_AUTO;Auto-correction !TP_RAWCACORR_CABLUE;Blue !TP_RAWCACORR_CARED;Red +!TP_RAWCACORR_CASTR;Strength !TP_RAWEXPOS_BLACKS;Black Levels !TP_RAWEXPOS_BLACK_0;Green 1 (lead) !TP_RAWEXPOS_BLACK_1;Red @@ -1735,7 +1739,6 @@ TP_WBALANCE_TEMPERATURE;Temperatur !TP_RETINEX_LABSPACE;L*a*b* !TP_RETINEX_LOW;Low !TP_RETINEX_MAP;Mask method -!TP_RETINEX_MAP_CURV;Curve only !TP_RETINEX_MAP_GAUS;Gaussian mask !TP_RETINEX_MAP_MAPP;Sharp mask (wavelet partial) !TP_RETINEX_MAP_MAPT;Sharp mask (wavelet total) diff --git a/rtdata/languages/Polish b/rtdata/languages/Polish index 0ffd7677f..2f6d07a15 100644 --- a/rtdata/languages/Polish +++ b/rtdata/languages/Polish @@ -158,7 +158,6 @@ FILEBROWSER_RANK3_TOOLTIP;Oceń 3 *\nSkrót: Shift-3 FILEBROWSER_RANK4_TOOLTIP;Oceń 4 *\nSkrót: Shift-4 FILEBROWSER_RANK5_TOOLTIP;Oceń 5 *\nSkrót: Shift-5 FILEBROWSER_RENAMEDLGLABEL;Zmień nazwę pliku -FILEBROWSER_RENAMEDLGMSG;Zmień nazwę pliku "%1" na: FILEBROWSER_SELECTDARKFRAME;Wybierz czarną klatkę... FILEBROWSER_SELECTFLATFIELD;Wybierz puste pole... FILEBROWSER_SHOWCOLORLABEL1HINT;Pokazuje zdjęcia z czerwoną etykietą.\nSkrót: Alt-1 @@ -1664,12 +1663,12 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrót: - !HISTORY_MSG_437;Retinex - M - Method !HISTORY_MSG_438;Retinex - M - Equalizer !HISTORY_MSG_439;Retinex - Preview +!HISTORY_MSG_440;CbDL - Method !MAIN_BUTTON_SENDTOEDITOR;Edit image in external editor !MAIN_TAB_INSPECT; Inspect !MAIN_TAB_WAVELET;Wavelet !MAIN_TAB_WAVELET_TOOLTIP;Shortcut: Alt-w !MONITOR_PROFILE_SYSTEM;System default -!MONITOR_SOFTPROOF;Soft-proof !PARTIALPASTE_EQUALIZER;Wavelet levels !PARTIALPASTE_PRSHARPENING;Post-resize sharpening !PARTIALPASTE_RETINEX;Retinex @@ -1737,6 +1736,10 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrót: - !PREFERENCES_WLTWO;Two levels !PREFERENCES_WLZER;No !SAVEDLG_SUBSAMP_TOOLTIP;Best compression:\nJ:a:b 4:2:0\nh/v 2/2\nChroma halved horizontally and vertically.\n\nBalanced:\nJ:a:b 4:2:2\nh/v 2/1\nChroma halved horizontally.\n\nBest quality:\nJ:a:b 4:4:4\nh/v 1/1\nNo chroma subsampling. +!TP_CBDL_AFT;After Black-and-White +!TP_CBDL_BEF;Before Black-and-White +!TP_CBDL_METHOD;Process located +!TP_CBDL_METHOD_TOOLTIP;Choose whether the Contrast by Detail Levels tool is to be positioned after the Black-and-White tool, which makes it work in L*a*b* space, or before it, which makes it work in RGB space. !TP_CROP_GTHARMMEANS;Harmonic Means !TP_CROP_GTTRIANGLE1;Golden Triangles 1 !TP_CROP_GTTRIANGLE2;Golden Triangles 2 @@ -1786,6 +1789,7 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrót: - !TP_NEUTRAL;Reset !TP_PRSHARPENING_LABEL;Post-Resize Sharpening !TP_PRSHARPENING_TOOLTIP;Sharpens the image after resizing. Only works when the "Lanczos" resizing method is used. It is impossible to preview the effects of this tool. See RawPedia for usage instructions. +!TP_RAWCACORR_CASTR;Strength !TP_RAW_HD;Threshold !TP_RAW_HD_TOOLTIP;Lower values make hot/dead pixel detection more aggressive, but false positives may lead to artifacts. If you notice any artifacts appearing when enabling the Hot/Dead Pixel Filters, gradually increase the threshold value until they disappear. !TP_RETINEX_CONTEDIT_HSL;Histogram equalizer HSL @@ -1825,7 +1829,6 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrót: - !TP_RETINEX_LABSPACE;L*a*b* !TP_RETINEX_LOW;Low !TP_RETINEX_MAP;Mask method -!TP_RETINEX_MAP_CURV;Curve only !TP_RETINEX_MAP_GAUS;Gaussian mask !TP_RETINEX_MAP_MAPP;Sharp mask (wavelet partial) !TP_RETINEX_MAP_MAPT;Sharp mask (wavelet total) diff --git a/rtdata/languages/Polish (Latin Characters) b/rtdata/languages/Polish (Latin Characters) index 218fdcbc6..d3ae63c44 100644 --- a/rtdata/languages/Polish (Latin Characters) +++ b/rtdata/languages/Polish (Latin Characters) @@ -158,7 +158,6 @@ FILEBROWSER_RANK3_TOOLTIP;Ocen 3 *\nSkrot: Shift-3 FILEBROWSER_RANK4_TOOLTIP;Ocen 4 *\nSkrot: Shift-4 FILEBROWSER_RANK5_TOOLTIP;Ocen 5 *\nSkrot: Shift-5 FILEBROWSER_RENAMEDLGLABEL;Zmien nazwe pliku -FILEBROWSER_RENAMEDLGMSG;Zmien nazwe pliku "%1" na: FILEBROWSER_SELECTDARKFRAME;Wybierz czarna klatke... FILEBROWSER_SELECTFLATFIELD;Wybierz puste pole... FILEBROWSER_SHOWCOLORLABEL1HINT;Pokazuje zdjecia z czerwona etykieta.\nSkrot: Alt-1 @@ -1664,12 +1663,12 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrot: - !HISTORY_MSG_437;Retinex - M - Method !HISTORY_MSG_438;Retinex - M - Equalizer !HISTORY_MSG_439;Retinex - Preview +!HISTORY_MSG_440;CbDL - Method !MAIN_BUTTON_SENDTOEDITOR;Edit image in external editor !MAIN_TAB_INSPECT; Inspect !MAIN_TAB_WAVELET;Wavelet !MAIN_TAB_WAVELET_TOOLTIP;Shortcut: Alt-w !MONITOR_PROFILE_SYSTEM;System default -!MONITOR_SOFTPROOF;Soft-proof !PARTIALPASTE_EQUALIZER;Wavelet levels !PARTIALPASTE_PRSHARPENING;Post-resize sharpening !PARTIALPASTE_RETINEX;Retinex @@ -1737,6 +1736,10 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrot: - !PREFERENCES_WLTWO;Two levels !PREFERENCES_WLZER;No !SAVEDLG_SUBSAMP_TOOLTIP;Best compression:\nJ:a:b 4:2:0\nh/v 2/2\nChroma halved horizontally and vertically.\n\nBalanced:\nJ:a:b 4:2:2\nh/v 2/1\nChroma halved horizontally.\n\nBest quality:\nJ:a:b 4:4:4\nh/v 1/1\nNo chroma subsampling. +!TP_CBDL_AFT;After Black-and-White +!TP_CBDL_BEF;Before Black-and-White +!TP_CBDL_METHOD;Process located +!TP_CBDL_METHOD_TOOLTIP;Choose whether the Contrast by Detail Levels tool is to be positioned after the Black-and-White tool, which makes it work in L*a*b* space, or before it, which makes it work in RGB space. !TP_CROP_GTHARMMEANS;Harmonic Means !TP_CROP_GTTRIANGLE1;Golden Triangles 1 !TP_CROP_GTTRIANGLE2;Golden Triangles 2 @@ -1786,6 +1789,7 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrot: - !TP_NEUTRAL;Reset !TP_PRSHARPENING_LABEL;Post-Resize Sharpening !TP_PRSHARPENING_TOOLTIP;Sharpens the image after resizing. Only works when the "Lanczos" resizing method is used. It is impossible to preview the effects of this tool. See RawPedia for usage instructions. +!TP_RAWCACORR_CASTR;Strength !TP_RAW_HD;Threshold !TP_RAW_HD_TOOLTIP;Lower values make hot/dead pixel detection more aggressive, but false positives may lead to artifacts. If you notice any artifacts appearing when enabling the Hot/Dead Pixel Filters, gradually increase the threshold value until they disappear. !TP_RETINEX_CONTEDIT_HSL;Histogram equalizer HSL @@ -1825,7 +1829,6 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrot: - !TP_RETINEX_LABSPACE;L*a*b* !TP_RETINEX_LOW;Low !TP_RETINEX_MAP;Mask method -!TP_RETINEX_MAP_CURV;Curve only !TP_RETINEX_MAP_GAUS;Gaussian mask !TP_RETINEX_MAP_MAPP;Sharp mask (wavelet partial) !TP_RETINEX_MAP_MAPT;Sharp mask (wavelet total) diff --git a/rtdata/languages/Portugues (Brasil) b/rtdata/languages/Portugues (Brasil) index 8601bb99f..fe24bbe36 100644 --- a/rtdata/languages/Portugues (Brasil) +++ b/rtdata/languages/Portugues (Brasil) @@ -50,7 +50,6 @@ FILEBROWSER_POPUPTRASH;Mover para a lixeira FILEBROWSER_POPUPUNRANK;Desclassificar FILEBROWSER_POPUPUNTRASH;Remover da lixeira FILEBROWSER_RENAMEDLGLABEL;Renomear arquivo -FILEBROWSER_RENAMEDLGMSG;Renomear arquivo "%1" como: FILEBROWSER_SHOWDIRHINT;Exibir todas as imagens do diretório FILEBROWSER_SHOWRANK1HINT;Exibir imagens classificadas como 1 estrela FILEBROWSER_SHOWRANK2HINT;Exibir imagens classificadas como 2 estrelas @@ -952,6 +951,7 @@ TP_WBALANCE_TEMPERATURE;Temperatura !HISTORY_MSG_437;Retinex - M - Method !HISTORY_MSG_438;Retinex - M - Equalizer !HISTORY_MSG_439;Retinex - Preview +!HISTORY_MSG_440;CbDL - Method !HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: Alt-s !MAIN_BUTTON_FULLSCREEN;Fullscreen !MAIN_BUTTON_NAVNEXT_TOOLTIP;Navigate to the next image relative to image opened in the Editor.\nShortcut: Shift-F4\n\nTo navigate to the next image relative to the currently selected thumbnail in the File Browser or Filmstrip:\nShortcut: F4 @@ -999,7 +999,6 @@ TP_WBALANCE_TEMPERATURE;Temperatura !MAIN_TOOLTIP_THRESHOLD;Threshold !MAIN_TOOLTIP_TOGGLE;Toggle the Before/After view.\nShortcut: Shift-b !MONITOR_PROFILE_SYSTEM;System default -!MONITOR_SOFTPROOF;Soft-proof !NAVIGATOR_B;B: !NAVIGATOR_G;G: !NAVIGATOR_H;H: @@ -1304,6 +1303,10 @@ TP_WBALANCE_TEMPERATURE;Temperatura !TP_BWMIX_TCMODE_STANDARD;B&W Standard !TP_BWMIX_TCMODE_WEIGHTEDSTD;B&W Weighted Standard !TP_BWMIX_VAL;L +!TP_CBDL_AFT;After Black-and-White +!TP_CBDL_BEF;Before Black-and-White +!TP_CBDL_METHOD;Process located +!TP_CBDL_METHOD_TOOLTIP;Choose whether the Contrast by Detail Levels tool is to be positioned after the Black-and-White tool, which makes it work in L*a*b* space, or before it, which makes it work in RGB space. !TP_CHROMATABERR_LABEL;Chromatic Aberration !TP_COLORAPP_ADAPTSCENE;Scene luminosity !TP_COLORAPP_ADAPTSCENE_TOOLTIP;Absolute luminance of the scene environement (cd/m²).\n1) Calculated from the Exif data:\nShutter speed - ISO speed - F number - camera exposure correction.\n2) Calculated from the raw white point and RT's Exposure Compensation slider. @@ -1666,6 +1669,7 @@ TP_WBALANCE_TEMPERATURE;Temperatura !TP_RAWCACORR_AUTO;Auto-correction !TP_RAWCACORR_CABLUE;Blue !TP_RAWCACORR_CARED;Red +!TP_RAWCACORR_CASTR;Strength !TP_RAWEXPOS_BLACKS;Black Levels !TP_RAWEXPOS_BLACK_0;Green 1 (lead) !TP_RAWEXPOS_BLACK_1;Red @@ -1736,7 +1740,6 @@ TP_WBALANCE_TEMPERATURE;Temperatura !TP_RETINEX_LABSPACE;L*a*b* !TP_RETINEX_LOW;Low !TP_RETINEX_MAP;Mask method -!TP_RETINEX_MAP_CURV;Curve only !TP_RETINEX_MAP_GAUS;Gaussian mask !TP_RETINEX_MAP_MAPP;Sharp mask (wavelet partial) !TP_RETINEX_MAP_MAPT;Sharp mask (wavelet total) diff --git a/rtdata/languages/Russian b/rtdata/languages/Russian index db7c5525a..4e28df010 100644 --- a/rtdata/languages/Russian +++ b/rtdata/languages/Russian @@ -153,7 +153,6 @@ FILEBROWSER_RANK3_TOOLTIP;Рейтинг 3 *\nГорячая клавиша: FILEBROWSER_RANK4_TOOLTIP;Рейтинг 4 *\nГорячая клавиша: Shift-4 FILEBROWSER_RANK5_TOOLTIP;Рейтинг 5 *\nГорячая клавиша: Shift-5 FILEBROWSER_RENAMEDLGLABEL;Переименовать файл -FILEBROWSER_RENAMEDLGMSG;Переименовать файл "%1" в: FILEBROWSER_SELECTDARKFRAME;Выбрать темновой кадр... FILEBROWSER_SELECTFLATFIELD;Выбрать плоское поле... FILEBROWSER_SHOWCOLORLABEL1HINT;Показать изображения, отмеченные Красным.\nГорячая клавиша: Alt-1 @@ -1515,13 +1514,13 @@ ZOOMPANEL_ZOOMOUT;Удалить - !HISTORY_MSG_437;Retinex - M - Method !HISTORY_MSG_438;Retinex - M - Equalizer !HISTORY_MSG_439;Retinex - Preview +!HISTORY_MSG_440;CbDL - Method !MAIN_BUTTON_SENDTOEDITOR;Edit image in external editor !MAIN_TAB_INSPECT; Inspect !MAIN_TAB_WAVELET;Wavelet !MAIN_TAB_WAVELET_TOOLTIP;Shortcut: Alt-w !MAIN_TOOLTIP_HIDEHP;Show/Hide the left panel (including the history).\nShortcut: l !MONITOR_PROFILE_SYSTEM;System default -!MONITOR_SOFTPROOF;Soft-proof !NAVIGATOR_B;B: !NAVIGATOR_G;G: !NAVIGATOR_H;H: @@ -1613,6 +1612,10 @@ ZOOMPANEL_ZOOMOUT;Удалить - !TP_BWMIX_SET_RGBREL;Relative RGB !TP_BWMIX_SET_ROYGCBPMABS;Absolute ROYGCBPM !TP_BWMIX_SET_ROYGCBPMREL;Relative ROYGCBPM +!TP_CBDL_AFT;After Black-and-White +!TP_CBDL_BEF;Before Black-and-White +!TP_CBDL_METHOD;Process located +!TP_CBDL_METHOD_TOOLTIP;Choose whether the Contrast by Detail Levels tool is to be positioned after the Black-and-White tool, which makes it work in L*a*b* space, or before it, which makes it work in RGB space. !TP_COLORAPP_DATACIE_TOOLTIP;When enabled, histograms in CIECAM02 curves show approximate values/ranges for J or Q, and C, s or M after the CIECAM02 adjustments.\nThis selection does not impact the main histogram panel.\n\nWhen disabled, histograms in CIECAM02 curves show L*a*b* values before CIECAM02 adjustments. !TP_COLORAPP_DEGREE_AUTO_TOOLTIP;If the check-box is checked (recommended), RawTherapee calculates an optimum value, which is then used by CAT02, and also for the entire CIECAM02.\nTo set the value manually, uncheck the check-box first (values above 65 are recommended). !TP_COLORAPP_DEGREE_TOOLTIP;Amount of CIE Chromatic Adaptation Transform 2002. @@ -1771,6 +1774,7 @@ ZOOMPANEL_ZOOMOUT;Удалить - !TP_PREPROCESS_HOTPIXFILT_TOOLTIP;Tries to suppress hot pixels. !TP_PRSHARPENING_LABEL;Post-Resize Sharpening !TP_PRSHARPENING_TOOLTIP;Sharpens the image after resizing. Only works when the "Lanczos" resizing method is used. It is impossible to preview the effects of this tool. See RawPedia for usage instructions. +!TP_RAWCACORR_CASTR;Strength !TP_RAWEXPOS_BLACK_0;Green 1 (lead) !TP_RAWEXPOS_BLACK_1;Red !TP_RAWEXPOS_BLACK_2;Blue @@ -1821,7 +1825,6 @@ ZOOMPANEL_ZOOMOUT;Удалить - !TP_RETINEX_LABSPACE;L*a*b* !TP_RETINEX_LOW;Low !TP_RETINEX_MAP;Mask method -!TP_RETINEX_MAP_CURV;Curve only !TP_RETINEX_MAP_GAUS;Gaussian mask !TP_RETINEX_MAP_MAPP;Sharp mask (wavelet partial) !TP_RETINEX_MAP_MAPT;Sharp mask (wavelet total) diff --git a/rtdata/languages/Serbian (Cyrilic Characters) b/rtdata/languages/Serbian (Cyrilic Characters) index e6f284a45..9ba954680 100644 --- a/rtdata/languages/Serbian (Cyrilic Characters) +++ b/rtdata/languages/Serbian (Cyrilic Characters) @@ -98,7 +98,6 @@ FILEBROWSER_QUERYBUTTONHINT;Очисти поље за претрагу FILEBROWSER_QUERYHINT;Унесите део имена датотеке за претрагу nCtrl-f поставља фокус (у Разгледачу датотека);nEnter претражује FILEBROWSER_QUERYLABEL; Тражи: FILEBROWSER_RENAMEDLGLABEL;Преименуј датотеку -FILEBROWSER_RENAMEDLGMSG;Преименуј датотеку „%1“ у: FILEBROWSER_SELECTDARKFRAME;Изабери тамни кадар... FILEBROWSER_SELECTFLATFIELD;Изабери равно поље... FILEBROWSER_SHOWCOLORLABEL1HINT;Приказује слике означене црвеном Alt-1 @@ -1156,6 +1155,7 @@ ZOOMPANEL_ZOOMOUT;Умањује приказ слике - !HISTORY_MSG_437;Retinex - M - Method !HISTORY_MSG_438;Retinex - M - Equalizer !HISTORY_MSG_439;Retinex - Preview +!HISTORY_MSG_440;CbDL - Method !HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: Alt-s !MAIN_BUTTON_NAVNEXT_TOOLTIP;Navigate to the next image relative to image opened in the Editor.\nShortcut: Shift-F4\n\nTo navigate to the next image relative to the currently selected thumbnail in the File Browser or Filmstrip:\nShortcut: F4 !MAIN_BUTTON_NAVPREV_TOOLTIP;Navigate to the previous image relative to image opened in the Editor.\nShortcut: Shift-F3\n\nTo navigate to the previous image relative to the currently selected thumbnail in the File Browser or Filmstrip:\nShortcut: F3 @@ -1180,7 +1180,6 @@ ZOOMPANEL_ZOOMOUT;Умањује приказ слике - !MAIN_TOOLTIP_PREVIEWR;Preview the Red channel.\nShortcut: r !MAIN_TOOLTIP_THRESHOLD;Threshold !MONITOR_PROFILE_SYSTEM;System default -!MONITOR_SOFTPROOF;Soft-proof !NAVIGATOR_B;B: !NAVIGATOR_G;G: !NAVIGATOR_H;H: @@ -1400,6 +1399,10 @@ ZOOMPANEL_ZOOMOUT;Умањује приказ слике - !TP_BWMIX_TCMODE_STANDARD;B&W Standard !TP_BWMIX_TCMODE_WEIGHTEDSTD;B&W Weighted Standard !TP_BWMIX_VAL;L +!TP_CBDL_AFT;After Black-and-White +!TP_CBDL_BEF;Before Black-and-White +!TP_CBDL_METHOD;Process located +!TP_CBDL_METHOD_TOOLTIP;Choose whether the Contrast by Detail Levels tool is to be positioned after the Black-and-White tool, which makes it work in L*a*b* space, or before it, which makes it work in RGB space. !TP_COLORAPP_ADAPTSCENE;Scene luminosity !TP_COLORAPP_ADAPTSCENE_TOOLTIP;Absolute luminance of the scene environement (cd/m²).\n1) Calculated from the Exif data:\nShutter speed - ISO speed - F number - camera exposure correction.\n2) Calculated from the raw white point and RT's Exposure Compensation slider. !TP_COLORAPP_ADAPTVIEWING;Viewing luminosity (cd/m²) @@ -1700,6 +1703,7 @@ ZOOMPANEL_ZOOMOUT;Умањује приказ слике - !TP_PREPROCESS_HOTPIXFILT_TOOLTIP;Tries to suppress hot pixels. !TP_PRSHARPENING_LABEL;Post-Resize Sharpening !TP_PRSHARPENING_TOOLTIP;Sharpens the image after resizing. Only works when the "Lanczos" resizing method is used. It is impossible to preview the effects of this tool. See RawPedia for usage instructions. +!TP_RAWCACORR_CASTR;Strength !TP_RAWEXPOS_BLACK_0;Green 1 (lead) !TP_RAWEXPOS_BLACK_1;Red !TP_RAWEXPOS_BLACK_2;Blue @@ -1755,7 +1759,6 @@ ZOOMPANEL_ZOOMOUT;Умањује приказ слике - !TP_RETINEX_LABSPACE;L*a*b* !TP_RETINEX_LOW;Low !TP_RETINEX_MAP;Mask method -!TP_RETINEX_MAP_CURV;Curve only !TP_RETINEX_MAP_GAUS;Gaussian mask !TP_RETINEX_MAP_MAPP;Sharp mask (wavelet partial) !TP_RETINEX_MAP_MAPT;Sharp mask (wavelet total) diff --git a/rtdata/languages/Serbian (Latin Characters) b/rtdata/languages/Serbian (Latin Characters) index cb77dee04..d9c69faf7 100644 --- a/rtdata/languages/Serbian (Latin Characters) +++ b/rtdata/languages/Serbian (Latin Characters) @@ -98,7 +98,6 @@ FILEBROWSER_QUERYBUTTONHINT;Očisti polje za pretragu FILEBROWSER_QUERYHINT;Unesite deo imena datoteke za pretragu nCtrl-f postavlja fokus (u Razgledaču datoteka);nEnter pretražuje FILEBROWSER_QUERYLABEL; Traži: FILEBROWSER_RENAMEDLGLABEL;Preimenuj datoteku -FILEBROWSER_RENAMEDLGMSG;Preimenuj datoteku „%1“ u: FILEBROWSER_SELECTDARKFRAME;Izaberi tamni kadar... FILEBROWSER_SELECTFLATFIELD;Izaberi ravno polje... FILEBROWSER_SHOWCOLORLABEL1HINT;Prikazuje slike označene crvenom Alt-1 @@ -1156,6 +1155,7 @@ ZOOMPANEL_ZOOMOUT;Umanjuje prikaz slike - !HISTORY_MSG_437;Retinex - M - Method !HISTORY_MSG_438;Retinex - M - Equalizer !HISTORY_MSG_439;Retinex - Preview +!HISTORY_MSG_440;CbDL - Method !HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: Alt-s !MAIN_BUTTON_NAVNEXT_TOOLTIP;Navigate to the next image relative to image opened in the Editor.\nShortcut: Shift-F4\n\nTo navigate to the next image relative to the currently selected thumbnail in the File Browser or Filmstrip:\nShortcut: F4 !MAIN_BUTTON_NAVPREV_TOOLTIP;Navigate to the previous image relative to image opened in the Editor.\nShortcut: Shift-F3\n\nTo navigate to the previous image relative to the currently selected thumbnail in the File Browser or Filmstrip:\nShortcut: F3 @@ -1180,7 +1180,6 @@ ZOOMPANEL_ZOOMOUT;Umanjuje prikaz slike - !MAIN_TOOLTIP_PREVIEWR;Preview the Red channel.\nShortcut: r !MAIN_TOOLTIP_THRESHOLD;Threshold !MONITOR_PROFILE_SYSTEM;System default -!MONITOR_SOFTPROOF;Soft-proof !NAVIGATOR_B;B: !NAVIGATOR_G;G: !NAVIGATOR_H;H: @@ -1400,6 +1399,10 @@ ZOOMPANEL_ZOOMOUT;Umanjuje prikaz slike - !TP_BWMIX_TCMODE_STANDARD;B&W Standard !TP_BWMIX_TCMODE_WEIGHTEDSTD;B&W Weighted Standard !TP_BWMIX_VAL;L +!TP_CBDL_AFT;After Black-and-White +!TP_CBDL_BEF;Before Black-and-White +!TP_CBDL_METHOD;Process located +!TP_CBDL_METHOD_TOOLTIP;Choose whether the Contrast by Detail Levels tool is to be positioned after the Black-and-White tool, which makes it work in L*a*b* space, or before it, which makes it work in RGB space. !TP_COLORAPP_ADAPTSCENE;Scene luminosity !TP_COLORAPP_ADAPTSCENE_TOOLTIP;Absolute luminance of the scene environement (cd/m²).\n1) Calculated from the Exif data:\nShutter speed - ISO speed - F number - camera exposure correction.\n2) Calculated from the raw white point and RT's Exposure Compensation slider. !TP_COLORAPP_ADAPTVIEWING;Viewing luminosity (cd/m²) @@ -1700,6 +1703,7 @@ ZOOMPANEL_ZOOMOUT;Umanjuje prikaz slike - !TP_PREPROCESS_HOTPIXFILT_TOOLTIP;Tries to suppress hot pixels. !TP_PRSHARPENING_LABEL;Post-Resize Sharpening !TP_PRSHARPENING_TOOLTIP;Sharpens the image after resizing. Only works when the "Lanczos" resizing method is used. It is impossible to preview the effects of this tool. See RawPedia for usage instructions. +!TP_RAWCACORR_CASTR;Strength !TP_RAWEXPOS_BLACK_0;Green 1 (lead) !TP_RAWEXPOS_BLACK_1;Red !TP_RAWEXPOS_BLACK_2;Blue @@ -1755,7 +1759,6 @@ ZOOMPANEL_ZOOMOUT;Umanjuje prikaz slike - !TP_RETINEX_LABSPACE;L*a*b* !TP_RETINEX_LOW;Low !TP_RETINEX_MAP;Mask method -!TP_RETINEX_MAP_CURV;Curve only !TP_RETINEX_MAP_GAUS;Gaussian mask !TP_RETINEX_MAP_MAPP;Sharp mask (wavelet partial) !TP_RETINEX_MAP_MAPT;Sharp mask (wavelet total) diff --git a/rtdata/languages/Slovak b/rtdata/languages/Slovak index cec90d5dd..c191dcb45 100644 --- a/rtdata/languages/Slovak +++ b/rtdata/languages/Slovak @@ -66,7 +66,6 @@ FILEBROWSER_POPUPTRASH;Presunúť do koša FILEBROWSER_POPUPUNRANK;Zrušiť triedu FILEBROWSER_POPUPUNTRASH;Odstrániť z koša FILEBROWSER_RENAMEDLGLABEL;Premenovať súbor -FILEBROWSER_RENAMEDLGMSG;Premenovať súbor "%1" na: FILEBROWSER_SHOWDIRHINT;Ukázať všetky obrázky v adresári FILEBROWSER_SHOWEXIFINFO;Ukázať EXIF info i FILEBROWSER_SHOWRANK1HINT;Ukázať obrázky triedy 1 hviezda @@ -1015,6 +1014,7 @@ ZOOMPANEL_ZOOMOUT;Oddialiť - !HISTORY_MSG_437;Retinex - M - Method !HISTORY_MSG_438;Retinex - M - Equalizer !HISTORY_MSG_439;Retinex - Preview +!HISTORY_MSG_440;CbDL - Method !HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: Alt-s !MAIN_BUTTON_NAVNEXT_TOOLTIP;Navigate to the next image relative to image opened in the Editor.\nShortcut: Shift-F4\n\nTo navigate to the next image relative to the currently selected thumbnail in the File Browser or Filmstrip:\nShortcut: F4 !MAIN_BUTTON_NAVPREV_TOOLTIP;Navigate to the previous image relative to image opened in the Editor.\nShortcut: Shift-F3\n\nTo navigate to the previous image relative to the currently selected thumbnail in the File Browser or Filmstrip:\nShortcut: F3 @@ -1055,7 +1055,6 @@ ZOOMPANEL_ZOOMOUT;Oddialiť - !MAIN_TOOLTIP_SHOWHIDETP1;Show/Hide the top panel.\nShortcut: Shift-l !MAIN_TOOLTIP_THRESHOLD;Threshold !MONITOR_PROFILE_SYSTEM;System default -!MONITOR_SOFTPROOF;Soft-proof !NAVIGATOR_B;B: !NAVIGATOR_G;G: !NAVIGATOR_H;H: @@ -1343,6 +1342,10 @@ ZOOMPANEL_ZOOMOUT;Oddialiť - !TP_BWMIX_TCMODE_STANDARD;B&W Standard !TP_BWMIX_TCMODE_WEIGHTEDSTD;B&W Weighted Standard !TP_BWMIX_VAL;L +!TP_CBDL_AFT;After Black-and-White +!TP_CBDL_BEF;Before Black-and-White +!TP_CBDL_METHOD;Process located +!TP_CBDL_METHOD_TOOLTIP;Choose whether the Contrast by Detail Levels tool is to be positioned after the Black-and-White tool, which makes it work in L*a*b* space, or before it, which makes it work in RGB space. !TP_CHROMATABERR_LABEL;Chromatic Aberration !TP_COLORAPP_ADAPTSCENE;Scene luminosity !TP_COLORAPP_ADAPTSCENE_TOOLTIP;Absolute luminance of the scene environement (cd/m²).\n1) Calculated from the Exif data:\nShutter speed - ISO speed - F number - camera exposure correction.\n2) Calculated from the raw white point and RT's Exposure Compensation slider. @@ -1679,6 +1682,7 @@ ZOOMPANEL_ZOOMOUT;Oddialiť - !TP_PRSHARPENING_TOOLTIP;Sharpens the image after resizing. Only works when the "Lanczos" resizing method is used. It is impossible to preview the effects of this tool. See RawPedia for usage instructions. !TP_RAWCACORR_CABLUE;Blue !TP_RAWCACORR_CARED;Red +!TP_RAWCACORR_CASTR;Strength !TP_RAWEXPOS_BLACKS;Black Levels !TP_RAWEXPOS_BLACK_0;Green 1 (lead) !TP_RAWEXPOS_BLACK_1;Red @@ -1744,7 +1748,6 @@ ZOOMPANEL_ZOOMOUT;Oddialiť - !TP_RETINEX_LABSPACE;L*a*b* !TP_RETINEX_LOW;Low !TP_RETINEX_MAP;Mask method -!TP_RETINEX_MAP_CURV;Curve only !TP_RETINEX_MAP_GAUS;Gaussian mask !TP_RETINEX_MAP_MAPP;Sharp mask (wavelet partial) !TP_RETINEX_MAP_MAPT;Sharp mask (wavelet total) diff --git a/rtdata/languages/Suomi b/rtdata/languages/Suomi index b58cd4b14..2220f6602 100644 --- a/rtdata/languages/Suomi +++ b/rtdata/languages/Suomi @@ -50,7 +50,6 @@ FILEBROWSER_POPUPTRASH;Siirrä roskakoriin FILEBROWSER_POPUPUNRANK;Poista arvostelu FILEBROWSER_POPUPUNTRASH;Pelasta roskakorista FILEBROWSER_RENAMEDLGLABEL;Nimeä uudelleen -FILEBROWSER_RENAMEDLGMSG;Tiedoston "%1" uusi nimi: FILEBROWSER_SHOWDIRHINT;Näytä hakemiston kaikki kuvat FILEBROWSER_SHOWRANK1HINT;Näytä 1 tähden kuvat FILEBROWSER_SHOWRANK2HINT;Näytä 2 tähden kuvat @@ -953,6 +952,7 @@ TP_WBALANCE_TEMPERATURE;Lämpötila [K] !HISTORY_MSG_437;Retinex - M - Method !HISTORY_MSG_438;Retinex - M - Equalizer !HISTORY_MSG_439;Retinex - Preview +!HISTORY_MSG_440;CbDL - Method !HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: Alt-s !MAIN_BUTTON_FULLSCREEN;Fullscreen !MAIN_BUTTON_NAVNEXT_TOOLTIP;Navigate to the next image relative to image opened in the Editor.\nShortcut: Shift-F4\n\nTo navigate to the next image relative to the currently selected thumbnail in the File Browser or Filmstrip:\nShortcut: F4 @@ -1000,7 +1000,6 @@ TP_WBALANCE_TEMPERATURE;Lämpötila [K] !MAIN_TOOLTIP_THRESHOLD;Threshold !MAIN_TOOLTIP_TOGGLE;Toggle the Before/After view.\nShortcut: Shift-b !MONITOR_PROFILE_SYSTEM;System default -!MONITOR_SOFTPROOF;Soft-proof !NAVIGATOR_B;B: !NAVIGATOR_G;G: !NAVIGATOR_H;H: @@ -1304,6 +1303,10 @@ TP_WBALANCE_TEMPERATURE;Lämpötila [K] !TP_BWMIX_TCMODE_STANDARD;B&W Standard !TP_BWMIX_TCMODE_WEIGHTEDSTD;B&W Weighted Standard !TP_BWMIX_VAL;L +!TP_CBDL_AFT;After Black-and-White +!TP_CBDL_BEF;Before Black-and-White +!TP_CBDL_METHOD;Process located +!TP_CBDL_METHOD_TOOLTIP;Choose whether the Contrast by Detail Levels tool is to be positioned after the Black-and-White tool, which makes it work in L*a*b* space, or before it, which makes it work in RGB space. !TP_CHROMATABERR_LABEL;Chromatic Aberration !TP_COLORAPP_ADAPTSCENE;Scene luminosity !TP_COLORAPP_ADAPTSCENE_TOOLTIP;Absolute luminance of the scene environement (cd/m²).\n1) Calculated from the Exif data:\nShutter speed - ISO speed - F number - camera exposure correction.\n2) Calculated from the raw white point and RT's Exposure Compensation slider. @@ -1666,6 +1669,7 @@ TP_WBALANCE_TEMPERATURE;Lämpötila [K] !TP_RAWCACORR_AUTO;Auto-correction !TP_RAWCACORR_CABLUE;Blue !TP_RAWCACORR_CARED;Red +!TP_RAWCACORR_CASTR;Strength !TP_RAWEXPOS_BLACKS;Black Levels !TP_RAWEXPOS_BLACK_0;Green 1 (lead) !TP_RAWEXPOS_BLACK_1;Red @@ -1736,7 +1740,6 @@ TP_WBALANCE_TEMPERATURE;Lämpötila [K] !TP_RETINEX_LABSPACE;L*a*b* !TP_RETINEX_LOW;Low !TP_RETINEX_MAP;Mask method -!TP_RETINEX_MAP_CURV;Curve only !TP_RETINEX_MAP_GAUS;Gaussian mask !TP_RETINEX_MAP_MAPP;Sharp mask (wavelet partial) !TP_RETINEX_MAP_MAPT;Sharp mask (wavelet total) diff --git a/rtdata/languages/Swedish b/rtdata/languages/Swedish index f2dffa79b..b8dbd8170 100644 --- a/rtdata/languages/Swedish +++ b/rtdata/languages/Swedish @@ -154,7 +154,6 @@ FILEBROWSER_RANK3_TOOLTIP;Betyg 3 *\nKortkommando: Shift-3 FILEBROWSER_RANK4_TOOLTIP;Betyg 4 *\nKortkommando: Shift-4 FILEBROWSER_RANK5_TOOLTIP;Betyg 5 *\nKortkommando: Shift-5 FILEBROWSER_RENAMEDLGLABEL;Byt namn -FILEBROWSER_RENAMEDLGMSG;Byt namn på "%1" till: FILEBROWSER_SELECTDARKFRAME;Välj svartbild... FILEBROWSER_SELECTFLATFIELD;Välj plattfält... FILEBROWSER_SHOWCOLORLABEL1HINT;Visa bilder märkta som röda.\nKortkommando: Alt-1 @@ -1791,9 +1790,9 @@ ZOOMPANEL_ZOOMOUT;Förminska.\nKortkommando: - !HISTORY_MSG_437;Retinex - M - Method !HISTORY_MSG_438;Retinex - M - Equalizer !HISTORY_MSG_439;Retinex - Preview +!HISTORY_MSG_440;CbDL - Method !MAIN_BUTTON_SENDTOEDITOR;Edit image in external editor !MONITOR_PROFILE_SYSTEM;System default -!MONITOR_SOFTPROOF;Soft-proof !PARTIALPASTE_COLORTONING;Color toning !PARTIALPASTE_FLATFIELDCLIPCONTROL;Flat-field clip control !PARTIALPASTE_PRSHARPENING;Post-resize sharpening @@ -1816,6 +1815,10 @@ ZOOMPANEL_ZOOMOUT;Förminska.\nKortkommando: - !PREFERENCES_TUNNELMETADATA;Copy Exif/IPTC/XMP unchanged to output file !SAVEDLG_SUBSAMP;Subsampling !SAVEDLG_SUBSAMP_TOOLTIP;Best compression:\nJ:a:b 4:2:0\nh/v 2/2\nChroma halved horizontally and vertically.\n\nBalanced:\nJ:a:b 4:2:2\nh/v 2/1\nChroma halved horizontally.\n\nBest quality:\nJ:a:b 4:4:4\nh/v 1/1\nNo chroma subsampling. +!TP_CBDL_AFT;After Black-and-White +!TP_CBDL_BEF;Before Black-and-White +!TP_CBDL_METHOD;Process located +!TP_CBDL_METHOD_TOOLTIP;Choose whether the Contrast by Detail Levels tool is to be positioned after the Black-and-White tool, which makes it work in L*a*b* space, or before it, which makes it work in RGB space. !TP_COLORAPP_LABEL;CIE Color Appearance Model 2002 !TP_COLORTONING_CURVEEDITOR_CL_TOOLTIP;Chroma opacity as a function of luminance oC=f(L) !TP_COLORTONING_LAB;L*a*b* blending @@ -1866,6 +1869,7 @@ ZOOMPANEL_ZOOMOUT;Förminska.\nKortkommando: - !TP_ICM_PROFILEINTENT;Rendering Intent !TP_NEUTRAL;Reset !TP_PRSHARPENING_LABEL;Post-Resize Sharpening +!TP_RAWCACORR_CASTR;Strength !TP_RAW_HD_TOOLTIP;Lower values make hot/dead pixel detection more aggressive, but false positives may lead to artifacts. If you notice any artifacts appearing when enabling the Hot/Dead Pixel Filters, gradually increase the threshold value until they disappear. !TP_RAW_SENSOR_XTRANS_DMETHOD_TOOLTIP;3-pass gives best results (recommended for low ISO images).\n1-pass is almost undistinguishable from 3-pass for high ISO images and is faster. !TP_RAW_SENSOR_XTRANS_LABEL;Sensor with X-Trans Matrix @@ -1906,7 +1910,6 @@ ZOOMPANEL_ZOOMOUT;Förminska.\nKortkommando: - !TP_RETINEX_LABSPACE;L*a*b* !TP_RETINEX_LOW;Low !TP_RETINEX_MAP;Mask method -!TP_RETINEX_MAP_CURV;Curve only !TP_RETINEX_MAP_GAUS;Gaussian mask !TP_RETINEX_MAP_MAPP;Sharp mask (wavelet partial) !TP_RETINEX_MAP_MAPT;Sharp mask (wavelet total) diff --git a/rtdata/languages/Turkish b/rtdata/languages/Turkish index 536fcbd33..dacd2c429 100644 --- a/rtdata/languages/Turkish +++ b/rtdata/languages/Turkish @@ -50,7 +50,6 @@ FILEBROWSER_POPUPTRASH;Move to trash FILEBROWSER_POPUPUNRANK;Unrank FILEBROWSER_POPUPUNTRASH;Remove from trash FILEBROWSER_RENAMEDLGLABEL;Rename file -FILEBROWSER_RENAMEDLGMSG;Rename file "%1" to: FILEBROWSER_SHOWDIRHINT;Show all images of the directory FILEBROWSER_SHOWRANK1HINT;Show images ranked as 1 star FILEBROWSER_SHOWRANK2HINT;Show images ranked as 2 star @@ -952,6 +951,7 @@ TP_WBALANCE_TEMPERATURE;Isı !HISTORY_MSG_437;Retinex - M - Method !HISTORY_MSG_438;Retinex - M - Equalizer !HISTORY_MSG_439;Retinex - Preview +!HISTORY_MSG_440;CbDL - Method !HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: Alt-s !MAIN_BUTTON_FULLSCREEN;Fullscreen !MAIN_BUTTON_NAVNEXT_TOOLTIP;Navigate to the next image relative to image opened in the Editor.\nShortcut: Shift-F4\n\nTo navigate to the next image relative to the currently selected thumbnail in the File Browser or Filmstrip:\nShortcut: F4 @@ -999,7 +999,6 @@ TP_WBALANCE_TEMPERATURE;Isı !MAIN_TOOLTIP_THRESHOLD;Threshold !MAIN_TOOLTIP_TOGGLE;Toggle the Before/After view.\nShortcut: Shift-b !MONITOR_PROFILE_SYSTEM;System default -!MONITOR_SOFTPROOF;Soft-proof !NAVIGATOR_B;B: !NAVIGATOR_G;G: !NAVIGATOR_H;H: @@ -1303,6 +1302,10 @@ TP_WBALANCE_TEMPERATURE;Isı !TP_BWMIX_TCMODE_STANDARD;B&W Standard !TP_BWMIX_TCMODE_WEIGHTEDSTD;B&W Weighted Standard !TP_BWMIX_VAL;L +!TP_CBDL_AFT;After Black-and-White +!TP_CBDL_BEF;Before Black-and-White +!TP_CBDL_METHOD;Process located +!TP_CBDL_METHOD_TOOLTIP;Choose whether the Contrast by Detail Levels tool is to be positioned after the Black-and-White tool, which makes it work in L*a*b* space, or before it, which makes it work in RGB space. !TP_CHROMATABERR_LABEL;Chromatic Aberration !TP_COLORAPP_ADAPTSCENE;Scene luminosity !TP_COLORAPP_ADAPTSCENE_TOOLTIP;Absolute luminance of the scene environement (cd/m²).\n1) Calculated from the Exif data:\nShutter speed - ISO speed - F number - camera exposure correction.\n2) Calculated from the raw white point and RT's Exposure Compensation slider. @@ -1665,6 +1668,7 @@ TP_WBALANCE_TEMPERATURE;Isı !TP_RAWCACORR_AUTO;Auto-correction !TP_RAWCACORR_CABLUE;Blue !TP_RAWCACORR_CARED;Red +!TP_RAWCACORR_CASTR;Strength !TP_RAWEXPOS_BLACKS;Black Levels !TP_RAWEXPOS_BLACK_0;Green 1 (lead) !TP_RAWEXPOS_BLACK_1;Red @@ -1735,7 +1739,6 @@ TP_WBALANCE_TEMPERATURE;Isı !TP_RETINEX_LABSPACE;L*a*b* !TP_RETINEX_LOW;Low !TP_RETINEX_MAP;Mask method -!TP_RETINEX_MAP_CURV;Curve only !TP_RETINEX_MAP_GAUS;Gaussian mask !TP_RETINEX_MAP_MAPP;Sharp mask (wavelet partial) !TP_RETINEX_MAP_MAPT;Sharp mask (wavelet total) diff --git a/rtdata/languages/default b/rtdata/languages/default index cf1b3b49a..5491a5d54 100644 --- a/rtdata/languages/default +++ b/rtdata/languages/default @@ -158,7 +158,6 @@ FILEBROWSER_RANK3_TOOLTIP;Rank 3 *\nShortcut: Shift-3 FILEBROWSER_RANK4_TOOLTIP;Rank 4 *\nShortcut: Shift-4 FILEBROWSER_RANK5_TOOLTIP;Rank 5 *\nShortcut: Shift-5 FILEBROWSER_RENAMEDLGLABEL;Rename file -FILEBROWSER_RENAMEDLGMSG;Rename file "%1" to: FILEBROWSER_SELECTDARKFRAME;Select dark-frame... FILEBROWSER_SELECTFLATFIELD;Select flat-field... FILEBROWSER_SHOWCOLORLABEL1HINT;Show images labeled Red.\nShortcut: Alt-1 @@ -672,7 +671,7 @@ HISTORY_MSG_436;Retinex - M - Radius HISTORY_MSG_437;Retinex - M - Method HISTORY_MSG_438;Retinex - M - Equalizer HISTORY_MSG_439;Retinex - Preview -HISTORY_MSG_440;CbDL - method +HISTORY_MSG_440;CbDL - Method HISTORY_NEWSNAPSHOT;Add HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: Alt-s HISTORY_SNAPSHOT;Snapshot @@ -791,7 +790,6 @@ MAIN_TOOLTIP_SHOWHIDETP1;Show/Hide the top panel.\nShortcut: Shift-l MAIN_TOOLTIP_THRESHOLD;Threshold MAIN_TOOLTIP_TOGGLE;Toggle the Before/After view.\nShortcut: Shift-b MONITOR_PROFILE_SYSTEM;System default -MONITOR_SOFTPROOF;Soft-proof NAVIGATOR_B;B: NAVIGATOR_G;G: NAVIGATOR_H;H: @@ -1209,10 +1207,10 @@ TP_BWMIX_VAL;L TP_CACORRECTION_BLUE;Blue TP_CACORRECTION_LABEL;Chromatic Aberration Correction TP_CACORRECTION_RED;Red -TP_CBDL_METHOD_TOOLTIP;Choose whether the Contrast by Detail Levels tool is to be positioned after the Black-and-White tool, which makes it work in L*a*b* space, or before it, which makes it work in RGB space. TP_CBDL_AFT;After Black-and-White TP_CBDL_BEF;Before Black-and-White TP_CBDL_METHOD;Process located +TP_CBDL_METHOD_TOOLTIP;Choose whether the Contrast by Detail Levels tool is to be positioned after the Black-and-White tool, which makes it work in L*a*b* space, or before it, which makes it work in RGB space. TP_CHMIXER_BLUE;Blue channel TP_CHMIXER_GREEN;Green channel TP_CHMIXER_LABEL;Channel Mixer @@ -1618,9 +1616,9 @@ TP_PREPROCESS_NO_FOUND;None found TP_PRSHARPENING_LABEL;Post-Resize Sharpening TP_PRSHARPENING_TOOLTIP;Sharpens the image after resizing. Only works when the "Lanczos" resizing method is used. It is impossible to preview the effects of this tool. See RawPedia for usage instructions. TP_RAWCACORR_AUTO;Auto-correction -TP_RAWCACORR_CASTR;Strength TP_RAWCACORR_CABLUE;Blue TP_RAWCACORR_CARED;Red +TP_RAWCACORR_CASTR;Strength TP_RAWEXPOS_BLACKS;Black Levels TP_RAWEXPOS_BLACK_0;Green 1 (lead) TP_RAWEXPOS_BLACK_1;Red @@ -1699,7 +1697,6 @@ TP_RETINEX_LABEL_MASK;Mask TP_RETINEX_LABSPACE;L*a*b* TP_RETINEX_LOW;Low TP_RETINEX_MAP;Mask method -TP_RETINEX_MAP_CURV;Curve only TP_RETINEX_MAP_GAUS;Gaussian mask TP_RETINEX_MAP_MAPP;Sharp mask (wavelet partial) TP_RETINEX_MAP_MAPT;Sharp mask (wavelet total) diff --git a/rtgui/cropwindow.cc b/rtgui/cropwindow.cc index e75c1d7a2..9934efb62 100644 --- a/rtgui/cropwindow.cc +++ b/rtgui/cropwindow.cc @@ -66,20 +66,19 @@ ZoomStep zoomSteps[] = { #define ZOOM11INDEX 13 CropWindow::CropWindow (ImageArea* parent, rtengine::StagedImageProcessor* ipc_, bool isLowUpdatePriority_, bool isDetailWindow) - : ObjectMOBuffer(parent), onResizeArea(false), deleted(false), fitZoomEnabled(true), fitZoom(false), isLowUpdatePriority(isLowUpdatePriority_), - cursor_type(CSUndefined), backColor(options.bgcolor), decorated(true), titleHeight(30), - sideBorderWidth(3), lowerBorderWidth(3), upperBorderWidth(1), sepWidth(2), - xpos(30), ypos(30), imgX(-1), imgY(-1), imgW(1), imgH(1), iarea(parent), - cropZoom(0), cropgl(NULL), pmlistener(NULL), observedCropWin(NULL), ipc(ipc_), isFlawnOver(false) + : ObjectMOBuffer(parent), state(SNormal), press_x(0), press_y(0), action_x(0), action_y(0), pickedObject(-1), pickModifierKey(0), rot_deg(0), onResizeArea(false), deleted(false), + fitZoomEnabled(true), fitZoom(false), isLowUpdatePriority(isLowUpdatePriority_), cropLabel(Glib::ustring("100%")), + backColor(options.bgcolor), decorated(true), isFlawnOver(false), titleHeight(30), sideBorderWidth(3), lowerBorderWidth(3), + upperBorderWidth(1), sepWidth(2), xpos(30), ypos(30), width(0), height(0), imgAreaX(0), imgAreaY(0), imgAreaW(0), imgAreaH(0), + imgX(-1), imgY(-1), imgW(1), imgH(1), iarea(parent), cropZoom(0), zoomVersion(0), exposeVersion(0), cropgl(NULL), + pmlistener(NULL), pmhlistener(NULL), observedCropWin(NULL), ipc(ipc_) { Glib::RefPtr context = parent->get_pango_context () ; Pango::FontDescription fontd = context->get_font_description (); fontd.set_weight (Pango::WEIGHT_BOLD); fontd.set_size(8 * Pango::SCALE); context->set_font_description (fontd); - cropLabel = "100%"; Glib::RefPtr cllayout = parent->create_pango_layout("1000%"); - exposeVersion = zoomVersion = 0; int iw, ih; cllayout->get_pixel_size (iw, ih); @@ -111,8 +110,6 @@ CropWindow::CropWindow (ImageArea* parent, rtengine::StagedImageProcessor* ipc_, cropHandler.setDisplayHandler(this); cropHandler.newImage (ipc_, isDetailWindow); - - state = SNormal; } void CropWindow::enable() @@ -272,109 +269,182 @@ void CropWindow::buttonPress (int button, int type, int bstate, int x, int y) { bool needRedraw = true; // most common case ; not redrawing are exceptions + const auto editSubscriber = iarea->getCurrSubscriber(); iarea->grabFocus (this); - if (button == 1 && type == GDK_2BUTTON_PRESS && onArea (CropImage, x, y) && (state == SNormal || state == SCropImgMove)) { - if (fitZoomEnabled) { - if (fitZoom) { - state = SNormal; - zoomVersion = exposeVersion; - screenCoordToImage (x, y, action_x, action_y); - changeZoom (ZOOM11INDEX, true, action_x, action_y); - fitZoom = false; + if (button == 1) { + if (type == GDK_2BUTTON_PRESS && onArea (CropImage, x, y) && (state == SNormal || state == SCropImgMove)) { + if (fitZoomEnabled) { + if (fitZoom) { + state = SNormal; + zoomVersion = exposeVersion; + screenCoordToImage (x, y, action_x, action_y); + changeZoom (ZOOM11INDEX, true, action_x, action_y); + fitZoom = false; + } else { + zoomFit (); + } } else { - zoomFit (); + zoom11 (); } - } else { - zoom11 (); - } - state = SNormal; - } - else if (button == 1 && type == GDK_BUTTON_PRESS && state == SNormal && onArea (CropToolBar, x, y)) { - if (!decorated || !buttonSet.pressNotify (x, y)) { - state = SCropWinMove; - action_x = x; - action_y = y; - press_x = xpos; - press_y = ypos; + state = SNormal; } - } else if (button == 1 && type == GDK_BUTTON_PRESS && state == SNormal && onArea (CropResize, x, y)) { - state = SCropWinResize; - action_x = x; - action_y = y; - press_x = width; - press_y = height; - } else if (type == GDK_BUTTON_PRESS && state == SNormal && onArea (CropImage, x, y)) { - if (button == 1 && onArea (CropTopLeft, x, y)) { - state = SResizeTL; - press_x = x; - action_x = cropHandler.cropParams.x; - press_y = y; - action_y = cropHandler.cropParams.y; - } else if (button == 1 && onArea (CropTopRight, x, y)) { - state = SResizeTR; - press_x = x; - action_x = cropHandler.cropParams.w; - press_y = y; - action_y = cropHandler.cropParams.y; - } else if (button == 1 && onArea (CropBottomLeft, x, y)) { - state = SResizeBL; - press_x = x; - action_x = cropHandler.cropParams.x; - press_y = y; - action_y = cropHandler.cropParams.h; - } else if (button == 1 && onArea (CropBottomRight, x, y)) { - state = SResizeBR; - press_x = x; - action_x = cropHandler.cropParams.w; - press_y = y; - action_y = cropHandler.cropParams.h; - } else if (button == 1 && onArea (CropTop, x, y)) { - state = SResizeH1; - press_y = y; - action_y = cropHandler.cropParams.y; - } else if (button == 1 && onArea (CropBottom, x, y)) { - state = SResizeH2; - press_y = y; - action_y = cropHandler.cropParams.h; - } else if (button == 1 && onArea (CropLeft, x, y)) { - state = SResizeW1; - press_x = x; - action_x = cropHandler.cropParams.x; - } else if (button == 1 && onArea (CropRight, x, y)) { - state = SResizeW2; - press_x = x; - action_x = cropHandler.cropParams.w; - } else if (button == 1 && (bstate & GDK_SHIFT_MASK) && onArea (CropInside, x, y)) { - state = SCropMove; - press_x = x; - press_y = y; - action_x = cropHandler.cropParams.x; - action_y = cropHandler.cropParams.y; - } else if (iarea->getToolMode () == TMHand) { + else if (type == GDK_BUTTON_PRESS && state == SNormal) { + if (onArea (CropToolBar, x, y)) { + if (!decorated || !buttonSet.pressNotify (x, y)) { + state = SCropWinMove; + action_x = x; + action_y = y; + press_x = xpos; + press_y = ypos; + } + } else if (onArea (CropResize, x, y)) { + state = SCropWinResize; + action_x = x; + action_y = y; + press_x = width; + press_y = height; + } else { + if (onArea (CropImage, x, y)) { // events inside of the image domain + if (onArea (CropTopLeft, x, y)) { + state = SResizeTL; + press_x = x; + action_x = cropHandler.cropParams.x; + press_y = y; + action_y = cropHandler.cropParams.y; + } else if (onArea (CropTopRight, x, y)) { + state = SResizeTR; + press_x = x; + action_x = cropHandler.cropParams.w; + press_y = y; + action_y = cropHandler.cropParams.y; + } else if (onArea (CropBottomLeft, x, y)) { + state = SResizeBL; + press_x = x; + action_x = cropHandler.cropParams.x; + press_y = y; + action_y = cropHandler.cropParams.h; + } else if (onArea (CropBottomRight, x, y)) { + state = SResizeBR; + press_x = x; + action_x = cropHandler.cropParams.w; + press_y = y; + action_y = cropHandler.cropParams.h; + } else if (onArea (CropTop, x, y)) { + state = SResizeH1; + press_y = y; + action_y = cropHandler.cropParams.y; + } else if (onArea (CropBottom, x, y)) { + state = SResizeH2; + press_y = y; + action_y = cropHandler.cropParams.h; + } else if (onArea (CropLeft, x, y)) { + state = SResizeW1; + press_x = x; + action_x = cropHandler.cropParams.x; + } else if (onArea (CropRight, x, y)) { + state = SResizeW2; + press_x = x; + action_x = cropHandler.cropParams.w; + } else if ((bstate & GDK_SHIFT_MASK) && onArea (CropInside, x, y)) { + state = SCropMove; + press_x = x; + press_y = y; + action_x = cropHandler.cropParams.x; + action_y = cropHandler.cropParams.y; + } else if (onArea (CropObserved, x, y)) { + state = SObservedMove; + press_x = x; + press_y = y; + action_x = 0; + action_y = 0; + } else if (iarea->getToolMode () == TMStraighten) { + state = SRotateSelecting; + press_x = x; + press_y = y; + action_x = x; + action_y = y; + rot_deg = 0; + } else if (iarea->getToolMode () == TMSpotWB) { + int spotx, spoty; + screenCoordToImage (x, y, spotx, spoty); + iarea->spotWBSelected (spotx, spoty); + } else if (iarea->getToolMode () == TMCropSelect && cropgl) { + state = SCropSelecting; + screenCoordToImage (x, y, press_x, press_y); + cropHandler.cropParams.enabled = true; + cropHandler.cropParams.x = press_x; + cropHandler.cropParams.y = press_y; + cropHandler.cropParams.w = cropHandler.cropParams.h = 1; + cropgl->cropInit (cropHandler.cropParams.x, cropHandler.cropParams.y, cropHandler.cropParams.w, cropHandler.cropParams.h); + } else if (iarea->getToolMode () == TMHand) { + if (editSubscriber) { + needRedraw = editSubscriber->button1Pressed(bstate); + if ((cropgl && cropgl->inImageArea(iarea->posImage.x, iarea->posImage.y) && (editSubscriber->getEditingType() == ET_PIPETTE && (bstate & GDK_CONTROL_MASK))) || editSubscriber->getEditingType() == ET_OBJECTS) { + if (editSubscriber->isDragging()) { + state = SEditDrag1; + } else if (editSubscriber->isPicking()) { + state = SEditPick1; + pickedObject = iarea->object; + pickModifierKey = bstate; + } + press_x = x; + press_y = y; + action_x = 0; + action_y = 0; + } + } + if (state != SEditDrag1) { + state = SCropImgMove; + press_x = x; + press_y = y; + action_x = 0; + action_y = 0; + } + } else { // if(zoomSteps[cropZoom].zoom > cropHandler.getFitZoom()) { // only allow move when image is only partial visible + state = SCropImgMove; + press_x = x; + press_y = y; + action_x = 0; + action_y = 0; + } + + } else if (iarea->getToolMode () == TMHand) { // events outside of the image domain + EditSubscriber *editSubscriber = iarea->getCurrSubscriber(); + + if (editSubscriber && editSubscriber->getEditingType() == ET_OBJECTS) { + needRedraw = editSubscriber->button1Pressed(bstate); + + if (editSubscriber->isDragging()) { + state = SEditDrag1; + } else if (editSubscriber->isPicking()) { + state = SEditPick1; + pickedObject = iarea->object; + pickModifierKey = bstate; + } + + press_x = x; + press_y = y; + action_x = 0; + action_y = 0; + } + } + } + } + } else if (button == 2) { + if (iarea->getToolMode () == TMHand) { EditSubscriber *editSubscriber = iarea->getCurrSubscriber(); - if (editSubscriber && editSubscriber->getEditingType() == ET_OBJECTS) { - if (button == 1) { - needRedraw = editSubscriber->button1Pressed(bstate); + needRedraw = editSubscriber->button2Pressed(bstate); - if (editSubscriber->isDragging()) { - state = SEditDrag1; - } - } else if (button == 2) { - needRedraw = editSubscriber->button2Pressed(bstate); - - if (editSubscriber->isDragging()) { - state = SEditDrag2; - } - } else if (button == 3) { - needRedraw = editSubscriber->button3Pressed(bstate); - - if (editSubscriber->isDragging()) { - state = SEditDrag3; - } + if (editSubscriber->isDragging()) { + state = SEditDrag2; + } else if (editSubscriber->isPicking()) { + state = SEditPick2; + pickedObject = iarea->object; + pickModifierKey = bstate; } press_x = x; @@ -382,100 +452,26 @@ void CropWindow::buttonPress (int button, int type, int bstate, int x, int y) action_x = 0; action_y = 0; } - - if (state != SEditDrag1 && state != SEditDrag2 && state != SEditDrag3) { - if (button == 1 && onArea (CropObserved, x, y)) { - state = SObservedMove; - press_x = x; - press_y = y; - action_x = 0; - action_y = 0; - } else if (button == 1 && editSubscriber && cropgl && cropgl->inImageArea(iarea->posImage.x, iarea->posImage.y) && (editSubscriber->getEditingType() == ET_PIPETTE && (bstate & GDK_CONTROL_MASK)) ) { - editSubscriber->button1Pressed(bstate); - state = SEditDrag1; - press_x = x; - press_y = y; - action_x = 0; - action_y = 0; - } else if (button == 1) { // if(zoomSteps[cropZoom].zoom > cropHandler.getFitZoom()) { // only allow move when image is only partial visible - state = SCropImgMove; - press_x = x; - press_y = y; - action_x = 0; - action_y = 0; - } - } - } else if (button == 1 && onArea (CropObserved, x, y)) { - state = SObservedMove; - press_x = x; - press_y = y; - action_x = 0; - action_y = 0; - } else if (button == 1 && iarea->getToolMode () == TMStraighten) { - state = SRotateSelecting; - press_x = x; - press_y = y; - action_x = x; - action_y = y; - rot_deg = 0; - } else if (button == 1 && iarea->getToolMode () == TMSpotWB) { - int spotx, spoty; - screenCoordToImage (x, y, spotx, spoty); - iarea->spotWBSelected (spotx, spoty); - } else if (button == 1 && iarea->getToolMode () == TMCropSelect && cropgl) { - state = SCropSelecting; - screenCoordToImage (x, y, press_x, press_y); - cropHandler.cropParams.enabled = true; - cropHandler.cropParams.x = press_x; - cropHandler.cropParams.y = press_y; - cropHandler.cropParams.w = cropHandler.cropParams.h = 1; - cropgl->cropInit (cropHandler.cropParams.x, cropHandler.cropParams.y, cropHandler.cropParams.w, cropHandler.cropParams.h); } - } else if (type == GDK_BUTTON_PRESS && state == SNormal && iarea->getToolMode () == TMHand) { - // Any other case... i.e. we're assuming to be on the canvas, looking for editing objects - EditSubscriber *editSubscriber = iarea->getCurrSubscriber(); - - if (editSubscriber && editSubscriber->getEditingType() == ET_OBJECTS) { - if (button == 1) { - needRedraw = editSubscriber->button1Pressed(bstate); - - if (editSubscriber->isDragging()) { - state = SEditDrag1; - } - } else if (button == 2) { - needRedraw = editSubscriber->button2Pressed(bstate); - - if (editSubscriber->isDragging()) { - state = SEditDrag2; - } - } else if (button == 3) { + } else if (button == 3) { + if (iarea->getToolMode () == TMHand) { + EditSubscriber *editSubscriber = iarea->getCurrSubscriber(); + if (editSubscriber && editSubscriber->getEditingType() == ET_OBJECTS) { needRedraw = editSubscriber->button3Pressed(bstate); if (editSubscriber->isDragging()) { state = SEditDrag3; + } else if (editSubscriber->isPicking()) { + state = SEditPick3; + pickedObject = iarea->object; + pickModifierKey = bstate; } + + press_x = x; + press_y = y; + action_x = 0; + action_y = 0; } - - press_x = x; - press_y = y; - action_x = 0; - action_y = 0; - } - } - - if (button == 3) { - iarea->pipetteVal[0] = iarea->pipetteVal[1] = iarea->pipetteVal[2] = -1.f; - EditSubscriber *editSubscriber = iarea->getCurrSubscriber(); - - if (editSubscriber && editSubscriber->getEditingType() == ET_PIPETTE) { - editSubscriber->mouseOver(0); - } - - state = SNormal; - iarea->setToolHand (); - - if (pmhlistener) { - pmhlistener->toggleFreeze(); } } @@ -529,7 +525,7 @@ void CropWindow::buttonRelease (int button, int num, int bstate, int x, int y) state = SNormal; needRedraw = true; } else if (state == SEditDrag1 || state == SEditDrag2 || state == SEditDrag3) { - if (state == SEditDrag1) { + if (state == SEditDrag1) { needRedraw = editSubscriber->button1Released(); } else if (state == SEditDrag2) { needRedraw = editSubscriber->button2Released(); @@ -562,12 +558,7 @@ void CropWindow::buttonRelease (int button, int num, int bstate, int x, int y) } } else if (editSubscriber->getEditingType() == ET_OBJECTS) { screenCoordToCropCanvas (x, y, cropPos.x, cropPos.y); - - if (onArea (CropImage, x, y)) { - iarea->object = ObjectMOBuffer::getObjectID(cropPos); - } else { - iarea->object = -1; - } + iarea->object = ObjectMOBuffer::getObjectID(cropPos); } needRedraw |= editSubscriber->mouseOver(bstate); @@ -579,7 +570,38 @@ void CropWindow::buttonRelease (int button, int num, int bstate, int x, int y) iarea->deltaScreen.set(0, 0); iarea->deltaPrevImage.set(0, 0); iarea->deltaPrevScreen.set(0, 0); - state = SNormal; + } else if (state == SEditPick1 || state == SEditPick2 || state == SEditPick3) { + if (editSubscriber) { + Coord imgPos; + action_x = x; + action_y = y; + screenCoordToImage (x, y, imgPos.x, imgPos.y); + + iarea->posImage.set (imgPos.x, imgPos.y); + iarea->posScreen.set (x, y); + + Coord cropPos; + screenCoordToCropCanvas (x, y, cropPos.x, cropPos.y); + + iarea->object = ObjectMOBuffer::getObjectID(cropPos); + + bool elemPicked = iarea->object == pickedObject && bstate == pickModifierKey; + + if (state == SEditPick1) { + needRedraw = editSubscriber->pick1 (elemPicked); + } else if (state == SEditPick2) { + needRedraw = editSubscriber->pick2 (elemPicked); + } else if (state == SEditPick3) { + needRedraw = editSubscriber->pick3 (elemPicked); + } + + iarea->object = pickedObject = -1; + pickModifierKey = 0; + + needRedraw |= editSubscriber->mouseOver (bstate); + } else { + iarea->object = 0; + } } if (cropgl && (state == SCropSelecting || state == SResizeH1 || state == SResizeH2 || state == SResizeW1 || state == SResizeW2 || state == SResizeTL || state == SResizeTR || state == SResizeBL || state == SResizeBR || state == SCropMove)) { @@ -598,6 +620,20 @@ void CropWindow::buttonRelease (int button, int num, int bstate, int x, int y) return; } + if (state != SEditDrag3 && state != SEditPick3 && button == 3 && !(bstate & (GDK_SHIFT_MASK|GDK_CONTROL_MASK))) { + iarea->pipetteVal[0] = iarea->pipetteVal[1] = iarea->pipetteVal[2] = -1.f; + + if (editSubscriber && editSubscriber->getEditingType() == ET_PIPETTE) { + editSubscriber->mouseOver(0); + } + + iarea->setToolHand (); + + if (pmhlistener) { + pmhlistener->toggleFreeze(); + } + } + state = SNormal; iarea->grabFocus (NULL); @@ -743,7 +779,7 @@ void CropWindow::pointerMoved (int bstate, int x, int y) } else if (editSubscriber) { rtengine::Crop* crop = static_cast(cropHandler.getCrop()); - if (state == SNormal) { + if (state == SNormal || state == SEditPick1 || state == SEditPick2 || state == SEditPick3) { Coord imgPos; action_x = x; action_y = y; diff --git a/rtgui/cropwindow.h b/rtgui/cropwindow.h index 3434eb52e..e9422406d 100644 --- a/rtgui/cropwindow.h +++ b/rtgui/cropwindow.h @@ -48,9 +48,11 @@ class CropWindow : public LWButtonListener, public CropDisplayHandler, public Ed { // state management - ImgEditState state; // current state of user (see enum State) + ImgEditState state; // current state of user (see enum State) int press_x, press_y; // position of the cursor in the GUI space on button press int action_x, action_y; // parameter that will evolve during a pan or drag action + int pickedObject; + int pickModifierKey; double rot_deg; bool onResizeArea; bool deleted; diff --git a/rtgui/curveeditor.cc b/rtgui/curveeditor.cc index 3cfe335b2..8ad521d06 100644 --- a/rtgui/curveeditor.cc +++ b/rtgui/curveeditor.cc @@ -392,7 +392,7 @@ void CurveEditor::switchOffEditMode () EditSubscriber::switchOffEditMode(); // disconnect } -bool CurveEditor::mouseOver(int modifierKey) +bool CurveEditor::mouseOver(const int modifierKey) { EditDataProvider* provider = getEditProvider(); subGroup->pipetteMouseOver(provider, modifierKey); @@ -400,7 +400,7 @@ bool CurveEditor::mouseOver(int modifierKey) return true; // return true will ask the preview to be redrawn, for the cursor } -bool CurveEditor::button1Pressed(int modifierKey) +bool CurveEditor::button1Pressed(const int modifierKey) { EditDataProvider* provider = getEditProvider(); @@ -422,7 +422,7 @@ bool CurveEditor::button1Released() return true; } -bool CurveEditor::drag1(int modifierKey) +bool CurveEditor::drag1(const int modifierKey) { EditDataProvider* provider = getEditProvider(); subGroup->pipetteDrag(provider, modifierKey); @@ -430,7 +430,7 @@ bool CurveEditor::drag1(int modifierKey) return false; } -CursorShape CurveEditor::getCursor(int objectID) +CursorShape CurveEditor::getCursor(const int objectID) { if (remoteDrag) { return CSResizeHeight; diff --git a/rtgui/curveeditor.h b/rtgui/curveeditor.h index 10e3d9668..a3ba68436 100644 --- a/rtgui/curveeditor.h +++ b/rtgui/curveeditor.h @@ -127,11 +127,11 @@ public: sigc::signal signal_curvepoint_release(); void switchOffEditMode (); - bool mouseOver(int modifierKey); - bool button1Pressed(int modifierKey); + bool mouseOver(const int modifierKey); + bool button1Pressed(const int modifierKey); bool button1Released(); - bool drag1(int modifierKey); - CursorShape getCursor(int objectID); + bool drag1(const int modifierKey); + CursorShape getCursor(const int objectID); }; diff --git a/rtgui/edit.cc b/rtgui/edit.cc index 598ee8da5..95831db7a 100644 --- a/rtgui/edit.cc +++ b/rtgui/edit.cc @@ -747,7 +747,295 @@ void Rectangle::drawToMOChannel(Cairo::RefPtr &cr, unsigned shor } } -EditSubscriber::EditSubscriber (EditType editType) : ID(EUID_None), editingType(editType), bufferType(BT_SINGLEPLANE_FLOAT), provider(NULL), dragging(false) {} +void OPIcon::drivenPointToRectangle(const rtengine::Coord &pos, + rtengine::Coord &topLeft, rtengine::Coord &bottomRight, int W, int H) +{ + switch (drivenPoint) { + case (DP_CENTERCENTER): + topLeft.x = pos.x - W / 2; + topLeft.y = pos.y - H / 2; + break; + + case (DP_TOPLEFT): + topLeft.x = pos.x; + topLeft.y = pos.y; + break; + + case (DP_TOPCENTER): + topLeft.x = pos.x - W / 2; + topLeft.y = pos.y; + break; + + case (DP_TOPRIGHT): + topLeft.x = pos.x - W; + topLeft.y = pos.y; + break; + + case (DP_CENTERRIGHT): + topLeft.x = pos.x - W; + topLeft.y = pos.y - H / 2; + break; + + case (DP_BOTTOMRIGHT): + topLeft.x = pos.x - W; + topLeft.y = pos.y - H; + break; + + case (DP_BOTTOMCENTER): + topLeft.x = pos.x - W / 2; + topLeft.y = pos.y - H; + break; + + case (DP_BOTTOMLEFT): + topLeft.x = pos.x; + topLeft.y = pos.y - H; + break; + + case (DP_CENTERLEFT): + topLeft.x = pos.x; + topLeft.y = pos.y - H / 2; + break; + } + + bottomRight.x = topLeft.x + W - 1; + bottomRight.y = topLeft.y + H - 1; +} + +OPIcon::OPIcon(const Cairo::RefPtr &normal, + const Cairo::RefPtr &active, + const Cairo::RefPtr &prelight, + const Cairo::RefPtr &dragged, + const Cairo::RefPtr &insensitive, + DrivenPoint drivenPoint) : + drivenPoint(drivenPoint) +{ + if (normal) { + normalImg = normal; + } + + if (prelight) { + prelightImg = prelight; + } + + if (active) { + activeImg = active; + } + + if (dragged) { + draggedImg = active; + } + + if (insensitive) { + insensitiveImg = insensitive; + } +} + +OPIcon::OPIcon(Glib::ustring normalImage, Glib::ustring activeImage, Glib::ustring prelightImage, + Glib::ustring draggedImage, Glib::ustring insensitiveImage, DrivenPoint drivenPoint) : drivenPoint(drivenPoint) +{ + if (!normalImage.empty()) { + normalImg = Cairo::ImageSurface::create_from_png( RTImage::findIconAbsolutePath(normalImage) ); + } + + if (!prelightImage.empty()) { + prelightImg = Cairo::ImageSurface::create_from_png( RTImage::findIconAbsolutePath(prelightImage) ); + } + + if (!activeImage.empty()) { + activeImg = Cairo::ImageSurface::create_from_png( RTImage::findIconAbsolutePath(activeImage) ); + } + + if (!draggedImage.empty()) { + draggedImg = Cairo::ImageSurface::create_from_png( RTImage::findIconAbsolutePath(draggedImage) ); + } + + if (!insensitiveImage.empty()) { + insensitiveImg = Cairo::ImageSurface::create_from_png( RTImage::findIconAbsolutePath(insensitiveImage) ); + } +} + +const Cairo::RefPtr OPIcon::getNormalImg() +{ + return normalImg; +} +const Cairo::RefPtr OPIcon::getPrelightImg() +{ + return prelightImg; +} +const Cairo::RefPtr OPIcon::getActiveImg() +{ + return activeImg; +} +const Cairo::RefPtr OPIcon::getDraggedImg() +{ + return draggedImg; +} +const Cairo::RefPtr OPIcon::getInsensitiveImg() +{ + return insensitiveImg; +} + +void OPIcon::drawImage(const Cairo::RefPtr &img, + Cairo::RefPtr &cr, ObjectMOBuffer *objectBuffer, + EditCoordSystem &coordSystem) +{ + int imgW = img->get_width(); + int imgH = img->get_height(); + + rtengine::Coord pos; + + if (datum == IMAGE) { + coordSystem.imageCoordToScreen(position.x, position.y, pos.x, pos.y); + } else if (datum == CLICKED_POINT) { + pos = position + objectBuffer->getDataProvider()->posScreen; + } else if (datum == CURSOR) + pos = position + objectBuffer->getDataProvider()->posScreen + + objectBuffer->getDataProvider()->deltaScreen; + + rtengine::Coord tl, br; // Coordinate of the rectangle in the CropBuffer coordinate system + drivenPointToRectangle(pos, tl, br, imgW, imgH); + + cr->set_source(img, tl.x, tl.y); + cr->set_line_width(0.); + cr->rectangle(tl.x, tl.y, imgW, imgH); + cr->fill(); +} + +void OPIcon::drawMOImage(const Cairo::RefPtr &img, Cairo::RefPtr &cr, + unsigned short id, ObjectMOBuffer *objectBuffer, EditCoordSystem &coordSystem) +{ + // test of F_HOVERABLE has already been done + + int imgW = img->get_width(); + int imgH = img->get_height(); + + rtengine::Coord pos; + + if (datum == IMAGE) + coordSystem.imageCoordToCropCanvas (position.x, position.y, pos.x, pos.y); + else if (datum == CLICKED_POINT) { + pos = position + objectBuffer->getDataProvider()->posScreen; + } else if (datum == CURSOR) + pos = position + objectBuffer->getDataProvider()->posScreen + + objectBuffer->getDataProvider()->deltaScreen; + + rtengine::Coord tl, br; // Coordinate of the rectangle in the CropBuffer coordinate system + drivenPointToRectangle(pos, tl, br, imgW, imgH); + + // drawing the lower byte's value + if (objectBuffer->getObjectMode() == OM_255) { + cr->set_source_rgba (0., 0., 0., ((id + 1) & 0xFF) / 255.); + } else { + cr->set_source_rgba (0., 0., 0., (id + 1) / 65535.); + } + cr->set_line_width(0.); + cr->rectangle(tl.x, tl.y, imgW, imgH); + cr->fill(); +} + +void OPIcon::drawOuterGeometry(Cairo::RefPtr &cr, + ObjectMOBuffer *objectBuffer, EditCoordSystem &coordSystem) {} + +void OPIcon::drawInnerGeometry(Cairo::RefPtr &cr, + ObjectMOBuffer *objectBuffer, EditCoordSystem &coordSystem) +{ + if (flags & F_VISIBLE) { + // Here we will handle fall-back solutions + + State tmpState = state; // can be updated through the successive test + + if (tmpState == INSENSITIVE) { + if (!insensitiveImg) { + tmpState = NORMAL; + } else { + OPIcon::drawImage(insensitiveImg, cr, objectBuffer, coordSystem); + return; + } + } + + if (tmpState == DRAGGED) { + if (!draggedImg) { + tmpState = ACTIVE; + } else { + OPIcon::drawImage(draggedImg, cr, objectBuffer, coordSystem); + return; + } + } + + if (tmpState == ACTIVE) { + if (!activeImg) { + tmpState = PRELIGHT; + } else { + OPIcon::drawImage(activeImg, cr, objectBuffer, coordSystem); + return; + } + } + + if (tmpState == PRELIGHT) { + if (!prelightImg) { + tmpState = NORMAL; + } else { + OPIcon::drawImage(prelightImg, cr, objectBuffer, coordSystem); + return; + } + } + + if (tmpState == NORMAL && normalImg) { + OPIcon::drawImage(normalImg, cr, objectBuffer, coordSystem); + } + } +} + +void OPIcon::drawToMOChannel(Cairo::RefPtr &cr, unsigned short id, + ObjectMOBuffer *objectBuffer, EditCoordSystem &coordSystem) +{ + if (flags & F_HOVERABLE) { + // Here we will handle fallback solutions + State tmpState = state; + + if (tmpState == INSENSITIVE) { + if (!insensitiveImg) { + tmpState = NORMAL; + } else { + OPIcon::drawMOImage(insensitiveImg, cr, id, objectBuffer, coordSystem); + return; + } + } + + if (tmpState == DRAGGED) { + if (!draggedImg) { + tmpState = ACTIVE; + } else { + OPIcon::drawMOImage(draggedImg, cr, id, objectBuffer, coordSystem); + return; + } + } + + if (tmpState == ACTIVE) { + if (!activeImg) { + tmpState = PRELIGHT; + } else { + OPIcon::drawMOImage(activeImg, cr, id, objectBuffer, coordSystem); + return; + } + } + + if (tmpState == PRELIGHT) { + if (!prelightImg) { + tmpState = NORMAL; + } else { + OPIcon::drawMOImage(prelightImg, cr, id, objectBuffer, coordSystem); + return; + } + } + + if (tmpState == NORMAL && normalImg) { + OPIcon::drawMOImage(normalImg, cr, id, objectBuffer, coordSystem); + } + } +} + +EditSubscriber::EditSubscriber (EditType editType) : ID(EUID_None), editingType(editType), bufferType(BT_SINGLEPLANE_FLOAT), provider(NULL), action(ES_ACTION_NONE) {} void EditSubscriber::setEditProvider(EditDataProvider *provider) { @@ -808,7 +1096,12 @@ BufferType EditSubscriber::getPipetteBufferType() bool EditSubscriber::isDragging() { - return dragging; + return action == ES_ACTION_DRAGGING; +} + +bool EditSubscriber::isPicking() +{ + return action == ES_ACTION_PICKING; } //-------------------------------------------------------------------------------------------------- diff --git a/rtgui/edit.h b/rtgui/edit.h index 5268e82e5..c49c45408 100644 --- a/rtgui/edit.h +++ b/rtgui/edit.h @@ -63,10 +63,10 @@ class EditSubscriber; * ### Event handling * * The mouseOver method is called on each mouse movement, excepted when dragging a point. This method can then access - * the pipetteVal array values, which contain the mean of the pixel read in the buffer, or -1 of the cursor is outside + * the pipetteVal array values, which contain the mean of the pixel read in the buffer, or -1 if the cursor is outside * of the image. In this case, EditDataProvider::object is also set to 0 (and 1 if over the image). * - * When the user will click on the left mouse button while pressing the CTRL key, the button1Pressed will be called. + * When the user will click on the left mouse button while pressing the CTRL key, button1Pressed will be called. * Setting "dragging" to true (or false) is not required for the pipette type editing. * * The drag1 method will be called on all subsequent mouse move. The pipetteVal[3] array will already be filled with @@ -79,7 +79,7 @@ class EditSubscriber; * * By using this class, objects can be drawn and manipulated on the preview. * - * The developer has to handle the buttonPress, buttonRelease, drag and mouseOver method that he needs. There + * The developer has to handle the buttonPress, buttonRelease, drag and mouseOver methods that he needs. There * are buttonPress, buttonRelease and drag methods dedicated to each mouse button, for better flexibility * (e.g.button2Press, button2Release, drag2 will handle event when mouse button 2 is used first). RT actually * does not handle multiple mouse button event (e.g. button1 + button2), only one at a time. The first button pressed @@ -93,10 +93,11 @@ class EditSubscriber; * specific values. To be displayed, the F_VISIBLE flag has to be set through the setActive or setVisible methods. * * The second list (mouseOverGeometry) is used in a backbuffer, the color used to draw the shape being the id of the - * mouseOverGeometry. As an example, you could use a circle line to represent the line to the user, but use another - * Circle object, filled, to be used as mouseOver detection. The association between both shape (visible and mouseOver) + * mouseOverGeometry. As an example, you could create a line to be shown in the preview, but create 2 filled Circle object + * to be used as mouseOver detection, one on each end of the line. The association between both shape (visible and mouseOver) * is handled by the developer. To be displayed on this backbuffer, the F_HOVERABLE flag has to be set through the - * setActive or setHoverable methods. + * setActive or setHoverable methods. For overlapping mouse over geometry, the priority is set by the order in the list : + * the last item is detected first (think of it like a stack piled up). * * * ### Event handling @@ -106,17 +107,28 @@ class EditSubscriber; * * RT will call the mouseOver method on each mouse movement where no mouse button is pressed. * - * On mouse button press over a mouseOverGeometry, it will call the button press method corresponding to the button - * (e.g. button1Pressed for mouse button 1), with the modifier key as parameter. Any other mouse button pressed at - * the same time will be ignored. It's up to the developer to decide whether it leads to a drag movement or not, - * by setting the "dragging" boolean to true. + * On mouse button press over a mouseOverGeometry (that has F_HOVERABLE set), it will call the button press method corresponding + * to the button (e.g. button1Pressed for mouse button 1), with the modifier key as parameter. Any other mouse button pressed at + * the same time will be ignored. It's up to the developer to decide whether this action is starting a 'drag' or 'pick' action, + * by setting the 'action' parameter to the appropriated value. * - * In this case, RT will then sent drag1 event (to stay with our button 1 pressed example) on each mouse movement. It's up - * to the developer of the tool to handle the dragging. The EditProvider class will help you in this by handling the actual - * position in various coordinate system and ways. + * If the user sets action to ES_ACTION_DRAGGING, RT will then send drag1 events (to stay with our button 1 pressed example) on each + * mouse movement. It's up to the developer of the tool to handle the dragging. The EditProvider class will help you in this by + * handling the actual position in various coordinate system and ways. * * When the user will release the mouse button, RT will call the button1Release event (in our example). The developer have - * then to set the "dragging" flag to false. + * then to set action to ES_ACTION_NONE. + * + * If the user sets action to ES_ACTION_PICKING, RT will keep in memory the mouseOver object that was selected when pressing the mouse + * (e.g. button 1), as well as the modifier keys. + * + * The element is said to be picked when the mouse button is released over the same mouse over object and with the same active + * modifier keys. In this case, the corresponding picked event (e.g. picked1 in our example) and the 'picked' flag will be true. + * If any of those condition is false, picked1 will still be be called to terminate the initiated picking action, but 'picked' + * will be false. This is necessary because the user may want to update the geometry if the picking is aborted. The developer have + * then to set action to ES_ACTION_NONE. + * + * Picking an on-screen element correspond to single-clicking on it. No double click is supported so far. * * Each of these methods have to returns a boolean value saying that the preview has to be refreshed or not (i.e. the displayed * geometry). @@ -134,11 +146,9 @@ class EditSubscriber; * the HSV tool, the Hue and Saturation and Value curves are applied on the current state of the image. That's why the pipette * of the H, S and V curve will share the same data of this "current state", otherwise the read value would be wrong. * - * When the mouse button 1 is pressed while pressing the CTRL key, the button1Pressed method will be called. - * * When the Edit process stops, the Subscriber is removed from the DataProvider, so buffers can be freed up. * A new ToolPanelListener::panelChanged event is also thrown to update the preview again, without the tool's - * graphical objects. The Edit button is also toggled off (by the user or programmatically). + * graphical objects. The Edit button is also toggled off (by the user or programatically). * * It means that each Edit buttons toggled on will start an update of the preview which might or might not create * a new History entry, depending on the ProcEvent used. @@ -315,12 +325,13 @@ public: bool isHoverable (); void setHoverable (bool visible); + // setActive will enable/disable the visible and hoverable flags in one shot! void setActive (bool active); - virtual void drawOuterGeometry (Cairo::RefPtr &cr, ObjectMOBuffer *parent, EditCoordSystem &coordSystem) = 0; - virtual void drawInnerGeometry (Cairo::RefPtr &cr, ObjectMOBuffer *parent, EditCoordSystem &coordSystem) = 0; - virtual void drawToMOChannel (Cairo::RefPtr &cr, unsigned short id, ObjectMOBuffer *pipetteBuffer, EditCoordSystem &coordSystem) = 0; + virtual void drawOuterGeometry (Cairo::RefPtr &cr, ObjectMOBuffer *objectBuffer, EditCoordSystem &coordSystem) = 0; + virtual void drawInnerGeometry (Cairo::RefPtr &cr, ObjectMOBuffer *objectBuffer, EditCoordSystem &coordSystem) = 0; + virtual void drawToMOChannel (Cairo::RefPtr &cr, unsigned short id, ObjectMOBuffer *objectBuffer, EditCoordSystem &coordSystem) = 0; }; class Circle : public Geometry @@ -335,9 +346,9 @@ public: Circle (rtengine::Coord& center, int radius, bool filled = false, bool radiusInImageSpace = false); Circle (int centerX, int centerY, int radius, bool filled = false, bool radiusInImageSpace = false); - void drawOuterGeometry (Cairo::RefPtr &cr, ObjectMOBuffer *pipetteBuffer, EditCoordSystem &coordSystem); - void drawInnerGeometry (Cairo::RefPtr &cr, ObjectMOBuffer *pipetteBuffer, EditCoordSystem &coordSystem); - void drawToMOChannel (Cairo::RefPtr &cr, unsigned short id, ObjectMOBuffer *pipetteBuffer, EditCoordSystem &coordSystem); + void drawOuterGeometry (Cairo::RefPtr &cr, ObjectMOBuffer *objectBuffer, EditCoordSystem &coordSystem); + void drawInnerGeometry (Cairo::RefPtr &cr, ObjectMOBuffer *objectBuffer, EditCoordSystem &coordSystem); + void drawToMOChannel (Cairo::RefPtr &cr, unsigned short id, ObjectMOBuffer *objectBuffer, EditCoordSystem &coordSystem); }; class Line : public Geometry @@ -350,9 +361,9 @@ public: Line (rtengine::Coord& begin, rtengine::Coord& end); Line (int beginX, int beginY, int endX, int endY); - void drawOuterGeometry (Cairo::RefPtr &cr, ObjectMOBuffer *pipetteBuffer, EditCoordSystem &coordSystem); - void drawInnerGeometry (Cairo::RefPtr &cr, ObjectMOBuffer *pipetteBuffer, EditCoordSystem &coordSystem); - void drawToMOChannel (Cairo::RefPtr &cr, unsigned short id, ObjectMOBuffer *pipetteBuffer, EditCoordSystem &coordSystem); + void drawOuterGeometry (Cairo::RefPtr &cr, ObjectMOBuffer *objectBuffer, EditCoordSystem &coordSystem); + void drawInnerGeometry (Cairo::RefPtr &cr, ObjectMOBuffer *objectBuffer, EditCoordSystem &coordSystem); + void drawToMOChannel (Cairo::RefPtr &cr, unsigned short id, ObjectMOBuffer *objectBuffer, EditCoordSystem &coordSystem); }; class Polyline : public Geometry @@ -363,9 +374,9 @@ public: Polyline (); - void drawOuterGeometry (Cairo::RefPtr &cr, ObjectMOBuffer *pipetteBuffer, EditCoordSystem &coordSystem); - void drawInnerGeometry (Cairo::RefPtr &cr, ObjectMOBuffer *pipetteBuffer, EditCoordSystem &coordSystem); - void drawToMOChannel (Cairo::RefPtr &cr, unsigned short id, ObjectMOBuffer *pipetteBuffer, EditCoordSystem &coordSystem); + void drawOuterGeometry (Cairo::RefPtr &cr, ObjectMOBuffer *objectBuffer, EditCoordSystem &coordSystem); + void drawInnerGeometry (Cairo::RefPtr &cr, ObjectMOBuffer *objectBuffer, EditCoordSystem &coordSystem); + void drawToMOChannel (Cairo::RefPtr &cr, unsigned short id, ObjectMOBuffer *objectBuffer, EditCoordSystem &coordSystem); }; class Rectangle : public Geometry @@ -381,9 +392,53 @@ public: void setXYXY(int left, int top, int right, int bottom); void setXYWH(rtengine::Coord topLeft, rtengine::Coord widthHeight); void setXYXY(rtengine::Coord topLeft, rtengine::Coord bottomRight); - void drawOuterGeometry (Cairo::RefPtr &cr, ObjectMOBuffer *pipetteBuffer, EditCoordSystem &coordSystem); - void drawInnerGeometry (Cairo::RefPtr &cr, ObjectMOBuffer *pipetteBuffer, EditCoordSystem &coordSystem); - void drawToMOChannel (Cairo::RefPtr &cr, unsigned short id, ObjectMOBuffer *pipetteBuffer, EditCoordSystem &coordSystem); + void drawOuterGeometry (Cairo::RefPtr &cr, ObjectMOBuffer *objectBuffer, EditCoordSystem &coordSystem); + void drawInnerGeometry (Cairo::RefPtr &cr, ObjectMOBuffer *objectBuffer, EditCoordSystem &coordSystem); + void drawToMOChannel (Cairo::RefPtr &cr, unsigned short id, ObjectMOBuffer *objectBuffer, EditCoordSystem &coordSystem); +}; + +class OPIcon : public Geometry // OP stands for "On Preview" +{ + +private: + Cairo::RefPtr normalImg; + Cairo::RefPtr prelightImg; + Cairo::RefPtr activeImg; + Cairo::RefPtr draggedImg; + Cairo::RefPtr insensitiveImg; + + static void setPaths(Options &opt); + static void updateImages(); + void changeImage(Glib::ustring &newImage); + static Glib::ustring findIconAbsolutePath(const Glib::ustring &iconFName); + void drawImage (const Cairo::RefPtr &img, Cairo::RefPtr &cr, ObjectMOBuffer *objectBuffer, EditCoordSystem &coordSystem); + void drawMOImage (const Cairo::RefPtr &img, Cairo::RefPtr &cr, unsigned short id, ObjectMOBuffer *objectBuffer, EditCoordSystem &coordSystem); + void drivenPointToRectangle(const rtengine::Coord &pos, rtengine::Coord &topLeft, rtengine::Coord &bottomRight, int W, int H); + +public: + DrivenPoint drivenPoint; + rtengine::Coord position; + + OPIcon (const Cairo::RefPtr &normal, + const Cairo::RefPtr &active, + const Cairo::RefPtr &prelight = {}, + const Cairo::RefPtr &dragged = {}, + const Cairo::RefPtr &insensitive = {}, + DrivenPoint drivenPoint = DP_CENTERCENTER); + OPIcon (Glib::ustring normalImage, Glib::ustring activeImage, Glib::ustring prelightImage = "", Glib::ustring draggedImage = "", Glib::ustring insensitiveImage = "", DrivenPoint drivenPoint = DP_CENTERCENTER); + const Cairo::RefPtr getNormalImg(); + const Cairo::RefPtr getPrelightImg(); + const Cairo::RefPtr getActiveImg(); + const Cairo::RefPtr getDraggedImg(); + const Cairo::RefPtr getInsensitiveImg(); + void drawOuterGeometry (Cairo::RefPtr &cr, ObjectMOBuffer *objectBuffer, EditCoordSystem &coordSystem); + void drawInnerGeometry (Cairo::RefPtr &cr, ObjectMOBuffer *objectBuffer, EditCoordSystem &coordSystem); + void drawToMOChannel (Cairo::RefPtr &cr, unsigned short id, ObjectMOBuffer *objectBuffer, EditCoordSystem &coordSystem); +}; + +class OPAdjuster : public Geometry // OP stands for "On Preview" +{ + }; /// @brief Method for client tools needing Edit information @@ -401,39 +456,44 @@ private: protected: std::vector visibleGeometry; /// displayed geometry std::vector mouseOverGeometry; /// mouseOver geometry, drawn in a hidden buffer - bool dragging; /// in object mode, set this to true in buttonPressed events to start dragging and ask for drag event (ignored in pipette mode) + enum { + ES_ACTION_NONE, /// + ES_ACTION_DRAGGING, /// set action to this value in the buttonPressed event to start dragging and ask for drag event + ES_ACTION_PICKING /// set action to this value in the buttonPressed event whenever the user is picking something through a single click. In this case, the pickX events will be called INSTEAD of buttonXReleased ! + } action; /// object mode only, ignored in Pipette mode public: EditSubscriber (EditType editType); virtual ~EditSubscriber () {} - void setEditProvider(EditDataProvider *provider); - EditDataProvider* getEditProvider (); - void setEditID(EditUniqueID ID, BufferType buffType); - bool isCurrentSubscriber(); - virtual void subscribe(); - virtual void unsubscribe(); - virtual void switchOffEditMode (); /// Occurs when the user want to stop the editing mode - EditUniqueID getEditID(); - EditType getEditingType(); - BufferType getPipetteBufferType(); - bool isDragging(); /// Returns true if something is being dragged and drag events has to be sent (object mode only) + void setEditProvider(EditDataProvider *provider); + EditDataProvider* getEditProvider (); + void setEditID(EditUniqueID ID, BufferType buffType); + bool isCurrentSubscriber(); + virtual void subscribe(); + virtual void unsubscribe(); + virtual void switchOffEditMode (); /// Occurs when the user want to stop the editing mode + EditUniqueID getEditID(); + EditType getEditingType(); + BufferType getPipetteBufferType(); + bool isDragging(); /// Returns true if something is being dragged and drag events has to be sent (object mode only) + bool isPicking(); /// Returns true if something is being picked /** @brief Get the cursor to be displayed when above handles @param objectID object currently "hovered" */ - virtual CursorShape getCursor (int objectID); + virtual CursorShape getCursor (const int objectID); /** @brief Triggered when the mouse is moving over an object This method is also triggered when the cursor is moving over the image in ET_PIPETTE mode @param modifierKey Gtk's event modifier key (GDK_CONTROL_MASK | GDK_SHIFT_MASK | ...) @return true if the preview has to be redrawn, false otherwise */ - virtual bool mouseOver (int modifierKey); + virtual bool mouseOver (const int modifierKey); /** @brief Triggered when mouse button 1 is pressed, together with the CTRL modifier key if the subscriber is of type ET_PIPETTE Once the key is pressed, RT will enter in drag1 mode on subsequent mouse movements @param modifierKey Gtk's event modifier key (GDK_CONTROL_MASK | GDK_SHIFT_MASK | ...) @return true if the preview has to be redrawn, false otherwise */ - virtual bool button1Pressed (int modifierKey); + virtual bool button1Pressed (const int modifierKey); /** @brief Triggered when mouse button 1 is released @return true if the preview has to be redrawn, false otherwise */ @@ -443,7 +503,7 @@ public: Once the key is pressed, RT will enter in drag2 mode on subsequent mouse movements @param modifierKey Gtk's event modifier key (GDK_CONTROL_MASK | GDK_SHIFT_MASK | ...) @return true if the preview has to be redrawn, false otherwise */ - virtual bool button2Pressed (int modifierKey); + virtual bool button2Pressed (const int modifierKey); /** @brief Triggered when mouse button 2 is released (middle button) @return true if the preview has to be redrawn, false otherwise */ @@ -453,7 +513,7 @@ public: Once the key is pressed, RT will enter in drag3 mode on subsequent mouse movements @param modifierKey Gtk's event modifier key (GDK_CONTROL_MASK | GDK_SHIFT_MASK | ...) @return true if the preview has to be redrawn, false otherwise */ - virtual bool button3Pressed (int modifierKey); + virtual bool button3Pressed (const int modifierKey); /** @brief Triggered when mouse button 3 is released (right button) @return true if the preview has to be redrawn, false otherwise */ @@ -462,17 +522,36 @@ public: /** @brief Triggered when the user is moving while holding down mouse button 1 @param modifierKey Gtk's event modifier key (GDK_CONTROL_MASK | GDK_SHIFT_MASK | ...) @return true if the preview has to be redrawn, false otherwise */ - virtual bool drag1 (int modifierKey); + virtual bool drag1 (const int modifierKey); /** @brief Triggered when the user is moving while holding down mouse button 2 @param modifierKey Gtk's event modifier key (GDK_CONTROL_MASK | GDK_SHIFT_MASK | ...) @return true if the preview has to be redrawn, false otherwise */ - virtual bool drag2 (int modifierKey); + virtual bool drag2 (const int modifierKey); /** @brief Triggered when the user is moving while holding down mouse button 3 @param modifierKey Gtk's event modifier key (GDK_CONTROL_MASK | GDK_SHIFT_MASK | ...) @return true if the preview has to be redrawn, false otherwise */ - virtual bool drag3 (int modifierKey); + virtual bool drag3 (const int modifierKey); + + /** @brief Triggered when the user is releasing mouse button 1 while in action==ES_ACTION_PICKING mode + No modifier key is provided, since having a different modifier key than on button press will set picked to false. + @param picked True if the cursor is still above the the same object than on button pressed and with the same modifier keys. + If false, the user moved the cursor away or the modifier key is different, so the element is considered as NOT selected. + @return true if the preview has to be redrawn, false otherwise */ + virtual bool pick1 (const bool picked); + + /** @brief Triggered when the user is releasing mouse button 2 while in action==ES_ACTION_PICKING mode + @param picked True if the cursor is still above the the same object than on button pressed and with the same modifier keys. + If false, the user moved the cursor away or the modifier key is different, so the element is considered as NOT selected. + @return true if the preview has to be redrawn, false otherwise */ + virtual bool pick2 (const bool picked); + + /** @brief Triggered when the user is releasing mouse button 3 while in action==ES_ACTION_PICKING mode + @param picked True if the cursor is still above the the same object than on button pressed and with the same modifier keys. + If false, the user moved the cursor away or the modifier key is different, so the element is considered as NOT selected. + @return true if the preview has to be redrawn, false otherwise */ + virtual bool pick3 (const bool picked); /** @brief Get the geometry to be shown to the user */ const std::vector& getVisibleGeometry (); @@ -617,8 +696,8 @@ inline bool Geometry::isHoverable () { return flags & F_HOVERABLE; } -inline void Geometry::setHoverable (bool visible) { - if (visible) { +inline void Geometry::setHoverable (bool hoverable) { + if (hoverable) { flags |= F_HOVERABLE; } else { flags &= ~F_HOVERABLE; @@ -637,15 +716,15 @@ inline EditDataProvider* EditSubscriber::getEditProvider () { return provider; } -inline CursorShape EditSubscriber::getCursor (int objectID) { +inline CursorShape EditSubscriber::getCursor (const int objectID) { return CSOpenHand; } -inline bool EditSubscriber::mouseOver (int modifierKey) { +inline bool EditSubscriber::mouseOver (const int modifierKey) { return false; } -inline bool EditSubscriber::button1Pressed (int modifierKey) { +inline bool EditSubscriber::button1Pressed (const int modifierKey) { return false; } @@ -653,7 +732,7 @@ inline bool EditSubscriber::button1Released () { return false; } -inline bool EditSubscriber::button2Pressed (int modifierKey) { +inline bool EditSubscriber::button2Pressed (const int modifierKey) { return false; } @@ -661,7 +740,7 @@ inline bool EditSubscriber::button2Released () { return false; } -inline bool EditSubscriber::button3Pressed (int modifierKey) { +inline bool EditSubscriber::button3Pressed (const int modifierKey) { return false; } @@ -669,15 +748,27 @@ inline bool EditSubscriber::button3Released () { return false; } -inline bool EditSubscriber::drag1 (int modifierKey) { +inline bool EditSubscriber::drag1 (const int modifierKey) { return false; } -inline bool EditSubscriber::drag2 (int modifierKey) { +inline bool EditSubscriber::drag2 (const int modifierKey) { return false; } -inline bool EditSubscriber::drag3 (int modifierKey) { +inline bool EditSubscriber::drag3 (const int modifierKey) { + return false; +} + +inline bool EditSubscriber::pick1 (const bool picked) { + return false; +} + +inline bool EditSubscriber::pick2 (const bool picked) { + return false; +} + +inline bool EditSubscriber::pick3 (const bool picked) { return false; } diff --git a/rtgui/editenums.h b/rtgui/editenums.h index e51918426..557912222 100644 --- a/rtgui/editenums.h +++ b/rtgui/editenums.h @@ -20,7 +20,8 @@ #define _EDITENUMS_ enum ImgEditState {SNormal, SCropMove, SHandMove, SResizeW1, SResizeW2, SResizeH1, SResizeH2, SResizeTL, SResizeTR, SResizeBL, SResizeBR, - SCropSelecting, SRotateSelecting, SCropWinMove, SCropFrameMove, SCropImgMove, SCropWinResize, SObservedMove, SEditDrag1, SEditDrag2, SEditDrag3 + SCropSelecting, SRotateSelecting, SCropWinMove, SCropFrameMove, SCropImgMove, SCropWinResize, SObservedMove, + SEditDrag1, SEditDrag2, SEditDrag3, SEditPick1, SEditPick2, SEditPick3 }; enum CursorArea {CropWinButtons, CropToolBar, CropImage, CropBorder, CropTop, CropTopLeft, CropTopRight, CropBottom, CropBottomLeft, CropBottomRight, CropLeft, CropRight, CropInside, CropResize, CropObserved diff --git a/rtgui/editid.h b/rtgui/editid.h index 6bc808c87..c4f9315c0 100644 --- a/rtgui/editid.h +++ b/rtgui/editid.h @@ -57,9 +57,9 @@ enum EditType { /// @brief Buffer type for ET_PIPETTE type editing enum BufferType { - BT_IMAGEFLOAT, - BT_LABIMAGE, - BT_SINGLEPLANE_FLOAT + BT_IMAGEFLOAT, /// Imagefloat buffer type (3 channels of float values) + BT_LABIMAGE, /// LabImage buffer type (3 channels of float values) + BT_SINGLEPLANE_FLOAT /// All purpose, 1 channel buffer of float values }; /// @brief Number of object to be handled (for optimization purpose) diff --git a/rtgui/gradient.cc b/rtgui/gradient.cc index 7492d456b..50625251e 100644 --- a/rtgui/gradient.cc +++ b/rtgui/gradient.cc @@ -323,7 +323,7 @@ void Gradient::editToggled () } } -CursorShape Gradient::getCursor(int objectID) +CursorShape Gradient::getCursor(const int objectID) { switch (objectID) { case (0): @@ -349,7 +349,7 @@ CursorShape Gradient::getCursor(int objectID) } } -bool Gradient::mouseOver(int modifierKey) +bool Gradient::mouseOver(const int modifierKey) { EditDataProvider* editProvider = getEditProvider(); @@ -379,7 +379,7 @@ bool Gradient::mouseOver(int modifierKey) return false; } -bool Gradient::button1Pressed(int modifierKey) +bool Gradient::button1Pressed(const int modifierKey) { if (lastObject < 0) { return false; @@ -433,7 +433,7 @@ bool Gradient::button1Pressed(int modifierKey) draggedFeatherOffset -= (feather->getValue() / 200. * diagonal); } - EditSubscriber::dragging = true; + EditSubscriber::action = ES_ACTION_DRAGGING; return false; } else { // should theoretically always be true // this will let this class ignore further drag events @@ -454,11 +454,11 @@ bool Gradient::button1Pressed(int modifierKey) bool Gradient::button1Released() { draggedPointOldAngle = -1000.; - EditSubscriber::dragging = false; + EditSubscriber::action = ES_ACTION_NONE; return true; } -bool Gradient::drag1(int modifierKey) +bool Gradient::drag1(const int modifierKey) { // compute the polar coordinate of the mouse position EditDataProvider *provider = getEditProvider(); diff --git a/rtgui/gradient.h b/rtgui/gradient.h index f59fb07e5..d1acb764b 100644 --- a/rtgui/gradient.h +++ b/rtgui/gradient.h @@ -51,11 +51,11 @@ public: void setEditProvider (EditDataProvider* provider); // EditSubscriber interface - CursorShape getCursor(int objectID); - bool mouseOver(int modifierKey); - bool button1Pressed(int modifierKey); + CursorShape getCursor(const int objectID); + bool mouseOver(const int modifierKey); + bool button1Pressed(const int modifierKey); bool button1Released(); - bool drag1(int modifierKey); + bool drag1(const int modifierKey); void switchOffEditMode (); }; diff --git a/rtgui/retinex.cc b/rtgui/retinex.cc index 138c3487e..33ddc7070 100644 --- a/rtgui/retinex.cc +++ b/rtgui/retinex.cc @@ -186,7 +186,6 @@ Retinex::Retinex () : FoldableToolPanel (this, "retinex", M ("TP_RETINEX_LABEL") mapMethod = Gtk::manage (new MyComboBoxText ()); mapMethod->append (M ("TP_RETINEX_MAP_NONE")); -// mapMethod->append (M("TP_RETINEX_MAP_CURV")); mapMethod->append (M ("TP_RETINEX_MAP_GAUS")); mapMethod->append (M ("TP_RETINEX_MAP_MAPP")); mapMethod->append (M ("TP_RETINEX_MAP_MAPT"));