liz/rawTherapee
liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge with dev

Browse Source
This commit is contained in:
U-PC-BUREAU\jacques 2018-11-03 17:24:34 +01:00
commit aef2ad47e3
52 changed files with 324 additions and 339 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
rtdata/images/themed/png/dark/redo-small.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 448 B

After

Width:  |  Height:  |  Size: 429 B

BIN
rtdata/images/themed/png/dark/undo-small.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 422 B

After

Width:  |  Height:  |  Size: 432 B

BIN
rtdata/images/themed/png/light/redo-small.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 465 B

After

Width:  |  Height:  |  Size: 431 B

BIN
rtdata/images/themed/png/light/undo-small.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 435 B

After

Width:  |  Height:  |  Size: 430 B

27
rtdata/images/themed/svg/redo-small.svg
View File

@ -26,14 +26,14 @@
borderopacity="1.0"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:zoom="22.627417"
inkscape:cx="-2.333987"
inkscape:cy="3.4079617"
inkscape:zoom="50.5"
inkscape:cx="8"
inkscape:cy="8"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="true"
inkscape:window-width="1920"
inkscape:window-height="1019"
inkscape:window-height="1017"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
@ -63,7 +63,7 @@
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
<dc:title />
<dc:creator>
<cc:Agent>
<dc:title>Maciej Dworak</dc:title>
@ -100,20 +100,11 @@
inkscape:groupmode="layer"
inkscape:label="Layer 1"
transform="translate(0,-8)">
<g
id="g1443"
transform="matrix(-0.63828036,0,0,0.63828036,16.274238,3.8726461)"
style="stroke-width:1.56670964">
<path
style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.26899993;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal"
d="m 10.491605,14.688218 1.593819,-1.947275 1.145969,6.051211 -6.3549192,0.573481 1.6273482,-2.07058 C 4.865759,13.000001 0.5,15.961974 0.5,15.961974 c 0,0 5.365759,-6.9619734 9.991605,-1.273756 z"
id="path815"
inkscape:connector-curvature="0"
id="path875"
d="m 5.2929688,15.246094 c -0.4876302,2.611979 -0.9752605,5.223958 -1.4628907,7.835937 2.642578,0.201172 5.2851559,0.402344 7.9277339,0.603516 -0.374133,-0.532158 -0.847393,-1.003846 -1.125,-1.595703 -0.325821,-0.810039 0.116871,-1.721414 0.838745,-2.142941 1.988745,-1.419724 4.416673,-2.092986 6.834425,-2.249036 0.302478,-0.03291 0.927116,0.01471 0.33115,-0.2064 C 16.791383,16.53179 14.781713,15.765562 12.673857,15.757082 11.021162,15.709962 9.3520341,16.045858 7.875,16.794922 7.1085741,17.055522 6.2680677,16.658655 5.8609582,15.988849 5.6716284,15.741264 5.4822986,15.493679 5.2929688,15.246094 Z"
style="opacity:0.5;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.56670964;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
<path
inkscape:connector-curvature="0"
id="rect821"
d="M 4.8691406,12.5 C 4.2256059,12.47184 3.8935369,13.109111 3.8664179,13.669519 3.2467608,17.007606 2.6150065,20.34374 2.0029077,23.683047 c -0.07867,0.651747 0.5659916,1.103542 1.1661457,1.043353 3.4103659,0.256648 6.8201177,0.525013 10.2308676,0.77433 0.792549,0.01926 1.215596,-1.054103 0.655016,-1.599385 -0.612986,-0.797787 -1.225381,-1.596028 -1.836187,-2.395486 2.563791,-1.920416 5.930852,-2.462158 9.06224,-2.172632 0.866955,-0.09143 1.857946,0.610861 2.624915,0.154323 0.227944,-0.946265 -1.203108,-1.315197 -1.7384,-1.929388 -3.331183,-2.42166 -7.528559,-4.001396 -11.686814,-3.348274 -1.0747,0.172155 -2.1410571,0.467329 -3.1095972,0.971753 C 6.7326561,14.368005 6.1315959,13.521813 5.4694486,12.728818 5.3047621,12.584571 5.0881269,12.501695 4.8691406,12.5 Z m 0.4238282,2.746094 c 0.5299226,0.644134 0.9725814,1.557929 1.9140624,1.617187 0.8187078,0.07811 1.4650515,-0.552497 2.2435698,-0.696401 2.732387,-0.80868 5.719891,-0.392478 8.249796,0.866033 0.329331,0.210287 1.820337,0.706992 0.765839,0.653413 -2.620621,0.150689 -5.294327,0.88681 -7.366627,2.553908 -0.766626,0.635787 -0.721442,1.86062 -0.03633,2.536528 0.231273,0.303095 0.464063,0.605141 0.694532,0.908785 C 9.115234,23.484375 6.4726561,23.283203 3.8300781,23.082031 4.3177083,20.470052 4.8053386,17.858073 5.2929688,15.246094 Z m 18.4003902,2.75 h 0.0039 z"
style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.56670964;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
</g>
sodipodi:nodetypes="ccccccc" />
</g>
</svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.8 KiB

After

Width:  |  Height:  |  Size: 3.7 KiB

8
rtdata/images/themed/svg/undo-small.svg
View File

@ -26,14 +26,14 @@
borderopacity="1.0"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:zoom="51.375"
inkscape:zoom="50.625"
inkscape:cx="8"
inkscape:cy="8"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="true"
inkscape:window-width="1920"
inkscape:window-height="1019"
inkscape:window-height="1017"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
@ -45,7 +45,7 @@
inkscape:object-nodes="false"
inkscape:snap-grids="true"
inkscape:snap-bbox-midpoints="false"
inkscape:snap-global="false">
inkscape:snap-global="true">
<inkscape:grid
type="xygrid"
id="grid1374"
@ -103,7 +103,7 @@
transform="translate(0,-8)">
<path
style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.26899993;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal"
d="m 4.3741546,14.688218 -1.5938192,-1.947276 -1.145969,6.051212 6.3549192,0.573481 -1.6273478,-2.07058 C 10,13 14.365759,15.961974 14.365759,15.961974 c 0,0 -5.3657589,-6.961974 -9.9916044,-1.273756 z"
d="M 5.5087882,14.688218 3.914969,12.740942 2.769,18.792154 9.1239192,19.365635 7.4965714,17.295055 C 11.134634,13 15.500393,15.961974 15.500393,15.961974 c 0,0 -5.365759,-6.961974 -9.9916048,-1.273756 z"
id="path815"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccccc" />

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.7 KiB

After

Width:  |  Height:  |  Size: 3.7 KiB

5
rtdata/languages/Catala
View File

@ -491,9 +491,6 @@ PREFERENCES_APPLNEXTSTARTUP;Efectiu en reiniciar
PREFERENCES_AUTOMONPROFILE;Usa els perfils dels monitors dels sist. operatius automàticament
PREFERENCES_BATCH_PROCESSING;Process. per lots
PREFERENCES_BEHAVIOR;Comportament
PREFERENCES_CACHECLEARALL;Esborrar tot
PREFERENCES_CACHECLEARPROFILES;Esborrar perfils
PREFERENCES_CACHECLEARTHUMBS;Esborra minifotos
PREFERENCES_CACHEMAXENTRIES;Màxim nombre d'entrades a la mem. cau
PREFERENCES_CACHEOPTS;Opcions memòria cau
PREFERENCES_CACHETHUMBHEIGHT;Màxima alçada de minifoto
@ -1313,7 +1310,6 @@ ZOOMPANEL_ZOOMOUT;Allunya\nDrecera: <b>-</b>
!HISTORY_MSG_486;Lens Correction - Camera
!HISTORY_MSG_487;Lens Correction - Lens
!HISTORY_MSG_488;Dynamic Range Compression
!HISTORY_MSG_489;DRC - Threshold
!HISTORY_MSG_490;DRC - Amount
!HISTORY_MSG_491;White Balance
!HISTORY_MSG_492;RGB Curves
@ -2090,7 +2086,6 @@ ZOOMPANEL_ZOOMOUT;Allunya\nDrecera: <b>-</b>
!TP_TM_FATTAL_AMOUNT;Amount
!TP_TM_FATTAL_ANCHOR;Anchor
!TP_TM_FATTAL_LABEL;Dynamic Range Compression
!TP_TM_FATTAL_THRESHOLD;Threshold
!TP_WAVELET_1;Level 1
!TP_WAVELET_2;Level 2
!TP_WAVELET_3;Level 3

5
rtdata/languages/Chinese (Simplified)
View File

@ -492,9 +492,6 @@ PREFERENCES_BEHADDALL;全 '添加'
PREFERENCES_BEHAVIOR;行为
PREFERENCES_BEHSETALL;全 '设定'
PREFERENCES_BLACKBODY;钨丝灯
PREFERENCES_CACHECLEARALL;全部清除
PREFERENCES_CACHECLEARPROFILES;清除配置
PREFERENCES_CACHECLEARTHUMBS;清除缩略图
PREFERENCES_CACHEMAXENTRIES;最大缓存数量
PREFERENCES_CACHEOPTS;缓存选项
PREFERENCES_CACHETHUMBHEIGHT;最大缩略图高度
@ -1390,7 +1387,6 @@ ZOOMPANEL_ZOOMOUT;缩放拉远\n快捷键: <b>-</b>
!HISTORY_MSG_486;Lens Correction - Camera
!HISTORY_MSG_487;Lens Correction - Lens
!HISTORY_MSG_488;Dynamic Range Compression
!HISTORY_MSG_489;DRC - Threshold
!HISTORY_MSG_490;DRC - Amount
!HISTORY_MSG_491;White Balance
!HISTORY_MSG_492;RGB Curves
@ -2067,7 +2063,6 @@ ZOOMPANEL_ZOOMOUT;缩放拉远\n快捷键: <b>-</b>
!TP_TM_FATTAL_AMOUNT;Amount
!TP_TM_FATTAL_ANCHOR;Anchor
!TP_TM_FATTAL_LABEL;Dynamic Range Compression
!TP_TM_FATTAL_THRESHOLD;Threshold
!TP_VIBRANCE_AVOIDCOLORSHIFT;Avoid color shift
!TP_VIBRANCE_CURVEEDITOR_SKINTONES;HH
!TP_VIBRANCE_CURVEEDITOR_SKINTONES_LABEL;Skin-tones

5
rtdata/languages/Chinese (Traditional)
View File

@ -239,9 +239,6 @@ PARTIALPASTE_SHARPENING;Sharpening
PARTIALPASTE_VIGNETTING;Vignetting correction
PARTIALPASTE_WHITEBALANCE;White balance
PREFERENCES_APPLNEXTSTARTUP;下次啟動生效
PREFERENCES_CACHECLEARALL;Clear All
PREFERENCES_CACHECLEARPROFILES;Clear Profiles
PREFERENCES_CACHECLEARTHUMBS;Clear Thumbnails
PREFERENCES_CACHEMAXENTRIES;Maximal Number of Cache Entries
PREFERENCES_CACHEOPTS;Cache Options
PREFERENCES_CACHETHUMBHEIGHT;Maximal Thumbnail Height
@ -975,7 +972,6 @@ TP_WBALANCE_TEMPERATURE;色溫
!HISTORY_MSG_486;Lens Correction - Camera
!HISTORY_MSG_487;Lens Correction - Lens
!HISTORY_MSG_488;Dynamic Range Compression
!HISTORY_MSG_489;DRC - Threshold
!HISTORY_MSG_490;DRC - Amount
!HISTORY_MSG_491;White Balance
!HISTORY_MSG_492;RGB Curves
@ -2029,7 +2025,6 @@ TP_WBALANCE_TEMPERATURE;色溫
!TP_TM_FATTAL_AMOUNT;Amount
!TP_TM_FATTAL_ANCHOR;Anchor
!TP_TM_FATTAL_LABEL;Dynamic Range Compression
!TP_TM_FATTAL_THRESHOLD;Threshold
!TP_VIBRANCE_AVOIDCOLORSHIFT;Avoid color shift
!TP_VIBRANCE_CURVEEDITOR_SKINTONES;HH
!TP_VIBRANCE_CURVEEDITOR_SKINTONES_LABEL;Skin-tones

5
rtdata/languages/Czech
View File

@ -989,9 +989,6 @@ PREFERENCES_BEHAVIOR;Režim
PREFERENCES_BEHSETALL;Vše do 'Nastavit'
PREFERENCES_BEHSETALLHINT;Nastaví všechny parametry do módu <b>Nastavit</b>.\nZměna parametrů v panelu dávkového zpracování se aplikuje jako <b>absolutní</b>, budou zobrazeny aktuální hodnoty.
PREFERENCES_BLACKBODY;Wolfram
PREFERENCES_CACHECLEARALL;Vymazat vše
PREFERENCES_CACHECLEARPROFILES;Smazat profily zpracování
PREFERENCES_CACHECLEARTHUMBS;Vymazat náhledy
PREFERENCES_CACHEMAXENTRIES;Maximální počet záznamů v mezipaměti
PREFERENCES_CACHEOPTS;Vlastnosti mezipaměti
PREFERENCES_CACHETHUMBHEIGHT;Maximální výška náhledu
@ -2200,7 +2197,6 @@ ZOOMPANEL_ZOOMOUT;Oddálit\nZkratka: <b>-</b>
!HISTORY_MSG_273;CT - Color Balance SMH
!HISTORY_MSG_392;W - Residual - Color Balance
!HISTORY_MSG_488;Dynamic Range Compression
!HISTORY_MSG_489;DRC - Threshold
!HISTORY_MSG_490;DRC - Amount
!HISTORY_MSG_DUALDEMOSAIC_CONTRAST;AMaZE+VNG4 - Contrast threshold
!HISTORY_MSG_ICM_OUTPUT_PRIMARIES;Output - Primaries
@ -2301,4 +2297,3 @@ ZOOMPANEL_ZOOMOUT;Oddálit\nZkratka: <b>-</b>
!TP_TM_FATTAL_AMOUNT;Amount
!TP_TM_FATTAL_ANCHOR;Anchor
!TP_TM_FATTAL_LABEL;Dynamic Range Compression
!TP_TM_FATTAL_THRESHOLD;Threshold

5
rtdata/languages/Dansk
View File

@ -230,9 +230,6 @@ PARTIALPASTE_SHARPENING;Skarphed
PARTIALPASTE_VIGNETTING;Vignettering
PARTIALPASTE_WHITEBALANCE;Hvidbalance
PREFERENCES_APPLNEXTSTARTUP;Anvendes ved næste opstart
PREFERENCES_CACHECLEARALL;Ryd alt
PREFERENCES_CACHECLEARPROFILES;Ryd profiler
PREFERENCES_CACHECLEARTHUMBS;Ryd miniaturer
PREFERENCES_CACHEMAXENTRIES;Maksimalt antal indskrivninger i cache
PREFERENCES_CACHEOPTS;Cache-indstillinger
PREFERENCES_CACHETHUMBHEIGHT;Maksimal miniaturehøjde
@ -970,7 +967,6 @@ TP_WBALANCE_TEMPERATURE;Temperatur
!HISTORY_MSG_486;Lens Correction - Camera
!HISTORY_MSG_487;Lens Correction - Lens
!HISTORY_MSG_488;Dynamic Range Compression
!HISTORY_MSG_489;DRC - Threshold
!HISTORY_MSG_490;DRC - Amount
!HISTORY_MSG_491;White Balance
!HISTORY_MSG_492;RGB Curves
@ -2027,7 +2023,6 @@ TP_WBALANCE_TEMPERATURE;Temperatur
!TP_TM_FATTAL_AMOUNT;Amount
!TP_TM_FATTAL_ANCHOR;Anchor
!TP_TM_FATTAL_LABEL;Dynamic Range Compression
!TP_TM_FATTAL_THRESHOLD;Threshold
!TP_VIBRANCE_AVOIDCOLORSHIFT;Avoid color shift
!TP_VIBRANCE_CURVEEDITOR_SKINTONES;HH
!TP_VIBRANCE_CURVEEDITOR_SKINTONES_LABEL;Skin-tones

5
rtdata/languages/Deutsch
View File

@ -790,7 +790,6 @@ HISTORY_MSG_485;(Objektivkorrektur)\nProfil
HISTORY_MSG_486;(Objektivkorrektur)\nProfil - Kamera
HISTORY_MSG_487;(Objektivkorrektur)\nProfil - Objektiv
HISTORY_MSG_488;(Dynamikkompression)
HISTORY_MSG_489;(Dynamikkompression)\nSchwelle
HISTORY_MSG_490;(Dynamikkompression)\nIntensität
HISTORY_MSG_491;(Weißabgleich)
HISTORY_MSG_492;(RGB-Kurven)
@ -1099,9 +1098,6 @@ PREFERENCES_BEHAVIOR;Verhalten
PREFERENCES_BEHSETALL;Alle setzen
PREFERENCES_BEHSETALLHINT;Setzt alle Parameter auf <b>Setzen</b>.\nAnpassungen der Parameter in der Hintergrundstapelverarbeitung werden als <b>Absolut</b> zu den gespeicherten Werten interpretiert.
PREFERENCES_BLACKBODY;Wolfram
PREFERENCES_CACHECLEARALL;Alles löschen
PREFERENCES_CACHECLEARPROFILES;Profile löschen
PREFERENCES_CACHECLEARTHUMBS;Miniaturbilder löschen
PREFERENCES_CACHEMAXENTRIES;Maximale Anzahl der Miniaturbilder im Festplatten-Cache
PREFERENCES_CACHEOPTS;Einstellungen des Festplatten-Cache für Miniaturbilder
PREFERENCES_CACHETHUMBHEIGHT;Maximale Höhe der Miniaturbilder
@ -2112,7 +2108,6 @@ TP_SOFTLIGHT_STRENGTH;Intensität
TP_TM_FATTAL_AMOUNT;Intensität
TP_TM_FATTAL_ANCHOR;Helligkeitsverschiebung
TP_TM_FATTAL_LABEL;Dynamikkompression
TP_TM_FATTAL_THRESHOLD;Schwelle
TP_VIBRANCE_AVOIDCOLORSHIFT;Farbverschiebungen vermeiden
TP_VIBRANCE_CURVEEDITOR_SKINTONES;HH
TP_VIBRANCE_CURVEEDITOR_SKINTONES_LABEL;Hautfarbtöne

5
rtdata/languages/English (UK)
View File

@ -811,7 +811,6 @@ TP_WBALANCE_EQBLUERED_TOOLTIP;Allows to deviate from the normal behaviour of "wh
!HISTORY_MSG_486;Lens Correction - Camera
!HISTORY_MSG_487;Lens Correction - Lens
!HISTORY_MSG_488;Dynamic Range Compression
!HISTORY_MSG_489;DRC - Threshold
!HISTORY_MSG_490;DRC - Amount
!HISTORY_MSG_491;White Balance
!HISTORY_MSG_492;RGB Curves
@ -1102,9 +1101,6 @@ TP_WBALANCE_EQBLUERED_TOOLTIP;Allows to deviate from the normal behaviour of "wh
!PREFERENCES_BEHSETALL;All to 'Set'
!PREFERENCES_BEHSETALLHINT;Set all parameters to the <b>Set</b> mode.\nAdjustments of parameters in the batch tool panel will be <b>absolute</b>, the actual values will be displayed.
!PREFERENCES_BLACKBODY;Tungsten
!PREFERENCES_CACHECLEARALL;Clear All
!PREFERENCES_CACHECLEARPROFILES;Clear Processing Profiles
!PREFERENCES_CACHECLEARTHUMBS;Clear Thumbnails
!PREFERENCES_CACHEMAXENTRIES;Maximum number of cache entries
!PREFERENCES_CACHEOPTS;Cache Options
!PREFERENCES_CACHETHUMBHEIGHT;Maximum thumbnail height
@ -2020,7 +2016,6 @@ TP_WBALANCE_EQBLUERED_TOOLTIP;Allows to deviate from the normal behaviour of "wh
!TP_TM_FATTAL_AMOUNT;Amount
!TP_TM_FATTAL_ANCHOR;Anchor
!TP_TM_FATTAL_LABEL;Dynamic Range Compression
!TP_TM_FATTAL_THRESHOLD;Threshold
!TP_VIBRANCE_CURVEEDITOR_SKINTONES;HH
!TP_VIBRANCE_CURVEEDITOR_SKINTONES_LABEL;Skin-tones
!TP_VIBRANCE_CURVEEDITOR_SKINTONES_RANGE1;Red/Purple

5
rtdata/languages/English (US)
View File

@ -720,7 +720,6 @@
!HISTORY_MSG_486;Lens Correction - Camera
!HISTORY_MSG_487;Lens Correction - Lens
!HISTORY_MSG_488;Dynamic Range Compression
!HISTORY_MSG_489;DRC - Threshold
!HISTORY_MSG_490;DRC - Amount
!HISTORY_MSG_491;White Balance
!HISTORY_MSG_492;RGB Curves
@ -1026,9 +1025,6 @@
!PREFERENCES_BEHSETALL;All to 'Set'
!PREFERENCES_BEHSETALLHINT;Set all parameters to the <b>Set</b> mode.\nAdjustments of parameters in the batch tool panel will be <b>absolute</b>, the actual values will be displayed.
!PREFERENCES_BLACKBODY;Tungsten
!PREFERENCES_CACHECLEARALL;Clear All
!PREFERENCES_CACHECLEARPROFILES;Clear Processing Profiles
!PREFERENCES_CACHECLEARTHUMBS;Clear Thumbnails
!PREFERENCES_CACHEMAXENTRIES;Maximum number of cache entries
!PREFERENCES_CACHEOPTS;Cache Options
!PREFERENCES_CACHETHUMBHEIGHT;Maximum thumbnail height
@ -2010,7 +2006,6 @@
!TP_TM_FATTAL_AMOUNT;Amount
!TP_TM_FATTAL_ANCHOR;Anchor
!TP_TM_FATTAL_LABEL;Dynamic Range Compression
!TP_TM_FATTAL_THRESHOLD;Threshold
!TP_VIBRANCE_AVOIDCOLORSHIFT;Avoid color shift
!TP_VIBRANCE_CURVEEDITOR_SKINTONES;HH
!TP_VIBRANCE_CURVEEDITOR_SKINTONES_LABEL;Skin-tones

5
rtdata/languages/Espanol
View File

@ -721,9 +721,6 @@ PREFERENCES_BEHAVIOR;Comportamiento
PREFERENCES_BEHSETALL;Todo para 'Establecer'
PREFERENCES_BEHSETALLHINT;Todos los parámetros para el modo <b>Establecer</b>.\nLos ajustes de parámetros en el panel de la herramienta de lotes serán serán <b>absolutos</b>, se mostrarán los valores vigentes
PREFERENCES_BLACKBODY;Tungsteno
PREFERENCES_CACHECLEARALL;Borrar todo
PREFERENCES_CACHECLEARPROFILES;Borrar perfiles
PREFERENCES_CACHECLEARTHUMBS;Borrar miniaturas
PREFERENCES_CACHEMAXENTRIES;Cantidad máxima de entradas en la memoria intermedia
PREFERENCES_CACHEOPTS;Opciones de memoria intermedia
PREFERENCES_CACHETHUMBHEIGHT;Altura máxima de las miniaturas
@ -1697,7 +1694,6 @@ ZOOMPANEL_ZOOMOUT;Reducir Zoom\nAtajo: <b>-</b>
!HISTORY_MSG_486;Lens Correction - Camera
!HISTORY_MSG_487;Lens Correction - Lens
!HISTORY_MSG_488;Dynamic Range Compression
!HISTORY_MSG_489;DRC - Threshold
!HISTORY_MSG_490;DRC - Amount
!HISTORY_MSG_491;White Balance
!HISTORY_MSG_492;RGB Curves
@ -2161,7 +2157,6 @@ ZOOMPANEL_ZOOMOUT;Reducir Zoom\nAtajo: <b>-</b>
!TP_TM_FATTAL_AMOUNT;Amount
!TP_TM_FATTAL_ANCHOR;Anchor
!TP_TM_FATTAL_LABEL;Dynamic Range Compression
!TP_TM_FATTAL_THRESHOLD;Threshold
!TP_WAVELET_1;Level 1
!TP_WAVELET_2;Level 2
!TP_WAVELET_3;Level 3

5
rtdata/languages/Euskara
View File

@ -230,9 +230,6 @@ PARTIALPASTE_SHARPENING;Sharpening
PARTIALPASTE_VIGNETTING;Vignetting correction
PARTIALPASTE_WHITEBALANCE;White balance
PREFERENCES_APPLNEXTSTARTUP;hurrengo abioan aplikatua
PREFERENCES_CACHECLEARALL;Clear All
PREFERENCES_CACHECLEARPROFILES;Clear Profiles
PREFERENCES_CACHECLEARTHUMBS;Clear Thumbnails
PREFERENCES_CACHEMAXENTRIES;Maximal Number of Cache Entries
PREFERENCES_CACHEOPTS;Cache Options
PREFERENCES_CACHETHUMBHEIGHT;Maximal Thumbnail Height
@ -971,7 +968,6 @@ TP_WBALANCE_TEMPERATURE;Tenperatura
!HISTORY_MSG_486;Lens Correction - Camera
!HISTORY_MSG_487;Lens Correction - Lens
!HISTORY_MSG_488;Dynamic Range Compression
!HISTORY_MSG_489;DRC - Threshold
!HISTORY_MSG_490;DRC - Amount
!HISTORY_MSG_491;White Balance
!HISTORY_MSG_492;RGB Curves
@ -2028,7 +2024,6 @@ TP_WBALANCE_TEMPERATURE;Tenperatura
!TP_TM_FATTAL_AMOUNT;Amount
!TP_TM_FATTAL_ANCHOR;Anchor
!TP_TM_FATTAL_LABEL;Dynamic Range Compression
!TP_TM_FATTAL_THRESHOLD;Threshold
!TP_VIBRANCE_AVOIDCOLORSHIFT;Avoid color shift
!TP_VIBRANCE_CURVEEDITOR_SKINTONES;HH
!TP_VIBRANCE_CURVEEDITOR_SKINTONES_LABEL;Skin-tones

5
rtdata/languages/Francais
View File

@ -988,9 +988,6 @@ PREFERENCES_BEHAVIOR;Comportement
PREFERENCES_BEHSETALL;Tout à 'Remplace'
PREFERENCES_BEHSETALLHINT;Règle tous les paramètres sur le mode <b>Remplace</b>.\nLa modification des paramètres dans le panneau d'édition en par lot sera <b>absolue</b>, les valeurs réelles seront affichées
PREFERENCES_BLACKBODY;Tungstène
PREFERENCES_CACHECLEARALL;Tout nettoyer
PREFERENCES_CACHECLEARPROFILES;Nettoyer les profils
PREFERENCES_CACHECLEARTHUMBS;Nettoyer les vignettes
PREFERENCES_CACHEMAXENTRIES;Nombre maximal d'éléments dans le Cache
PREFERENCES_CACHEOPTS;Options du Cache
PREFERENCES_CACHETHUMBHEIGHT;Hauteur maximale des vignettes
@ -2220,7 +2217,6 @@ ZOOMPANEL_ZOOMOUT;Zoom Arrière\nRaccourci: <b>-</b>
!HISTORY_MSG_273;CT - Color Balance SMH
!HISTORY_MSG_392;W - Residual - Color Balance
!HISTORY_MSG_488;Dynamic Range Compression
!HISTORY_MSG_489;DRC - Threshold
!HISTORY_MSG_490;DRC - Amount
!HISTORY_MSG_CLAMPOOG;Clip out-of-gamut colors
!HISTORY_MSG_DUALDEMOSAIC_CONTRAST;AMaZE+VNG4 - Contrast threshold
@ -2289,4 +2285,3 @@ ZOOMPANEL_ZOOMOUT;Zoom Arrière\nRaccourci: <b>-</b>
!TP_TM_FATTAL_AMOUNT;Amount
!TP_TM_FATTAL_ANCHOR;Anchor
!TP_TM_FATTAL_LABEL;Dynamic Range Compression
!TP_TM_FATTAL_THRESHOLD;Threshold

5
rtdata/languages/Greek
View File

@ -230,9 +230,6 @@ PARTIALPASTE_SHARPENING;Sharpening
PARTIALPASTE_VIGNETTING;Vignetting correction
PARTIALPASTE_WHITEBALANCE;White balance
PREFERENCES_APPLNEXTSTARTUP;εφαρμόζεται στην επόμενη εκκίνηση
PREFERENCES_CACHECLEARALL;Clear All
PREFERENCES_CACHECLEARPROFILES;Clear Profiles
PREFERENCES_CACHECLEARTHUMBS;Clear Thumbnails
PREFERENCES_CACHEMAXENTRIES;Maximal Number of Cache Entries
PREFERENCES_CACHEOPTS;Cache Options
PREFERENCES_CACHETHUMBHEIGHT;Maximal Thumbnail Height
@ -970,7 +967,6 @@ TP_WBALANCE_TEMPERATURE;Θερμοκρασία
!HISTORY_MSG_486;Lens Correction - Camera
!HISTORY_MSG_487;Lens Correction - Lens
!HISTORY_MSG_488;Dynamic Range Compression
!HISTORY_MSG_489;DRC - Threshold
!HISTORY_MSG_490;DRC - Amount
!HISTORY_MSG_491;White Balance
!HISTORY_MSG_492;RGB Curves
@ -2027,7 +2023,6 @@ TP_WBALANCE_TEMPERATURE;Θερμοκρασία
!TP_TM_FATTAL_AMOUNT;Amount
!TP_TM_FATTAL_ANCHOR;Anchor
!TP_TM_FATTAL_LABEL;Dynamic Range Compression
!TP_TM_FATTAL_THRESHOLD;Threshold
!TP_VIBRANCE_AVOIDCOLORSHIFT;Avoid color shift
!TP_VIBRANCE_CURVEEDITOR_SKINTONES;HH
!TP_VIBRANCE_CURVEEDITOR_SKINTONES_LABEL;Skin-tones

5
rtdata/languages/Hebrew
View File

@ -230,9 +230,6 @@ PARTIALPASTE_SHARPENING;Sharpening
PARTIALPASTE_VIGNETTING;Vignetting correction
PARTIALPASTE_WHITEBALANCE;White balance
PREFERENCES_APPLNEXTSTARTUP;ייושם באתחול הבא
PREFERENCES_CACHECLEARALL;Clear All
PREFERENCES_CACHECLEARPROFILES;Clear Profiles
PREFERENCES_CACHECLEARTHUMBS;Clear Thumbnails
PREFERENCES_CACHEMAXENTRIES;Maximal Number of Cache Entries
PREFERENCES_CACHEOPTS;Cache Options
PREFERENCES_CACHETHUMBHEIGHT;Maximal Thumbnail Height
@ -971,7 +968,6 @@ TP_WBALANCE_TEMPERATURE;מידת חום
!HISTORY_MSG_486;Lens Correction - Camera
!HISTORY_MSG_487;Lens Correction - Lens
!HISTORY_MSG_488;Dynamic Range Compression
!HISTORY_MSG_489;DRC - Threshold
!HISTORY_MSG_490;DRC - Amount
!HISTORY_MSG_491;White Balance
!HISTORY_MSG_492;RGB Curves
@ -2028,7 +2024,6 @@ TP_WBALANCE_TEMPERATURE;מידת חום
!TP_TM_FATTAL_AMOUNT;Amount
!TP_TM_FATTAL_ANCHOR;Anchor
!TP_TM_FATTAL_LABEL;Dynamic Range Compression
!TP_TM_FATTAL_THRESHOLD;Threshold
!TP_VIBRANCE_AVOIDCOLORSHIFT;Avoid color shift
!TP_VIBRANCE_CURVEEDITOR_SKINTONES;HH
!TP_VIBRANCE_CURVEEDITOR_SKINTONES_LABEL;Skin-tones

5
rtdata/languages/Italiano
View File

@ -627,9 +627,6 @@ PREFERENCES_BEHAVIOR;Comportamento
PREFERENCES_BEHSETALL;Tutti a 'Imposta'
PREFERENCES_BEHSETALLHINT;Imposta tutti i parametri nella modalità <b>Imposta</b>.\nLe regolazioni dei parametri nel pannello strumenti batch saranno <b>assoluti</b>, verranno mostrati i valori reali.
PREFERENCES_BLACKBODY;Tungsteno
PREFERENCES_CACHECLEARALL;Rimuovi tutto
PREFERENCES_CACHECLEARPROFILES;Rimuovi i profili di sviluppo
PREFERENCES_CACHECLEARTHUMBS;Rimuovi le miniature
PREFERENCES_CACHEMAXENTRIES;Numero massimo di voci in memoria
PREFERENCES_CACHEOPTS;Opzioni della memoria
PREFERENCES_CACHETHUMBHEIGHT;Massima altezza delle miniature
@ -1572,7 +1569,6 @@ ZOOMPANEL_ZOOMOUT;Rimpicciolisci.\nScorciatoia: <b>-</b>
!HISTORY_MSG_486;Lens Correction - Camera
!HISTORY_MSG_487;Lens Correction - Lens
!HISTORY_MSG_488;Dynamic Range Compression
!HISTORY_MSG_489;DRC - Threshold
!HISTORY_MSG_490;DRC - Amount
!HISTORY_MSG_491;White Balance
!HISTORY_MSG_492;RGB Curves
@ -2102,7 +2098,6 @@ ZOOMPANEL_ZOOMOUT;Rimpicciolisci.\nScorciatoia: <b>-</b>
!TP_TM_FATTAL_AMOUNT;Amount
!TP_TM_FATTAL_ANCHOR;Anchor
!TP_TM_FATTAL_LABEL;Dynamic Range Compression
!TP_TM_FATTAL_THRESHOLD;Threshold
!TP_WAVELET_1;Level 1
!TP_WAVELET_2;Level 2
!TP_WAVELET_3;Level 3

5
rtdata/languages/Japanese
View File

@ -751,7 +751,6 @@ HISTORY_MSG_485;レンズ補正
HISTORY_MSG_486;レンズ補正 - カメラ
HISTORY_MSG_487;レンズ補正 - レンズ
HISTORY_MSG_488;ダイナミックレンジ圧縮
HISTORY_MSG_489;DRC - しきい値
HISTORY_MSG_490;DRC - 量
HISTORY_MSG_491;ホワイトバランス
HISTORY_MSG_492;RGBカーブ
@ -1056,9 +1055,6 @@ PREFERENCES_BEHAVIOR;ビヘイビア
PREFERENCES_BEHSETALL;すべて '設定'
PREFERENCES_BEHSETALLHINT;すべてのパラメータを <b>設定</b>モードにします\nバッチツールパネルで設定される調整値が、各画像の既定値に取って代わり<b>同一</b>になります
PREFERENCES_BLACKBODY;タングステン
PREFERENCES_CACHECLEARALL;すべてクリア
PREFERENCES_CACHECLEARPROFILES;プロファイルのクリア
PREFERENCES_CACHECLEARTHUMBS;サムネイルのクリア
PREFERENCES_CACHEMAXENTRIES;キャッシュエントリーの最大数
PREFERENCES_CACHEOPTS;cache オプション
PREFERENCES_CACHETHUMBHEIGHT;サムネイル縦の最大値
@ -2040,7 +2036,6 @@ TP_SOFTLIGHT_STRENGTH;強さ
TP_TM_FATTAL_AMOUNT;量
TP_TM_FATTAL_ANCHOR;アンカー
TP_TM_FATTAL_LABEL;ダイナミックレンジ圧縮
TP_TM_FATTAL_THRESHOLD;しきい値
TP_VIBRANCE_AVOIDCOLORSHIFT;色ずれを回避
TP_VIBRANCE_CURVEEDITOR_SKINTONES;HH
TP_VIBRANCE_CURVEEDITOR_SKINTONES_LABEL;肌色トーン

5
rtdata/languages/Latvian
View File

@ -230,9 +230,6 @@ PARTIALPASTE_SHARPENING;Asināšana
PARTIALPASTE_VIGNETTING;Vinjetes labošana
PARTIALPASTE_WHITEBALANCE;Baltā līdzsvarss
PREFERENCES_APPLNEXTSTARTUP;lietos nākamā reizē
PREFERENCES_CACHECLEARALL;Attīrīt visu
PREFERENCES_CACHECLEARPROFILES;Attīrīt Profilus
PREFERENCES_CACHECLEARTHUMBS;Attīrīt sīktēlus
PREFERENCES_CACHEMAXENTRIES;Maksimālais keša ierakstu skaits
PREFERENCES_CACHEOPTS;Keša opcijas
PREFERENCES_CACHETHUMBHEIGHT;Keša maksimālais sīktēla augstums
@ -971,7 +968,6 @@ TP_WBALANCE_TEMPERATURE;Temperatūra
!HISTORY_MSG_486;Lens Correction - Camera
!HISTORY_MSG_487;Lens Correction - Lens
!HISTORY_MSG_488;Dynamic Range Compression
!HISTORY_MSG_489;DRC - Threshold
!HISTORY_MSG_490;DRC - Amount
!HISTORY_MSG_491;White Balance
!HISTORY_MSG_492;RGB Curves
@ -2028,7 +2024,6 @@ TP_WBALANCE_TEMPERATURE;Temperatūra
!TP_TM_FATTAL_AMOUNT;Amount
!TP_TM_FATTAL_ANCHOR;Anchor
!TP_TM_FATTAL_LABEL;Dynamic Range Compression
!TP_TM_FATTAL_THRESHOLD;Threshold
!TP_VIBRANCE_AVOIDCOLORSHIFT;Avoid color shift
!TP_VIBRANCE_CURVEEDITOR_SKINTONES;HH
!TP_VIBRANCE_CURVEEDITOR_SKINTONES_LABEL;Skin-tones

5
rtdata/languages/Magyar
View File

@ -475,9 +475,6 @@ PREFERENCES_APPLNEXTSTARTUP;újraindítás után érvényes
PREFERENCES_AUTOMONPROFILE;Oprendszerben beállított monitor-színprofil automatikus használata
PREFERENCES_BATCH_PROCESSING;Kötegelt feldolgozás
PREFERENCES_BEHAVIOR;Viselkedés
PREFERENCES_CACHECLEARALL;Teljes gyorsítótár törlése
PREFERENCES_CACHECLEARPROFILES;Feldolg. param. törlése
PREFERENCES_CACHECLEARTHUMBS;Előnézeti képek törlése
PREFERENCES_CACHEMAXENTRIES;Gyorsítótárban tárolt képek max. száma
PREFERENCES_CACHEOPTS;Gyorsítótár beállítások
PREFERENCES_CACHETHUMBHEIGHT;Előnézeti kép maximális magassága
@ -1243,7 +1240,6 @@ ZOOMPANEL_ZOOMOUT;Kicsinyítés <b>-</b>
!HISTORY_MSG_486;Lens Correction - Camera
!HISTORY_MSG_487;Lens Correction - Lens
!HISTORY_MSG_488;Dynamic Range Compression
!HISTORY_MSG_489;DRC - Threshold
!HISTORY_MSG_490;DRC - Amount
!HISTORY_MSG_491;White Balance
!HISTORY_MSG_492;RGB Curves
@ -2082,7 +2078,6 @@ ZOOMPANEL_ZOOMOUT;Kicsinyítés <b>-</b>
!TP_TM_FATTAL_AMOUNT;Amount
!TP_TM_FATTAL_ANCHOR;Anchor
!TP_TM_FATTAL_LABEL;Dynamic Range Compression
!TP_TM_FATTAL_THRESHOLD;Threshold
!TP_VIBRANCE_CURVEEDITOR_SKINTONES;HH
!TP_VIBRANCE_CURVEEDITOR_SKINTONES_LABEL;Skin-tones
!TP_VIBRANCE_CURVEEDITOR_SKINTONES_RANGE1;Red/Purple

5
rtdata/languages/Nederlands
View File

@ -912,9 +912,6 @@ PREFERENCES_BEHAVIOR;Gedrag
PREFERENCES_BEHSETALL;Alles op 'Activeer'
PREFERENCES_BEHSETALLHINT;Zet alle parameters in de <b>Activeer</b> mode.\nWijzigingen van parameters in de batch tool zijn <b>absoluut</b>. De actuele waarden worden gebruikt.
PREFERENCES_BLACKBODY;Tungsten(wolfraam)
PREFERENCES_CACHECLEARALL;Wis alles
PREFERENCES_CACHECLEARPROFILES;Wis profielen
PREFERENCES_CACHECLEARTHUMBS;Wis miniaturen
PREFERENCES_CACHEMAXENTRIES;Maximaal aantal elementen in cache
PREFERENCES_CACHEOPTS;Cache-opties
PREFERENCES_CACHETHUMBHEIGHT;Maximale hoogte miniaturen
@ -2106,7 +2103,6 @@ ZOOMPANEL_ZOOMOUT;Zoom uit\nSneltoets: <b>-</b>
!HISTORY_MSG_486;Lens Correction - Camera
!HISTORY_MSG_487;Lens Correction - Lens
!HISTORY_MSG_488;Dynamic Range Compression
!HISTORY_MSG_489;DRC - Threshold
!HISTORY_MSG_490;DRC - Amount
!HISTORY_MSG_491;White Balance
!HISTORY_MSG_492;RGB Curves
@ -2305,5 +2301,4 @@ ZOOMPANEL_ZOOMOUT;Zoom uit\nSneltoets: <b>-</b>
!TP_TM_FATTAL_AMOUNT;Amount
!TP_TM_FATTAL_ANCHOR;Anchor
!TP_TM_FATTAL_LABEL;Dynamic Range Compression
!TP_TM_FATTAL_THRESHOLD;Threshold
!TP_WAVELET_CB_TOOLTIP;For strong values product color-toning by combining it or not with levels decomposition 'toning'\nFor low values you can change the white balance of the background (sky, ...) without changing that of the front plane, generally more contrasted

5
rtdata/languages/Norsk BM
View File

@ -230,9 +230,6 @@ PARTIALPASTE_SHARPENING;Oppskarping
PARTIALPASTE_VIGNETTING;Vignetteringskorreksjon
PARTIALPASTE_WHITEBALANCE;Hvitbalanse
PREFERENCES_APPLNEXTSTARTUP;Endres ved neste oppstart
PREFERENCES_CACHECLEARALL;Slett alle
PREFERENCES_CACHECLEARPROFILES;Slett profiler
PREFERENCES_CACHECLEARTHUMBS;Slett thumbnails
PREFERENCES_CACHEMAXENTRIES;Maksimalt antall cache oppføringer
PREFERENCES_CACHEOPTS;Cache innstillinger
PREFERENCES_CACHETHUMBHEIGHT;Maksimal Thumbnail Høyde
@ -970,7 +967,6 @@ TP_WBALANCE_TEMPERATURE;Temperatur
!HISTORY_MSG_486;Lens Correction - Camera
!HISTORY_MSG_487;Lens Correction - Lens
!HISTORY_MSG_488;Dynamic Range Compression
!HISTORY_MSG_489;DRC - Threshold
!HISTORY_MSG_490;DRC - Amount
!HISTORY_MSG_491;White Balance
!HISTORY_MSG_492;RGB Curves
@ -2027,7 +2023,6 @@ TP_WBALANCE_TEMPERATURE;Temperatur
!TP_TM_FATTAL_AMOUNT;Amount
!TP_TM_FATTAL_ANCHOR;Anchor
!TP_TM_FATTAL_LABEL;Dynamic Range Compression
!TP_TM_FATTAL_THRESHOLD;Threshold
!TP_VIBRANCE_AVOIDCOLORSHIFT;Avoid color shift
!TP_VIBRANCE_CURVEEDITOR_SKINTONES;HH
!TP_VIBRANCE_CURVEEDITOR_SKINTONES_LABEL;Skin-tones

5
rtdata/languages/Polish
View File

@ -676,9 +676,6 @@ PREFERENCES_BEHAVIOR;Zachowanie
PREFERENCES_BEHSETALL;'Ustaw' wszystkie
PREFERENCES_BEHSETALLHINT;Ustaw wszystkie narzędzia w tryb <b>Ustaw</b>.\nZmiany parametrów w panelu edycji zbiorczej zostaną traktowane jako <b>absolutne</b>, nie biorąc pod uwagę poprzednich wartości.
PREFERENCES_BLACKBODY;Wolfram
PREFERENCES_CACHECLEARALL;Wyczyść wszystko
PREFERENCES_CACHECLEARPROFILES;Wyczyść profile
PREFERENCES_CACHECLEARTHUMBS;Wyczyść miniaturki
PREFERENCES_CACHEMAXENTRIES;Maksymalna liczba wpisów w pamięci podręcznej
PREFERENCES_CACHEOPTS;Opcje pamięci podręcznej
PREFERENCES_CACHETHUMBHEIGHT;Maksymalna wysokość miniatury
@ -1654,7 +1651,6 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrót: <b>-</b>
!HISTORY_MSG_486;Lens Correction - Camera
!HISTORY_MSG_487;Lens Correction - Lens
!HISTORY_MSG_488;Dynamic Range Compression
!HISTORY_MSG_489;DRC - Threshold
!HISTORY_MSG_490;DRC - Amount
!HISTORY_MSG_491;White Balance
!HISTORY_MSG_492;RGB Curves
@ -2108,7 +2104,6 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrót: <b>-</b>
!TP_TM_FATTAL_AMOUNT;Amount
!TP_TM_FATTAL_ANCHOR;Anchor
!TP_TM_FATTAL_LABEL;Dynamic Range Compression
!TP_TM_FATTAL_THRESHOLD;Threshold
!TP_WAVELET_1;Level 1
!TP_WAVELET_2;Level 2
!TP_WAVELET_3;Level 3

5
rtdata/languages/Polish (Latin Characters)
View File

@ -676,9 +676,6 @@ PREFERENCES_BEHAVIOR;Zachowanie
PREFERENCES_BEHSETALL;'Ustaw' wszystkie
PREFERENCES_BEHSETALLHINT;Ustaw wszystkie narzedzia w tryb <b>Ustaw</b>.\nZmiany parametrow w panelu edycji zbiorczej zostana traktowane jako <b>absolutne</b>, nie biorac pod uwage poprzednich wartosci.
PREFERENCES_BLACKBODY;Wolfram
PREFERENCES_CACHECLEARALL;Wyczysc wszystko
PREFERENCES_CACHECLEARPROFILES;Wyczysc profile
PREFERENCES_CACHECLEARTHUMBS;Wyczysc miniaturki
PREFERENCES_CACHEMAXENTRIES;Maksymalna liczba wpisow w pamieci podrecznej
PREFERENCES_CACHEOPTS;Opcje pamieci podrecznej
PREFERENCES_CACHETHUMBHEIGHT;Maksymalna wysokosc miniatury
@ -1654,7 +1651,6 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrot: <b>-</b>
!HISTORY_MSG_486;Lens Correction - Camera
!HISTORY_MSG_487;Lens Correction - Lens
!HISTORY_MSG_488;Dynamic Range Compression
!HISTORY_MSG_489;DRC - Threshold
!HISTORY_MSG_490;DRC - Amount
!HISTORY_MSG_491;White Balance
!HISTORY_MSG_492;RGB Curves
@ -2108,7 +2104,6 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrot: <b>-</b>
!TP_TM_FATTAL_AMOUNT;Amount
!TP_TM_FATTAL_ANCHOR;Anchor
!TP_TM_FATTAL_LABEL;Dynamic Range Compression
!TP_TM_FATTAL_THRESHOLD;Threshold
!TP_WAVELET_1;Level 1
!TP_WAVELET_2;Level 2
!TP_WAVELET_3;Level 3

5
rtdata/languages/Portugues (Brasil)
View File

@ -717,7 +717,6 @@ HISTORY_MSG_485;Correção de Lente
HISTORY_MSG_486;Correção de Lente - Câmera
HISTORY_MSG_487;Correção de Lente - Lente
HISTORY_MSG_488;Compressão de Amplitude Dinâmica(DRC)
HISTORY_MSG_489;DRC - Limite
HISTORY_MSG_490;DRC - Montante
HISTORY_MSG_491;Balanço de Branco
HISTORY_MSG_492;Curvas RGB
@ -1020,9 +1019,6 @@ PREFERENCES_BEHAVIOR;Comportamento
PREFERENCES_BEHSETALL;Tudo para 'Configurar'
PREFERENCES_BEHSETALLHINT;Definir todos os parâmetros para o <b>Configurar</b> modo.\nAjustes de parâmetros no painel de ferramentas de lote serão <b>absoluto</b>, os valores reais serão exibidos.
PREFERENCES_BLACKBODY;Tungstênio
PREFERENCES_CACHECLEARALL;Limpar Tudo
PREFERENCES_CACHECLEARPROFILES;Limpar Perfis de Processamento
PREFERENCES_CACHECLEARTHUMBS;Limpar Miniaturas
PREFERENCES_CACHEMAXENTRIES;Número máximo de entradas de cache
PREFERENCES_CACHEOPTS;Opções de Cache
PREFERENCES_CACHETHUMBHEIGHT;Altura máxima da miniatura
@ -2003,7 +1999,6 @@ TP_SOFTLIGHT_STRENGTH;Intensidade
TP_TM_FATTAL_AMOUNT;Montante
TP_TM_FATTAL_ANCHOR;Âncora
TP_TM_FATTAL_LABEL;Compressão de Amplitude Dinâmica(DRC)
TP_TM_FATTAL_THRESHOLD;Limite
TP_VIBRANCE_AVOIDCOLORSHIFT;Evite mudança de cor
TP_VIBRANCE_CURVEEDITOR_SKINTONES;MM
TP_VIBRANCE_CURVEEDITOR_SKINTONES_LABEL;Tons cor de pele

5
rtdata/languages/Russian
View File

@ -672,9 +672,6 @@ PREFERENCES_BEHAVIOR;Поведение
PREFERENCES_BEHSETALL;Всё в "Установить"
PREFERENCES_BEHSETALLHINT;Выставить все параметры в режим <b>Установить</b>.\nНастройки параметров в панели пакетной обработки будут <b>абсолютными</b>, будут показаны используемые значения
PREFERENCES_BLACKBODY;Лампа накаливания
PREFERENCES_CACHECLEARALL;Удалить все
PREFERENCES_CACHECLEARPROFILES;Удалить параметры обработки
PREFERENCES_CACHECLEARTHUMBS;Удалить эскизы
PREFERENCES_CACHEMAXENTRIES;Максимальное число элементов в кэше
PREFERENCES_CACHEOPTS;Параметры кэширования
PREFERENCES_CACHETHUMBHEIGHT;Максимальная высота эскиза
@ -1636,7 +1633,6 @@ ZOOMPANEL_ZOOMOUT;Отдалить\nГорячая клавиша: <b>-</b>
!HISTORY_MSG_486;Lens Correction - Camera
!HISTORY_MSG_487;Lens Correction - Lens
!HISTORY_MSG_488;Dynamic Range Compression
!HISTORY_MSG_489;DRC - Threshold
!HISTORY_MSG_490;DRC - Amount
!HISTORY_MSG_CLAMPOOG;Clip out-of-gamut colors
!HISTORY_MSG_COLORTONING_LABGRID_VALUE;CT - Color correction
@ -2108,7 +2104,6 @@ ZOOMPANEL_ZOOMOUT;Отдалить\nГорячая клавиша: <b>-</b>
!TP_TM_FATTAL_AMOUNT;Amount
!TP_TM_FATTAL_ANCHOR;Anchor
!TP_TM_FATTAL_LABEL;Dynamic Range Compression
!TP_TM_FATTAL_THRESHOLD;Threshold
!TP_WAVELET_1;Level 1
!TP_WAVELET_2;Level 2
!TP_WAVELET_3;Level 3

5
rtdata/languages/Serbian (Cyrilic Characters)
View File

@ -597,9 +597,6 @@ PREFERENCES_BEHAVIOR;Понашање
PREFERENCES_BEHSETALL;Све у „Постави“
PREFERENCES_BEHSETALLHINT;Поставља све параметре у режим <b>Постави</b>.\nЊихово подешавање помоћу алата из панела за заказано ће бити <b>апсолутне</b> вредности као што су и изабране.
PREFERENCES_BLACKBODY;Обична сијалица
PREFERENCES_CACHECLEARALL;Обриши све
PREFERENCES_CACHECLEARPROFILES;Обриши профиле
PREFERENCES_CACHECLEARTHUMBS;Обриши приказе
PREFERENCES_CACHEMAXENTRIES;Највећи број мест у остави
PREFERENCES_CACHEOPTS;Подешавање оставе
PREFERENCES_CACHETHUMBHEIGHT;Највећа висина приказа
@ -1548,7 +1545,6 @@ ZOOMPANEL_ZOOMOUT;Умањује приказ слике <b>-</b>
!HISTORY_MSG_486;Lens Correction - Camera
!HISTORY_MSG_487;Lens Correction - Lens
!HISTORY_MSG_488;Dynamic Range Compression
!HISTORY_MSG_489;DRC - Threshold
!HISTORY_MSG_490;DRC - Amount
!HISTORY_MSG_491;White Balance
!HISTORY_MSG_492;RGB Curves
@ -2103,7 +2099,6 @@ ZOOMPANEL_ZOOMOUT;Умањује приказ слике <b>-</b>
!TP_TM_FATTAL_AMOUNT;Amount
!TP_TM_FATTAL_ANCHOR;Anchor
!TP_TM_FATTAL_LABEL;Dynamic Range Compression
!TP_TM_FATTAL_THRESHOLD;Threshold
!TP_WAVELET_1;Level 1
!TP_WAVELET_2;Level 2
!TP_WAVELET_3;Level 3

5
rtdata/languages/Serbian (Latin Characters)
View File

@ -597,9 +597,6 @@ PREFERENCES_BEHAVIOR;Ponašanje
PREFERENCES_BEHSETALL;Sve u „Postavi“
PREFERENCES_BEHSETALLHINT;Postavlja sve parametre u režim <b>Postavi</b>.\nNjihovo podešavanje pomoću alata iz panela za zakazano će biti <b>apsolutne</b> vrednosti kao što su i izabrane.
PREFERENCES_BLACKBODY;Obična sijalica
PREFERENCES_CACHECLEARALL;Obriši sve
PREFERENCES_CACHECLEARPROFILES;Obriši profile
PREFERENCES_CACHECLEARTHUMBS;Obriši prikaze
PREFERENCES_CACHEMAXENTRIES;Najveći broj mest u ostavi
PREFERENCES_CACHEOPTS;Podešavanje ostave
PREFERENCES_CACHETHUMBHEIGHT;Najveća visina prikaza
@ -1548,7 +1545,6 @@ ZOOMPANEL_ZOOMOUT;Umanjuje prikaz slike <b>-</b>
!HISTORY_MSG_486;Lens Correction - Camera
!HISTORY_MSG_487;Lens Correction - Lens
!HISTORY_MSG_488;Dynamic Range Compression
!HISTORY_MSG_489;DRC - Threshold
!HISTORY_MSG_490;DRC - Amount
!HISTORY_MSG_491;White Balance
!HISTORY_MSG_492;RGB Curves
@ -2103,7 +2099,6 @@ ZOOMPANEL_ZOOMOUT;Umanjuje prikaz slike <b>-</b>
!TP_TM_FATTAL_AMOUNT;Amount
!TP_TM_FATTAL_ANCHOR;Anchor
!TP_TM_FATTAL_LABEL;Dynamic Range Compression
!TP_TM_FATTAL_THRESHOLD;Threshold
!TP_WAVELET_1;Level 1
!TP_WAVELET_2;Level 2
!TP_WAVELET_3;Level 3

5
rtdata/languages/Slovak
View File

@ -274,9 +274,6 @@ PREFERENCES_ADD;Pridať
PREFERENCES_APPLNEXTSTARTUP;Aplikovaný pri ďalšom spustení
PREFERENCES_BATCH_PROCESSING;dávkové spracovanie
PREFERENCES_BEHAVIOR;Správanie sa
PREFERENCES_CACHECLEARALL;Vyčistiť všetko
PREFERENCES_CACHECLEARPROFILES;Vyčistiť profily
PREFERENCES_CACHECLEARTHUMBS;Vyčistiť zmenšeniny
PREFERENCES_CACHEMAXENTRIES;Maximálny počet vstupov v cache
PREFERENCES_CACHEOPTS;Možnosti cache
PREFERENCES_CACHETHUMBHEIGHT;Maximálna výška zmenšenín
@ -1033,7 +1030,6 @@ ZOOMPANEL_ZOOMOUT;Oddialiť <b>-</b>
!HISTORY_MSG_486;Lens Correction - Camera
!HISTORY_MSG_487;Lens Correction - Lens
!HISTORY_MSG_488;Dynamic Range Compression
!HISTORY_MSG_489;DRC - Threshold
!HISTORY_MSG_490;DRC - Amount
!HISTORY_MSG_491;White Balance
!HISTORY_MSG_492;RGB Curves
@ -2037,7 +2033,6 @@ ZOOMPANEL_ZOOMOUT;Oddialiť <b>-</b>
!TP_TM_FATTAL_AMOUNT;Amount
!TP_TM_FATTAL_ANCHOR;Anchor
!TP_TM_FATTAL_LABEL;Dynamic Range Compression
!TP_TM_FATTAL_THRESHOLD;Threshold
!TP_VIBRANCE_AVOIDCOLORSHIFT;Avoid color shift
!TP_VIBRANCE_CURVEEDITOR_SKINTONES;HH
!TP_VIBRANCE_CURVEEDITOR_SKINTONES_LABEL;Skin-tones

5
rtdata/languages/Suomi
View File

@ -230,9 +230,6 @@ PARTIALPASTE_SHARPENING;Terävöinti
PARTIALPASTE_VIGNETTING;Vinjetoinnin korjaus
PARTIALPASTE_WHITEBALANCE;Valkotasapaino
PREFERENCES_APPLNEXTSTARTUP;käytössä käynnistyksen jälkeen
PREFERENCES_CACHECLEARALL;Tyhjennä kaikki
PREFERENCES_CACHECLEARPROFILES;Tyhjennä profiilit
PREFERENCES_CACHECLEARTHUMBS;Tyhjennä esikatselukuvat
PREFERENCES_CACHEMAXENTRIES;Välimuistin koko
PREFERENCES_CACHEOPTS;Välimuistin asetukset
PREFERENCES_CACHETHUMBHEIGHT;Suurin esikatselukuvan korkeus
@ -972,7 +969,6 @@ TP_WBALANCE_TEMPERATURE;Lämpötila [K]
!HISTORY_MSG_486;Lens Correction - Camera
!HISTORY_MSG_487;Lens Correction - Lens
!HISTORY_MSG_488;Dynamic Range Compression
!HISTORY_MSG_489;DRC - Threshold
!HISTORY_MSG_490;DRC - Amount
!HISTORY_MSG_491;White Balance
!HISTORY_MSG_492;RGB Curves
@ -2028,7 +2024,6 @@ TP_WBALANCE_TEMPERATURE;Lämpötila [K]
!TP_TM_FATTAL_AMOUNT;Amount
!TP_TM_FATTAL_ANCHOR;Anchor
!TP_TM_FATTAL_LABEL;Dynamic Range Compression
!TP_TM_FATTAL_THRESHOLD;Threshold
!TP_VIBRANCE_AVOIDCOLORSHIFT;Avoid color shift
!TP_VIBRANCE_CURVEEDITOR_SKINTONES;HH
!TP_VIBRANCE_CURVEEDITOR_SKINTONES_LABEL;Skin-tones

5
rtdata/languages/Swedish
View File

@ -817,9 +817,6 @@ PREFERENCES_BEHAVIOR;Uppträdande
PREFERENCES_BEHSETALL;Sätt allt till 'Ange'
PREFERENCES_BEHSETALLHINT;Sätt alla parametrar till <b>Ange</b>-läge.\nFörändringar i parametrar i batch-verktyget kommer att vara <b>absoluta</b> och de faktiska värdena kommer att visas.
PREFERENCES_BLACKBODY;Glödlampa
PREFERENCES_CACHECLEARALL;Återställ alla
PREFERENCES_CACHECLEARPROFILES;Återställ profiler
PREFERENCES_CACHECLEARTHUMBS;Ta bort cachade miniatyrbilder
PREFERENCES_CACHEMAXENTRIES;Maximalt antal cachefiler
PREFERENCES_CACHEOPTS;Cacheinställningar
PREFERENCES_CACHETHUMBHEIGHT;Maximal höjd på miniatyrbilderna
@ -1909,7 +1906,6 @@ ZOOMPANEL_ZOOMOUT;Förminska.\nKortkommando: <b>-</b>
!HISTORY_MSG_486;Lens Correction - Camera
!HISTORY_MSG_487;Lens Correction - Lens
!HISTORY_MSG_488;Dynamic Range Compression
!HISTORY_MSG_489;DRC - Threshold
!HISTORY_MSG_490;DRC - Amount
!HISTORY_MSG_491;White Balance
!HISTORY_MSG_492;RGB Curves
@ -2233,7 +2229,6 @@ ZOOMPANEL_ZOOMOUT;Förminska.\nKortkommando: <b>-</b>
!TP_TM_FATTAL_AMOUNT;Amount
!TP_TM_FATTAL_ANCHOR;Anchor
!TP_TM_FATTAL_LABEL;Dynamic Range Compression
!TP_TM_FATTAL_THRESHOLD;Threshold
!TP_WAVELET_CBENAB;Toning and Color Balance
!TP_WAVELET_CB_TOOLTIP;For strong values product color-toning by combining it or not with levels decomposition 'toning'\nFor low values you can change the white balance of the background (sky, ...) without changing that of the front plane, generally more contrasted
!TP_WAVELET_CHRO_TOOLTIP;Sets the wavelet level which will be the threshold between saturated and pastel colors.\n1-x: saturated\nx-9: pastel\n\nIf the value exceeds the amount of wavelet levels you are using then it will be ignored.

5
rtdata/languages/Turkish
View File

@ -230,9 +230,6 @@ PARTIALPASTE_SHARPENING;Sharpening
PARTIALPASTE_VIGNETTING;Vignetting correction
PARTIALPASTE_WHITEBALANCE;White balance
PREFERENCES_APPLNEXTSTARTUP;Bir sonraki başlamada uygulacacak.
PREFERENCES_CACHECLEARALL;Clear All
PREFERENCES_CACHECLEARPROFILES;Clear Profiles
PREFERENCES_CACHECLEARTHUMBS;Clear Thumbnails
PREFERENCES_CACHEMAXENTRIES;Maximal Number of Cache Entries
PREFERENCES_CACHEOPTS;Cache Options
PREFERENCES_CACHETHUMBHEIGHT;Maximal Thumbnail Height
@ -971,7 +968,6 @@ TP_WBALANCE_TEMPERATURE;Isı
!HISTORY_MSG_486;Lens Correction - Camera
!HISTORY_MSG_487;Lens Correction - Lens
!HISTORY_MSG_488;Dynamic Range Compression
!HISTORY_MSG_489;DRC - Threshold
!HISTORY_MSG_490;DRC - Amount
!HISTORY_MSG_491;White Balance
!HISTORY_MSG_492;RGB Curves
@ -2027,7 +2023,6 @@ TP_WBALANCE_TEMPERATURE;Isı
!TP_TM_FATTAL_AMOUNT;Amount
!TP_TM_FATTAL_ANCHOR;Anchor
!TP_TM_FATTAL_LABEL;Dynamic Range Compression
!TP_TM_FATTAL_THRESHOLD;Threshold
!TP_VIBRANCE_AVOIDCOLORSHIFT;Avoid color shift
!TP_VIBRANCE_CURVEEDITOR_SKINTONES;HH
!TP_VIBRANCE_CURVEEDITOR_SKINTONES_LABEL;Skin-tones

13
rtdata/languages/default
View File

@ -741,7 +741,7 @@ HISTORY_MSG_485;Lens Correction
HISTORY_MSG_486;Lens Correction - Camera
HISTORY_MSG_487;Lens Correction - Lens
HISTORY_MSG_488;Dynamic Range Compression
HISTORY_MSG_489;DRC - Threshold
HISTORY_MSG_489;DRC - Detail
HISTORY_MSG_490;DRC - Amount
HISTORY_MSG_491;White Balance
HISTORY_MSG_492;RGB Curves
@ -1164,10 +1164,11 @@ PREFERENCES_BEHAVIOR;Behavior
PREFERENCES_BEHSETALL;All to 'Set'
PREFERENCES_BEHSETALLHINT;Set all parameters to the <b>Set</b> mode.\nAdjustments of parameters in the batch tool panel will be <b>absolute</b>, the actual values will be displayed.
PREFERENCES_BLACKBODY;Tungsten
PREFERENCES_CACHECLEARALL;Clear All
PREFERENCES_CACHECLEARPROFILES;Clear pp3
PREFERENCES_CACHECLEARMIP;Clear mip
PREFERENCES_CACHECLEARTHUMBS;Clear Thumbnails
PREFERENCES_CACHECLEAR;Clear
PREFERENCES_CACHECLEAR_ALL;Clear all cached files:
PREFERENCES_CACHECLEAR_ALLBUTPROFILES;Clear all cached files except for cached processing profiles:
PREFERENCES_CACHECLEAR_ONLYPROFILES;Clear only cached processing profiles:
PREFERENCES_CACHECLEAR_SAFETY;Only files in the cache are cleared. Processing profiles stored alongside the source images are not touched.
PREFERENCES_CACHEMAXENTRIES;Maximum number of cache entries
PREFERENCES_CACHEOPTS;Cache Options
PREFERENCES_CACHETHUMBHEIGHT;Maximum thumbnail height
@ -2276,7 +2277,7 @@ TP_SOFTLIGHT_STRENGTH;Strength
TP_TM_FATTAL_AMOUNT;Amount
TP_TM_FATTAL_ANCHOR;Anchor
TP_TM_FATTAL_LABEL;Dynamic Range Compression
TP_TM_FATTAL_THRESHOLD;Threshold
TP_TM_FATTAL_THRESHOLD;Detail
TP_VIBRANCE_AVOIDCOLORSHIFT;Avoid color shift
TP_VIBRANCE_CURVEEDITOR_SKINTONES;HH
TP_VIBRANCE_CURVEEDITOR_SKINTONES_LABEL;Skin-tones

18
rtengine/color.cc
View File

@ -1953,6 +1953,24 @@ void Color::Lab2Lch(float a, float b, float &c, float &h)
h = xatan2f(b, a);
}
#ifdef __SSE2__
void Color::Lab2Lch(float *a, float *b, float *c, float *h, int w)
{
int i = 0;
vfloat c327d68v = F2V(327.68f);
for (; i < w - 3; i += 4) {
vfloat av = LVFU(a[i]);
vfloat bv = LVFU(b[i]);
STVFU(c[i], vsqrtf(SQRV(av) + SQRV(bv)) / c327d68v);
STVFU(h[i], xatan2f(bv, av));
}
for (; i < w; ++i) {
c[i] = sqrtf(SQR(a[i]) + SQR(b[i])) / 327.68f;
h[i] = xatan2f(b[i], a[i]);
}
}
#endif
void Color::Lch2Lab(float c, float h, float &a, float &b)
{
float2 sincosval = xsincosf(h);

4
rtengine/color.h
View File

@ -652,7 +652,9 @@ public:
* @param h 'h' channel return value, in [-PI ; +PI] (return value)
*/
static void Lab2Lch(float a, float b, float &c, float &h);
#ifdef __SSE2__
static void Lab2Lch(float *a, float *b, float *c, float *h, int w);
#endif
/**
* @brief Convert 'c' and 'h' channels of the Lch color space to the 'a' and 'b' channels of the L*a*b color space (channel 'L' is identical [0 ; 32768])

2
rtengine/gauss.cc
View File

@ -1142,7 +1142,7 @@ template<class T> void gaussVerticalmult (T** src, T** dst, const int W, const i
template<class T> void gaussianBlurImpl(T** src, T** dst, const int W, const int H, const double sigma, T *buffer = nullptr, eGaussType gausstype = GAUSS_STANDARD, T** buffer2 = nullptr)
{
static constexpr auto GAUSS_3X3_LIMIT = 0.6;
static constexpr auto GAUSS_DOUBLE = 70.0;
static constexpr auto GAUSS_DOUBLE = 25.0;
if(buffer) {
// special variant for very large sigma, currently only used by retinex algorithm

4
rtengine/improcfun.cc
View File

@ -5948,8 +5948,8 @@ void ImProcFunctions::lab2rgb(const LabImage &src, Imagefloat &dst, const Glib::
*/
void ImProcFunctions::colorToningLabGrid(LabImage *lab, int xstart, int xend, int ystart, int yend, bool MultiThread)
{
const float factor = 3.f;
const float scaling = 3.f;
const float factor = ColorToningParams::LABGRID_CORR_MAX * 3.f;
const float scaling = ColorToningParams::LABGRID_CORR_SCALE;
float a_scale = (params->colorToning.labgridAHigh - params->colorToning.labgridALow) / factor / scaling;
float a_base = params->colorToning.labgridALow / scaling;
float b_scale = (params->colorToning.labgridBHigh - params->colorToning.labgridBLow) / factor / scaling;

153
rtengine/iplabregions.cc
View File

@ -24,6 +24,31 @@
#include "improcfun.h"
#include "guidedfilter.h"
//#define BENCHMARK
#include "StopWatch.h"
#include "sleef.c"
namespace {
#ifdef __SSE2__
void fastlin2log(float *x, float factor, float base, int w)
{
float baseLog = 1.f / xlogf(base);
vfloat baseLogv = F2V(baseLog);
factor = factor * (base - 1.f);
vfloat factorv = F2V(factor);
vfloat onev = F2V(1.f);
int i = 0;
for (; i < w - 3; i += 4) {
STVFU(x[i], xlogf(LVFU(x[i]) * factorv + onev) * baseLogv);
}
for (; i < w; ++i) {
x[i] = xlogf(x[i] * factor + 1.f) * baseLog;
}
}
#endif
}
namespace rtengine {
@ -32,7 +57,7 @@ void ImProcFunctions::labColorCorrectionRegions(LabImage *lab)
if (!params->colorToning.enabled || params->colorToning.method != "LabRegions") {
return;
}
BENCHFUN
int n = params->colorToning.labregions.size();
int show_mask_idx = params->colorToning.labregionsShowMask;
if (show_mask_idx >= n) {
@ -65,53 +90,62 @@ void ImProcFunctions::labColorCorrectionRegions(LabImage *lab)
Lmask[i](lab->W, lab->H);
}
#ifdef _OPENMP
#pragma omp parallel for if (multiThread)
#endif
for (int y = 0; y < lab->H; ++y) {
for (int x = 0; x < lab->W; ++x) {
float l = lab->L[y][x];
float a = lab->a[y][x];
float b = lab->b[y][x];
float c, h;
Color::Lab2Lch(a, b, c, h);
array2D<float> guide(lab->W, lab->H);
// magic constant c_factor: normally chromaticity is in [0; 42000] (see color.h), but here we use the constant to match how the chromaticity pipette works (see improcfun.cc lines 4705-4706 and color.cc line 1930
constexpr float c_factor = 327.68f / 48000.f;
float c1 = lin2log(c * c_factor, 10.f);
float h1 = Color::huelab_to_huehsv2(h);
h1 = h1 + 1.f/6.f; // offset the hue because we start from purple instead of red
if (h1 > 1.f) {
h1 -= 1.f;
#ifdef _OPENMP
#pragma omp parallel if (multiThread)
#endif
{
#ifdef __SSE2__
float cBuffer[lab->W];
float hBuffer[lab->W];
#endif
#ifdef _OPENMP
#pragma omp for schedule(dynamic, 16)
#endif
for (int y = 0; y < lab->H; ++y) {
#ifdef __SSE2__
// vectorized precalculation
Color::Lab2Lch(lab->a[y], lab->b[y], cBuffer, hBuffer, lab->W);
fastlin2log(cBuffer, c_factor, 10.f, lab->W);
#endif
for (int x = 0; x < lab->W; ++x) {
const float l = lab->L[y][x] / 32768.f;
guide[y][x] = LIM01(l);
#ifdef __SSE2__
// use precalculated values
const float c = cBuffer[x];
float h = hBuffer[x];
#else
float c, h;
Color::Lab2Lch(lab->a[y][x], lab->b[y][x], c, h);
c = xlin2log(c * c_factor, 10.f);
#endif
h = Color::huelab_to_huehsv2(h);
h += 1.f/6.f; // offset the hue because we start from purple instead of red
if (h > 1.f) {
h -= 1.f;
}
h1 = lin2log(h1, 3.f);
float l1 = l / 32768.f;
h = xlin2log(h, 3.f);
for (int i = begin_idx; i < end_idx; ++i) {
auto &hm = hmask[i];
auto &cm = cmask[i];
auto &lm = lmask[i];
float blend = LIM01((hm ? hm->getVal(h1) : 1.f) * (cm ? cm->getVal(c1) : 1.f) * (lm ? lm->getVal(l1) : 1.f));
float blend = LIM01((hm ? hm->getVal(h) : 1.f) * (cm ? cm->getVal(c) : 1.f) * (lm ? lm->getVal(l) : 1.f));
Lmask[i][y][x] = abmask[i][y][x] = blend;
}
}
}
{
array2D<float> guide(lab->W, lab->H, lab->L);
#ifdef _OPENMP
#pragma omp parallel for if (multiThread)
#endif
for (int y = 0; y < lab->H; ++y) {
for (int x = 0; x < lab->W; ++x) {
guide[y][x] = LIM01(lab->L[y][x] / 32768.f);
}
}
for (int i = begin_idx; i < end_idx; ++i) {
rtengine::guidedFilter(guide, abmask[i], abmask[i], max(int(4 / scale + 0.5), 1), 0.001, multiThread);
rtengine::guidedFilter(guide, Lmask[i], Lmask[i], max(int(25 / scale + 0.5), 1), 0.0001, multiThread);
}
}
if (show_mask_idx >= 0) {
#ifdef _OPENMP
@ -132,25 +166,67 @@ void ImProcFunctions::labColorCorrectionRegions(LabImage *lab)
const auto abcoord =
[](float x) -> float
{
return 12000.f * SGN(x) * log2lin(std::abs(x), 4.f);
return 12000.f * SGN(x) * xlog2lin(std::abs(x), 4.f);
};
float abca[n];
float abcb[n];
float rs[n];
float rl[n];
for (int i = 0; i < n; ++i) {
auto &r = params->colorToning.labregions[i];
abca[i] = abcoord(r.a);
abcb[i] = abcoord(r.b);
rs[i] = 1.f + r.saturation / 100.f;
rl[i] = 1.f + r.lightness / 500.f;
}
#ifdef _OPENMP
#pragma omp parallel for if (multiThread)
#pragma omp parallel if (multiThread)
#endif
{
#ifdef __SSE2__
vfloat c42000v = F2V(42000.f);
vfloat cm42000v = F2V(-42000.f);
vfloat c32768v = F2V(32768.f);
#endif
#ifdef _OPENMP
#pragma omp for
#endif
for (int y = 0; y < lab->H; ++y) {
for (int x = 0; x < lab->W; ++x) {
int x = 0;
#ifdef __SSE2__
for (; x < lab->W - 3; x += 4) {
vfloat lv = LVFU(lab->L[y][x]);
vfloat av = LVFU(lab->a[y][x]);
vfloat bv = LVFU(lab->b[y][x]);
for (int i = 0; i < n; ++i) {
vfloat blendv = LVFU(abmask[i][y][x]);
vfloat sv = F2V(rs[i]);
vfloat a_newv = LIMV(sv * (av + F2V(abca[i])), cm42000v, c42000v);
vfloat b_newv = LIMV(sv * (bv + F2V(abcb[i])), cm42000v, c42000v);
vfloat l_newv = LIMV(lv * F2V(rl[i]), ZEROV, c32768v);
lv = vintpf(LVFU(Lmask[i][y][x]), l_newv, lv);
av = vintpf(blendv, a_newv, av);
bv = vintpf(blendv, b_newv, bv);
}
STVFU(lab->L[y][x], lv);
STVFU(lab->a[y][x], av);
STVFU(lab->b[y][x], bv);
}
#endif
for (; x < lab->W; ++x) {
float l = lab->L[y][x];
float a = lab->a[y][x];
float b = lab->b[y][x];
for (int i = 0; i < n; ++i) {
auto &r = params->colorToning.labregions[i];
float blend = abmask[i][y][x];
float s = 1.f + r.saturation / 100.f;
float a_new = LIM(s * (a + abcoord(r.a)), -42000.f, 42000.f);
float b_new = LIM(s * (b + abcoord(r.b)), -42000.f, 42000.f);
float l_new = LIM(l * (1.f + float(r.lightness) / 500.f), 0.f, 32768.f);
float s = rs[i];
float a_new = LIM(s * (a + abca[i]), -42000.f, 42000.f);
float b_new = LIM(s * (b + abcb[i]), -42000.f, 42000.f);
float l_new = LIM(l * rl[i], 0.f, 32768.f);
l = intp(Lmask[i][y][x], l_new, l);
a = intp(blend, a_new, a);
b = intp(blend, b_new, b);
@ -160,6 +236,7 @@ void ImProcFunctions::labColorCorrectionRegions(LabImage *lab)
lab->b[y][x] = b;
}
}
}
}
} // namespace rtengine

7
rtengine/ipshadowshighlights.cc
View File

@ -160,7 +160,7 @@ void ImProcFunctions::shadowsHighlights(LabImage *lab)
float orig = 1.f - blend;
if (l >= 0.f && l < 32768.f) {
if (lab_mode) {
lab->L[y][x] = f[l] * blend + l * orig;
lab->L[y][x] = intp(blend, f[l], l);
if (!hl && l > 1.f) {
// when pushing shadows, scale also the chromaticity
float s = max(lab->L[y][x] / l * 0.5f, 1.f) * blend;
@ -173,7 +173,10 @@ void ImProcFunctions::shadowsHighlights(LabImage *lab)
float rgb[3];
lab2rgb(l, lab->a[y][x], lab->b[y][x], rgb[0], rgb[1], rgb[2]);
for (int i = 0; i < 3; ++i) {
rgb[i] = f[rgb[i]] * blend + rgb[i] * orig;
float c = rgb[i];
if (!OOG(c)) {
rgb[i] = intp(blend, f[c], c);
}
}
rgb2lab(rgb[0], rgb[1], rgb[2], lab->L[y][x], lab->a[y][x], lab->b[y][x]);
}

4
rtengine/procparams.cc
View File

@ -1532,8 +1532,8 @@ bool EPDParams::operator !=(const EPDParams& other) const
FattalToneMappingParams::FattalToneMappingParams() :
enabled(false),
threshold(0),
amount(30),
threshold(30),
amount(20),
anchor(50)
{
}

2
rtengine/rtthumbnail.cc
View File

@ -2225,7 +2225,7 @@ bool Thumbnail::readAEHistogram (const Glib::ustring& fname)
FILE* f = g_fopen (fname.c_str (), "rb");
if (!f) {
aeHistogram (0);
aeHistogram.reset();
} else {
aeHistogram (65536 >> aeHistCompression);
fread (&aeHistogram[0], 1, (65536 >> aeHistCompression)*sizeof (aeHistogram[0]), f);

11
rtengine/sleef.c
View File

@ -23,6 +23,7 @@
#define L2U .69314718055966295651160180568695068359375
#define L2L .28235290563031577122588448175013436025525412068e-12
#define R_LN2 1.442695040888963407359924681001892137426645954152985934135449406931
#define pow_F(a,b) (xexpf(b*xlogf(a)))
__inline int64_t doubleToRawLongBits(double d) {
union {
@ -1263,6 +1264,16 @@ __inline float xdivf( float d, int n){
return uflint.floatval;
}
__inline float xlin2log(float x, float base)
{
constexpr float one(1);
return xlogf(x * (base - one) + one) / xlogf(base);
}
__inline float xlog2lin(float x, float base)
{
constexpr float one(1);
return (pow_F(base, x) - one) / (base - one);
}
#endif

15
rtgui/batchqueue.cc
View File

@ -229,7 +229,7 @@ void BatchQueue::addEntries (const std::vector<BatchQueueEntry*>& entries, bool
saveBatchQueue ();
redraw ();
notifyListener (true);
notifyListener ();
}
bool BatchQueue::saveBatchQueue ()
@ -387,7 +387,7 @@ bool BatchQueue::loadBatchQueue ()
}
redraw ();
notifyListener (true);
notifyListener ();
return !fd.empty ();
}
@ -460,7 +460,7 @@ void BatchQueue::cancelItems (const std::vector<ThumbBrowserEntryBase*>& items)
saveBatchQueue ();
redraw ();
notifyListener (true);
notifyListener ();
}
void BatchQueue::headItems (const std::vector<ThumbBrowserEntryBase*>& items)
@ -597,6 +597,8 @@ void BatchQueue::startProcessing ()
// start batch processing
rtengine::startBatchProcessing (next->job, this);
queue_draw ();
notifyListener();
}
}
}
@ -775,8 +777,7 @@ rtengine::ProcessingJob* BatchQueue::imageReady(rtengine::IImagefloat* img)
}
redraw ();
const bool queueRunning = processing;
notifyListener (queueRunning);
notifyListener ();
return processing ? processing->job : nullptr;
}
@ -971,9 +972,9 @@ void BatchQueue::buttonPressed (LWButton* button, int actionCode, void* actionDa
}
}
void BatchQueue::notifyListener (bool queueRunning)
void BatchQueue::notifyListener ()
{
const bool queueRunning = processing;
if (listener) {
NLParams* params = new NLParams;
params->listener = listener;

2
rtgui/batchqueue.h
View File

@ -93,7 +93,7 @@ protected:
Glib::ustring autoCompleteFileName (const Glib::ustring& fileName, const Glib::ustring& format);
Glib::ustring getTempFilenameForParams( const Glib::ustring &filename );
bool saveBatchQueue ();
void notifyListener (bool queueRunning);
void notifyListener ();
BatchQueueEntry* processing; // holds the currently processed image
FileCatalog* fileCatalog;

77
rtgui/batchqueuepanel.cc
View File

@ -57,6 +57,8 @@ BatchQueuePanel::BatchQueuePanel (FileCatalog* aFileCatalog) : parent(nullptr)
qAutoStart->set_tooltip_text (M("BATCHQUEUE_AUTOSTARTHINT"));
qAutoStart->set_active (options.procQueueEnabled);
queueShouldRun = false;
batchQueueButtonBox->pack_start (*qStartStop, Gtk::PACK_SHRINK, 4);
batchQueueButtonBox->pack_start (*qAutoStart, Gtk::PACK_SHRINK, 4);
Gtk::Frame *bbox = Gtk::manage(new Gtk::Frame(M("MAIN_FRAME_BATCHQUEUE")));
@ -247,23 +249,14 @@ void BatchQueuePanel::updateTab (int qsize, int forceOrientation)
void BatchQueuePanel::queueSizeChanged(int qsize, bool queueRunning, bool queueError, const Glib::ustring& queueErrorMessage)
{
updateTab (qsize);
setGuiFromBatchState(queueRunning, qsize);
if (qsize == 0 || (qsize == 1 && queueRunning)) {
qStartStop->set_sensitive(false);
} else {
qStartStop->set_sensitive(true);
}
if (!queueRunning && qsize == 0 && queueShouldRun) {
// There was work, but it is all done now.
queueShouldRun = false;
if (!queueRunning) {
stopBatchProc ();
fdir->set_sensitive (true);
fformat->set_sensitive (true);
if (qsize == 0) {
SoundManager::playSoundAsync(options.sndBatchQueueDone);
}
}
if (queueError) {
Gtk::MessageDialog msgd (queueErrorMessage, true, Gtk::MESSAGE_ERROR, Gtk::BUTTONS_OK, true);
@ -273,8 +266,7 @@ void BatchQueuePanel::queueSizeChanged(int qsize, bool queueRunning, bool queueE
void BatchQueuePanel::startOrStopBatchProc()
{
bool state = qStartStop->get_state();
if (state) {
if (qStartStop->get_state()) {
startBatchProc();
} else {
stopBatchProc();
@ -283,36 +275,42 @@ void BatchQueuePanel::startOrStopBatchProc()
void BatchQueuePanel::startBatchProc ()
{
// Update switch when queue started programmatically
qStartStopConn.block (true);
qStartStop->set_active(true);
qStartStopState = true;
qStartStopConn.block (false);
if (batchQueue->hasJobs()) {
fdir->set_sensitive (false);
fformat->set_sensitive (false);
if (batchQueue->getEntries().size() == 1) {
qStartStop->set_sensitive(false);
}
// Update the *desired* state of the queue, then launch it. The switch
// state is not updated here; it is changed by the queueSizeChanged()
// callback in response to the *reported* state.
queueShouldRun = true;
saveOptions();
batchQueue->startProcessing ();
} else {
stopBatchProc ();
}
updateTab (batchQueue->getEntries().size());
}
void BatchQueuePanel::stopBatchProc ()
{
// Update switch when queue started programmatically
qStartStopConn.block (true);
qStartStop->set_active(false);
qStartStopState = false;
qStartStopConn.block (false);
// There is nothing much to do here except set the desired state, which the
// background queue thread must check. It will notify queueSizeChanged()
// when it stops.
queueShouldRun = false;
}
updateTab (batchQueue->getEntries().size());
void BatchQueuePanel::setGuiFromBatchState(bool queueRunning, int qsize)
{
// Change the GUI state in response to the reported queue state
if (qsize == 0 || (qsize == 1 && queueRunning)) {
qStartStop->set_sensitive(false);
} else {
qStartStop->set_sensitive(true);
}
qStartStopConn.block(true);
qStartStop->set_active(queueRunning);
qStartStopConn.block(false);
fdir->set_sensitive (!queueRunning);
fformat->set_sensitive (!queueRunning);
updateTab(qsize);
}
void BatchQueuePanel::addBatchQueueJobs(const std::vector<BatchQueueEntry*>& entries, bool head)
@ -320,6 +318,7 @@ void BatchQueuePanel::addBatchQueueJobs(const std::vector<BatchQueueEntry*>& ent
batchQueue->addEntries(entries, head);
if (!qStartStop->get_active() && qAutoStart->get_active()) {
// Auto-start as if the user had pressed the qStartStop switch
startBatchProc ();
}
}
@ -354,9 +353,9 @@ bool BatchQueuePanel::handleShortcutKey (GdkEventKey* event)
bool BatchQueuePanel::canStartNext ()
{
// This function is called from the background BatchQueue thread.
// It cannot call UI functions, so grab the stored state of qStartStop.
return qStartStopState;
// This function is called from the background BatchQueue thread. It
// cannot call UI functions; we keep the desired state in an atomic.
return queueShouldRun;
}
void BatchQueuePanel::pathFolderButtonPressed ()

3
rtgui/batchqueuepanel.h
View File

@ -53,7 +53,7 @@ class BatchQueuePanel : public Gtk::VBox,
Gtk::HBox* bottomBox;
Gtk::HBox* topBox;
std::atomic<bool> qStartStopState;
std::atomic<bool> queueShouldRun;
IdleRegister idle_register;
@ -76,6 +76,7 @@ private:
void startBatchProc ();
void stopBatchProc ();
void startOrStopBatchProc();
void setGuiFromBatchState(bool queueRunning, int qsize);
void pathFolderChanged ();
void pathFolderButtonPressed ();

3
rtgui/fattaltonemap.cc
View File

@ -31,7 +31,8 @@ FattalToneMapping::FattalToneMapping(): FoldableToolPanel(this, "fattal", M("TP_
EvTMFattalAnchor = m->newEvent(HDR, "HISTORY_MSG_TM_FATTAL_ANCHOR");
amount = Gtk::manage(new Adjuster (M("TP_TM_FATTAL_AMOUNT"), 1., 100., 1., 30.));
threshold = Gtk::manage(new Adjuster (M("TP_TM_FATTAL_THRESHOLD"), -100., 100., 1., 0.0));
threshold = Gtk::manage(new Adjuster (M("TP_TM_FATTAL_THRESHOLD"), -100., 300., 1., 0.0));
threshold->setLogScale(10, 0);
Gtk::Image *al = Gtk::manage(new RTImage("circle-black-small.png"));
Gtk::Image *ar = Gtk::manage(new RTImage("circle-white-small.png"));
anchor = Gtk::manage(new Adjuster(M("TP_TM_FATTAL_ANCHOR"), 1, 100, 1, 50, al, ar));

98
rtgui/preferences.cc
View File

@ -1336,40 +1336,66 @@ Gtk::Widget* Preferences::getFileBrowserPanel()
fre->add(*vbre);
Gtk::Frame* frc = Gtk::manage(new Gtk::Frame(M("PREFERENCES_CACHEOPTS")));
Gtk::VBox* vbc = Gtk::manage(new Gtk::VBox());
// Cache
Gtk::Frame* frc = Gtk::manage (new Gtk::Frame(M("PREFERENCES_CACHEOPTS")));
Gtk::VBox* vbc = Gtk::manage (new Gtk::VBox());
frc->add(*vbc);
Gtk::HBox* hb3 = Gtk::manage(new Gtk::HBox());
Gtk::Label* chlab = Gtk::manage(new Gtk::Label(M("PREFERENCES_CACHETHUMBHEIGHT") + ":"));
maxThumbSize = Gtk::manage(new Gtk::SpinButton());
hb3->pack_start(*chlab, Gtk::PACK_SHRINK, 4);
hb3->pack_start(*maxThumbSize, Gtk::PACK_SHRINK, 4);
Gtk::Grid* cacheGrid = Gtk::manage(new Gtk::Grid());
cacheGrid->get_style_context()->add_class("grid-spacing");
setExpandAlignProperties(cacheGrid, false, false, Gtk::ALIGN_START, Gtk::ALIGN_CENTER);
maxThumbSize->set_digits(0);
maxThumbSize->set_increments(1, 10);
maxThumbSize->set_range(40, 800);
vbc->pack_start(*hb3, Gtk::PACK_SHRINK, 4);
Gtk::Label* maxThumbHeightLbl = Gtk::manage (new Gtk::Label(M("PREFERENCES_CACHETHUMBHEIGHT") + ":"));
setExpandAlignProperties(maxThumbHeightLbl, false, false, Gtk::ALIGN_START, Gtk::ALIGN_CENTER);
maxThumbHeightSB = Gtk::manage (new Gtk::SpinButton());
maxThumbHeightSB->set_digits (0);
maxThumbHeightSB->set_increments (1, 10);
maxThumbHeightSB->set_range (40, 800);
Gtk::HBox* hb4 = Gtk::manage(new Gtk::HBox());
Gtk::Label* celab = Gtk::manage(new Gtk::Label(M("PREFERENCES_CACHEMAXENTRIES") + ":"));
maxCacheEntries = Gtk::manage(new Gtk::SpinButton());
hb4->pack_start(*celab, Gtk::PACK_SHRINK, 4);
hb4->pack_start(*maxCacheEntries, Gtk::PACK_SHRINK, 4);
Gtk::Label* maxCacheEntriesLbl = Gtk::manage (new Gtk::Label(M("PREFERENCES_CACHEMAXENTRIES") + ":"));
setExpandAlignProperties(maxCacheEntriesLbl, false, false, Gtk::ALIGN_START, Gtk::ALIGN_CENTER);
maxCacheEntriesSB = Gtk::manage (new Gtk::SpinButton());
maxCacheEntriesSB->set_digits (0);
maxCacheEntriesSB->set_increments (1, 10);
maxCacheEntriesSB->set_range (10, 100000);
maxCacheEntries->set_digits(0);
maxCacheEntries->set_increments(1, 10);
maxCacheEntries->set_range(10, 100000);
vbc->pack_start(*hb4, Gtk::PACK_SHRINK, 4);
// Separation is needed so that a button is not accidentally clicked when one wanted
// to click a spinbox. Ideally, the separation wouldn't require attaching a widget, but how?
Gtk::Label *separator = Gtk::manage (new Gtk::Label());
Gtk::HBox* hb5 = Gtk::manage(new Gtk::HBox());
clearThumbnails = Gtk::manage(new Gtk::Button(M("PREFERENCES_CACHECLEARTHUMBS")));
clearProfiles = Gtk::manage(new Gtk::Button(M("PREFERENCES_CACHECLEARPROFILES")));
clearAll = Gtk::manage(new Gtk::Button(M("PREFERENCES_CACHECLEARALL")));
hb5->pack_start(*clearThumbnails, Gtk::PACK_SHRINK, 4);
hb5->pack_start(*clearProfiles, Gtk::PACK_SHRINK, 4);
hb5->pack_start(*clearAll, Gtk::PACK_SHRINK, 4);
vbc->pack_start(*hb5, Gtk::PACK_SHRINK, 4);
Gtk::Label* clearThumbsLbl = Gtk::manage (new Gtk::Label(M("PREFERENCES_CACHECLEAR_ALLBUTPROFILES")));
setExpandAlignProperties(clearThumbsLbl, false, false, Gtk::ALIGN_START, Gtk::ALIGN_CENTER);
Gtk::Button* clearThumbsBtn = Gtk::manage (new Gtk::Button(M("PREFERENCES_CACHECLEAR")));
Gtk::Label* clearProfilesLbl = Gtk::manage (new Gtk::Label(M("PREFERENCES_CACHECLEAR_ONLYPROFILES")));
setExpandAlignProperties(clearProfilesLbl, false, false, Gtk::ALIGN_START, Gtk::ALIGN_CENTER);
Gtk::Button* clearProfilesBtn = Gtk::manage (new Gtk::Button(M("PREFERENCES_CACHECLEAR")));
Gtk::Label* clearAllLbl = Gtk::manage (new Gtk::Label(M("PREFERENCES_CACHECLEAR_ALL")));
setExpandAlignProperties(clearAllLbl, false, false, Gtk::ALIGN_START, Gtk::ALIGN_CENTER);
Gtk::Button* clearAllBtn = Gtk::manage (new Gtk::Button(M("PREFERENCES_CACHECLEAR")));
cacheGrid->attach (*maxThumbHeightLbl, 0, 0, 1, 1);
cacheGrid->attach (*maxThumbHeightSB, 1, 0, 1, 1);
cacheGrid->attach (*maxCacheEntriesLbl, 0, 1, 1, 1);
cacheGrid->attach (*maxCacheEntriesSB, 1, 1, 1, 1);
cacheGrid->attach (*separator, 0, 2, 2, 1);
cacheGrid->attach (*clearThumbsLbl, 0, 3, 1, 1);
cacheGrid->attach (*clearThumbsBtn, 1, 3, 1, 1);
if (moptions.saveParamsCache) {
cacheGrid->attach (*clearProfilesLbl, 0, 4, 1, 1);
cacheGrid->attach (*clearProfilesBtn, 1, 4, 1, 1);
cacheGrid->attach (*clearAllLbl, 0, 5, 1, 1);
cacheGrid->attach (*clearAllBtn, 1, 5, 1, 1);
}
vbc->pack_start (*cacheGrid, Gtk::PACK_SHRINK, 4);
Gtk::Label* clearSafetyLbl = Gtk::manage (new Gtk::Label(M("PREFERENCES_CACHECLEAR_SAFETY")));
setExpandAlignProperties(clearSafetyLbl, false, false, Gtk::ALIGN_START, Gtk::ALIGN_CENTER);
clearSafetyLbl->set_line_wrap(true);
vbc->pack_start(*clearSafetyLbl, Gtk::PACK_SHRINK, 4);
Gtk::HBox* hb6 = Gtk::manage(new Gtk::HBox());
Gtk::VBox* vb6 = Gtk::manage(new Gtk::VBox());
@ -1388,9 +1414,11 @@ Gtk::Widget* Preferences::getFileBrowserPanel()
moveExtUp->signal_clicked().connect(sigc::mem_fun(*this, &Preferences::moveExtUpPressed));
moveExtDown->signal_clicked().connect(sigc::mem_fun(*this, &Preferences::moveExtDownPressed));
extension->signal_activate().connect(sigc::mem_fun(*this, &Preferences::addExtPressed));
clearThumbnails->signal_clicked().connect(sigc::mem_fun(*this, &Preferences::clearThumbImagesPressed));
clearProfiles->signal_clicked().connect(sigc::mem_fun(*this, &Preferences::clearProfilesPressed));
clearAll->signal_clicked().connect(sigc::mem_fun(*this, &Preferences::clearAllPressed));
clearThumbsBtn->signal_clicked().connect ( sigc::mem_fun (*this, &Preferences::clearThumbImagesPressed) );
if (moptions.saveParamsCache) {
clearProfilesBtn->signal_clicked().connect(sigc::mem_fun(*this, &Preferences::clearProfilesPressed));
clearAllBtn->signal_clicked().connect(sigc::mem_fun(*this, &Preferences::clearAllPressed));
}
swFileBrowser->add(*vbFileBrowser);
return swFileBrowser;
@ -1703,8 +1731,8 @@ void Preferences::storePreferences()
}
moptions.maxRecentFolders = (int)maxRecentFolders->get_value();
moptions.maxThumbnailHeight = (int)maxThumbSize->get_value();
moptions.maxCacheEntries = (int)maxCacheEntries->get_value();
moptions.maxThumbnailHeight = (int)maxThumbHeightSB->get_value ();
moptions.maxCacheEntries = (int)maxCacheEntriesSB->get_value ();
moptions.overlayedFileNames = overlayedFileNames->get_active();
moptions.filmStripOverlayedFileNames = filmStripOverlayedFileNames->get_active();
moptions.sameThumbSize = sameThumbSize->get_active();
@ -1918,9 +1946,9 @@ void Preferences::fillPreferences()
row[extensionColumns.ext] = moptions.parseExtensions[i];
}
maxThumbSize->set_value(moptions.maxThumbnailHeight);
maxRecentFolders->set_value(moptions.maxRecentFolders);
maxCacheEntries->set_value(moptions.maxCacheEntries);
maxThumbHeightSB->set_value (moptions.maxThumbnailHeight);
maxCacheEntriesSB->set_value (moptions.maxCacheEntries);
overlayedFileNames->set_active(moptions.overlayedFileNames);
filmStripOverlayedFileNames->set_active(moptions.filmStripOverlayedFileNames);
sameThumbSize->set_active(moptions.sameThumbSize);

7
rtgui/preferences.h
View File

@ -146,12 +146,9 @@ class Preferences : public Gtk::Dialog, public ProfileStoreListener
Gtk::ColorButton* butCropCol;
Gtk::ColorButton* butNavGuideCol;
Gtk::SpinButton* maxThumbSize;
Gtk::SpinButton* maxCacheEntries;
Gtk::SpinButton* maxRecentFolders;
Gtk::Button* clearThumbnails;
Gtk::Button* clearProfiles;
Gtk::Button* clearAll;
Gtk::SpinButton* maxThumbHeightSB;
Gtk::SpinButton* maxCacheEntriesSB;
Gtk::Entry* extension;
Gtk::TreeView* extensions;
Gtk::Button* addExt;