diff --git a/rtdata/languages/Catala b/rtdata/languages/Catala
index 25f564710..e0a6ac8cb 100644
--- a/rtdata/languages/Catala
+++ b/rtdata/languages/Catala
@@ -348,10 +348,10 @@ PREFERENCES_DIRLAST;Últim directori usat
PREFERENCES_DIROTHER;Un altre
PREFERENCES_DIRSELECTDLG;Selecc. directori d'inici...
PREFERENCES_DIRSOFTWARE;Instal·lació al directori
-PREFERENCES_DMETHOD;Mètode
+TP_RAW_DMETHOD;Mètode
PREFERENCES_EDITORCMDLINE;Una altra línia de comandament
PREFERENCES_EXTERNALEDITOR;Editor extern
-PREFERENCES_FALSECOLOR;Passos de supressió del fals color
+TP_RAW_FALSECOLOR;Passos de supressió del fals color
PREFERENCES_FBROWSEROPTS;Opcions gestor d'arxius
PREFERENCES_FILEFORMAT;Format de fitxer
PREFERENCES_FORIMAGE;Per fitxers d'imatge
diff --git a/rtdata/languages/Czech b/rtdata/languages/Czech
index 35d4c9e3e..d593ad220 100644
--- a/rtdata/languages/Czech
+++ b/rtdata/languages/Czech
@@ -419,7 +419,7 @@ PREFERENCES_APPLNEXTSTARTUP;Projeví se při dalším spuštění
PREFERENCES_BATCH_PROCESSING;Dávkové zpracování
PREFERENCES_BEHAVIOR;Režim
PREFERENCES_BLINKCLIPPED;Blikání v oříznutých oblastech
-PREFERENCES_CABLUE;Manuální korekce modré CA
+TP_RAWCACORR_CABLUE;Manuální korekce modré CA
PREFERENCES_CACHECLEARALL;Vymaž vše
PREFERENCES_CACHECLEARPROFILES;Vymaž profily
PREFERENCES_CACHECLEARTHUMBS;Vymaž náhledy
@@ -432,8 +432,8 @@ PREFERENCES_CACHESTRAT2;Upřednostnit menší spotřebu paměti před rychlostí
PREFERENCES_CACHESTRAT;Strategie cache
PREFERENCES_CACHETHUMBFORM;Formát náhledů v cache
PREFERENCES_CACHETHUMBHEIGHT;Maximální velikost náhledu
-PREFERENCES_CACORRECTION;Aplikovat automatickou korekci chromatické aberace
-PREFERENCES_CARED;Manuální korekce červené CA
+TP_RAWCACORR_AUTO;Aplikovat automatickou korekci chromatické aberace
+TP_RAWCACORR_CARED;Manuální korekce červené CA
PREFERENCES_CLEARDLG_LINE1;Čištění cache
PREFERENCES_CLEARDLG_LINE2;může trvat několik sekund.
PREFERENCES_CLEARDLG_TITLE;Prosím počkejte.
@@ -443,8 +443,8 @@ PREFERENCES_CUTOVERLAYBRUSH;Štětec přesahu
PREFERENCES_DARKFRAME;Tmavé snímky
PREFERENCES_DATEFORMAT;Formát data
PREFERENCES_DATEFORMATHINT;Lze použít následující formátovací řetězce:\n%y : rok (year)\n%m : měsíc (month)\n%d : den (day)\n\nNapříklad český formát data:\n%d. %m. %y
-PREFERENCES_DCBENHANCE;Aplikovat krok DCB rozšíření
-PREFERENCES_DCBITERATIONS;Počet DCB iterací
+TP_RAW_DCBENHANCE;Aplikovat krok DCB rozšíření
+TP_RAW_DCBITERATIONS;Počet DCB iterací
PREFERENCES_DEFAULTLANG;Výchozí jazyk
PREFERENCES_DEFAULTTHEME;Výchozí vzhled
PREFERENCES_DEMOSAICINGALGO;Demozajkovací algoritmus
@@ -454,28 +454,28 @@ PREFERENCES_DIRLAST;Poslední navštívená složka
PREFERENCES_DIROTHER;Jiná
PREFERENCES_DIRSELECTDLG;Zvolte složku s obrázky pro spuštění...
PREFERENCES_DIRSOFTWARE;Instalační složka
-PREFERENCES_DMETHOD;Metoda
+TP_RAW_DMETHOD;Metoda
PREFERENCES_EDITORCMDLINE;Jiný příkaz
PREFERENCES_EDITORLAYOUT;Rozvržení editoru
PREFERENCES_EXTERNALEDITOR;Externí editor
-PREFERENCES_FALSECOLOR;Počet kroků při potlačování chybných barev
+TP_RAW_FALSECOLOR;Počet kroků při potlačování chybných barev
PREFERENCES_FBROWSEROPTS;Volby prohlížeče souborů
PREFERENCES_FILEFORMAT;Formát souboru
PREFERENCES_FORIMAGE;Pro obrázkové soubory
PREFERENCES_FORRAW;Pro RAW soubory
PREFERENCES_GIMPPATH;GIMP instalační adresář
-PREFERENCES_GREENEQUIL;Vyrovnání zelené
+TP_PREPROCESS_GREENEQUIL;Vyrovnání zelené
PREFERENCES_GTKTHEME;GTK výchozí
PREFERENCES_HINT;Nápověda
PREFERENCES_HLTHRESHOLD;Práh pro oříznutá světla
-PREFERENCES_HOTDEADPIXFILT;Aplikovat filtr na vypálené/mrtvé body
+TP_PREPROCESS_HOTDEADPIXFILT;Aplikovat filtr na vypálené/mrtvé body
PREFERENCES_ICCDIR;Složka ICC profilů
PREFERENCES_IMPROCPARAMS;Výchozí profily pro zpracování obrázku
PREFERENCES_INTENT_ABSOLUTE;Absolutní kolorimetrie
PREFERENCES_INTENT_PERCEPTUAL;Vnímání
PREFERENCES_INTENT_RELATIVE;Relativní kolorimetrie
PREFERENCES_INTENT_SATURATION;Saturace
-PREFERENCES_LINEDENOISE;Filtrovat linkové rušení
+TP_PREPROCESS_LINEDENOISE;Filtrovat linkové rušení
PREFERENCES_LIVETHUMBNAILS;Živé náhledy (pomalejší)
PREFERENCES_MONITORICC;Profil monitoru
PREFERENCES_MULTITAB;Mód více karet
@@ -707,10 +707,9 @@ TP_LUMADENOISE_RADIUS;Poloměr
TP_PERSPECTIVE_HORIZONTAL;Horizontální
TP_PERSPECTIVE_LABEL;Perspektiva
TP_PERSPECTIVE_VERTICAL;Vertikální
-TP_PREPROCESS_DARKFRAME;Tmavé snímky
-TP_PREPROCESS_DFAUTOSELECT;Automatický výběr
-TP_RAWPANEL_DEMOSAICING;Demozajkování
-TP_RAWPANEL_PREPROCESSING;Předzpracování
+TP_DARKFRAME_AUTOSELECT;Automatický výběr
+TP_RAW_LABEL;Demozajkování
+TP_PREPROCESS_LABEL;Předzpracování
TP_RESIZE_BICUBIC;Bikubická
TP_RESIZE_BICUBICSF;Bikubická (Měkčí)
TP_RESIZE_BICUBICSH;Bikubická (Ostřejší)
diff --git a/rtdata/languages/Dansk b/rtdata/languages/Dansk
index d8fd0d1aa..c652e7bb8 100644
--- a/rtdata/languages/Dansk
+++ b/rtdata/languages/Dansk
@@ -349,10 +349,10 @@ PREFERENCES_DIRLAST;Sidst anvendte mappe
PREFERENCES_DIROTHER;Andet
PREFERENCES_DIRSELECTDLG;Vælg startmappe...
PREFERENCES_DIRSOFTWARE;Installationsmappe
-PREFERENCES_DMETHOD;Metode
+TP_RAW_DMETHOD;Metode
PREFERENCES_EDITORCMDLINE;Anden kommandostreng
PREFERENCES_EXTERNALEDITOR;Eksternt redigeringsprogram
-PREFERENCES_FALSECOLOR;Antal trin til undertrykkelse af forkert farve
+TP_RAW_FALSECOLOR;Antal trin til undertrykkelse af forkert farve
PREFERENCES_FBROWSEROPTS;Indstllinger til filbrowser
PREFERENCES_FILEFORMAT;Filformat
PREFERENCES_FORIMAGE;Til billedfiler
diff --git a/rtdata/languages/Deutsch b/rtdata/languages/Deutsch
index a6b67c7c6..fc26f1673 100644
--- a/rtdata/languages/Deutsch
+++ b/rtdata/languages/Deutsch
@@ -171,10 +171,10 @@ HISTORY_MSG_108;Lichter-Kompression Schwellenwert
HISTORY_MSG_109;Größenänderung Begrenzungsrahmen
HISTORY_MSG_10;Schatten-Kompression
HISTORY_MSG_110;Größenänderung gilt für
-HISTORY_MSG_111;Weißbild Datei
-HISTORY_MSG_112;Weißbild Automatische Auswahl
-HISTORY_MSG_113;Weißbild Unschärferadius
-HISTORY_MSG_114;Weißbild Unschärfetyp
+HISTORY_MSG_126;Weißbild Datei
+HISTORY_MSG_127;Weißbild Automatische Auswahl
+HISTORY_MSG_128;Weißbild Unschärferadius
+HISTORY_MSG_129;Weißbild Unschärfetyp
HISTORY_MSG_11;Tonwertkurve
HISTORY_MSG_12;Automatische Belichtung
HISTORY_MSG_13;Belichtungsbeschneidung
@@ -464,7 +464,7 @@ PREFERENCES_APPLNEXTSTARTUP;erfordert Neustart
PREFERENCES_BATCH_PROCESSING;Batch-Verarbeitung
PREFERENCES_BEHAVIOR;Verhalten
PREFERENCES_BLINKCLIPPED;Zu helle/dunkle Bereiche kennzeichnen
-PREFERENCES_CABLUE;Chrom. Aberration blau\nmanuelle Korrektur
+TP_RAWCACORR_CABLUE;Blau
PREFERENCES_CACHECLEARALL;Alles löschen
PREFERENCES_CACHECLEARPROFILES;Profile löschen
PREFERENCES_CACHECLEARTHUMBS;Voransichten löschen
@@ -477,19 +477,18 @@ PREFERENCES_CACHESTRAT2;Priorität auf minimierten Speicherverbrauch (geringere
PREFERENCES_CACHESTRAT;Strategie des Zwischenspeichers
PREFERENCES_CACHETHUMBFORM;Format
PREFERENCES_CACHETHUMBHEIGHT;Maximale Höhe der Voransichten
-PREFERENCES_CACORRECTION;Autom. Korrektur Chrom. Aberration
-PREFERENCES_CARED;Chrom. Aberration rot\nmanuelle Korrektur
+TP_RAWCACORR_AUTO;Autom. Korrektur Chrom. Aberration
+TP_RAWCACORR_CARED;Rot
PREFERENCES_CLIPPINGIND;Anzeige zu heller/dunkler Bereiche
PREFERENCES_CMETRICINTENT;Farbraumtransformation
PREFERENCES_CUTOVERLAYBRUSH;Abdeckfarbe für Ausschnitt
PREFERENCES_DARKFRAME;Dunkelbild
PREFERENCES_DARKFRAMEFOUND;Gefunden
-PREFERENCES_DARKFRAMESHOTS;Aufnahmen
PREFERENCES_DARKFRAMETEMPLATES;Vorlagen
PREFERENCES_DATEFORMAT;Datumsformat
PREFERENCES_DATEFORMATHINT;Die folgenden Variablen können verwendet werden:\n%y : Jahr\n%m : Monat\n%d : Tag\n\nDas deutsche Datumsformat beispielsweise ist:\n%d.%m.%y
-PREFERENCES_DCBENHANCE;DCB Verfeinerungsschritt durchführen
-PREFERENCES_DCBITERATIONS;Anzahl der DCB Iterationen
+TP_RAW_DCBENHANCE;DCB Verfeinerungsschritt durchführen
+TP_RAW_DCBITERATIONS;Anzahl der DCB Iterationen
PREFERENCES_DEFAULTLANG;Sprache für Menüs und Dialoge
PREFERENCES_DEFAULTTHEME;Standard-Oberflächendesign
PREFERENCES_DEMOSAICINGALGO;Algorithmus zur Entrasterung
@@ -499,12 +498,11 @@ PREFERENCES_DIRLAST;Zuletzt geöffnetes Verzeichnis
PREFERENCES_DIROTHER;Anderes
PREFERENCES_DIRSELECTDLG;Wähle das Bild-Verzeichnis beim Programmstart...
PREFERENCES_DIRSOFTWARE;Installationsverzeichnis
-PREFERENCES_DMETHOD;Methode
+TP_RAW_DMETHOD;Methode
PREFERENCES_EDITORCMDLINE;Andere Befehlszeile
PREFERENCES_EDITORLAYOUT;Editor-Layout
-PREFERENCES_EXPOS;Belichtung vor Interpolation:\nKorrektur (lin)
PREFERENCES_EXTERNALEDITOR;Externer Editor
-PREFERENCES_FALSECOLOR;Falschfarbenunterdrückung\nStufen
+TP_RAW_FALSECOLOR;Stufen Falschfarben-Unterdrückung
PREFERENCES_FBROWSEROPTS;Dateiverwaltung-Einstellungen
PREFERENCES_FILEFORMAT;Datei-Format
PREFERENCES_FLATFIELD;Weißbild
@@ -514,23 +512,22 @@ PREFERENCES_FLATFIELDBLURTYPE;Weißbild Unschärfetyp
PREFERENCES_FLATFIELDFILE;Weißbild Datei
PREFERENCES_FLATFIELDFOUND;Gefunden
PREFERENCES_FLATFIELDSDIR;Weißbild Verzeichnis
-PREFERENCES_FLATFIELDSHOTS;Aufnahmen
PREFERENCES_FLATFIELDTEMPLATES;Vorlagen
PREFERENCES_FORIMAGE;Für Bilddateien
PREFERENCES_FORRAW;Für RAW-Dateien
PREFERENCES_GIMPPATH;GIMP Installationsverzeichnis
-PREFERENCES_GREENEQUIL;Grün-Ausgleich
+TP_PREPROCESS_GREENEQUIL;Grün-Ausgleich
PREFERENCES_GTKTHEME;Standard GTK
PREFERENCES_HINT;Erklärungen
PREFERENCES_HLTHRESHOLD;Schwellenwert - zu hell
-PREFERENCES_HOTDEADPIXFILT;Hot/Dead-Pixel-Filter anwenden
+TP_PREPROCESS_HOTDEADPIXFILT;Hot/Dead Pixel Filter anwenden
PREFERENCES_ICCDIR;ICC-Profile-Verzeichnis
PREFERENCES_IMPROCPARAMS;Standard-Bildbearbeitungsparameter
PREFERENCES_INTENT_ABSOLUTE;Absolut farbmetrisch
PREFERENCES_INTENT_PERCEPTUAL;Wahrnehmungsabhängig
PREFERENCES_INTENT_RELATIVE;Relativ farbmetrisch
PREFERENCES_INTENT_SATURATION;Sättigung
-PREFERENCES_LINEDENOISE;Zeilenrausch-Filter
+TP_PREPROCESS_LINEDENOISE;Zeilenrausch-Filter
PREFERENCES_LIVETHUMBNAILS;Live Voransichten (langsamer)
PREFERENCES_METADATA;Metadaten
PREFERENCES_MONITORICC;Monitor-Profil
@@ -548,7 +545,6 @@ PREFERENCES_PARSEDEXT;In der Dateiverwaltung angezeigte Dateitypen
PREFERENCES_PARSEDEXTADD;Dateityp hinzufügen
PREFERENCES_PARSEDEXTADDHINT;Eingegebenen Dateityp (Extension) der obigen Liste hinzufügen
PREFERENCES_PARSEDEXTDELHINT;Markierten Dateityp aus Liste entfernen
-PREFERENCES_PRESER;Belichtung vor Interpolation:\nLichter beibehalten (EV)
PREFERENCES_PROFILEHANDLING;Behandlung der Bearbeitungsprofile
PREFERENCES_PROFILELOADPR;Priorität der Profile beim Laden
PREFERENCES_PROFILEPRCACHE;Bearbeitungsprofil im Zwischenspeicher (Cache)
@@ -768,14 +764,13 @@ TP_LUMADENOISE_RADIUS;Radius
TP_PERSPECTIVE_HORIZONTAL;Horizontal
TP_PERSPECTIVE_LABEL;Perspektive
TP_PERSPECTIVE_VERTICAL;Vertikal
-TP_PREPROCESS_DARKFRAME;Dunkelbild
-TP_PREPROCESS_DFAUTOSELECT;Automatische Auswahl
-TP_PREPROCESS_FLATFIELDAUTOSELECT;Weißbild Automatische Auswahl
-TP_PREPROCESS_FLATFIELDBLURRADIUS;Weißbild Unschärferadius
-TP_PREPROCESS_FLATFIELDBLURTYPE;Weißbild Unschärfetyp
-TP_PREPROCESS_FLATFIELDFILE;Weißbild Datei
-TP_RAWPANEL_DEMOSAICING;Farbinterpolation
-TP_RAWPANEL_PREPROCESSING;Vorverarbeitung
+TP_DARKFRAME_AUTOSELECT;Automatische Auswahl
+TP_FLATFIELD_AUTOSELECT;Weißbild Automatische Auswahl
+TP_FLATFIELD_BLURRADIUS;Weißbild Unschärferadius
+TP_FLATFIELD_BLURTYPE;Weißbild Unschärfetyp
+GENERAL_FILE;Datei
+TP_RAW_LABEL;Farbinterpolation
+TP_PREPROCESS_LABEL;Vorverarbeitung
TP_RESIZE_APPLIESTO;Gilt für:
TP_RESIZE_BICUBIC;Bikubisch
TP_RESIZE_BICUBICSF;Bikubisch (Weicher)
diff --git a/rtdata/languages/English (UK) b/rtdata/languages/English (UK)
index e1ba3f899..9fe7b63d7 100644
--- a/rtdata/languages/English (UK)
+++ b/rtdata/languages/English (UK)
@@ -28,7 +28,7 @@ PARTIALPASTE_COLORSHIFT;Colour shift
PREFERENCES_BEHAVIOR;Behaviour
PREFERENCES_CACHEMAXENTRIES;Maximum Number of Cache Entries
PREFERENCES_CACHETHUMBHEIGHT;Maximum Thumbnail Height
-PREFERENCES_FALSECOLOR;False colour suppression steps
+TP_RAW_FALSECOLOR;False colour suppression steps
PREFERENCES_TAB_COLORMGR;Colour Management
TP_COLORBOOST_AVOIDCOLORCLIP;Avoid colour clipping
TP_COLORBOOST_LABEL;Colour Boost
diff --git a/rtdata/languages/Espanol b/rtdata/languages/Espanol
index a6318e3f4..0b8fee400 100644
--- a/rtdata/languages/Espanol
+++ b/rtdata/languages/Espanol
@@ -155,8 +155,8 @@ HISTORY_MSG_104;Ecualizador HSV
HISTORY_MSG_105;Quitar borde púrpura
HISTORY_MSG_106;Quitar borde púrpura Radio
HISTORY_MSG_107;Quitar borde púrpura Umbral
-HISTORY_MSG_108;Cambiar tamaño rectángulo limitador
-HISTORY_MSG_109;Cambio tamaño aplica a
+HISTORY_MSG_109;Cambiar tamaño rectángulo limitador
+HISTORY_MSG_110;Cambio tamaño aplica a
HISTORY_MSG_10;Compresión de sombras
HISTORY_MSG_11;Curva de tono
HISTORY_MSG_12;Exposición automática
@@ -432,7 +432,7 @@ PREFERENCES_APPLNEXTSTARTUP;aplicado al próximo arranque
PREFERENCES_BATCH_PROCESSING;Proceso por lotes
PREFERENCES_BEHAVIOR;Comportamiento
PREFERENCES_BLINKCLIPPED;Parpadear áreas cortadas
-PREFERENCES_CABLUE;Correcc. manual aberr. cromát. Azul
+TP_RAWCACORR_CABLUE;Azul
PREFERENCES_CACHECLEARALL;Borrar todo
PREFERENCES_CACHECLEARPROFILES;Borrar perfiles
PREFERENCES_CACHECLEARTHUMBS;Borrar miniaturas
@@ -445,8 +445,8 @@ PREFERENCES_CACHESTRAT2;Preferir consumo de memoria bajo sobre velocidad
PREFERENCES_CACHESTRAT;Estrategia de la memoria intermedia
PREFERENCES_CACHETHUMBFORM;Formato de las miniaturas
PREFERENCES_CACHETHUMBHEIGHT;Altura máxima de las miniaturas
-PREFERENCES_CACORRECTION;Aplicar autocorrección aberr. cromát.
-PREFERENCES_CARED;Correcc. manual aberr. cromát. Rojo
+TP_RAWCACORR_AUTO;Aplicar autocorrección aberr. cromát.
+TP_RAWCACORR_CARED;Rojo
PREFERENCES_CLEARDLG_LINE1;Borrando memoria intermedia
PREFERENCES_CLEARDLG_LINE2;Puede durar unos segundos.
PREFERENCES_CLEARDLG_TITLE;Aguardar, por favor
@@ -456,8 +456,8 @@ PREFERENCES_CUTOVERLAYBRUSH;Pincel para ventana de recorte
PREFERENCES_DARKFRAME;Imagen en oscuridad
PREFERENCES_DATEFORMAT;Formato de fechas
PREFERENCES_DATEFORMATHINT;Se pueden usar las variables siguientes:\n%y : año\n%m : mes\n%d : dia\n\nPor ejemplo, la fecha en Argentina es:\n%d/%m/%y
-PREFERENCES_DCBENHANCE;Aplicar paso mejora DCB
-PREFERENCES_DCBITERATIONS;Número iteraciones DCB
+TP_RAW_DCBENHANCE;Aplicar paso mejora DCB
+TP_RAW_DCBITERATIONS;Número iteraciones DCB
PREFERENCES_DEFAULTLANG;Idioma predeterminado
PREFERENCES_DEFAULTTHEME;Estilo predeterminado
PREFERENCES_DEMOSAICINGALGO;Algoritmo de desmosaicado
@@ -467,29 +467,28 @@ PREFERENCES_DIRLAST;Última carpeta visitada
PREFERENCES_DIROTHER;Otro
PREFERENCES_DIRSELECTDLG;Seleccionar carpeta de imágenes en el arranque...
PREFERENCES_DIRSOFTWARE;Carpeta de instalación
-PREFERENCES_DMETHOD;Método
+TP_RAW_DMETHOD;Método
PREFERENCES_EDITORCMDLINE;Otro mandato
PREFERENCES_EDITORLAYOUT;Aspecto del editor
-PREFERENCES_EXPOS;Exposición antes de interpolación:\n corrección (lin)
PREFERENCES_EXTERNALEDITOR;Editor externo
-PREFERENCES_FALSECOLOR;Pasos de supresión de colores falsos
+TP_RAW_FALSECOLOR;Pasos de supresión de colores falsos
PREFERENCES_FBROWSEROPTS;Opciones del explorador de archivos
PREFERENCES_FILEFORMAT;Formato de archivos
PREFERENCES_FORIMAGE;Para archivos de imágenes
PREFERENCES_FORRAW;Para archivos RAW
PREFERENCES_GIMPPATH;Carpeta de instalación de GIMP
-PREFERENCES_GREENEQUIL;Equilibrado del verde
+TP_PREPROCESS_GREENEQUIL;Equilibrado del verde
PREFERENCES_GTKTHEME;Estilo de GTK predeterminado
PREFERENCES_HINT;Consejo
PREFERENCES_HLTHRESHOLD;Umbral de luces altas cortadas
-PREFERENCES_HOTDEADPIXFILT;Aplicar filtro de píxel dañado
+TP_PREPROCESS_HOTDEADPIXFILT;Aplicar filtro de píxel dañado
PREFERENCES_ICCDIR;Carpeta de perfiles ICC
PREFERENCES_IMPROCPARAMS;Parámetros predeterminados de procesamiento de imágenes
PREFERENCES_INTENT_ABSOLUTE;Colorimétrico absoluto
PREFERENCES_INTENT_PERCEPTUAL;Perceptual
PREFERENCES_INTENT_RELATIVE;Colorimétrico relativo
PREFERENCES_INTENT_SATURATION;Saturación
-PREFERENCES_LINEDENOISE;Filtro de ruido de línea
+TP_PREPROCESS_LINEDENOISE;Filtro de ruido de línea
PREFERENCES_LIVETHUMBNAILS;Miniaturas 'en vivo' (más lento)
PREFERENCES_MONITORICC;Perfil de pantalla
PREFERENCES_MULTITAB;Modo de varias pestañas
@@ -506,7 +505,6 @@ PREFERENCES_PARSEDEXT;Extensiones analizadas
PREFERENCES_PARSEDEXTADD;Agregar extensión
PREFERENCES_PARSEDEXTADDHINT;Entra una extensión y pulsa este botón para agregar a la lista
PREFERENCES_PARSEDEXTDELHINT;Borrar extensión de la lista
-PREFERENCES_PRESER;Exposición antes de interpolación:\n preservar luces altas (EV)
PREFERENCES_PROFILEHANDLING;Tratamiento de perfiles de procesamiento
PREFERENCES_PROFILELOADPR;Prioridad de perfiles cuando se abre imagen
PREFERENCES_PROFILEPRCACHE;Perfil en memoria intermedia
@@ -728,10 +726,9 @@ TP_LUMADENOISE_RADIUS;Radio
TP_PERSPECTIVE_HORIZONTAL;Horizontal
TP_PERSPECTIVE_LABEL;Perspectiva
TP_PERSPECTIVE_VERTICAL;Vertical
-TP_PREPROCESS_DARKFRAME;Imagen en oscuridad
-TP_PREPROCESS_DFAUTOSELECT;Selección automática
-TP_RAWPANEL_DEMOSAICING;Desmosaicado
-TP_RAWPANEL_PREPROCESSING;Preprocesado
+TP_DARKFRAME_AUTOSELECT;Selección automática
+TP_RAW_LABEL;Desmosaicado
+TP_PREPROCESS_LABEL;Preprocesado
TP_RESIZE_APPLIESTO;Aplica a:
TP_RESIZE_BICUBIC;Bicúbica
TP_RESIZE_BICUBICSF;Bicúbica (más suave)
diff --git a/rtdata/languages/Euskara b/rtdata/languages/Euskara
index f9ce3bf60..845c49cb3 100644
--- a/rtdata/languages/Euskara
+++ b/rtdata/languages/Euskara
@@ -349,10 +349,10 @@ PREFERENCES_DIRLAST;Azkena ikusitako karpeta
PREFERENCES_DIROTHER;Besterik
PREFERENCES_DIRSELECTDLG;Abioko irudien karpeta hautatu...
PREFERENCES_DIRSOFTWARE;Inatalazio karpeta
-PREFERENCES_DMETHOD;Metodoa
+TP_RAW_DMETHOD;Metodoa
PREFERENCES_EDITORCMDLINE;Other command line
PREFERENCES_EXTERNALEDITOR;External editor
-PREFERENCES_FALSECOLOR;Okerreko kolore ezabaketa atalak
+TP_RAW_FALSECOLOR;Okerreko kolore ezabaketa atalak
PREFERENCES_FBROWSEROPTS;Arakatzailearen aukerak
PREFERENCES_FILEFORMAT;Artxiboen formatua
PREFERENCES_FORIMAGE;Irudi artxiboetarako
diff --git a/rtdata/languages/Francais b/rtdata/languages/Francais
index e6ed4424b..40e342d95 100644
--- a/rtdata/languages/Francais
+++ b/rtdata/languages/Francais
@@ -125,6 +125,7 @@ GENERAL_LANDSCAPE;Paysage
GENERAL_LOAD;Charger
GENERAL_NA;indisponible
GENERAL_NO;Non
+GENERAL_NONE;Aucun
GENERAL_OK;OK
GENERAL_PORTRAIT;Portrait
GENERAL_SAVE;Enregistrer
@@ -159,10 +160,22 @@ HISTORY_MSG_110;Redim. s'applique à
HISTORY_MSG_111;Éviter l'écrêtage couleur
HISTORY_MSG_112;Limiteur de saturation
HISTORY_MSG_113;Limite de saturation
-HISTORY_MSG_114;Champ Uniforme - Fichier
-HISTORY_MSG_115;Champ Uniforme - Auto sélection
-HISTORY_MSG_116;Champ Uniforme - Rayon
-HISTORY_MSG_117;Champ Uniforme - Type de floutage
+HISTORY_MSG_114;Nbr d'itération DCB
+HISTORY_MSG_115;Nbr d'itération des fausses couleurs
+HISTORY_MSG_116;DCB amélioré
+HISTORY_MSG_117;Corr. aberr. chromatique rouge
+HISTORY_MSG_118;Corr. aberr. chromatique bleu
+HISTORY_MSG_119;Filtre de bruit de ligne
+HISTORY_MSG_120;Équilibrage du vert
+HISTORY_MSG_121;Corr. auto. de l'aberr. chromatique
+HISTORY_MSG_122;Trame Noire automatique
+HISTORY_MSG_123;Champ Uniforme automatique
+HISTORY_MSG_124;Correct. d'expo linéaire
+HISTORY_MSG_125;Correct. d'expo préservant les HL
+HISTORY_MSG_126;Champ Uniforme - Fichier
+HISTORY_MSG_127;Champ Uniforme - Auto sélection
+HISTORY_MSG_128;Champ Uniforme - Rayon
+HISTORY_MSG_129;Champ Uniforme - Type de floutage
HISTORY_MSG_11;Courbe tonale
HISTORY_MSG_12;Exposition auto
HISTORY_MSG_13;Rognage de l'exposition
@@ -258,8 +271,8 @@ HISTORY_MSG_94;Contraste par niveau de détail
HISTORY_MSG_95;Saturation
HISTORY_MSG_96;Courbe 'a'
HISTORY_MSG_97;Courbe 'b'
-HISTORY_MSG_98;Dématriçage
-HISTORY_MSG_99;Traitement pre-dématriçage
+HISTORY_MSG_98;Algorithme de dématriçage
+HISTORY_MSG_99;Filtrage des pixels chauds/morts
HISTORY_MSG_9;Compression des hautes lumières
HISTORY_NEWSNAPSHOT;Ajouter
HISTORY_NEWSNAPSHOTAS;Sous...
@@ -433,7 +446,7 @@ PREFERENCES_APPLNEXTSTARTUP;appliqué au prochain lancement
PREFERENCES_BATCH_PROCESSING;Traitement par lot
PREFERENCES_BEHAVIOR;Comportement
PREFERENCES_BLINKCLIPPED;Faire clignoter les zones hors domaine
-PREFERENCES_CABLUE;Correct. manuelle de\nl'aberr. chrom. bleue
+TP_RAWCACORR_CABLUE;Bleue
PREFERENCES_CACHECLEARALL;Tout nettoyer
PREFERENCES_CACHECLEARPROFILES;Nettoyer les profils
PREFERENCES_CACHECLEARTHUMBS;Nettoyer les vignettes
@@ -446,8 +459,8 @@ PREFERENCES_CACHESTRAT2;Optimiser la consommation mémoire au détriment de la v
PREFERENCES_CACHESTRAT;Stratégie de gestion du Cache
PREFERENCES_CACHETHUMBFORM;Format des vignettes du Cache
PREFERENCES_CACHETHUMBHEIGHT;Hauteur maximale des vignettes
-PREFERENCES_CACORRECTION;Correction automatique de\nl'aberration chromatique
-PREFERENCES_CARED;Correct. manuelle de\nl'aberr. chrom. rouge
+TP_RAWCACORR_AUTO;Correction automatique
+TP_RAWCACORR_CARED;Rouge
PREFERENCES_CLIPPINGIND;Indication du dépassement de plage dynamique
PREFERENCES_CMETRICINTENT;Intention Colorimétrique
PREFERENCES_CUTOVERLAYBRUSH;Masque de recadrage
@@ -457,8 +470,8 @@ PREFERENCES_DARKFRAMESHOTS;image(s)
PREFERENCES_DARKFRAMETEMPLATES;modèle(s)
PREFERENCES_DATEFORMAT;Format de la date
PREFERENCES_DATEFORMATHINT;Vous pouvez utiliser les paramètres de chaînes formatés suivants:\n%y : année\n%m : mois\n%d : jour\n\nPar exemple, le format de date française est:\n%d/%m/%y
-PREFERENCES_DCBENHANCE;Appliquer la phase d'amélioration de DCB
-PREFERENCES_DCBITERATIONS;Nombre d'itération de DCB
+TP_RAW_DCBENHANCE;Appliquer la phase d'amélioration de DCB
+TP_RAW_DCBITERATIONS;Nombre d'itération de DCB
PREFERENCES_DEFAULTLANG;Langue par défaut
PREFERENCES_DEFAULTTHEME;Thème par défaut
PREFERENCES_DEMOSAICINGALGO;Algorithme de dématriçage
@@ -468,12 +481,12 @@ PREFERENCES_DIRLAST;Dernier dossier visité
PREFERENCES_DIROTHER;Autre
PREFERENCES_DIRSELECTDLG;Choix du dossier Image au lancement...
PREFERENCES_DIRSOFTWARE;Dossier d'installation
-PREFERENCES_DMETHOD;Méthode
+TP_RAW_DMETHOD;Méthode
PREFERENCES_EDITORCMDLINE;Autre ligne de commande
PREFERENCES_EDITORLAYOUT;Disposition de l'éditeur
-PREFERENCES_EXPOS;Facteur de correction\nd'exposition (linéaire)
+TP_RAWEXPOS_LINEAR;Facteur de corr. linéaire
PREFERENCES_EXTERNALEDITOR;Éditeur externe
-PREFERENCES_FALSECOLOR;Itérations pour la suppression\ndes fausses couleurs
+TP_RAW_FALSECOLOR;Itérations pour la suppression\ndes fausses couleurs
PREFERENCES_FBROWSEROPTS;Options du navigateur de fichiers
PREFERENCES_FILEFORMAT;Format du fichier
PREFERENCES_FLATFIELD;Champ Uniforme
@@ -488,18 +501,18 @@ PREFERENCES_FLATFIELDTEMPLATES;modèle(s)
PREFERENCES_FORIMAGE;Pour les fichiers images
PREFERENCES_FORRAW;Pour les fichiers RAW
PREFERENCES_GIMPPATH;Dossier d'intallation de GIMP
-PREFERENCES_GREENEQUIL;Équilibrage du vert
+TP_PREPROCESS_GREENEQUIL;Équilibrage du vert
PREFERENCES_GTKTHEME;GTK par défaut
PREFERENCES_HINT;Conseil
PREFERENCES_HLTHRESHOLD;Seuil pour le dépassement de domaine supérieur
-PREFERENCES_HOTDEADPIXFILT;Filtrer les pixels chauds/morts
+TP_PREPROCESS_HOTDEADPIXFILT;Filtrer les pixels chauds/morts
PREFERENCES_ICCDIR;Dossier des profils ICC
PREFERENCES_IMPROCPARAMS;Paramètres de traitement d'image par défaut
PREFERENCES_INTENT_ABSOLUTE;Colorimétrie absolue
PREFERENCES_INTENT_PERCEPTUAL;Perceptuel
PREFERENCES_INTENT_RELATIVE;Colorimétrie relative
PREFERENCES_INTENT_SATURATION;Saturation
-PREFERENCES_LINEDENOISE;Filtre de bruit de Ligne
+TP_PREPROCESS_LINEDENOISE;Filtre de bruit de Ligne
PREFERENCES_LIVETHUMBNAILS;Vignettes "Live" (plus lent)
PREFERENCES_METADATA;Metadonnées
PREFERENCES_MONITORICC;Profil du moniteur
@@ -517,7 +530,7 @@ PREFERENCES_PARSEDEXT;Extensions considérées
PREFERENCES_PARSEDEXTADD;Ajout de l'extension
PREFERENCES_PARSEDEXTADDHINT;Tapez une extension et cliquez ce bouton pour l'ajouter à la liste
PREFERENCES_PARSEDEXTDELHINT;Supprime de la liste les extensions sélectionnées
-PREFERENCES_PRESER;Correct. d'expo. préservant\nles hautes lumières (EV)
+TP_RAWEXPOS_PRESER;Corr. préservant les HL (EV)
PREFERENCES_PROFILEHANDLING;Gestionnaire des profils de traitement
PREFERENCES_PROFILELOADPR;Priorité de chargement des profils
PREFERENCES_PROFILEPRCACHE;Profil dans le Cache
@@ -610,6 +623,7 @@ TP_CHMIXER_BLUE;Bleu
TP_CHMIXER_GREEN;Vert
TP_CHMIXER_LABEL;Mixage des canaux
TP_CHMIXER_RED;Rouge
+TP_CHROMATABERR_LABEL;Aberration Chromatique
TP_COARSETRAF_DEGREE;degré:
TP_COARSETRAF_TOOLTIP_HFLIP;Symétriser / axe vertical
TP_COARSETRAF_TOOLTIP_ROTLEFT;Rotation vers la gauche
@@ -649,6 +663,7 @@ TP_CROP_SELECTCROP; Sélection du recadrage
TP_CROP_W;L
TP_CROP_X;x
TP_CROP_Y;y
+TP_DARKFRAME_LABEL;Trame Noire
TP_DEFRINGE_LABEL;Suppression de l'aberr. chromatique
TP_DEFRINGE_RADIUS;Rayon
TP_DEFRINGE_THRESHOLD;Seuil
@@ -672,6 +687,7 @@ TP_EQUALIZER_FINEST;les plus petites
TP_EQUALIZER_LABEL;Égaliseur d'ondelette
TP_EQUALIZER_LARGEST;les plus grandes
TP_EQUALIZER_NEUTRAL;Neutre
+TP_EXPOSCORR_LABEL;Exposition
TP_EXPOSURE_AUTOLEVELS;Niveaux Auto
TP_EXPOSURE_BLACKLEVEL;Noir
TP_EXPOSURE_BRIGHTNESS;Luminosité
@@ -684,6 +700,7 @@ TP_EXPOSURE_CURVEEDITOR;Courbe tonale
TP_EXPOSURE_EXPCOMP;Compensation d'exposition
TP_EXPOSURE_LABEL;Exposition
TP_EXPOSURE_SATURATION;Saturation
+TP_FLATFIELD_LABEL;Champ Uniforme
TP_HLREC_CIELAB;Mélange CIELab
TP_HLREC_COLOR;Propagation de la couleur
TP_HLREC_LABEL;Récupération des hautes lumières
@@ -737,10 +754,14 @@ TP_LUMADENOISE_RADIUS;Rayon
TP_PERSPECTIVE_HORIZONTAL;Horizontal
TP_PERSPECTIVE_LABEL;Perspective
TP_PERSPECTIVE_VERTICAL;Vertical
-TP_PREPROCESS_DARKFRAME;Trame noire
-TP_PREPROCESS_DFAUTOSELECT;Sélection automatique
-TP_RAWPANEL_DEMOSAICING;Dématriçage
-TP_RAWPANEL_PREPROCESSING;Traitement pre-dématriçage
+TP_DARKFRAME_AUTOSELECT;Sélection automatique
+TP_FLATFIELD_BT_AREA;Zone
+TP_FLATFIELD_BT_VERTICAL;Vertical
+TP_FLATFIELD_BT_HORIZONTAL;Horizontal
+TP_FLATFIELD_BT_VERTHORIZ;Vert. + Horiz.
+TP_RAW_LABEL;Dématriçage
+TP_PREPROCESS_NO_FOUND;Aucun trouvé
+TP_PREPROCESS_LABEL;Traitement pre-dématriçage
TP_RESIZE_APPLIESTO;S'applique à:
TP_RESIZE_BICUBIC;Bicubique
TP_RESIZE_BICUBICSF;Bicubique (Plus doux)
@@ -817,39 +838,32 @@ ZOOMPANEL_ZOOMFITSCREEN;Ajuster à la fenêtre F
ZOOMPANEL_ZOOMIN;Zoom +
ZOOMPANEL_ZOOMOUT;Zoom -
-
-!!!!!!!!!!!!!!!!!!!!!!!!!
-! Untranslated keys follow; remove the ! prefix after an entry is translated.
-!!!!!!!!!!!!!!!!!!!!!!!!!
-
-
-!FILEBROWSER_AUTOFLATFIELD;Auto flat field
-!FILEBROWSER_CACHE;Cache
-!FILEBROWSER_CACHECLEARFROMFULL;Clear from cache - full
-!FILEBROWSER_CACHECLEARFROMPARTIAL;Clear from cache - partial
-!FILEBROWSER_DELETEDLGMSGINCLPROC;Are you sure you want to delete the selected %1 files INCLUDING a batch processed version?
-!FILEBROWSER_MOVETOFLATFIELDDIR;Move to flat fields directory
-!FILEBROWSER_POPUPREMOVEINCLPROC;Remove from filesystem incl. batch processed
-!FILEBROWSER_SELECTFLATFIELD;Select flat field...
-!MAIN_BUTTON_SHOWHIDESIDEPANELS_TOOLTIP;Show/hide all side panels m
-!MAIN_TAB_COLOR_TOOLTIP;Alt-c
-!MAIN_TAB_DETAIL_TOOLTIP;Alt-d
-!MAIN_TAB_EXPOSURE_TOOLTIP;Alt-e
-!MAIN_TAB_METADATA_TOOLTIP;Alt-m
-!MAIN_TAB_RAW_TOOLTIP;Alt-r
-!MAIN_TAB_TRANSFORM_TOOLTIP;Alt-t
-!MAIN_TOOLTIP_SHOWHIDERP1;Show/hide the right panel Alt-l
-!MAIN_TOOLTIP_SHOWHIDETP1;Show/hide the top panel Shift-l
-!PARTIALPASTE_DARKFRAMEAUTOSELECT;Dark Frame Auto Select
-!PARTIALPASTE_DARKFRAMEFILE;Dark Frame File
-!PARTIALPASTE_EVERYTHING;Everything
-!PARTIALPASTE_FLATFIELDAUTOSELECT;FF Auto Select
-!PARTIALPASTE_FLATFIELDBLURRADIUS;FF Blur Radius
-!PARTIALPASTE_FLATFIELDBLURTYPE;FF Blur Type
-!PARTIALPASTE_FLATFIELDFILE;Flat field (FF) File
-!PARTIALPASTE_RAWGROUP;Raw settings
-!TP_PREPROCESS_FLATFIELDAUTOSELECT;Flat Field Auto Select
-!TP_PREPROCESS_FLATFIELDBLURRADIUS;Flat Field Blur Radius
-!TP_PREPROCESS_FLATFIELDBLURTYPE;Flat Field Blur Type
-!TP_PREPROCESS_FLATFIELDFILE;Flat Field File
-!TP_PREPROCESS_NO_FOUND;None found
+FILEBROWSER_AUTOFLATFIELD;Champ Uniforme auto
+FILEBROWSER_CACHE;Cache
+FILEBROWSER_CACHECLEARFROMFULL;Supprimer du cache - complet
+FILEBROWSER_CACHECLEARFROMPARTIAL;Supprimer du cache - partiel
+FILEBROWSER_DELETEDLGMSGINCLPROC;Êtes-vous sûr de vouloir supprimer les %1 fichiers sélectionnées, INCLUANT une version déjà traitée?
+FILEBROWSER_MOVETOFLATFIELDDIR;Déplacer vers le dossier de Trame Noire
+FILEBROWSER_POPUPREMOVEINCLPROC;Suppresion du système de fichier, vers. déjà traitée inclus
+FILEBROWSER_SELECTFLATFIELD;Sélectionner un Champ Uniforme...
+MAIN_BUTTON_SHOWHIDESIDEPANELS_TOOLTIP;Affiche/Cache les 2 panneaux latéraux m
+MAIN_TAB_COLOR_TOOLTIP;Alt-c
+MAIN_TAB_DETAIL_TOOLTIP;Alt-d
+MAIN_TAB_EXPOSURE_TOOLTIP;Alt-e
+MAIN_TAB_METADATA_TOOLTIP;Alt-m
+MAIN_TAB_RAW_TOOLTIP;Alt-r
+MAIN_TAB_TRANSFORM_TOOLTIP;Alt-t
+MAIN_TOOLTIP_SHOWHIDERP1;Affiche/Cache le panneau droit Alt-l
+MAIN_TOOLTIP_SHOWHIDETP1;Affiche/Cache le panneau supérieur Shift-l
+PARTIALPASTE_DARKFRAMEAUTOSELECT;Sélection auto de la Trame Noire
+PARTIALPASTE_DARKFRAMEFILE;Fichier de Trame Noire
+PARTIALPASTE_EVERYTHING;Tout
+PARTIALPASTE_FLATFIELDAUTOSELECT;Sélection auto du Champ Uniforme
+PARTIALPASTE_FLATFIELDBLURRADIUS;Rayon de floutage du Champ Uniforme
+PARTIALPASTE_FLATFIELDBLURTYPE;Type de floutage du Champ Uniforme
+PARTIALPASTE_FLATFIELDFILE;Fichier de Champ Uniforme
+PARTIALPASTE_RAWGROUP;Réglages RAW
+TP_FLATFIELD_AUTOSELECT;Sélection automatique
+TP_FLATFIELD_BLURRADIUS;Rayon de floutage
+TP_FLATFIELD_BLURTYPE;Type de floutage
+GENERAL_FILE;Fichier
diff --git a/rtdata/languages/Greek b/rtdata/languages/Greek
index 98b4e0ef2..1e7d3d54a 100644
--- a/rtdata/languages/Greek
+++ b/rtdata/languages/Greek
@@ -348,10 +348,10 @@ PREFERENCES_DIRLAST;Τελευταία τοποθεσία που χρησιμο
PREFERENCES_DIROTHER;Άλλο
PREFERENCES_DIRSELECTDLG;Επιλέξτε τοποθεσία εικόνων κατά την έναρξη...
PREFERENCES_DIRSOFTWARE;Τοποθεσία εγκατάστασης
-PREFERENCES_DMETHOD;Μέθοδος
+TP_RAW_DMETHOD;Μέθοδος
PREFERENCES_EDITORCMDLINE;Other command line
PREFERENCES_EXTERNALEDITOR;External editor
-PREFERENCES_FALSECOLOR;Βήματα καταστολής σφαλμένων χρωμάτων
+TP_RAW_FALSECOLOR;Βήματα καταστολής σφαλμένων χρωμάτων
PREFERENCES_FBROWSEROPTS;Επιλογές περιήγησης αρχείων
PREFERENCES_FILEFORMAT;Είδος αρχείου
PREFERENCES_FORIMAGE;Για αρχεία εικόνων
diff --git a/rtdata/languages/Hebrew b/rtdata/languages/Hebrew
index 95d2521f4..c0888f2ab 100644
--- a/rtdata/languages/Hebrew
+++ b/rtdata/languages/Hebrew
@@ -348,10 +348,10 @@ PREFERENCES_DIRLAST;תיקיה האחרונה שביקרתי בה
PREFERENCES_DIROTHER;אחר
PREFERENCES_DIRSELECTDLG;בחר תיקיית צילומים לאתחול
PREFERENCES_DIRSOFTWARE;תיקיית התקנה
-PREFERENCES_DMETHOD;שיטה
+TP_RAW_DMETHOD;שיטה
PREFERENCES_EDITORCMDLINE;Other command line
PREFERENCES_EXTERNALEDITOR;External editor
-PREFERENCES_FALSECOLOR;דחיית צבע מסולף
+TP_RAW_FALSECOLOR;דחיית צבע מסולף
PREFERENCES_FBROWSEROPTS;ברירות דפדפן
PREFERENCES_FILEFORMAT;תצורת קובץ
PREFERENCES_FORIMAGE;עבור קבצי צילום
diff --git a/rtdata/languages/Italian b/rtdata/languages/Italian
index c7cd5498b..34633b795 100644
--- a/rtdata/languages/Italian
+++ b/rtdata/languages/Italian
@@ -419,7 +419,7 @@ PREFERENCES_APPLNEXTSTARTUP;applicato al prossimo avvio
PREFERENCES_BATCH_PROCESSING;Elaborazione batch
PREFERENCES_BEHAVIOR;Comportamento
PREFERENCES_BLINKCLIPPED;Lampeggia le aree tosate
-PREFERENCES_CABLUE;Correzione AC blu manuale
+TP_RAWCACORR_CABLUE;Blu
PREFERENCES_CACHECLEARALL;Ripulisci tutto
PREFERENCES_CACHECLEARPROFILES;Ripulisci i profili
PREFERENCES_CACHECLEARTHUMBS;Ripulisci le miniature
@@ -432,8 +432,8 @@ PREFERENCES_CACHESTRAT2;Privilegia il minore consumo di memoria alla rapidità
PREFERENCES_CACHESTRAT;Strategia di precaricamento
PREFERENCES_CACHETHUMBFORM;Formato delle miniature precaricate
PREFERENCES_CACHETHUMBHEIGHT;Massima quantità di miniature
-PREFERENCES_CACORRECTION;Correzione AC automatica
-PREFERENCES_CARED;Correzione AC rossa manuale
+TP_RAWCACORR_AUTO;Correzione AC automatica
+TP_RAWCACORR_CARED;Rossa
PREFERENCES_CLEARDLG_LINE1;Ripulitura dati in memoria
PREFERENCES_CLEARDLG_LINE2;Questa operazione potrebbe impiegare alcuni secondi.
PREFERENCES_CLEARDLG_TITLE;Prego attendere
@@ -443,8 +443,8 @@ PREFERENCES_CUTOVERLAYBRUSH;Pennello copertura ritaglio
PREFERENCES_DARKFRAME;Dark frame
PREFERENCES_DATEFORMAT;Formato data
PREFERENCES_DATEFORMATHINT;Puoi usare le seguenti stringhe di formattazione:\n%y : anno\n%m : mese\n%d : giorno\n\nPer esempio, il formato italiano per la data è:\n%d/%m/%y
-PREFERENCES_DCBENHANCE;Applicare passi di miglioramento DCB
-PREFERENCES_DCBITERATIONS;Numbero di iterazioni DCB
+TP_RAW_DCBENHANCE;Applicare passi di miglioramento DCB
+TP_RAW_DCBITERATIONS;Numbero di iterazioni DCB
PREFERENCES_DEFAULTLANG;Lingua predefinita
PREFERENCES_DEFAULTTHEME;Aspetto ordinario
PREFERENCES_DEMOSAICINGALGO;Algoritmo di demosaicizzazione
@@ -454,28 +454,28 @@ PREFERENCES_DIRLAST;Ultima cartella visitata
PREFERENCES_DIROTHER;Altra
PREFERENCES_DIRSELECTDLG;Seleziona la cartella delle immagini all'avvio...
PREFERENCES_DIRSOFTWARE;Cartella d'installazione
-PREFERENCES_DMETHOD;Metodo
+TP_RAW_DMETHOD;Metodo
PREFERENCES_EDITORCMDLINE;Esegui altro da linea di comando
PREFERENCES_EDITORLAYOUT;Layout editor
PREFERENCES_EXTERNALEDITOR;Programmi di ritocco esterni
-PREFERENCES_FALSECOLOR;Iterazioni per la soppressione dei falsi colori
+TP_RAW_FALSECOLOR;Iterazioni per la soppressione dei falsi colori
PREFERENCES_FBROWSEROPTS;Opzioni del navigatore di file
PREFERENCES_FILEFORMAT;Formato file
PREFERENCES_FORIMAGE;Per file immagine
PREFERENCES_FORRAW;Per file RAW
PREFERENCES_GIMPPATH;Cartella d'installazione di GIMP
-PREFERENCES_GREENEQUIL;Equilibrazione del verde
+TP_PREPROCESS_GREENEQUIL;Equilibrazione del verde
PREFERENCES_GTKTHEME;Predefinito GTK
PREFERENCES_HINT;Suggerimento
PREFERENCES_HLTHRESHOLD;Soglia per le alteluci tosate
-PREFERENCES_HOTDEADPIXFILT;Filtro pixel caldi/morti
+TP_PREPROCESS_HOTDEADPIXFILT;Filtro pixel caldi/morti
PREFERENCES_ICCDIR;Cartella profili ICC
PREFERENCES_IMPROCPARAMS;Parametri predefiniti di elaborazione dell'immagine
PREFERENCES_INTENT_ABSOLUTE;Colorimetrico Assoluto
PREFERENCES_INTENT_PERCEPTUAL;Percettivo
PREFERENCES_INTENT_RELATIVE;Colorimetrico Relativo
PREFERENCES_INTENT_SATURATION;Saturazione
-PREFERENCES_LINEDENOISE;Filtro rumore di linea
+TP_PREPROCESS_LINEDENOISE;Filtro rumore di linea
PREFERENCES_LIVETHUMBNAILS;Miniature sincronizzate (maggiore lentezza)
PREFERENCES_MONITORICC;Profilo dello schermo
PREFERENCES_MULTITAB;Modalità tab multipli
@@ -706,10 +706,9 @@ TP_LUMADENOISE_RADIUS;Raggio
TP_PERSPECTIVE_HORIZONTAL;Orizzontale
TP_PERSPECTIVE_LABEL;Prospettiva
TP_PERSPECTIVE_VERTICAL;Verticale
-TP_PREPROCESS_DARKFRAME;Dark frame
-TP_PREPROCESS_DFAUTOSELECT;Selezione automatica
-TP_RAWPANEL_DEMOSAICING;Demosaicizzazione
-TP_RAWPANEL_PREPROCESSING;Pre-elaborazione
+TP_DARKFRAME_AUTOSELECT;Selezione automatica
+TP_RAW_LABEL;Demosaicizzazione
+TP_PREPROCESS_LABEL;Pre-elaborazione
TP_RESIZE_BICUBIC;Bicubico
TP_RESIZE_BICUBICSF;Bicubico (più sfumato)
TP_RESIZE_BICUBICSH;Bicubico (più definito)
diff --git a/rtdata/languages/Latvian b/rtdata/languages/Latvian
index 0e124d332..a6f3ab962 100644
--- a/rtdata/languages/Latvian
+++ b/rtdata/languages/Latvian
@@ -347,10 +347,10 @@ PREFERENCES_DIRLAST;Pēdējā lietotā mape
PREFERENCES_DIROTHER;Cita
PREFERENCES_DIRSELECTDLG;Izvēlies attēlu mapi sākumam...
PREFERENCES_DIRSOFTWARE;Uzstādīšanas mape
-PREFERENCES_DMETHOD;Metode
+TP_RAW_DMETHOD;Metode
PREFERENCES_EDITORCMDLINE;Cita komandrinda
PREFERENCES_EXTERNALEDITOR;Ārējais redaktors
-PREFERENCES_FALSECOLOR;Neīsto krāsu slāpēšanas soļi
+TP_RAW_FALSECOLOR;Neīsto krāsu slāpēšanas soļi
PREFERENCES_FBROWSEROPTS;Failu pārlūka iespējas
PREFERENCES_FILEFORMAT;Faila formāts
PREFERENCES_FORIMAGE;Attēlu failiem
diff --git a/rtdata/languages/Magyar b/rtdata/languages/Magyar
index b96626d44..ab4f9cf42 100644
--- a/rtdata/languages/Magyar
+++ b/rtdata/languages/Magyar
@@ -394,7 +394,7 @@ PREFERENCES_CACHESTRAT2;Inkább memóriatakarékos, mint gyors
PREFERENCES_CACHESTRAT;Gyorsítótár stratégia
PREFERENCES_CACHETHUMBFORM;Előnézeti kép formátuma
PREFERENCES_CACHETHUMBHEIGHT;Előnézeti kép maximális magassága
-PREFERENCES_CACORRECTION;Színihiba (kromatikus aberráció) automatikus helyesbítése
+TP_RAWCACORR_AUTO;Színihiba (kromatikus aberráció) automatikus helyesbítése
PREFERENCES_CLEARDLG_LINE1;Gyorsítótár ürítése
PREFERENCES_CLEARDLG_LINE2;Ez eltarthat pár másodpercig.
PREFERENCES_CLEARDLG_TITLE;Kérem várjon
@@ -402,8 +402,8 @@ PREFERENCES_CLIPPINGIND;Kiégett és bebukott részek jelzése
PREFERENCES_CMETRICINTENT;Intent
PREFERENCES_DATEFORMAT;Dátumformátum
PREFERENCES_DATEFORMATHINT;A következő jeleket lehet használni:\n%y : év\n%m : hónap\n%d : nap\n\nPéldául a magyar dátumformátum:\n%y/%m/%d
-PREFERENCES_DCBENHANCE;DCB helyesbítő lépés alkalmazása
-PREFERENCES_DCBITERATIONS;DCB iterációk száma
+TP_RAW_DCBENHANCE;DCB helyesbítő lépés alkalmazása
+TP_RAW_DCBITERATIONS;DCB iterációk száma
PREFERENCES_DEFAULTLANG;Alapértelmezett nyelv
PREFERENCES_DEFAULTTHEME;Alapértelmezett kinézet
PREFERENCES_DEMOSAICINGALGO;Bayer interpoláció
@@ -413,11 +413,11 @@ PREFERENCES_DIRLAST;Utoljára látogatott könyvtár
PREFERENCES_DIROTHER;Más
PREFERENCES_DIRSELECTDLG;Képek könyvtára induláskor...
PREFERENCES_DIRSOFTWARE;Telepítés helye
-PREFERENCES_DMETHOD;Algoritmus
+TP_RAW_DMETHOD;Algoritmus
PREFERENCES_EDITORCMDLINE;Egyéb parancssor
PREFERENCES_EDITORLAYOUT;Szerkesztési mód
PREFERENCES_EXTERNALEDITOR;Külső képszerkesztő program
-PREFERENCES_FALSECOLOR;Színhiba-elnyomási lépések
+TP_RAW_FALSECOLOR;Színhiba-elnyomási lépések
PREFERENCES_FBROWSEROPTS;Állományböngésző beállításai
PREFERENCES_FILEFORMAT;Állományformátum
PREFERENCES_FORIMAGE;Egyéb képekhez
@@ -426,14 +426,14 @@ PREFERENCES_GIMPPATH;GIMP telepítési könyvtára
PREFERENCES_GTKTHEME;Alap GTK kinézet
PREFERENCES_HINT;Tipp
PREFERENCES_HLTHRESHOLD;Küszöbérték kiégett területekhez
-PREFERENCES_HOTDEADPIXFILT;Hot/dead pixel szűrő alkalmazása
+TP_PREPROCESS_HOTDEADPIXFILT;Hot/dead pixel szűrő alkalmazása
PREFERENCES_ICCDIR;ICC profilok könyvtára
PREFERENCES_IMPROCPARAMS;Alapértelmezett feldolgozási paraméterek
PREFERENCES_INTENT_ABSOLUTE;Abszolút kolorimetrikus
PREFERENCES_INTENT_PERCEPTUAL;Perceptuális
PREFERENCES_INTENT_RELATIVE;Relatív kolorimetrikus
PREFERENCES_INTENT_SATURATION;Színtelítettség
-PREFERENCES_LINEDENOISE;Sorzaj-szűrő
+TP_PREPROCESS_LINEDENOISE;Sorzaj-szűrő
PREFERENCES_LIVETHUMBNAILS;Élő előnézeti képek (lassabb)
PREFERENCES_MONITORICC;Monitor ICC profilja
PREFERENCES_MULTITAB;Több szerkesztőfül
@@ -660,10 +660,9 @@ TP_LUMADENOISE_RADIUS;Sugár
TP_PERSPECTIVE_HORIZONTAL;Vízszintes
TP_PERSPECTIVE_LABEL;Perspektíva
TP_PERSPECTIVE_VERTICAL;Függőleges
-TP_PREPROCESS_DARKFRAME;Dark frame
-TP_PREPROCESS_DFAUTOSELECT;Auto selection
-TP_RAWPANEL_DEMOSAICING;Deinterpoláció
-TP_RAWPANEL_PREPROCESSING;Előfeldolgozás
+TP_DARKFRAME_AUTOSELECT;Auto selection
+TP_RAW_LABEL;Deinterpoláció
+TP_PREPROCESS_LABEL;Előfeldolgozás
TP_RESIZE_BICUBIC;Bicubic
TP_RESIZE_BICUBICSF;Bicubic (lágyabb)
TP_RESIZE_BICUBICSH;Bicubic (keményebb)
diff --git a/rtdata/languages/Nederlands b/rtdata/languages/Nederlands
index e370d8157..cbbad9887 100644
--- a/rtdata/languages/Nederlands
+++ b/rtdata/languages/Nederlands
@@ -427,7 +427,7 @@ PREFERENCES_CACHESTRAT2;Langzamer, minder geheugenbeslag
PREFERENCES_CACHESTRAT;Cache-strategie
PREFERENCES_CACHETHUMBFORM;Miniatuurformaat cache
PREFERENCES_CACHETHUMBHEIGHT;Maximale hoogte miniaturen
-PREFERENCES_CACORRECTION;Automatische CA-correctie
+TP_RAWCACORR_AUTO;Automatische CA-correctie
PREFERENCES_CLEARDLG_LINE1;Cache legen...
PREFERENCES_CLEARDLG_LINE2;Dit kan even duren.
PREFERENCES_CLEARDLG_TITLE;Momentje svp.
@@ -436,8 +436,8 @@ PREFERENCES_CMETRICINTENT;Bedoelde colorimetrie
PREFERENCES_DARKFRAME;Dark-frame
PREFERENCES_DATEFORMAT;Datumformaat
PREFERENCES_DATEFORMATHINT;U kunt de volgende formaten gebruiken:\n%y : jaar\n%m : maand\n%d : dag\n\nHet Nederlandse datumformaat is bijvoorbeeld:\n%d/%m/%y
-PREFERENCES_DCBENHANCE;Pas DCB-verbetering toe
-PREFERENCES_DCBITERATIONS;Aantal DCB-herhalingen
+TP_RAW_DCBENHANCE;Pas DCB-verbetering toe
+TP_RAW_DCBITERATIONS;Aantal DCB-herhalingen
PREFERENCES_DEFAULTLANG;Standaardtaal
PREFERENCES_DEFAULTTHEME;Standaardthema
PREFERENCES_DEMOSAICINGALGO;Demozaïek-algoritme
@@ -447,28 +447,28 @@ PREFERENCES_DIRLAST;Laatst bezochte map
PREFERENCES_DIROTHER;Anders
PREFERENCES_DIRSELECTDLG;Selecteer standaardmap bij opstarten...
PREFERENCES_DIRSOFTWARE;Installatiemap
-PREFERENCES_DMETHOD;Methode
+TP_RAW_DMETHOD;Methode
PREFERENCES_EDITORCMDLINE;Andere editor, geef pad
PREFERENCES_EDITORLAYOUT;Bewerkingsvenster
PREFERENCES_EXTERNALEDITOR;Externe editor
-PREFERENCES_FALSECOLOR;Stapgrootte kleurfoutonderdrukking
+TP_RAW_FALSECOLOR;Stapgrootte kleurfoutonderdrukking
PREFERENCES_FBROWSEROPTS;Opties bestandsnavigator
PREFERENCES_FILEFORMAT;Bestandstype
PREFERENCES_FORIMAGE;Voor niet-RAW-bestanden
PREFERENCES_FORRAW;Voor RAW-bestanden
PREFERENCES_GIMPPATH;Installatiemap GIMP
-PREFERENCES_GREENEQUIL;Groenbalans
+TP_PREPROCESS_GREENEQUIL;Groenbalans
PREFERENCES_GTKTHEME;GTK standaard
PREFERENCES_HINT;Voorbeeld
PREFERENCES_HLTHRESHOLD;Grenswaarde overbelichting
-PREFERENCES_HOTDEADPIXFILT;Filter hete/dode pixels
+TP_PREPROCESS_HOTDEADPIXFILT;Filter hete/dode pixels
PREFERENCES_ICCDIR;Map met ICC-profielen
PREFERENCES_IMPROCPARAMS;Standaardprofiel
PREFERENCES_INTENT_ABSOLUTE;Absolute colorimetrie
PREFERENCES_INTENT_PERCEPTUAL;Waargenomen colorimetrie
PREFERENCES_INTENT_RELATIVE;Relatieve colorimetrie
PREFERENCES_INTENT_SATURATION;Verzadiging
-PREFERENCES_LINEDENOISE;Lijnruisfilter
+TP_PREPROCESS_LINEDENOISE;Lijnruisfilter
PREFERENCES_LIVETHUMBNAILS;Live-miniaturen (langzamer)
PREFERENCES_MONITORICC;Monitorprofiel
PREFERENCES_MULTITAB;Multi-tab-modus
@@ -696,10 +696,9 @@ TP_LUMADENOISE_RADIUS;Straal
TP_PERSPECTIVE_HORIZONTAL;Horizontaal
TP_PERSPECTIVE_LABEL;Perspectief
TP_PERSPECTIVE_VERTICAL;Verticaal
-TP_PREPROCESS_DARKFRAME;Dark-frame
-TP_PREPROCESS_DFAUTOSELECT;Automatische selectie
-TP_RAWPANEL_DEMOSAICING;Demozaïekproces
-TP_RAWPANEL_PREPROCESSING;Voorbewerking
+TP_DARKFRAME_AUTOSELECT;Automatische selectie
+TP_RAW_LABEL;Demozaïekproces
+TP_PREPROCESS_LABEL;Voorbewerking
TP_RESIZE_BICUBIC;Bikubisch
TP_RESIZE_BICUBICSF;Bikubisch (zachter)
TP_RESIZE_BICUBICSH;Bikubisch (scherper)
diff --git a/rtdata/languages/Norsk BM b/rtdata/languages/Norsk BM
index 345d9299b..584ad97f1 100644
--- a/rtdata/languages/Norsk BM
+++ b/rtdata/languages/Norsk BM
@@ -349,10 +349,10 @@ PREFERENCES_DIRLAST;Sidste besøkte mappe
PREFERENCES_DIROTHER;Annen
PREFERENCES_DIRSELECTDLG;Velg bildemappe ved oppstart...
PREFERENCES_DIRSOFTWARE;Installasjons-mappe
-PREFERENCES_DMETHOD;Metode
+TP_RAW_DMETHOD;Metode
PREFERENCES_EDITORCMDLINE;Annen kommandolinje
PREFERENCES_EXTERNALEDITOR;Ekstern editor
-PREFERENCES_FALSECOLOR;Falsk fargefortrengningsverdi
+TP_RAW_FALSECOLOR;Falsk fargefortrengningsverdi
PREFERENCES_FBROWSEROPTS;Filfremviser-innstillinger
PREFERENCES_FILEFORMAT;Filformat
PREFERENCES_FORIMAGE;For bildefiler
diff --git a/rtdata/languages/Polish b/rtdata/languages/Polish
index c155f23db..c28b956d9 100644
--- a/rtdata/languages/Polish
+++ b/rtdata/languages/Polish
@@ -353,10 +353,10 @@ PREFERENCES_DIRLAST;Ostatnio odwiedzony katalog
PREFERENCES_DIROTHER;Inny
PREFERENCES_DIRSELECTDLG;Wybierz katalog z obrazami po uruchomieniu...
PREFERENCES_DIRSOFTWARE;Katalog instalacyjny
-PREFERENCES_DMETHOD;Metoda
+TP_RAW_DMETHOD;Metoda
PREFERENCES_EDITORCMDLINE;Other command line
PREFERENCES_EXTERNALEDITOR;Zewnętrzny edytor
-PREFERENCES_FALSECOLOR;Kroki zapobiegania zafałszowaniom kolorów
+TP_RAW_FALSECOLOR;Kroki zapobiegania zafałszowaniom kolorów
PREFERENCES_FBROWSEROPTS;Opcje przeglądarki plików
PREFERENCES_FILEFORMAT;Format pliku
PREFERENCES_FORIMAGE;Dla plików z obrazami
diff --git a/rtdata/languages/Polish (Latin Characters) b/rtdata/languages/Polish (Latin Characters)
index 3cf54753f..aae5c4ca6 100644
--- a/rtdata/languages/Polish (Latin Characters)
+++ b/rtdata/languages/Polish (Latin Characters)
@@ -352,10 +352,10 @@ PREFERENCES_DIRLAST;Ostatnio odwiedzony katalog
PREFERENCES_DIROTHER;Inny
PREFERENCES_DIRSELECTDLG;Wybierz katalog z obrazami po uruchomieniu...
PREFERENCES_DIRSOFTWARE;Katalog instalacyjny
-PREFERENCES_DMETHOD;Metoda
+TP_RAW_DMETHOD;Metoda
PREFERENCES_EDITORCMDLINE;Other command line
PREFERENCES_EXTERNALEDITOR;Zewnetrzny edytor
-PREFERENCES_FALSECOLOR;Kroki zapobiegania zafalszowaniom kolorow
+TP_RAW_FALSECOLOR;Kroki zapobiegania zafalszowaniom kolorow
PREFERENCES_FBROWSEROPTS;Opcje przegladarki plikow
PREFERENCES_FILEFORMAT;Format pliku
PREFERENCES_FORIMAGE;Dla plikow z obrazami
diff --git a/rtdata/languages/Portugues (Brasil) b/rtdata/languages/Portugues (Brasil)
index 9a75ce27a..fd066f7f5 100644
--- a/rtdata/languages/Portugues (Brasil)
+++ b/rtdata/languages/Portugues (Brasil)
@@ -348,10 +348,10 @@ PREFERENCES_DIRLAST;Último directory visitado
PREFERENCES_DIROTHER;Outro
PREFERENCES_DIRSELECTDLG;selecionar diretório de imagem na inicialização...
PREFERENCES_DIRSOFTWARE;Diretório de instalação
-PREFERENCES_DMETHOD;Método
+TP_RAW_DMETHOD;Método
PREFERENCES_EDITORCMDLINE;Outra Linha de Comando
PREFERENCES_EXTERNALEDITOR;Editor externo
-PREFERENCES_FALSECOLOR;Supressão de cor falsa
+TP_RAW_FALSECOLOR;Supressão de cor falsa
PREFERENCES_FBROWSEROPTS;Opções do navegador de arquivos
PREFERENCES_FILEFORMAT;Formato de arquivo
PREFERENCES_FORIMAGE;Para arquivos de imagem
diff --git a/rtdata/languages/Russian b/rtdata/languages/Russian
index ec882196c..cbb7e2141 100644
--- a/rtdata/languages/Russian
+++ b/rtdata/languages/Russian
@@ -398,7 +398,7 @@ PREFERENCES_APPLNEXTSTARTUP;Нужен перезапуск
PREFERENCES_BATCH_PROCESSING;Пакетная обработка
PREFERENCES_BEHAVIOR;Поведение
PREFERENCES_BLINKCLIPPED;Мигать проблемными зонами
-PREFERENCES_CABLUE;Ручная коррекция ХА: синий
+TP_RAWCACORR_CABLUE;синий
PREFERENCES_CACHECLEARALL;Удалить все
PREFERENCES_CACHECLEARPROFILES;Удалить параметры обработки
PREFERENCES_CACHECLEARTHUMBS;Удалить эскизы
@@ -411,8 +411,8 @@ PREFERENCES_CACHESTRAT2;Меньше расход памяти - скорост
PREFERENCES_CACHESTRAT;Стратегия кэширования
PREFERENCES_CACHETHUMBFORM;Формат кэширования эскизов
PREFERENCES_CACHETHUMBHEIGHT;Максимальная высота эскиза
-PREFERENCES_CACORRECTION;Применить автоматическую коррекцию ХА
-PREFERENCES_CARED;Ручная коррекция ХА: красный
+TP_RAWCACORR_AUTO;Применить автоматическую коррекцию ХА
+TP_RAWCACORR_CARED;красный
PREFERENCES_CLEARDLG_LINE1;Очистка кэша
PREFERENCES_CLEARDLG_LINE2;Это может занять несколько секунд.
PREFERENCES_CLEARDLG_TITLE;Пожалуйста, подождите
@@ -422,8 +422,8 @@ PREFERENCES_CUTOVERLAYBRUSH;Cut overlay brush
PREFERENCES_DARKFRAME;Тёмный кадр
PREFERENCES_DATEFORMAT;Формат даты
PREFERENCES_DATEFORMATHINT;Вы можете использовать следующие элементы форматирования:\n%y : год\n%m : месяц\n%d : день\n\nНапример, венгерский формат даты такой:\n%y/%m/%d
-PREFERENCES_DCBENHANCE;Применить шаг улучшения DCB
-PREFERENCES_DCBITERATIONS;Количество итераций DCB
+TP_RAW_DCBENHANCE;Применить шаг улучшения DCB
+TP_RAW_DCBITERATIONS;Количество итераций DCB
PREFERENCES_DEFAULTLANG;Язык по умолчанию
PREFERENCES_DEFAULTTHEME;Тема по умолчанию
PREFERENCES_DEMOSAICINGALGO;Алгоритм получения изображения
@@ -433,28 +433,28 @@ PREFERENCES_DIRLAST;Последний каталог
PREFERENCES_DIROTHER;Другой
PREFERENCES_DIRSELECTDLG;Выберите каталог для хранения изображений
PREFERENCES_DIRSOFTWARE;Каталог установки
-PREFERENCES_DMETHOD;Метод
+TP_RAW_DMETHOD;Метод
PREFERENCES_EDITORCMDLINE;Другой (путь к исполняемому файлу)
PREFERENCES_EDITORLAYOUT;Тип редактора
PREFERENCES_EXTERNALEDITOR;Внешний редактор
-PREFERENCES_FALSECOLOR;Шагов для подавления ложных цветов:
+TP_RAW_FALSECOLOR;Шагов для подавления ложных цветов:
PREFERENCES_FBROWSEROPTS;Настройки
PREFERENCES_FILEFORMAT;Формат файлов
PREFERENCES_FORIMAGE;Для изображений
PREFERENCES_FORRAW;Для RAW файлов
PREFERENCES_GIMPPATH;Каталог установки GIMP
-PREFERENCES_GREENEQUIL;Выравнивание зелёного
+TP_PREPROCESS_GREENEQUIL;Выравнивание зелёного
PREFERENCES_GTKTHEME;GTK по умолчанию
PREFERENCES_HINT;Подсказка
PREFERENCES_HLTHRESHOLD;Порог срабатывания пересветов
-PREFERENCES_HOTDEADPIXFILT;Применить фильтр горячих/темных пикселей
+TP_PREPROCESS_HOTDEADPIXFILT;Применить фильтр горячих/темных пикселей
PREFERENCES_ICCDIR;Каталог ICC профилей
PREFERENCES_IMPROCPARAMS;Параметры обработки по умолчанию
PREFERENCES_INTENT_ABSOLUTE;Абсолютное
PREFERENCES_INTENT_PERCEPTUAL;Перцепционное
PREFERENCES_INTENT_RELATIVE;Относительное
PREFERENCES_INTENT_SATURATION;По насыщенности
-PREFERENCES_LINEDENOISE;Фильтр линейного шума
+TP_PREPROCESS_LINEDENOISE;Фильтр линейного шума
PREFERENCES_LIVETHUMBNAILS;Эскизы в реальном времени (медленно)
PREFERENCES_MONITORICC;Профиль монитора
PREFERENCES_MULTITAB;Много вкладок
@@ -681,10 +681,9 @@ TP_LUMADENOISE_RADIUS;радиус
TP_PERSPECTIVE_HORIZONTAL;Горизонтальная
TP_PERSPECTIVE_LABEL;Перспектива
TP_PERSPECTIVE_VERTICAL;Вертикальная
-TP_PREPROCESS_DARKFRAME;Темный кадр
-TP_PREPROCESS_DFAUTOSELECT;Автовыбор
-TP_RAWPANEL_DEMOSAICING;Демозаик
-TP_RAWPANEL_PREPROCESSING;Предобработка
+TP_DARKFRAME_AUTOSELECT;Автовыбор
+TP_RAW_LABEL;Демозаик
+TP_PREPROCESS_LABEL;Предобработка
TP_RESIZE_BICUBIC;Бикубический
TP_RESIZE_BICUBICSF;Мягкий бикубический
TP_RESIZE_BICUBICSH;Резкий бикубический
diff --git a/rtdata/languages/Serbian (Cyrilic Characters) b/rtdata/languages/Serbian (Cyrilic Characters)
index cd21adadb..e7ccd0b83 100644
--- a/rtdata/languages/Serbian (Cyrilic Characters)
+++ b/rtdata/languages/Serbian (Cyrilic Characters)
@@ -423,7 +423,7 @@ PREFERENCES_CACHESTRAT2;Мала заузетост меморије, уз сп
PREFERENCES_CACHESTRAT;Остава
PREFERENCES_CACHETHUMBFORM;Формат умањених приказа
PREFERENCES_CACHETHUMBHEIGHT;Највећа висина приказа
-PREFERENCES_CACORRECTION;Исправи хроматске аберације
+TP_RAWCACORR_AUTO;Исправи хроматске аберације
PREFERENCES_CLEARDLG_LINE1;Чишћење оставе
PREFERENCES_CLEARDLG_LINE2;Ово може да потраје неколико секунди.
PREFERENCES_CLEARDLG_TITLE;Сачекајте
@@ -432,8 +432,8 @@ PREFERENCES_CMETRICINTENT;Колориметријска намера
PREFERENCES_DARKFRAME;Тамни кадар
PREFERENCES_DATEFORMAT;Формат датума
PREFERENCES_DATEFORMATHINT;Можете задати следеће формате:\n%y :година\n%m : месец\n%d : дан\n\nУ Србији се највише користи:\n%d.%m.%y
-PREFERENCES_DCBENHANCE;Примени ДЦБ побољшање
-PREFERENCES_DCBITERATIONS;Број ДЦБ пролаза
+TP_RAW_DCBENHANCE;Примени ДЦБ побољшање
+TP_RAW_DCBITERATIONS;Број ДЦБ пролаза
PREFERENCES_DEFAULTLANG;Језик програма
PREFERENCES_DEFAULTTHEME;Тема програма
PREFERENCES_DEMOSAICINGALGO;Алгоритам за склапање
@@ -443,28 +443,28 @@ PREFERENCES_DIRLAST;Последњи директоријум
PREFERENCES_DIROTHER;Неки други
PREFERENCES_DIRSELECTDLG;Бира одређени директоријум са сликама...
PREFERENCES_DIRSOFTWARE;Директоријум са инсталацијом
-PREFERENCES_DMETHOD;Начин
+TP_RAW_DMETHOD;Начин
PREFERENCES_EDITORCMDLINE;Произвољна наредба
PREFERENCES_EDITORLAYOUT;Размештај програма
PREFERENCES_EXTERNALEDITOR;Спољни уређивач
-PREFERENCES_FALSECOLOR;Кораци за пригушивање лажне боје
+TP_RAW_FALSECOLOR;Кораци за пригушивање лажне боје
PREFERENCES_FBROWSEROPTS;Опције разгледача датотеке
PREFERENCES_FILEFORMAT;Формат датотеке
PREFERENCES_FORIMAGE;За датотеке са сликама
PREFERENCES_FORRAW;За RAW датотеке
PREFERENCES_GIMPPATH;Директоријум са инсталираним Гимпом
-PREFERENCES_GREENEQUIL;Калибрација зелене боје
+TP_PREPROCESS_GREENEQUIL;Калибрација зелене боје
PREFERENCES_GTKTHEME;ГТК тема
PREFERENCES_HINT;Савет
PREFERENCES_HLTHRESHOLD;Праг за одсечене светле делове
-PREFERENCES_HOTDEADPIXFILT;Избаци прегореле и мртве пикселе
+TP_PREPROCESS_HOTDEADPIXFILT;Избаци прегореле и мртве пикселе
PREFERENCES_ICCDIR;ИЦЦ директоријум
PREFERENCES_IMPROCPARAMS;Подразумевани параметри за обраду слика
PREFERENCES_INTENT_ABSOLUTE;Апсолутно колориметријски
PREFERENCES_INTENT_PERCEPTUAL;Перцептуално
PREFERENCES_INTENT_RELATIVE;Релативно колориметријски
PREFERENCES_INTENT_SATURATION;Засићени приказ
-PREFERENCES_LINEDENOISE;Линијски филтер шума
+TP_PREPROCESS_LINEDENOISE;Линијски филтер шума
PREFERENCES_LIVETHUMBNAILS;„Живи“ прикази (спорије)
PREFERENCES_MONITORICC;Профил монитора
PREFERENCES_MULTITAB;Режим у више листова
@@ -689,10 +689,9 @@ TP_LUMADENOISE_RADIUS;Полупречник
TP_PERSPECTIVE_HORIZONTAL;Хоризонтална
TP_PERSPECTIVE_LABEL;Перспектива
TP_PERSPECTIVE_VERTICAL;Вертикална
-TP_PREPROCESS_DARKFRAME;Тамни кадар
-TP_PREPROCESS_DFAUTOSELECT;Сам изабери
-TP_RAWPANEL_DEMOSAICING;Расклапање мозаика
-TP_RAWPANEL_PREPROCESSING;Предобрада
+TP_DARKFRAME_AUTOSELECT;Сам изабери
+TP_RAW_LABEL;Расклапање мозаика
+TP_PREPROCESS_LABEL;Предобрада
TP_RESIZE_BICUBIC;Бикубично
TP_RESIZE_BICUBICSF;Бикубично (мекше)
TP_RESIZE_BICUBICSH;Бикубично (оштрије)
diff --git a/rtdata/languages/Serbian (Latin Characters) b/rtdata/languages/Serbian (Latin Characters)
index 025436012..1ec1fd436 100644
--- a/rtdata/languages/Serbian (Latin Characters)
+++ b/rtdata/languages/Serbian (Latin Characters)
@@ -423,7 +423,7 @@ PREFERENCES_CACHESTRAT2;Mala zauzetost memorije, uz sporiji rad
PREFERENCES_CACHESTRAT;Ostava
PREFERENCES_CACHETHUMBFORM;Format umanjenih prikaza
PREFERENCES_CACHETHUMBHEIGHT;Najveća visina prikaza
-PREFERENCES_CACORRECTION;Ispravi hromatske aberacije
+TP_RAWCACORR_AUTO;Ispravi hromatske aberacije
PREFERENCES_CLEARDLG_LINE1;Čišćenje ostave
PREFERENCES_CLEARDLG_LINE2;Ovo može da potraje nekoliko sekundi.
PREFERENCES_CLEARDLG_TITLE;Sačekajte
@@ -432,8 +432,8 @@ PREFERENCES_CMETRICINTENT;Kolorimetrijska namera
PREFERENCES_DARKFRAME;Tamni kadar
PREFERENCES_DATEFORMAT;Format datuma
PREFERENCES_DATEFORMATHINT;Možete zadati sledeće formate:\n%y :godina\n%m : mesec\n%d : dan\n\nU Srbiji se najviše koristi:\n%d.%m.%y
-PREFERENCES_DCBENHANCE;Primeni DCB poboljšanje
-PREFERENCES_DCBITERATIONS;Broj DCB prolaza
+TP_RAW_DCBENHANCE;Primeni DCB poboljšanje
+TP_RAW_DCBITERATIONS;Broj DCB prolaza
PREFERENCES_DEFAULTLANG;Jezik programa
PREFERENCES_DEFAULTTHEME;Tema programa
PREFERENCES_DEMOSAICINGALGO;Algoritam za sklapanje
@@ -443,28 +443,28 @@ PREFERENCES_DIRLAST;Poslednji direktorijum
PREFERENCES_DIROTHER;Neki drugi
PREFERENCES_DIRSELECTDLG;Bira određeni direktorijum sa slikama...
PREFERENCES_DIRSOFTWARE;Direktorijum sa instalacijom
-PREFERENCES_DMETHOD;Način
+TP_RAW_DMETHOD;Način
PREFERENCES_EDITORCMDLINE;Proizvoljna naredba
PREFERENCES_EDITORLAYOUT;Razmeštaj programa
PREFERENCES_EXTERNALEDITOR;Spoljni uređivač
-PREFERENCES_FALSECOLOR;Koraci za prigušivanje lažne boje
+TP_RAW_FALSECOLOR;Koraci za prigušivanje lažne boje
PREFERENCES_FBROWSEROPTS;Opcije razgledača datoteke
PREFERENCES_FILEFORMAT;Format datoteke
PREFERENCES_FORIMAGE;Za datoteke sa slikama
PREFERENCES_FORRAW;Za RAW datoteke
PREFERENCES_GIMPPATH;Direktorijum sa instaliranim Gimpom
-PREFERENCES_GREENEQUIL;Kalibracija zelene boje
+TP_PREPROCESS_GREENEQUIL;Kalibracija zelene boje
PREFERENCES_GTKTHEME;GTK tema
PREFERENCES_HINT;Savet
PREFERENCES_HLTHRESHOLD;Prag za odsečene svetle delove
-PREFERENCES_HOTDEADPIXFILT;Izbaci pregorele i mrtve piksele
+TP_PREPROCESS_HOTDEADPIXFILT;Izbaci pregorele i mrtve piksele
PREFERENCES_ICCDIR;ICC direktorijum
PREFERENCES_IMPROCPARAMS;Podrazumevani parametri za obradu slika
PREFERENCES_INTENT_ABSOLUTE;Apsolutno kolorimetrijski
PREFERENCES_INTENT_PERCEPTUAL;Perceptualno
PREFERENCES_INTENT_RELATIVE;Relativno kolorimetrijski
PREFERENCES_INTENT_SATURATION;Zasićeni prikaz
-PREFERENCES_LINEDENOISE;Linijski filter šuma
+TP_PREPROCESS_LINEDENOISE;Linijski filter šuma
PREFERENCES_LIVETHUMBNAILS;„Živi“ prikazi (sporije)
PREFERENCES_MONITORICC;Profil monitora
PREFERENCES_MULTITAB;Režim u više listova
@@ -689,10 +689,9 @@ TP_LUMADENOISE_RADIUS;Poluprečnik
TP_PERSPECTIVE_HORIZONTAL;Horizontalna
TP_PERSPECTIVE_LABEL;Perspektiva
TP_PERSPECTIVE_VERTICAL;Vertikalna
-TP_PREPROCESS_DARKFRAME;Tamni kadar
-TP_PREPROCESS_DFAUTOSELECT;Sam izaberi
-TP_RAWPANEL_DEMOSAICING;Rasklapanje mozaika
-TP_RAWPANEL_PREPROCESSING;Predobrada
+TP_DARKFRAME_AUTOSELECT;Sam izaberi
+TP_RAW_LABEL;Rasklapanje mozaika
+TP_PREPROCESS_LABEL;Predobrada
TP_RESIZE_BICUBIC;Bikubično
TP_RESIZE_BICUBICSF;Bikubično (mekše)
TP_RESIZE_BICUBICSH;Bikubično (oštrije)
diff --git a/rtdata/languages/Slovak b/rtdata/languages/Slovak
index b045586b3..d4554bf6d 100644
--- a/rtdata/languages/Slovak
+++ b/rtdata/languages/Slovak
@@ -399,7 +399,7 @@ PREFERENCES_CACHESTRAT2;Uprednostniť malú spotrebu pamäte pred rýchlosťou
PREFERENCES_CACHESTRAT;Stratégia použitia cache
PREFERENCES_CACHETHUMBFORM;Formát zmenšenín pre cache
PREFERENCES_CACHETHUMBHEIGHT;Maximálna výška zmenšenín
-PREFERENCES_CACORRECTION;Použiť automatickú úpravu CA
+TP_RAWCACORR_AUTO;Použiť automatickú úpravu CA
PREFERENCES_CLEARDLG_LINE1;Čistím cache
PREFERENCES_CLEARDLG_LINE2;Môže to pár sekúnd trvať.
PREFERENCES_CLEARDLG_TITLE;Prosím, čakajte.
@@ -407,8 +407,8 @@ PREFERENCES_CLIPPINGIND;Indikácia orezu
PREFERENCES_CMETRICINTENT;Kolorimetrický zámer
PREFERENCES_DATEFORMAT;Formát dátumu
PREFERENCES_DATEFORMATHINT;Môžete použiť nasledujúce formátovacie reťazce:\n%y : rok\n%m : mesiac\n%d : deň\n\nNapríklad, slovenský formát je:\n%d.%m.%y
-PREFERENCES_DCBENHANCE;Použiť vylepšovací krok DCB
-PREFERENCES_DCBITERATIONS;Počet iterácií DCB
+TP_RAW_DCBENHANCE;Použiť vylepšovací krok DCB
+TP_RAW_DCBITERATIONS;Počet iterácií DCB
PREFERENCES_DEFAULTLANG;Predvolený jazyk
PREFERENCES_DEFAULTTHEME;Predvolený vzhľad
PREFERENCES_DEMOSAICINGALGO;Demozaikovací algoritmus
@@ -417,29 +417,29 @@ PREFERENCES_DIRLAST;Posledný navštívený adresár
PREFERENCES_DIROTHER;Iný
PREFERENCES_DIRSELECTDLG;Vybrať adresár s obrázkami pri spustení...
PREFERENCES_DIRSOFTWARE;Inštalačný adresár
-PREFERENCES_DMETHOD;Metóda
-PREFERENCES_DMETHODBATCH;Dávka
+TP_RAW_DMETHOD;Metóda
+TP_RAW_DMETHODBATCH;Dávka
PREFERENCES_EDITORCMDLINE;Iný príkazový riadok
PREFERENCES_EDITORLAYOUT;Rozloženie editora
PREFERENCES_EXTERNALEDITOR;Externý editor
-PREFERENCES_FALSECOLOR;Kroky potlačenia chybných farieb
+TP_RAW_FALSECOLOR;Kroky potlačenia chybných farieb
PREFERENCES_FBROWSEROPTS;Voľby prehliadača súborov
PREFERENCES_FILEFORMAT;Formát súborov
PREFERENCES_FORIMAGE;Pre obrazové súbory
PREFERENCES_FORRAW;Pre RAW súbory
PREFERENCES_GIMPPATH;Inštalačný adresár GIMPu
-PREFERENCES_GREENEQUIL;Vyvažovanie zelenej
+TP_PREPROCESS_GREENEQUIL;Vyvažovanie zelenej
PREFERENCES_GTKTHEME;GTK predvolený
PREFERENCES_HINT;Tip
PREFERENCES_HLTHRESHOLD;Prah pre orezanie najvyšších svetiel
-PREFERENCES_HOTDEADPIXFILT;Použiť filter na horúce/mŕtve pixely
+TP_PREPROCESS_HOTDEADPIXFILT;Použiť filter na horúce/mŕtve pixely
PREFERENCES_ICCDIR;Adresár s ICC profilmy
PREFERENCES_IMPROCPARAMS;Predvolené parametre spracovania obrazu
PREFERENCES_INTENT_ABSOLUTE;Absolútny kolorimetrický
PREFERENCES_INTENT_PERCEPTUAL;Vnímaný
PREFERENCES_INTENT_RELATIVE;Relatívny kolorimetrický
PREFERENCES_INTENT_SATURATION;Sýtosť
-PREFERENCES_LINEDENOISE;Filter šumu vedenia
+TP_PREPROCESS_LINEDENOISE;Filter šumu vedenia
PREFERENCES_LIVETHUMBNAILS;Živé zmenšeniny (pomalšie)
PREFERENCES_MONITORICC;Profil monitora
PREFERENCES_MULTITAB;Režim viacerých kariet
diff --git a/rtdata/languages/Suomi b/rtdata/languages/Suomi
index 08abf2f9e..0fd6642ce 100644
--- a/rtdata/languages/Suomi
+++ b/rtdata/languages/Suomi
@@ -348,10 +348,10 @@ PREFERENCES_DIRLAST;Viimeksi käytetty hakemisto
PREFERENCES_DIROTHER;Muu
PREFERENCES_DIRSELECTDLG;Valitse kuvahakemisto käynnistettäessä...
PREFERENCES_DIRSOFTWARE;Asennushakemisto
-PREFERENCES_DMETHOD;Menetelmä
+TP_RAW_DMETHOD;Menetelmä
PREFERENCES_EDITORCMDLINE;Muu komentorivi
PREFERENCES_EXTERNALEDITOR;Ulkoinen ohjelma
-PREFERENCES_FALSECOLOR;Värivääristymien eston määrä
+TP_RAW_FALSECOLOR;Värivääristymien eston määrä
PREFERENCES_FBROWSEROPTS;Näytettävät tiedot
PREFERENCES_FILEFORMAT;Tallennuksen asetukset
PREFERENCES_FORIMAGE;Kuvatiedostoille
diff --git a/rtdata/languages/Swedish b/rtdata/languages/Swedish
index 80a4b3334..74a2a83e3 100644
--- a/rtdata/languages/Swedish
+++ b/rtdata/languages/Swedish
@@ -165,10 +165,10 @@ HISTORY_MSG_108;Storleksförändring på avgränsad yta
HISTORY_MSG_109;Storleksförändring tillämpas på
HISTORY_MSG_10;Skuggkomprimering
HISTORY_MSG_110;Storleksförändring tillämpas på
-HISTORY_MSG_111;Plattfältsfil
-HISTORY_MSG_112;Automatiskt val av plattfält
-HISTORY_MSG_113;Oskärperadie för plattfält
-HISTORY_MSG_114;Oskärpetyp hos plattfältet
+HISTORY_MSG_126;Plattfältsfil
+HISTORY_MSG_127;Automatiskt val av plattfält
+HISTORY_MSG_128;Oskärperadie för plattfält
+HISTORY_MSG_129;Oskärpetyp hos plattfältet
HISTORY_MSG_11;Tonkurva
HISTORY_MSG_12;Autoexponering
HISTORY_MSG_13;Exponeringsmarkering
@@ -460,7 +460,7 @@ PREFERENCES_APPLNEXTSTARTUP;Ändras vid nästa uppstart
PREFERENCES_BATCH_PROCESSING;Batchbehandling
PREFERENCES_BEHAVIOR;Uppträdande
PREFERENCES_BLINKCLIPPED;Blinka markerade områden
-PREFERENCES_CABLUE;Blå CA manuell korrigering
+TP_RAWCACORR_CABLUE;Blå
PREFERENCES_CACHECLEARALL;Återställ alla
PREFERENCES_CACHECLEARPROFILES;Återställ profiler
PREFERENCES_CACHECLEARTHUMBS;Ta bort cachade miniatyrbilder
@@ -473,8 +473,8 @@ PREFERENCES_CACHESTRAT2;Föredra låg minnesanvändning framför hastighet
PREFERENCES_CACHESTRAT;Cachestrategi
PREFERENCES_CACHETHUMBFORM;Miniatyrbildens format i cachen
PREFERENCES_CACHETHUMBHEIGHT;Maximal storlek på miniatyrbilderna
-PREFERENCES_CACORRECTION;Reducera kromatiska abberationer
-PREFERENCES_CARED;Röd CA manuell korrigering
+TP_RAWCACORR_AUTO;Reducera kromatiska abberationer
+TP_RAWCACORR_CARED;Röd
PREFERENCES_CLEARDLG_LINE1;Rensa cache
PREFERENCES_CLEARDLG_LINE2;Det här tar kanske ett par sekunder...
PREFERENCES_CLEARDLG_TITLE;Var vänlig vänta
@@ -482,13 +482,10 @@ PREFERENCES_CLIPPINGIND;Markeringsindikation
PREFERENCES_CMETRICINTENT;Kolorimetrisk återgivning
PREFERENCES_CUTOVERLAYBRUSH;Bakgrundsfärg vid beskärning
PREFERENCES_DARKFRAME;Svartbild
-PREFERENCES_DARKFRAMEFOUND;Hittade
-PREFERENCES_DARKFRAMESHOTS;bilder
-PREFERENCES_DARKFRAMETEMPLATES;mallar
PREFERENCES_DATEFORMAT;Datumformat
PREFERENCES_DATEFORMATHINT;Du kan använda de följande formatteringssträngarna:\n%y : år\n%m : månad\n%d : dag\n\nTill exempel är det svenska datumformatet:-n%y-%m-%d
-PREFERENCES_DCBENHANCE;Applicera DCB-förbättringssteg
-PREFERENCES_DCBITERATIONS;Antal DCB-iterationer
+TP_RAW_DCBENHANCE;Applicera DCB-förbättringssteg
+TP_RAW_DCBITERATIONS;Antal DCB-iterationer
PREFERENCES_DEFAULTLANG;Förvalt språk
PREFERENCES_DEFAULTTHEME;Förvalt tema
PREFERENCES_DEMOSAICINGALGO;Algoritm för demosaicing
@@ -498,38 +495,29 @@ PREFERENCES_DIRLAST;Senaste besökta katalog
PREFERENCES_DIROTHER;Annan
PREFERENCES_DIRSELECTDLG;Välj bildkatalog vid uppstart...
PREFERENCES_DIRSOFTWARE;Installationskatalog
-PREFERENCES_DMETHOD;Metod
-PREFERENCES_DMETHODBATCH;Batch
+TP_RAW_DMETHOD;Metod
+TP_RAW_DMETHODBATCH;Batch
PREFERENCES_EDITORCMDLINE;Annan kommandorad
PREFERENCES_EDITORLAYOUT;Layout på redigeringsvyn
-PREFERENCES_EXPOS;Exponering före interpolering: Korrigering (lin)
PREFERENCES_EXTERNALEDITOR;Externt bildredigeringsprogram
-PREFERENCES_FALSECOLOR;Falskt färgbortträngningssteg
+TP_RAW_FALSECOLOR;Falskt färgbortträngningssteg
PREFERENCES_FBROWSEROPTS;Filbläddrarinställningar
PREFERENCES_FILEFORMAT;Filformat
-PREFERENCES_FLATFIELDAUTOSELECT;Välj plattfält automatiskt
-PREFERENCES_FLATFIELDBLURRADIUS;Oskärperadie för plattfält
-PREFERENCES_FLATFIELDBLURTYPE;Oskärpetyp hos plattfältet
-PREFERENCES_FLATFIELDFILE;Plattfältsfil
-PREFERENCES_FLATFIELDFOUND;Hittade
-PREFERENCES_FLATFIELDSDIR;Plattfältskatalog
-PREFERENCES_FLATFIELDSHOTS;bilder
-PREFERENCES_FLATFIELDTEMPLATES;mallar
PREFERENCES_FORIMAGE;För bildfiler
PREFERENCES_FORRAW;För råbilder
PREFERENCES_GIMPPATH;Installationskatalog för GIMP
-PREFERENCES_GREENEQUIL;Grönbalansering
+TP_PREPROCESS_GREENEQUIL;Grönbalansering
PREFERENCES_GTKTHEME;GTK standard
PREFERENCES_HINT;Tips
PREFERENCES_HLTHRESHOLD;Tröskelvärde för högdagrar
-PREFERENCES_HOTDEADPIXFILT;Applicera het- och dödpixelfiltrering
+TP_PREPROCESS_HOTDEADPIXFILT;Applicera het- och dödpixelfiltrering
PREFERENCES_ICCDIR;Katalog för ICC-profiler
PREFERENCES_IMPROCPARAMS;Standardprofiler
PREFERENCES_INTENT_ABSOLUTE;Totalkolorimetrisk
PREFERENCES_INTENT_PERCEPTUAL;Upplevd
PREFERENCES_INTENT_RELATIVE;Relativ kolorimetrisk
PREFERENCES_INTENT_SATURATION;Mättnad
-PREFERENCES_LINEDENOISE;Linjärt brusfilter
+TP_PREPROCESS_LINEDENOISE;Linjärt brusfilter
PREFERENCES_LIVETHUMBNAILS;Alltid uppdaterade miniatyrbilder(långsammare)
PREFERENCES_METADATA;Metadata
PREFERENCES_MONITORICC;Skärmprofil
@@ -547,7 +535,6 @@ PREFERENCES_PARSEDEXT;Behandlade filtyper
PREFERENCES_PARSEDEXTADD;Lägg till filtyp
PREFERENCES_PARSEDEXTADDHINT;Skriv in en filändelse och tryck på den här knappen för att lägga till den i listan
PREFERENCES_PARSEDEXTDELHINT;Ta bort de markerade filändelserna från listan
-PREFERENCES_PRESER;Exponering före interpolering: Bevara högdagrar (EV)
PREFERENCES_PROFILEHANDLING;Hantering av bildbehandlingsparametrar
PREFERENCES_PROFILELOADPR;Laddningsprioritet för profil
PREFERENCES_PROFILEPRCACHE;Profil i cache
@@ -772,15 +759,9 @@ TP_LUMADENOISE_RADIUS;Radie
TP_PERSPECTIVE_HORIZONTAL;Horisontell
TP_PERSPECTIVE_LABEL;Perspektiv
TP_PERSPECTIVE_VERTICAL;Vertikal
-TP_PREPROCESS_DARKFRAME;Svartbild
-TP_PREPROCESS_DFAUTOSELECT;Välj svartbild automatiskt
-TP_PREPROCESS_FLATFIELDAUTOSELECT;Välj plattfält automatiskt
-TP_PREPROCESS_FLATFIELDBLURRADIUS;Oskärperadie för plattfält
-TP_PREPROCESS_FLATFIELDBLURTYPE;Oskärpetyp hos plattfältet
-TP_PREPROCESS_FLATFIELDFILE;Plattfältsfil
-TP_PREPROCESS_NO_FOUND;Inga hittade
-TP_RAWPANEL_DEMOSAICING;Demosaicing
-TP_RAWPANEL_PREPROCESSING;Förbehandling
+TP_DARKFRAME_AUTOSELECT;Välj svartbild automatiskt
+TP_RAW_LABEL;Demosaicing
+TP_PREPROCESS_LABEL;Förbehandling
TP_RESIZE_APPLIESTO;Tillämpas på:
TP_RESIZE_BICUBIC;Bikubisk
TP_RESIZE_BICUBICSF;Bikubisk (Mjukare)
diff --git a/rtdata/languages/Turkish b/rtdata/languages/Turkish
index 6100caca7..c9c44836d 100644
--- a/rtdata/languages/Turkish
+++ b/rtdata/languages/Turkish
@@ -349,10 +349,10 @@ PREFERENCES_DIRLAST;Son gidilen dizin
PREFERENCES_DIROTHER;Diğer
PREFERENCES_DIRSELECTDLG;Başlangıç görüntü dizinini seç...
PREFERENCES_DIRSOFTWARE;Kurulum dizini
-PREFERENCES_DMETHOD;Yöntem
+TP_RAW_DMETHOD;Yöntem
PREFERENCES_EDITORCMDLINE;Other command line
PREFERENCES_EXTERNALEDITOR;External editor
-PREFERENCES_FALSECOLOR;Hatalı-renk bastırma değerleri
+TP_RAW_FALSECOLOR;Hatalı-renk bastırma değerleri
PREFERENCES_FBROWSEROPTS;Dosya gezgini seçenekleri
PREFERENCES_FILEFORMAT;Dosya biçimi
PREFERENCES_FORIMAGE;Gürüntü dosyaları için
diff --git a/rtdata/languages/default b/rtdata/languages/default
index 14c8451f1..08b77d648 100644
--- a/rtdata/languages/default
+++ b/rtdata/languages/default
@@ -132,11 +132,13 @@ GENERAL_DISABLE;Disable
GENERAL_DISABLED;Disabled
GENERAL_ENABLE;Enable
GENERAL_ENABLED;Enabled
+GENERAL_FILE;File
GENERAL_HIGH_QUALITY;High Quality
GENERAL_LANDSCAPE;Landscape
GENERAL_LOAD;Load
GENERAL_NA;n/a
GENERAL_NO;No
+GENERAL_NONE;None
GENERAL_OK;OK
GENERAL_PORTRAIT;Portrait
GENERAL_SAVE;Save
@@ -171,10 +173,22 @@ HISTORY_MSG_110;Resizing applies to
HISTORY_MSG_111;Avoid Color Clipping
HISTORY_MSG_112;Saturation Limiter
HISTORY_MSG_113;Saturation Limit
-HISTORY_MSG_114;Flat Field File
-HISTORY_MSG_115;Flat Field Auto Select
-HISTORY_MSG_116;Flat Field Blur Radius
-HISTORY_MSG_117;Flat Field Blur Type
+HISTORY_MSG_114;DCB Iterations
+HISTORY_MSG_115;False color iterations
+HISTORY_MSG_116;Enhanced DCB
+HISTORY_MSG_117;Red CA correction
+HISTORY_MSG_118;Blue CA correction
+HISTORY_MSG_119;Line denoise
+HISTORY_MSG_120;Green equil. threshold
+HISTORY_MSG_121;Auto CA
+HISTORY_MSG_122;Auto Dark Frame
+HISTORY_MSG_123;Dark Frame File
+HISTORY_MSG_124;Linear exp. correction
+HISTORY_MSG_125;Expo. correction preserving HL
+HISTORY_MSG_126;Flat Field File
+HISTORY_MSG_127;Flat Field Auto Select
+HISTORY_MSG_128;Flat Field Blur Radius
+HISTORY_MSG_129;Flat Field Blur Type
HISTORY_MSG_11;Tone Curve
HISTORY_MSG_12;Auto Exposure
HISTORY_MSG_13;Exposure Clipping
@@ -270,8 +284,8 @@ HISTORY_MSG_94;Contrast by detail levels
HISTORY_MSG_95;Saturation
HISTORY_MSG_96;'a' curve
HISTORY_MSG_97;'b' curve
-HISTORY_MSG_98;Demosaicing
-HISTORY_MSG_99;Preprocessing
+HISTORY_MSG_98;Demosaicing method
+HISTORY_MSG_99;Hot/dead pixel filtering
HISTORY_MSG_9;Highlight Compression
HISTORY_NEWSNAPSHOT;Add
HISTORY_NEWSNAPSHOTAS;As...
@@ -462,7 +476,6 @@ PREFERENCES_APPLNEXTSTARTUP;restart required
PREFERENCES_BATCH_PROCESSING;Batch Processing
PREFERENCES_BEHAVIOR;Behavior
PREFERENCES_BLINKCLIPPED;Blink clipped areas
-PREFERENCES_CABLUE;CA Blue manual correction
PREFERENCES_CACHECLEARALL;Clear All
PREFERENCES_CACHECLEARPROFILES;Clear Profiles
PREFERENCES_CACHECLEARTHUMBS;Clear Thumbnails
@@ -475,8 +488,6 @@ PREFERENCES_CACHESTRAT2;Prefer Low Memory Consumption to Speed
PREFERENCES_CACHESTRAT;Cache Strategy
PREFERENCES_CACHETHUMBFORM;Cache Thumbnail Format
PREFERENCES_CACHETHUMBHEIGHT;Maximal Thumbnail Height
-PREFERENCES_CACORRECTION;Apply CA auto correction
-PREFERENCES_CARED;CA Red manual correction
PREFERENCES_CLIPPINGIND;Clipping indication
PREFERENCES_CMETRICINTENT;Colorimetric Intent
PREFERENCES_CUTOVERLAYBRUSH;Cut overlay brush
@@ -486,8 +497,6 @@ PREFERENCES_DARKFRAMESHOTS;shots
PREFERENCES_DARKFRAMETEMPLATES;templates
PREFERENCES_DATEFORMAT;Date Format
PREFERENCES_DATEFORMATHINT;You can use the following formatting strings:\n%y : year\n%m : month\n%d : day\n\nFor example, the hungarian date format is:\n%y/%m/%d
-PREFERENCES_DCBENHANCE;Apply DCB enhancement step
-PREFERENCES_DCBITERATIONS;Number of DCB iterations
PREFERENCES_DEFAULTLANG;Default language
PREFERENCES_DEFAULTTHEME;Default theme
PREFERENCES_DEMOSAICINGALGO;Demosaicing Algorithm
@@ -497,19 +506,12 @@ PREFERENCES_DIRLAST;Last visited directory
PREFERENCES_DIROTHER;Other
PREFERENCES_DIRSELECTDLG;Select Image Directory at Startup...
PREFERENCES_DIRSOFTWARE;Installation directory
-PREFERENCES_DMETHOD;Method
PREFERENCES_EDITORCMDLINE;Other command line
PREFERENCES_EDITORLAYOUT;Editor Layout
-PREFERENCES_EXPOS;Exposure before interpolation\n :correction (lin)
PREFERENCES_EXTERNALEDITOR;External editor
-PREFERENCES_FALSECOLOR;False color suppression steps
PREFERENCES_FBROWSEROPTS;File Browser Options
PREFERENCES_FILEFORMAT;File format
PREFERENCES_FLATFIELD;Flat Field
-PREFERENCES_FLATFIELDAUTOSELECT;Flat Field Auto Select
-PREFERENCES_FLATFIELDBLURRADIUS;Flat Field Blur Radius
-PREFERENCES_FLATFIELDBLURTYPE;Flat Field Blur Type
-PREFERENCES_FLATFIELDFILE;Flat Field File
PREFERENCES_FLATFIELDFOUND;Found
PREFERENCES_FLATFIELDSDIR;Flat Fields directory
PREFERENCES_FLATFIELDSHOTS;shots
@@ -517,18 +519,15 @@ PREFERENCES_FLATFIELDTEMPLATES;templates
PREFERENCES_FORIMAGE;For image files
PREFERENCES_FORRAW;For RAW files
PREFERENCES_GIMPPATH;GIMP installation directory
-PREFERENCES_GREENEQUIL;Green equilibration
PREFERENCES_GTKTHEME;GTK default
PREFERENCES_HINT;Hint
PREFERENCES_HLTHRESHOLD;Threshold for clipped highlights
-PREFERENCES_HOTDEADPIXFILT;Apply hot/dead pixel filter
PREFERENCES_ICCDIR;Directory of ICC profiles
PREFERENCES_IMPROCPARAMS;Default image processing parameters
PREFERENCES_INTENT_ABSOLUTE;Absolute Colorimetric
PREFERENCES_INTENT_PERCEPTUAL;Perceptual
PREFERENCES_INTENT_RELATIVE;Relative Colorimetric
PREFERENCES_INTENT_SATURATION;Saturation
-PREFERENCES_LINEDENOISE;Line noise filter
PREFERENCES_LIVETHUMBNAILS;Live Thumbnails (slower)
PREFERENCES_METADATA;Metadata
PREFERENCES_MONITORICC;Monitor Profile
@@ -546,7 +545,6 @@ PREFERENCES_PARSEDEXT;Parsed Extensions
PREFERENCES_PARSEDEXTADD;Add Extension
PREFERENCES_PARSEDEXTADDHINT;Type an extension and press this button to append list
PREFERENCES_PARSEDEXTDELHINT;Delete selected extension from the list
-PREFERENCES_PRESER;Exposure before interpolation\n :preserve highlights (EV)
PREFERENCES_PROFILEHANDLING;Processing Profile Handling
PREFERENCES_PROFILELOADPR;Profile Loading Priority
PREFERENCES_PROFILEPRCACHE;Profile in cache
@@ -639,6 +637,7 @@ TP_CHMIXER_BLUE;Blue
TP_CHMIXER_GREEN;Green
TP_CHMIXER_LABEL;Channel Mixer
TP_CHMIXER_RED;Red
+TP_CHROMATABERR_LABEL;Chromatic Aberration
TP_COARSETRAF_DEGREE;degree:
TP_COARSETRAF_TOOLTIP_HFLIP;Flip horizontally
TP_COARSETRAF_TOOLTIP_ROTLEFT;Rotate left [
@@ -678,6 +677,7 @@ TP_CROP_SELECTCROP; Select Crop
TP_CROP_W;W
TP_CROP_X;x
TP_CROP_Y;y
+TP_DARKFRAME_LABEL;Dark Frame
TP_DEFRINGE_LABEL;Defringe
TP_DEFRINGE_RADIUS;Radius
TP_DEFRINGE_THRESHOLD;Threshold
@@ -701,6 +701,7 @@ TP_EQUALIZER_FINEST;finest
TP_EQUALIZER_LABEL;Wavelet equalizer
TP_EQUALIZER_LARGEST;coarsest
TP_EQUALIZER_NEUTRAL;Neutral
+TP_EXPOSCORR_LABEL;Exposure
TP_EXPOSURE_AUTOLEVELS;Auto Levels
TP_EXPOSURE_BLACKLEVEL;Black
TP_EXPOSURE_BRIGHTNESS;Brightness
@@ -713,6 +714,7 @@ TP_EXPOSURE_CURVEEDITOR;Tone Curve
TP_EXPOSURE_EXPCOMP;Exp. Comp.
TP_EXPOSURE_LABEL;Exposure
TP_EXPOSURE_SATURATION;Saturation
+TP_FLATFIELD_LABEL;Flat Field
TP_HLREC_CIELAB;CIELab Blending
TP_HLREC_COLOR;Color Propagation
TP_HLREC_LABEL;Highlight Reconstruction
@@ -766,15 +768,29 @@ TP_LUMADENOISE_RADIUS;Radius
TP_PERSPECTIVE_HORIZONTAL;Horizontal
TP_PERSPECTIVE_LABEL;Perspective
TP_PERSPECTIVE_VERTICAL;Vertical
-TP_PREPROCESS_DARKFRAME;Dark frame
-TP_PREPROCESS_DFAUTOSELECT;Auto selection
-TP_PREPROCESS_FLATFIELDAUTOSELECT;Flat Field Auto Select
-TP_PREPROCESS_FLATFIELDBLURRADIUS;Flat Field Blur Radius
-TP_PREPROCESS_FLATFIELDBLURTYPE;Flat Field Blur Type
-TP_PREPROCESS_FLATFIELDFILE;Flat Field File
+TP_RAWCACORR_AUTO;Auto correction
+TP_RAWCACORR_CARED;Red
+TP_RAWCACORR_CABLUE;Blue
+TP_DARKFRAME_AUTOSELECT;Auto selection
+TP_RAWEXPOS_LINEAR;Linear corr. factor
+TP_FLATFIELD_BT_AREA;Area
+TP_FLATFIELD_BT_VERTICAL;Vertical
+TP_FLATFIELD_BT_HORIZONTAL;Horizontal
+TP_FLATFIELD_BT_VERTHORIZ;Vert. + Horiz.
+TP_FLATFIELD_AUTOSELECT;Auto selection
+TP_FLATFIELD_BLURRADIUS;Blur Radius
+TP_FLATFIELD_BLURTYPE;Blur Type
+TP_PREPROCESS_GREENEQUIL;Green equilibration
+TP_PREPROCESS_HOTDEADPIXFILT;Apply hot/dead pixel filter
TP_PREPROCESS_NO_FOUND;None found
-TP_RAWPANEL_DEMOSAICING;Demosaicing
-TP_RAWPANEL_PREPROCESSING;Preprocessing
+TP_PREPROCESS_LABEL;Preprocessing
+TP_PREPROCESS_LINEDENOISE;Line noise filter
+TP_RAWEXPOS_PRESER;HL preserving corr. (EV)
+TP_RAW_DCBENHANCE;Apply DCB enhancement step
+TP_RAW_DCBITERATIONS;Number of DCB iterations
+TP_RAW_DMETHOD;Method
+TP_RAW_FALSECOLOR;False color suppression steps
+TP_RAW_LABEL;Demosaicing
TP_RESIZE_APPLIESTO;Applies to:
TP_RESIZE_BICUBIC;Bicubic
TP_RESIZE_BICUBICSF;Bicubic (Softer)
diff --git a/rtengine/procevents.h b/rtengine/procevents.h
index 3ac59d3ec..b0b9f9fe5 100644
--- a/rtengine/procevents.h
+++ b/rtengine/procevents.h
@@ -119,8 +119,8 @@ enum ProcEvent {
EvLSaturation=94,
EvLaCurve=95,
EvLbCurve=96,
- EvDemosaic=97,
- EvPreProcess=98,
+ EvDemosaicMethod=97,
+ EvPreProcessHotDeadPixel=98,
EvSaturation=99,
EvHSVEqualizerH=100,
EvHSVEqualizerS=101,
@@ -135,11 +135,23 @@ enum ProcEvent {
EvLAvoidClip=110,
EvLSatLimiter=111,
EvLSatLimit=112,
- EvFlatFieldFile=113,
- EvFlatFieldAutoSelect=114,
- EvFlatFieldBlurRadius=115,
- EvFlatFieldBlurType=116,
- NUMOFEVENTS=117
+ EvDemosaicDCBIter=113,
+ EvDemosaicFalseColorIter=114,
+ EvDemosaicDCBEnhanced=115,
+ EvPreProcessCARed=116,
+ EvPreProcessCABlue=117,
+ EvPreProcessLineDenoise=118,
+ EvPreProcessGEquilThresh=119,
+ EvPreProcessAutoCA=120,
+ EvPreProcessAutoDF=121,
+ EvPreProcessDFFile=122,
+ EvPreProcessExpCorrLinear=123,
+ EvPreProcessExpCorrPH=124,
+ EvFlatFieldFile=125,
+ EvFlatFieldAutoSelect=126,
+ EvFlatFieldBlurRadius=127,
+ EvFlatFieldBlurType=128,
+ NUMOFEVENTS=129
};
}
#endif
diff --git a/rtengine/refreshmap.cc b/rtengine/refreshmap.cc
index 0371228b4..36c34b1f3 100644
--- a/rtengine/refreshmap.cc
+++ b/rtengine/refreshmap.cc
@@ -117,8 +117,8 @@ DIRPYREQUALIZER, // EvDirPyrEqlEnabled,
LUMINANCECURVE, // EvLSaturation,
LUMINANCECURVE, // EvLaCurve,
LUMINANCECURVE, // EvLbCurve,
-DEMOSAIC, // EvDemosaic
-DARKFRAME, // EvPreProcess
+DEMOSAIC, // EvDemosaicMethod
+DARKFRAME, // EvPreProcessHotDeadPixel
RGBCURVE, // EvSaturation,
RGBCURVE, // EvHSVEqualizerH,
RGBCURVE, // EvHSVEqualizerS,
@@ -133,6 +133,18 @@ RESIZE, // EvResizeAppliesTo
LUMINANCECURVE, // EvCBAvoidClip,
LUMINANCECURVE, // EvCBSatLimiter,
LUMINANCECURVE, // EvCBSatLimit,
+DEMOSAIC, // EvDemosaicDCBIter
+DEMOSAIC, // EvDemosaicFalseColorIter
+DEMOSAIC, // EvDemosaicDCBEnhanced
+DARKFRAME, // EvPreProcessCARed
+DARKFRAME, // EvPreProcessCABlue
+DARKFRAME, // EvPreProcessLineDenoise
+DARKFRAME, // EvPreProcessGEquilThresh
+DARKFRAME, // EvPreProcessAutoCA
+DARKFRAME, // EvPreProcessAutoDF
+DARKFRAME, // EvPreProcessDFFile
+DARKFRAME, // EvPreProcessExpCorrLinear
+DARKFRAME, // EvPreProcessExpCorrPH
FLATFIELD, // EvFlatFieldFile,
FLATFIELD, // EvFlatFieldAutoSelect,
FLATFIELD, // EvFlatFieldBlurRadius,
diff --git a/rtgui/CMakeLists.txt b/rtgui/CMakeLists.txt
index eaaf62cee..0dbc4a806 100644
--- a/rtgui/CMakeLists.txt
+++ b/rtgui/CMakeLists.txt
@@ -26,6 +26,7 @@ set (BASESOURCEFILES
batchqueue.cc lwbutton.cc lwbuttonset.cc
batchqueuebuttonset.cc browserfilter.cc exiffiltersettings.cc
profilestore.cc partialpastedlg.cc rawprocess.cc preprocess.cc
+ darkframe.cc flatfield.cc rawcacorrection.cc rawexposure.cc
equalizer.cc dirpyrequalizer.cc hsvequalizer.cc defringe.cc
popupcommon.cc popupbutton.cc popuptogglebutton.cc)
diff --git a/rtgui/adjuster.cc b/rtgui/adjuster.cc
index a01112ab9..f7dc26d65 100644
--- a/rtgui/adjuster.cc
+++ b/rtgui/adjuster.cc
@@ -21,17 +21,19 @@
#include
#include
#include
+#include
extern Glib::ustring argv0;
-int Adjuster::delay = 1000;
-
Adjuster::Adjuster (Glib::ustring vlabel, double vmin, double vmax, double vstep, double vdefault, bool editedcb) {
adjusterListener = NULL;
afterReset = false;
blocked = false;
+ // TODO: let the user chose the default value of Adjuster::delay, for slow machines
+ delay = options.adjusterDelay; // delay is no more static, so we can set the delay individually (usefull for the RAW editor tab)
+
set_border_width (2);
hbox = Gtk::manage (new Gtk::HBox ());
@@ -212,6 +214,16 @@ double Adjuster::getValue () {
return spin->get_value ();
}
+int Adjuster::getIntValue () {
+
+ return spin->get_value_as_int ();
+}
+
+Glib::ustring Adjuster::getTextValue () {
+
+ return spin->get_text ();
+}
+
bool Adjuster::notifyListener () {
if (adjusterListener!=NULL && !blocked) {
diff --git a/rtgui/adjuster.h b/rtgui/adjuster.h
index fa91b730b..5b34e0392 100644
--- a/rtgui/adjuster.h
+++ b/rtgui/adjuster.h
@@ -57,13 +57,15 @@ class Adjuster : public Gtk::VBox {
public:
- static int delay;
+ int delay;
Adjuster (Glib::ustring label, double vmin, double vmax, double vstep, double vdefault, bool editedCheckBox=false);
virtual ~Adjuster ();
void setAdjusterListener (AdjusterListener* alistener);
double getValue ();
+ int getIntValue ();
+ Glib::ustring getTextValue ();
void setValue (double a);
void setLimits (double vmin, double vmax, double vstep, double vdefault);
void setEnabled (bool enabled);
diff --git a/rtgui/darkframe.cc b/rtgui/darkframe.cc
new file mode 100644
index 000000000..ffefd0e35
--- /dev/null
+++ b/rtgui/darkframe.cc
@@ -0,0 +1,148 @@
+/*
+ * This file is part of RawTherapee.
+ *
+ * Copyright (c) 2004-2010 Gabor Horvath
+ *
+ * RawTherapee is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * RawTherapee is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with RawTherapee. If not, see .
+ */
+#include
+#include
+#include
+#include
+#include
+
+using namespace rtengine;
+using namespace rtengine::procparams;
+
+DarkFrame::DarkFrame () : Gtk::VBox(), FoldableToolPanel(this)
+{
+ hbdf = Gtk::manage(new Gtk::HBox());
+ darkFrameFile = Gtk::manage(new Gtk::FileChooserButton(M("TP_DARKFRAME_LABEL"), Gtk::FILE_CHOOSER_ACTION_OPEN));
+ dfLabel = Gtk::manage(new Gtk::Label(M("GENERAL_FILE")));
+ btnReset = Gtk::manage(new Gtk::Button());
+ btnReset->set_image (*Gtk::manage(new Gtk::Image (Gtk::StockID("gtk-cancel"), Gtk::ICON_SIZE_BUTTON)));
+ hbdf->pack_start(*dfLabel, Gtk::PACK_SHRINK, 4);
+ hbdf->pack_start(*darkFrameFile);
+ hbdf->pack_start(*btnReset, Gtk::PACK_SHRINK, 4);
+ dfAuto = Gtk::manage(new Gtk::CheckButton((M("TP_DARKFRAME_AUTOSELECT"))));
+ dfInfo = Gtk::manage(new Gtk::Label(""));
+ dfInfo->set_alignment(0,0); //left align
+
+ pack_start( *hbdf, Gtk::PACK_SHRINK, 4);
+ pack_start( *dfAuto, Gtk::PACK_SHRINK, 4);
+ pack_start( *dfInfo, Gtk::PACK_SHRINK, 4);
+
+ dfautoconn = dfAuto->signal_toggled().connect ( sigc::mem_fun(*this, &DarkFrame::dfAutoChanged), true);
+ dfFile = darkFrameFile->signal_file_set().connect ( sigc::mem_fun(*this, &DarkFrame::darkFrameChanged), true);
+ btnReset->signal_clicked().connect( sigc::mem_fun(*this, &DarkFrame::darkFrameReset), true );
+}
+
+void DarkFrame::read(const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited)
+{
+ disableListener ();
+ dfautoconn.block(true);
+
+ if(pedited ){
+ dfAuto->set_inconsistent(!pedited->raw.dfAuto );
+ }
+ if (safe_file_test (pp->raw.dark_frame, Glib::FILE_TEST_EXISTS))
+ darkFrameFile->set_filename (pp->raw.dark_frame);
+ else if( !options.rtSettings.darkFramesPath.empty() )
+ darkFrameFile->set_current_folder( options.rtSettings.darkFramesPath );
+ hbdf->set_sensitive( !pp->raw.df_autoselect );
+
+ lastDFauto = pp->raw.df_autoselect;
+
+ if( pp->raw.df_autoselect && dfp && !batchMode){
+ // retrieve the auto-selected df filename
+ rtengine::RawImage *img = dfp->getDF();
+ if( img ){
+ dfInfo->set_text( Glib::ustring::compose("%1: %2ISO %3s", Glib::path_get_basename(img->get_filename()), img->get_ISOspeed(), img->get_shutter()) );
+ }else{
+ dfInfo->set_text(Glib::ustring(M("TP_PREPROCESS_NO_FOUND")));
+ }
+ }
+ else dfInfo->set_text("");
+
+ dfAuto->set_active( pp->raw.df_autoselect );
+ dfChanged = false;
+
+ dfautoconn.block(false);
+ enableListener ();
+}
+
+void DarkFrame::write( rtengine::procparams::ProcParams* pp, ParamsEdited* pedited)
+{
+ pp->raw.dark_frame = darkFrameFile->get_filename();
+ pp->raw.df_autoselect = dfAuto->get_active();
+
+ if (pedited) {
+ pedited->raw.darkFrame = dfChanged;
+ pedited->raw.dfAuto = !dfAuto->get_inconsistent();
+ }
+
+}
+
+void DarkFrame::dfAutoChanged()
+{
+ if (batchMode) {
+ if (dfAuto->get_inconsistent()) {
+ dfAuto->set_inconsistent (false);
+ dfautoconn.block (true);
+ dfAuto->set_active (false);
+ dfautoconn.block (false);
+ }
+ else if (lastDFauto)
+ dfAuto->set_inconsistent (true);
+
+ lastDFauto = dfAuto->get_active ();
+ }
+
+ if(dfAuto->get_active() && dfp && !batchMode){
+ // retrieve the auto-selected df filename
+ rtengine::RawImage *img = dfp->getDF();
+ if( img ){
+ dfInfo->set_text( Glib::ustring::compose("%1: %2ISO %3s", Glib::path_get_basename(img->get_filename()), img->get_ISOspeed(), img->get_shutter()) );
+ }else{
+ dfInfo->set_text(Glib::ustring(M("TP_PREPROCESS_NO_FOUND")));
+ }
+ }
+ else{dfInfo->set_text("");}
+
+ hbdf->set_sensitive( !dfAuto->get_active() );
+ if (listener)
+ listener->panelChanged (EvPreProcessAutoDF, dfAuto->get_active()?M("GENERAL_ENABLED"):M("GENERAL_DISABLED"));
+}
+
+void DarkFrame::darkFrameChanged()
+{
+ dfChanged=true;
+ if (listener)
+ listener->panelChanged (EvPreProcessDFFile, Glib::path_get_basename(darkFrameFile->get_filename()));
+}
+
+void DarkFrame::darkFrameReset()
+{
+ dfChanged=true;
+ //darkFrameFile->set_current_name("");
+ darkFrameFile->set_filename ("");
+
+ if( !options.rtSettings.darkFramesPath.empty() )
+ darkFrameFile->set_current_folder( options.rtSettings.darkFramesPath );
+
+ dfInfo->set_text("");
+ if (listener)
+ listener->panelChanged (EvPreProcessDFFile, M("GENERAL_NONE"));
+
+}
diff --git a/rtgui/darkframe.h b/rtgui/darkframe.h
new file mode 100644
index 000000000..7ebe93bd7
--- /dev/null
+++ b/rtgui/darkframe.h
@@ -0,0 +1,61 @@
+/*
+ * This file is part of RawTherapee.
+ *
+ * Copyright (c) 2004-2010 Gabor Horvath
+ *
+ * RawTherapee is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * RawTherapee is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with RawTherapee. If not, see .
+ */
+#ifndef _DARKFRAME_H_
+#define _DARKFRAME_H_
+
+#include
+#include
+#include
+
+class DFProvider {
+ public:
+ virtual rtengine::RawImage* getDF() {}
+ // add other info here
+};
+
+class DarkFrame : public Gtk::VBox, public FoldableToolPanel {
+
+protected:
+
+ Gtk::ComboBoxText* darkFrameMethod;
+ Gtk::FileChooserButton *darkFrameFile;
+ Gtk::HBox *hbdf;
+ Gtk::Button *btnReset;
+ Gtk::Label *dfLabel;
+ Gtk::Label *dfInfo;
+ Gtk::CheckButton* dfAuto;
+ bool dfChanged;
+ bool lastDFauto;
+ DFProvider *dfp;
+ sigc::connection dfautoconn, dfFile;
+
+public:
+
+ DarkFrame ();
+
+ void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited=NULL);
+ void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited=NULL);
+
+ void darkFrameChanged ();
+ void darkFrameReset ();
+ void dfAutoChanged ();
+ void setDFProvider (DFProvider* p) { dfp = p; };
+};
+
+#endif
diff --git a/rtgui/flatfield.cc b/rtgui/flatfield.cc
new file mode 100644
index 000000000..467722313
--- /dev/null
+++ b/rtgui/flatfield.cc
@@ -0,0 +1,228 @@
+/*
+ * This file is part of RawTherapee.
+ *
+ * Copyright (c) 2004-2010 Gabor Horvath
+ *
+ * RawTherapee is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * RawTherapee is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with RawTherapee. If not, see .
+ */
+#include
+#include
+#include
+#include
+#include
+
+using namespace rtengine;
+using namespace rtengine::procparams;
+
+FlatField::FlatField () : Gtk::VBox(), FoldableToolPanel(this)
+{
+ hbff = Gtk::manage(new Gtk::HBox());
+ flatFieldFile = Gtk::manage(new Gtk::FileChooserButton(M("TP_FLATFIELD_LABEL"), Gtk::FILE_CHOOSER_ACTION_OPEN));
+ ffLabel = Gtk::manage(new Gtk::Label(M("GENERAL_FILE")));
+ flatFieldFileReset = Gtk::manage(new Gtk::Button());
+ flatFieldFileReset->set_image (*Gtk::manage(new Gtk::Image (Gtk::StockID("gtk-cancel"), Gtk::ICON_SIZE_BUTTON)));
+ hbff->pack_start(*ffLabel, Gtk::PACK_SHRINK, 4);
+ hbff->pack_start(*flatFieldFile);
+ hbff->pack_start(*flatFieldFileReset, Gtk::PACK_SHRINK, 4);
+ flatFieldAutoSelect = Gtk::manage(new Gtk::CheckButton((M("TP_FLATFIELD_AUTOSELECT"))));
+ ffInfo = Gtk::manage(new Gtk::Label(""));
+ ffInfo->set_alignment(0,0); //left align
+ flatFieldBlurRadius = Gtk::manage(new Adjuster (M("TP_FLATFIELD_BLURRADIUS"),0,200,2,32));
+ flatFieldBlurRadius->setAdjusterListener (this);
+ if (flatFieldBlurRadius->delay < 1000) flatFieldBlurRadius->delay = 1000;
+ flatFieldBlurRadius->show();
+
+ Gtk::HBox* hbffbt = Gtk::manage (new Gtk::HBox ());
+ hbffbt->pack_start (*Gtk::manage (new Gtk::Label ( M("TP_FLATFIELD_BLURTYPE") +": ")));
+ flatFieldBlurType = Gtk::manage (new Gtk::ComboBoxText ());
+ flatFieldBlurType->append_text(M("TP_FLATFIELD_BT_AREA"));
+ flatFieldBlurType->append_text(M("TP_FLATFIELD_BT_VERTICAL"));
+ flatFieldBlurType->append_text(M("TP_FLATFIELD_BT_HORIZONTAL"));
+ flatFieldBlurType->append_text(M("TP_FLATFIELD_BT_VERTHORIZ"));
+ flatFieldBlurType->set_active(0);
+ hbffbt->pack_end (*flatFieldBlurType);
+
+ pack_start( *hbff, Gtk::PACK_SHRINK, 4);
+ pack_start( *flatFieldAutoSelect, Gtk::PACK_SHRINK, 4);
+ pack_start( *ffInfo, Gtk::PACK_SHRINK, 4);
+ pack_start( *hbffbt, Gtk::PACK_SHRINK, 4);
+ pack_start( *flatFieldBlurRadius, Gtk::PACK_SHRINK, 4);
+
+ flatFieldFileconn = flatFieldFile->signal_file_set().connect ( sigc::mem_fun(*this, &FlatField::flatFieldFileChanged), true);
+ flatFieldFileReset->signal_clicked().connect( sigc::mem_fun(*this, &FlatField::flatFieldFile_Reset), true );
+ flatFieldAutoSelectconn = flatFieldAutoSelect->signal_toggled().connect ( sigc::mem_fun(*this, &FlatField::flatFieldAutoSelectChanged), true);
+ flatFieldBlurTypeconn = flatFieldBlurType->signal_changed().connect( sigc::mem_fun(*this, &FlatField::flatFieldBlurTypeChanged) );
+}
+
+void FlatField::read(const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited)
+{
+ disableListener ();
+ flatFieldAutoSelectconn.block (true);
+ flatFieldBlurTypeconn.block (true);
+
+ if(pedited ){
+ flatFieldAutoSelect->set_inconsistent (!pedited->raw.ff_AutoSelect);
+ flatFieldBlurRadius->setEditedState( pedited->raw.ff_BlurRadius ? Edited : UnEdited );
+ if( !pedited->raw.ff_BlurType )
+ flatFieldBlurType->set_active(procparams::RAWParams::numFlatFileBlurTypes); // No name
+ }
+ if (safe_file_test (pp->raw.ff_file, Glib::FILE_TEST_EXISTS))
+ flatFieldFile->set_filename (pp->raw.ff_file);
+ else if( !options.rtSettings.flatFieldsPath.empty() )
+ flatFieldFile->set_current_folder( options.rtSettings.flatFieldsPath );
+ hbff->set_sensitive( !pp->raw.ff_AutoSelect );
+
+ lastFFAutoSelect = pp->raw.ff_AutoSelect;
+ if( pp->raw.ff_AutoSelect && ffp && !batchMode){
+ // retrieve the auto-selected ff filename
+ rtengine::RawImage *img = ffp->getFF();
+ if( img ){
+ ffInfo->set_text( Glib::ustring::compose("%1: f/%2", Glib::path_get_basename(img->get_filename()), img->get_aperture()) ); // !!! need to add focallength in mm and format aperture to ##.#
+ }else{
+ ffInfo->set_text(Glib::ustring(M("TP_PREPROCESS_NO_FOUND")));
+ }
+ }
+ else ffInfo->set_text("");
+
+ flatFieldAutoSelect ->set_active(pp->raw.ff_AutoSelect);
+ flatFieldBlurRadius->setValue (pp->raw.ff_BlurRadius);
+ flatFieldBlurType->set_active(procparams::RAWParams::numFlatFileBlurTypes);
+
+ //flatFieldBlurType
+ for( size_t i=0; i< procparams::RAWParams::numFlatFileBlurTypes;i++)
+ if( pp->raw.ff_BlurType == procparams::RAWParams::ff_BlurTypestring[i]){
+ flatFieldBlurType->set_active(i);
+ break;
+ }
+
+ flatFieldAutoSelect->set_active (pp->raw.ff_AutoSelect);
+ flatFieldBlurRadius->setValue (pp->raw.ff_BlurRadius);
+
+ ffChanged = false;
+
+ flatFieldAutoSelectconn.block (false);
+ flatFieldBlurTypeconn.block (false);
+ enableListener ();
+}
+
+void FlatField::write( rtengine::procparams::ProcParams* pp, ParamsEdited* pedited)
+{
+ pp->raw.ff_file = flatFieldFile->get_filename();
+ pp->raw.ff_AutoSelect = flatFieldAutoSelect->get_active();
+ pp->raw.ff_BlurRadius = flatFieldBlurRadius->getIntValue();
+
+ int currentRow = flatFieldBlurType->get_active_row_number();
+ if( currentRow>=0 && currentRow < procparams::RAWParams::numFlatFileBlurTypes)
+ pp->raw.ff_BlurType = procparams::RAWParams::ff_BlurTypestring[currentRow];
+
+ if (pedited) {
+ pedited->raw.ff_file = ffChanged;
+ pedited->raw.ff_AutoSelect = !flatFieldAutoSelect->get_inconsistent();
+ pedited->raw.ff_BlurRadius = flatFieldBlurRadius->getEditedState ();
+ pedited->raw.ff_BlurType = flatFieldBlurType->get_active_row_number() != procparams::RAWParams::numFlatFileBlurTypes;
+ }
+
+}
+
+void FlatField::adjusterChanged (Adjuster* a, double newval)
+{
+ if (listener) {
+
+ Glib::ustring value = a->getTextValue();
+
+ listener->panelChanged (EvFlatFieldBlurRadius, value );
+ }
+}
+
+void FlatField::setBatchMode(bool batchMode)
+{
+ ToolPanel::setBatchMode (batchMode);
+ flatFieldBlurRadius->showEditedCB ();
+}
+
+void FlatField::setDefaults(const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited)
+{
+ flatFieldBlurRadius->setDefault( defParams->raw.ff_BlurRadius);
+
+ if (pedited) {
+ flatFieldBlurRadius->setDefaultEditedState( pedited->raw.ff_BlurRadius ? Edited : UnEdited);
+ } else {
+ flatFieldBlurRadius->setDefaultEditedState( Irrelevant );
+ }
+}
+
+void FlatField::flatFieldFileChanged()
+{
+ ffChanged=true;
+ if (listener)
+ listener->panelChanged (EvFlatFieldFile, Glib::path_get_basename(flatFieldFile->get_filename()));
+}
+
+void FlatField::flatFieldFile_Reset()
+{
+ ffChanged=true;
+ //flatFieldFile->set_current_name("");
+ flatFieldFile->set_filename ("");
+
+ if( !options.rtSettings.flatFieldsPath.empty() )
+ flatFieldFile->set_current_folder( options.rtSettings.flatFieldsPath );
+
+ ffInfo->set_text("");
+ if (listener)
+ listener->panelChanged (EvFlatFieldFile, M("GENERAL_NONE") );
+}
+
+void FlatField::flatFieldBlurTypeChanged ()
+{
+ int curSelection = flatFieldBlurType->get_active_row_number();
+
+ Glib::ustring s="";
+ if( curSelection>=0 && curSelection < procparams::RAWParams::numFlatFileBlurTypes)
+ s = flatFieldBlurType->get_active_text();
+
+ if (listener)
+ listener->panelChanged (EvFlatFieldBlurType, s);
+}
+
+void FlatField::flatFieldAutoSelectChanged()
+{
+ if (batchMode) {
+ if (flatFieldAutoSelect->get_inconsistent()) {
+ flatFieldAutoSelect->set_inconsistent (false);
+ flatFieldAutoSelectconn.block (true);
+ flatFieldAutoSelect->set_active (false);
+ flatFieldAutoSelectconn.block (false);
+ }
+ else if (lastFFAutoSelect)
+ flatFieldAutoSelect->set_inconsistent (true);
+
+ lastFFAutoSelect = flatFieldAutoSelect->get_active ();
+ }
+ hbff->set_sensitive( !flatFieldAutoSelect->get_active() );
+
+ if( flatFieldAutoSelect->get_active() && ffp && !batchMode){
+ // retrieve the auto-selected ff filename
+ rtengine::RawImage *img = ffp->getFF();
+ if( img ){
+ ffInfo->set_text( Glib::ustring::compose("%1: f/%2s", Glib::path_get_basename(img->get_filename()), img->get_aperture()) ); // !!! need to add focallength in mm and format aperture to ##.#
+ }else{
+ ffInfo->set_text(Glib::ustring(M("TP_PREPROCESS_NO_FOUND")));
+ }
+ }
+ else{ffInfo->set_text("");}
+
+ if (listener)
+ listener->panelChanged (EvFlatFieldAutoSelect, flatFieldAutoSelect->get_active()?M("GENERAL_ENABLED"):M("GENERAL_DISABLED"));
+
+}
diff --git a/rtgui/flatfield.h b/rtgui/flatfield.h
new file mode 100644
index 000000000..db1e8de4e
--- /dev/null
+++ b/rtgui/flatfield.h
@@ -0,0 +1,67 @@
+/*
+ * This file is part of RawTherapee.
+ *
+ * Copyright (c) 2004-2010 Gabor Horvath
+ *
+ * RawTherapee is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * RawTherapee is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with RawTherapee. If not, see .
+ */
+#ifndef _FLATFIELD_H_
+#define _FLATFIELD_H_
+
+#include
+#include
+#include
+#include
+
+class FFProvider {
+ public:
+ virtual rtengine::RawImage* getFF() {}
+ // add other info here
+};
+
+class FlatField : public Gtk::VBox, public AdjusterListener, public FoldableToolPanel {
+
+protected:
+
+ Gtk::FileChooserButton *flatFieldFile;
+ Gtk::Label *ffLabel;
+ Gtk::Label *ffInfo;
+ Gtk::Button *flatFieldFileReset;
+ Gtk::CheckButton* flatFieldAutoSelect;
+ Adjuster* flatFieldBlurRadius;
+ Gtk::ComboBoxText* flatFieldBlurType;
+ Gtk::HBox *hbff;
+ bool ffChanged;
+ bool lastFFAutoSelect;
+ FFProvider *ffp;
+ sigc::connection flatFieldFileconn, flatFieldAutoSelectconn, flatFieldBlurTypeconn;
+
+public:
+
+ FlatField ();
+
+ void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited=NULL);
+ void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited=NULL);
+ void setBatchMode (bool batchMode);
+ void setDefaults (const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited=NULL);
+
+ void adjusterChanged (Adjuster* a, double newval);
+ void flatFieldFileChanged ();
+ void flatFieldFile_Reset ();
+ void flatFieldAutoSelectChanged ();
+ void flatFieldBlurTypeChanged ();
+ void setFFProvider (FFProvider* p) { ffp = p; };
+};
+
+#endif
diff --git a/rtgui/options.cc b/rtgui/options.cc
index 3dee8d974..6373344d5 100644
--- a/rtgui/options.cc
+++ b/rtgui/options.cc
@@ -18,7 +18,6 @@
*/
#include
#include
-#include
#include
#include
#include
@@ -59,6 +58,7 @@ void Options::setDefaults () {
defProfRaw = "default";
defProfImg = "neutral";
dateFormat = "%y-%m-%d";
+ adjusterDelay = 0;
startupDir = 1;
startupPath = "";
profilePath = "profiles";
@@ -182,7 +182,7 @@ if (keyFile.has_group ("General")) {
if (keyFile.has_key ("General", "StartupPath")) startupPath = keyFile.get_string ("General", "StartupPath");
if (keyFile.has_key ("General", "DateFormat")) dateFormat = keyFile.get_string ("General", "DateFormat");
- if (keyFile.has_key ("General", "AdjusterDelay")) Adjuster::delay = keyFile.get_integer ("General", "AdjusterDelay");
+ if (keyFile.has_key ("General", "AdjusterDelay")) adjusterDelay = keyFile.get_integer ("General", "AdjusterDelay");
if (keyFile.has_key ("General", "StoreLastProfile")) savesParamsAtExit = keyFile.get_boolean ("General", "StoreLastProfile");
if (keyFile.has_key ("General", "DualProcSupport")) rtSettings.dualThreadEnabled = keyFile.get_boolean ("General", "DualProcSupport");
if (keyFile.has_key ("General", "MultiUser")) multiUser = keyFile.get_boolean ("General", "MultiUser");
@@ -331,7 +331,7 @@ int Options::saveToFile (Glib::ustring fname) {
keyFile.set_string ("General", "StartupDirectory", "last");
keyFile.set_string ("General", "StartupPath", startupPath);
keyFile.set_string ("General", "DateFormat", dateFormat);
- keyFile.set_integer ("General", "AdjusterDelay", Adjuster::delay);
+ keyFile.set_integer ("General", "AdjusterDelay", adjusterDelay);
keyFile.set_boolean ("General", "DualProcSupport", rtSettings.dualThreadEnabled);
keyFile.set_boolean ("General", "MultiUser", multiUser);
keyFile.set_string ("General", "Language", language);
diff --git a/rtgui/options.h b/rtgui/options.h
index f24cd6894..98f9e8c5b 100644
--- a/rtgui/options.h
+++ b/rtgui/options.h
@@ -58,6 +58,7 @@ class Options {
Glib::ustring defProfRaw;
Glib::ustring defProfImg;
Glib::ustring dateFormat;
+ int adjusterDelay;
int startupDir;
Glib::ustring startupPath;
Glib::ustring profilePath;
diff --git a/rtgui/preprocess.cc b/rtgui/preprocess.cc
index f11151625..1a0a9a670 100644
--- a/rtgui/preprocess.cc
+++ b/rtgui/preprocess.cc
@@ -17,7 +17,6 @@
* along with RawTherapee. If not, see .
*/
#include
-#include
#include
#include
#include
@@ -25,369 +24,100 @@
using namespace rtengine;
using namespace rtengine::procparams;
-PreProcess::PreProcess (): Gtk::VBox(), FoldableToolPanel(this)
+PreProcess::PreProcess () : Gtk::VBox(), FoldableToolPanel(this)
{
- hbdf = Gtk::manage(new Gtk::HBox());
- darkFrameFile = Gtk::manage(new Gtk::FileChooserButton(M("TP_PREPROCESS_DARKFRAME"), Gtk::FILE_CHOOSER_ACTION_OPEN));
- dfLabel = Gtk::manage(new Gtk::Label(M("TP_PREPROCESS_DARKFRAME")));
- btnReset = Gtk::manage(new Gtk::Button());
- btnReset->set_image (*Gtk::manage(new Gtk::Image (Gtk::StockID("gtk-cancel"), Gtk::ICON_SIZE_BUTTON)));
- hbdf->pack_start(*dfLabel, Gtk::PACK_SHRINK, 4);
- hbdf->pack_start(*darkFrameFile);
- hbdf->pack_start(*btnReset, Gtk::PACK_SHRINK, 4);
- dfAuto = Gtk::manage(new Gtk::CheckButton((M("TP_PREPROCESS_DFAUTOSELECT"))));
- dfInfo = Gtk::manage(new Gtk::Label(""));
- dfInfo->set_alignment(0,0); //left align
-
- hbff = Gtk::manage(new Gtk::HBox());
- flatFieldFile = Gtk::manage(new Gtk::FileChooserButton(M("TP_PREPROCESS_FLATFIELDFILE"), Gtk::FILE_CHOOSER_ACTION_OPEN));
- ffLabel = Gtk::manage(new Gtk::Label(M("TP_PREPROCESS_FLATFIELDFILE")));
- flatFieldFileReset = Gtk::manage(new Gtk::Button());
- flatFieldFileReset->set_image (*Gtk::manage(new Gtk::Image (Gtk::StockID("gtk-cancel"), Gtk::ICON_SIZE_BUTTON)));
- hbff->pack_start(*ffLabel, Gtk::PACK_SHRINK, 4);
- hbff->pack_start(*flatFieldFile);
- hbff->pack_start(*flatFieldFileReset, Gtk::PACK_SHRINK, 4);
- flatFieldAutoSelect = Gtk::manage(new Gtk::CheckButton((M("TP_PREPROCESS_FLATFIELDAUTOSELECT"))));
- ffInfo = Gtk::manage(new Gtk::Label(""));
- ffInfo->set_alignment(0,0); //left align
- flatFieldBlurRadius = Gtk::manage(new Adjuster (M("PREFERENCES_FLATFIELDBLURRADIUS"),0,200,2,32));
- flatFieldBlurRadius->setAdjusterListener (this);
- flatFieldBlurRadius->show();
-
- Gtk::HBox* hbffbt = Gtk::manage (new Gtk::HBox ());
- hbffbt->pack_start (*Gtk::manage (new Gtk::Label ( M("PREFERENCES_FLATFIELDBLURTYPE") +": ")));
- flatFieldBlurType = Gtk::manage (new Gtk::ComboBoxText ());
- for( size_t i=0; i< procparams::RAWParams::numFlatFileBlurTypes;i++)
- flatFieldBlurType->append_text(procparams::RAWParams::ff_BlurTypestring[i]);
- flatFieldBlurType->set_active(0);
+ hotDeadPixel = Gtk::manage(new Gtk::CheckButton((M("TP_PREPROCESS_HOTDEADPIXFILT"))));
- caAutocorrect = Gtk::manage(new Gtk::CheckButton((M("PREFERENCES_CACORRECTION"))));
- caRed = Gtk::manage(new Adjuster (M("PREFERENCES_CARED"),-4.0,4.0,0.1,0));
- caRed->setAdjusterListener (this);
- caRed->show();
- caBlue = Gtk::manage(new Adjuster (M("PREFERENCES_CABLUE"),-4.0,4.0,0.1,0));
- caBlue->setAdjusterListener (this);
- caBlue->show();
-//exposi
- /*exPos = Gtk::manage(new Adjuster (M("PREFERENCES_EXPOS"),0.2,4.0,0.1,1));
- exPos->setAdjusterListener (this);
- exPos->show();
- exPreser = Gtk::manage(new Adjuster (M("PREFERENCES_PRESER"),0,2.5,0.1,0));
- exPreser->setAdjusterListener (this);
- exPreser->show();*/
- PexPos = Gtk::manage(new Adjuster (M("PREFERENCES_EXPOS"),0.2,4.0,0.1,1));
- PexPos->setAdjusterListener (this);
- PexPos->show();
- PexPreser = Gtk::manage(new Adjuster (M("PREFERENCES_PRESER"),0,2.5,0.1,0));
- PexPreser->setAdjusterListener (this);
- PexPreser->show();
-
-
- hotDeadPixel = Gtk::manage(new Gtk::CheckButton((M("PREFERENCES_HOTDEADPIXFILT"))));
-
- lineDenoise = Gtk::manage(new Adjuster (M("PREFERENCES_LINEDENOISE"),0,1000,1,0));
+ lineDenoise = Gtk::manage(new Adjuster (M("TP_PREPROCESS_LINEDENOISE"),0,1000,1,0));
lineDenoise->setAdjusterListener (this);
+ if (lineDenoise->delay < 1000) lineDenoise->delay = 1000;
lineDenoise->show();
- greenEqThreshold = Gtk::manage(new Adjuster (M("PREFERENCES_GREENEQUIL"),0,100,1,0));
- greenEqThreshold->setAdjusterListener (this);
+ greenEqThreshold = Gtk::manage(new Adjuster (M("TP_PREPROCESS_GREENEQUIL"),0,100,1,0));
+ if (greenEqThreshold->delay < 1000) greenEqThreshold->delay = 1000;
greenEqThreshold->show();
- pack_start( *hbdf, Gtk::PACK_SHRINK, 4);
- pack_start( *dfAuto, Gtk::PACK_SHRINK, 4);
- pack_start( *dfInfo, Gtk::PACK_SHRINK, 4);
- pack_start( *Gtk::manage (new Gtk::HSeparator()));
+ pack_start( *lineDenoise, Gtk::PACK_SHRINK, 4);
- pack_start( *hbff, Gtk::PACK_SHRINK, 4);
- pack_start( *flatFieldAutoSelect, Gtk::PACK_SHRINK, 4);
- pack_start( *ffInfo, Gtk::PACK_SHRINK, 4);
- hbffbt->pack_end (*flatFieldBlurType);
- pack_start( *hbffbt, Gtk::PACK_SHRINK, 4);
- pack_start( *flatFieldBlurRadius, Gtk::PACK_SHRINK, 4);
- pack_start( *Gtk::manage (new Gtk::HSeparator()));
+ pack_start( *Gtk::manage (new Gtk::HSeparator()));
- pack_start( *hotDeadPixel, Gtk::PACK_SHRINK, 4);
- pack_start( *Gtk::manage (new Gtk::HSeparator()));
- pack_start( *caAutocorrect, Gtk::PACK_SHRINK, 4);
- pack_start( *caRed, Gtk::PACK_SHRINK, 4);
- pack_start( *caBlue, Gtk::PACK_SHRINK, 4);
- pack_start( *PexPos, Gtk::PACK_SHRINK, 4);//exposi
- pack_start( *PexPreser, Gtk::PACK_SHRINK, 4);
-
- pack_start( *Gtk::manage (new Gtk::HSeparator()));
- pack_start( *lineDenoise, Gtk::PACK_SHRINK, 4);
- pack_start( *Gtk::manage (new Gtk::HSeparator()));
- pack_start( *greenEqThreshold, Gtk::PACK_SHRINK, 4);
+ pack_start( *greenEqThreshold, Gtk::PACK_SHRINK, 4);
- caacsconn = caAutocorrect->signal_toggled().connect ( sigc::mem_fun(*this, &PreProcess::caCorrectionChanged), true);
- dfautoconn = dfAuto->signal_toggled().connect ( sigc::mem_fun(*this, &PreProcess::dfAutoChanged), true);
- hdpixelconn = hotDeadPixel->signal_toggled().connect ( sigc::mem_fun(*this, &PreProcess::hotDeadPixelChanged), true);
- dfFile = darkFrameFile->signal_file_set().connect ( sigc::mem_fun(*this, &PreProcess::darkFrameChanged), true);
- btnReset->signal_clicked().connect( sigc::mem_fun(*this, &PreProcess::darkFrameReset), true );
- flatFieldFileconn = flatFieldFile->signal_file_set().connect ( sigc::mem_fun(*this, &PreProcess::flatFieldFileChanged), true);
- flatFieldFileReset->signal_clicked().connect( sigc::mem_fun(*this, &PreProcess::flatFieldFile_Reset), true );
- flatFieldAutoSelectconn = flatFieldAutoSelect->signal_toggled().connect ( sigc::mem_fun(*this, &PreProcess::flatFieldAutoSelectChanged), true);
- flatFieldBlurTypeconn = flatFieldBlurType->signal_changed().connect( sigc::mem_fun(*this, &PreProcess::flatFieldBlurTypeChanged) );
+ pack_start( *Gtk::manage (new Gtk::HSeparator()));
+
+ pack_start( *hotDeadPixel, Gtk::PACK_SHRINK, 4);
+
+ hdpixelconn = hotDeadPixel->signal_toggled().connect ( sigc::mem_fun(*this, &PreProcess::hotDeadPixelChanged), true);
}
-
void PreProcess::read(const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited)
{
- disableListener ();
- caacsconn.block (true);
- dfautoconn.block(true);
- hdpixelconn.block (true);
- flatFieldAutoSelectconn.block (true);
- flatFieldBlurTypeconn.block (true);
+ disableListener ();
+ hdpixelconn.block (true);
-
- if(pedited ){
- dfAuto->set_inconsistent(!pedited->raw.dfAuto );
- caAutocorrect->set_inconsistent(!pedited->raw.caCorrection);
- caRed->setEditedState( pedited->raw.caRed ? Edited : UnEdited );
- caBlue->setEditedState( pedited->raw.caBlue ? Edited : UnEdited );
- PexPos->setEditedState( pedited->raw.exPos ? Edited : UnEdited );
- PexPreser->setEditedState( pedited->raw.exPreser ? Edited : UnEdited );
-
- //exposure
- hotDeadPixel->set_inconsistent (!pedited->raw.hotDeadPixel);
- lineDenoise->setEditedState( pedited->raw.linenoise ? Edited : UnEdited );
- greenEqThreshold->setEditedState( pedited->raw.greenEq ? Edited : UnEdited );
- flatFieldAutoSelect->set_inconsistent (!pedited->raw.ff_AutoSelect);
- flatFieldBlurRadius->setEditedState( pedited->raw.ff_BlurRadius ? Edited : UnEdited );
- if( !pedited->raw.ff_BlurType )
- flatFieldBlurType->set_active(procparams::RAWParams::numFlatFileBlurTypes); // No name
- }
-
- if (safe_file_test (pp->raw.dark_frame, Glib::FILE_TEST_EXISTS))
- darkFrameFile->set_filename (pp->raw.dark_frame);
- else if( !options.rtSettings.darkFramesPath.empty() )
- darkFrameFile->set_current_folder( options.rtSettings.darkFramesPath );
- hbdf->set_sensitive( !pp->raw.df_autoselect );
-
- if (safe_file_test (pp->raw.ff_file, Glib::FILE_TEST_EXISTS))
- flatFieldFile->set_filename (pp->raw.ff_file);
- else if( !options.rtSettings.flatFieldsPath.empty() )
- flatFieldFile->set_current_folder( options.rtSettings.flatFieldsPath );
- hbff->set_sensitive( !pp->raw.ff_AutoSelect );
-
-
- lastCA = pp->raw.ca_autocorrect;
- lastHot = pp->raw.hotdeadpix_filt;
- lastDFauto = pp->raw.df_autoselect;
-
- if( pp->raw.df_autoselect && dfp && !batchMode){
- // retrieve the auto-selected df filename
- rtengine::RawImage *img = dfp->getDF();
- if( img ){
- std::ostringstream s;
- s << Glib::path_get_basename(img->get_filename()) << ": " <get_ISOspeed() << "ISO " << img->get_shutter() << "s";
- dfInfo->set_text( s.str() );
- }else{
- dfInfo->set_text(Glib::ustring(M("TP_PREPROCESS_NO_FOUND")));
- }
+ if(pedited ){
+ hotDeadPixel->set_inconsistent (!pedited->raw.hotDeadPixel);
+ lineDenoise->setEditedState( pedited->raw.linenoise ? Edited : UnEdited );
+ greenEqThreshold->setEditedState( pedited->raw.greenEq ? Edited : UnEdited );
}
- else dfInfo->set_text("");
-
- lastFFAutoSelect = pp->raw.ff_AutoSelect;
- if( pp->raw.ff_AutoSelect && ffp && !batchMode){
- // retrieve the auto-selected ff filename
- rtengine::RawImage *img = ffp->getFF();
- if( img ){
- std::ostringstream s;
- s << Glib::path_get_basename(img->get_filename()) << ": " << "f/" << img->get_aperture(); // !!! need to add focallength in mm and format aperture to ##.#
- ffInfo->set_text( s.str() );
- }else{
- ffInfo->set_text(Glib::ustring(M("TP_PREPROCESS_NO_FOUND")));
- }
- }
- else ffInfo->set_text("");
-
- flatFieldAutoSelect ->set_active(pp->raw.ff_AutoSelect);
- flatFieldBlurRadius->setValue (pp->raw.ff_BlurRadius);
- flatFieldBlurType->set_active(procparams::RAWParams::numFlatFileBlurTypes);
-
- //flatFieldBlurType
- for( size_t i=0; i< procparams::RAWParams::numFlatFileBlurTypes;i++)
- if( pp->raw.ff_BlurType == procparams::RAWParams::ff_BlurTypestring[i]){
- flatFieldBlurType->set_active(i);
- break;
- }
-
- dfAuto->set_active( pp->raw.df_autoselect );
- caAutocorrect->set_active(pp->raw.ca_autocorrect);
- caRed->setValue (pp->raw.cared);
- caBlue->setValue (pp->raw.cablue);
- PexPos->setValue (pp->raw.expos);
- PexPreser->setValue (pp->raw.preser);//exposi
-
- hotDeadPixel->set_active (pp->raw.hotdeadpix_filt);
- lineDenoise->setValue (pp->raw.linenoise);
- greenEqThreshold->setValue (pp->raw.greenthresh);
+ lastHot = pp->raw.hotdeadpix_filt;
- flatFieldAutoSelect->set_active (pp->raw.ff_AutoSelect);
- flatFieldBlurRadius->setValue (pp->raw.ff_BlurRadius);
+ hotDeadPixel->set_active (pp->raw.hotdeadpix_filt);
+ lineDenoise->setValue (pp->raw.linenoise);
+ greenEqThreshold->setValue (pp->raw.greenthresh);
- dfChanged = false;
- ffChanged = false;
-
-
- caacsconn.block (false);
- dfautoconn.block(false);
- hdpixelconn.block (false);
- flatFieldAutoSelectconn.block (false);
- flatFieldBlurTypeconn.block (false);
-
-
- enableListener ();
+ hdpixelconn.block (false);
+ enableListener ();
}
void PreProcess::write( rtengine::procparams::ProcParams* pp, ParamsEdited* pedited)
{
- pp->raw.dark_frame = darkFrameFile->get_filename();
- pp->raw.df_autoselect = dfAuto->get_active();
- pp->raw.ff_file = flatFieldFile->get_filename();
- pp->raw.ff_AutoSelect = flatFieldAutoSelect->get_active();
- pp->raw.ff_BlurRadius = (int)flatFieldBlurRadius->getValue();
-
- int currentRow = flatFieldBlurType->get_active_row_number();
- if( currentRow>=0 && currentRow < procparams::RAWParams::numFlatFileBlurTypes)
- pp->raw.ff_BlurType = procparams::RAWParams::ff_BlurTypestring[currentRow];
-
- pp->raw.ca_autocorrect = caAutocorrect->get_active();
- pp->raw.cared = (double)caRed->getValue();
- pp->raw.cablue = (double)caBlue->getValue();
- pp->raw.expos = (double)PexPos->getValue();
- pp->raw.preser = (double)PexPreser->getValue();//exposi
-
pp->raw.hotdeadpix_filt = hotDeadPixel->get_active();
- pp->raw.linenoise = (int)lineDenoise->getValue();
- pp->raw.greenthresh = (int)greenEqThreshold->getValue();
+ pp->raw.linenoise = lineDenoise->getIntValue();
+ pp->raw.greenthresh = greenEqThreshold->getIntValue();
if (pedited) {
- pedited->raw.darkFrame = dfChanged;
- pedited->raw.dfAuto = !dfAuto->get_inconsistent();
- pedited->raw.ff_file = ffChanged;
- pedited->raw.ff_AutoSelect = !flatFieldAutoSelect->get_inconsistent();
- pedited->raw.ff_BlurRadius = flatFieldBlurRadius->getEditedState ();
- pedited->raw.ff_BlurType = flatFieldBlurType->get_active_row_number() != procparams::RAWParams::numFlatFileBlurTypes;
pedited->raw.linenoise = lineDenoise->getEditedState ();
pedited->raw.greenEq= greenEqThreshold->getEditedState ();
- pedited->raw.caCorrection = !caAutocorrect->get_inconsistent();
- pedited->raw.caRed = caRed->getEditedState ();
- pedited->raw.caBlue = caBlue->getEditedState ();
- pedited->raw.exPos = PexPos->getEditedState ();
- pedited->raw.exPreser = PexPreser->getEditedState ();//exposi
-
pedited->raw.hotDeadPixel = !hotDeadPixel->get_inconsistent();
}
}
void PreProcess::adjusterChanged (Adjuster* a, double newval)
{
- if (listener)
- listener->panelChanged (EvPreProcess, Glib::ustring("params") );
+ if (listener) {
+
+ Glib::ustring value = a->getTextValue();
+
+ if (a == greenEqThreshold)
+ listener->panelChanged (EvPreProcessGEquilThresh, value );
+ else if (a == lineDenoise)
+ listener->panelChanged (EvPreProcessLineDenoise, value );
+ }
}
void PreProcess::setBatchMode(bool batchMode)
{
- ToolPanel::setBatchMode (batchMode);
- caRed->showEditedCB ();
- caBlue->showEditedCB ();
- PexPos->showEditedCB ();
- PexPreser->showEditedCB ();//exposi
-
- lineDenoise->showEditedCB ();
- greenEqThreshold->showEditedCB ();
-
- flatFieldBlurRadius->showEditedCB ();
-
+ ToolPanel::setBatchMode (batchMode);
+ lineDenoise->showEditedCB ();
+ greenEqThreshold->showEditedCB ();
}
void PreProcess::setDefaults(const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited)
{
lineDenoise->setDefault( defParams->raw.linenoise);
- caRed->setDefault( defParams->raw.cared);
- caBlue->setDefault( defParams->raw.cablue);
- PexPos->setDefault( defParams->raw.expos);
- PexPreser->setDefault( defParams->raw.preser);
-
greenEqThreshold->setDefault (defParams->raw.greenthresh);
- flatFieldBlurRadius->setDefault( defParams->raw.ff_BlurRadius);
if (pedited) {
lineDenoise->setDefaultEditedState( pedited->raw.linenoise ? Edited : UnEdited);
- caRed->setDefaultEditedState( pedited->raw.caRed ? Edited : UnEdited);
- caBlue->setDefaultEditedState( pedited->raw.caBlue ? Edited : UnEdited);
- PexPos->setDefaultEditedState( pedited->raw.exPos ? Edited : UnEdited);
- PexPreser->setDefaultEditedState( pedited->raw.exPreser ? Edited : UnEdited);
-
greenEqThreshold->setDefaultEditedState(pedited->raw.greenEq ? Edited : UnEdited);
- flatFieldBlurRadius->setDefaultEditedState( pedited->raw.ff_BlurRadius ? Edited : UnEdited);
- }else{
+ } else {
lineDenoise->setDefaultEditedState( Irrelevant );
- caRed->setDefaultEditedState( Irrelevant );
- caBlue->setDefaultEditedState( Irrelevant );
- PexPos->setDefaultEditedState( Irrelevant );
- PexPreser->setDefaultEditedState( Irrelevant );
-
greenEqThreshold->setDefaultEditedState(Irrelevant );
- flatFieldBlurRadius->setDefaultEditedState( Irrelevant );
}
}
-void PreProcess::caCorrectionChanged()
-{
- if (batchMode) {
- if (caAutocorrect->get_inconsistent()) {
- caAutocorrect->set_inconsistent (false);
- caacsconn.block (true);
- caAutocorrect->set_active (false);
- caacsconn.block (false);
- }
- else if (lastCA)
- caAutocorrect->set_inconsistent (true);
-
- lastCA = caAutocorrect->get_active ();
- }
- if (listener)
- listener->panelChanged (EvPreProcess, Glib::ustring(M("PREFERENCES_CACORRECTION"))+"="+(caAutocorrect->get_active()?"ON":"OFF") );
-}
-
-void PreProcess::dfAutoChanged()
-{
- if (batchMode) {
- if (dfAuto->get_inconsistent()) {
- dfAuto->set_inconsistent (false);
- dfautoconn.block (true);
- dfAuto->set_active (false);
- dfautoconn.block (false);
- }
- else if (lastDFauto)
- dfAuto->set_inconsistent (true);
-
- lastDFauto = dfAuto->get_active ();
- }
-
- if(dfAuto->get_active() && dfp && !batchMode){
- // retrieve the auto-selected df filename
- rtengine::RawImage *img = dfp->getDF();
- if( img ){
- std::ostringstream s;
- s << Glib::path_get_basename(img->get_filename()) << ": " <get_ISOspeed() << "ISO " << img->get_shutter() << "s";
- dfInfo->set_text( s.str() );
- }else{
- dfInfo->set_text(Glib::ustring(M("TP_PREPROCESS_NO_FOUND")));
- }
- }
- else{dfInfo->set_text("");}
-
- hbdf->set_sensitive( !dfAuto->get_active() );
- if (listener)
- listener->panelChanged (EvPreProcess, Glib::ustring(M("TP_PREPROCESS_DFAUTOSELECT"))+"="+(dfAuto->get_active()?"ON":"OFF") );
-}
-
void PreProcess::hotDeadPixelChanged ()
{
if (batchMode) {
@@ -403,101 +133,5 @@ void PreProcess::hotDeadPixelChanged ()
lastHot = hotDeadPixel->get_active ();
}
if (listener)
- listener->panelChanged (EvPreProcess, Glib::ustring(M("PREFERENCES_HOTDEADPIXFILT"))+"="+(hotDeadPixel->get_active()?"ON":"OFF") );
-}
-void PreProcess::darkFrameChanged()
-{
- dfChanged=true;
- if (listener)
- listener->panelChanged (EvPreProcess, Glib::ustring(M("TP_PREPROCESS_DARKFRAME"))+"="+darkFrameFile->get_filename());
-}
-
-void PreProcess::darkFrameReset()
-{
- dfChanged=true;
- //darkFrameFile->set_current_name("");
- darkFrameFile->set_filename ("");
-
- if( !options.rtSettings.darkFramesPath.empty() )
- darkFrameFile->set_current_folder( options.rtSettings.darkFramesPath );
-
- dfInfo->set_text("");
- if (listener)
- listener->panelChanged (EvPreProcess, Glib::ustring(M("TP_PREPROCESS_DARKFRAME"))+"=0" );
-
-}
-
-void PreProcess::flatFieldFileChanged()
-{
- ffChanged=true;
- if (listener)
- listener->panelChanged (EvFlatFieldFile, Glib::ustring(M("TP_PREPROCESS_FLATFIELDFILE"))+"="+flatFieldFile->get_filename());
-}
-
-void PreProcess::flatFieldFile_Reset()
-{
- ffChanged=true;
- //flatFieldFile->set_current_name("");
- flatFieldFile->set_filename ("");
-
- if( !options.rtSettings.flatFieldsPath.empty() )
- flatFieldFile->set_current_folder( options.rtSettings.flatFieldsPath );
-
- ffInfo->set_text("");
- if (listener)
- //listener->panelChanged (EvFlatFieldFile, Glib::ustring(M("TP_PREPROCESS_FLATFIELDFILE"))+"=None" );
- listener->panelChanged (EvFlatFieldFile, "None" );
-}
-
-void PreProcess::flatFieldBlurTypeChanged ()
-{
- int curSelection = flatFieldBlurType->get_active_row_number();
-
- Glib::ustring s="";
- if( curSelection>=0 && curSelection < procparams::RAWParams::numFlatFileBlurTypes)
- s = procparams::RAWParams::ff_BlurTypestring[curSelection];
-
- if (listener)
- //listener->panelChanged (EvFlatFieldBlurType, Glib::ustring(M("TP_PREPROCESS_FLATFIELDBLURTYPE"))+ "="+ s);
- listener->panelChanged (EvFlatFieldBlurType, s);
-}
-
-void PreProcess::flatFieldAutoSelectChanged()
-{
- if (batchMode) {
- if (flatFieldAutoSelect->get_inconsistent()) {
- flatFieldAutoSelect->set_inconsistent (false);
- flatFieldAutoSelectconn.block (true);
- flatFieldAutoSelect->set_active (false);
- flatFieldAutoSelectconn.block (false);
- }
- else if (lastFFAutoSelect)
- flatFieldAutoSelect->set_inconsistent (true);
-
- lastFFAutoSelect = flatFieldAutoSelect->get_active ();
- }
- hbff->set_sensitive( !flatFieldAutoSelect->get_active() );
-
- if( flatFieldAutoSelect->get_active() && ffp && !batchMode){
- // retrieve the auto-selected ff filename
- rtengine::RawImage *img = ffp->getFF();
- if( img ){
- std::ostringstream s;
- s << Glib::path_get_basename(img->get_filename()) << ": " << "f/" << img->get_aperture(); // !!! need to add focallength in mm and format aperture to ##.#
- ffInfo->set_text( s.str() );
- }else{
- ffInfo->set_text(Glib::ustring(M("TP_PREPROCESS_NO_FOUND")));
- }
- }
- else{ffInfo->set_text("");}
-
- if (listener)
- //listener->panelChanged (EvFlatFieldAutoSelect, Glib::ustring(M("TP_PREPROCESS_FLATFIELDAUTOSELECT"))+"="+(flatFieldAutoSelect->get_active()?"ON":"OFF") );
- listener->panelChanged (EvFlatFieldAutoSelect, (flatFieldAutoSelect->get_active()?"ON":"OFF") );
-
-}
-
-void PreProcess::flatFieldBlurRadiusChanged()
-{
-//EvFlatFieldBlurRadius
+ listener->panelChanged (EvPreProcessHotDeadPixel, hotDeadPixel->get_active()?M("GENERAL_ENABLED"):M("GENERAL_DISABLED"));
}
diff --git a/rtgui/preprocess.h b/rtgui/preprocess.h
index 5709704fd..5252c41fb 100644
--- a/rtgui/preprocess.h
+++ b/rtgui/preprocess.h
@@ -24,56 +24,16 @@
#include
#include
-class DFProvider {
- public:
- virtual rtengine::RawImage* getDF() {}
- // add other info here
-};
-
-class FFProvider {
- public:
- virtual rtengine::RawImage* getFF() {}
- // add other info here
-};
-
-class PreProcess : public Gtk::VBox, public AdjusterListener, public FoldableToolPanel{
+class PreProcess : public Gtk::VBox, public AdjusterListener, public FoldableToolPanel {
protected:
- Gtk::ComboBoxText* darkFrameMethod;
- Gtk::FileChooserButton *darkFrameFile;
- Gtk::HBox *hbdf;
- Gtk::Button *btnReset;
- Gtk::Label *dfLabel;
- Gtk::Label *dfInfo;
- bool dfChanged;
-
- Gtk::FileChooserButton *flatFieldFile;
- Gtk::Label *ffLabel;
- Gtk::Label *ffInfo;
- Gtk::Button *flatFieldFileReset;
- Gtk::CheckButton* flatFieldAutoSelect;
- Adjuster* flatFieldBlurRadius;
- Gtk::ComboBoxText* flatFieldBlurType;
- Gtk::HBox *hbff;
- bool ffChanged;
-
- Adjuster* caRed;
- Adjuster* caBlue;
- Adjuster* PexPos;
- Adjuster* PexPreser;
-
Adjuster* lineDenoise;
- Adjuster* greenEqThreshold;
- Gtk::CheckButton* caAutocorrect;
- Gtk::CheckButton* hotDeadPixel;
- Gtk::CheckButton* dfAuto;
- bool lastCA,lastHot,lastDFauto, lastFFAutoSelect;
-
- DFProvider *dfp;
- FFProvider *ffp;
- sigc::connection caacsconn,dfautoconn,hdpixelconn,dfFile,flatFieldFileconn,flatFieldAutoSelectconn,flatFieldBlurTypeconn;
+ Adjuster* greenEqThreshold;
+ Gtk::CheckButton* hotDeadPixel;
+ bool lastHot;
+ sigc::connection hdpixelconn;
public:
@@ -85,20 +45,7 @@ class PreProcess : public Gtk::VBox, public AdjusterListener, public FoldableToo
void setDefaults (const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited=NULL);
void adjusterChanged (Adjuster* a, double newval);
- void caCorrectionChanged();
void hotDeadPixelChanged();
- void darkFrameChanged();
- void darkFrameReset();
- void dfAutoChanged();
-
- void flatFieldFileChanged();
- void flatFieldFile_Reset();
- void flatFieldAutoSelectChanged();
- void flatFieldBlurRadiusChanged();
- void flatFieldBlurTypeChanged();
-
- void setDFProvider (DFProvider* p) { dfp = p; };
- void setFFProvider (FFProvider* p) { ffp = p; };
};
#endif
diff --git a/rtgui/rawcacorrection.cc b/rtgui/rawcacorrection.cc
new file mode 100644
index 000000000..5808737fe
--- /dev/null
+++ b/rtgui/rawcacorrection.cc
@@ -0,0 +1,143 @@
+/*
+ * This file is part of RawTherapee.
+ *
+ * Copyright (c) 2004-2010 Gabor Horvath
+ *
+ * RawTherapee is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * RawTherapee is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with RawTherapee. If not, see .
+ */
+#include
+#include
+#include
+#include
+
+using namespace rtengine;
+using namespace rtengine::procparams;
+
+RAWCACorr::RAWCACorr () : Gtk::VBox(), FoldableToolPanel(this)
+{
+ caAutocorrect = Gtk::manage(new Gtk::CheckButton((M("TP_RAWCACORR_AUTO"))));
+ caRed = Gtk::manage(new Adjuster (M("TP_RAWCACORR_CARED"),-4.0,4.0,0.1,0));
+ caRed->setAdjusterListener (this);
+ if (caRed->delay < 1000) caRed->delay = 1000;
+ caRed->show();
+ caBlue = Gtk::manage(new Adjuster (M("TP_RAWCACORR_CABLUE"),-4.0,4.0,0.1,0));
+ caBlue->setAdjusterListener (this);
+ if (caBlue->delay < 1000) caBlue->delay = 1000;
+ caBlue->show();
+
+ pack_start( *caAutocorrect, Gtk::PACK_SHRINK, 4);
+ pack_start( *caRed, Gtk::PACK_SHRINK, 4);
+ pack_start( *caBlue, Gtk::PACK_SHRINK, 4);
+
+ caacsconn = caAutocorrect->signal_toggled().connect ( sigc::mem_fun(*this, &RAWCACorr::caCorrectionChanged), true);
+}
+
+void RAWCACorr::read(const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited)
+{
+ disableListener ();
+ caacsconn.block (true);
+
+ if(pedited ){
+ caAutocorrect->set_inconsistent(!pedited->raw.caCorrection);
+ caRed->setEditedState( pedited->raw.caRed ? Edited : UnEdited );
+ caBlue->setEditedState( pedited->raw.caBlue ? Edited : UnEdited );
+ }
+
+ lastCA = pp->raw.ca_autocorrect;
+
+ caAutocorrect->set_active(pp->raw.ca_autocorrect);
+ caRed->setValue (pp->raw.cared);
+ caBlue->setValue (pp->raw.cablue);
+
+ caacsconn.block (false);
+ enableListener ();
+}
+
+void RAWCACorr::write( rtengine::procparams::ProcParams* pp, ParamsEdited* pedited)
+{
+ pp->raw.ca_autocorrect = caAutocorrect->get_active();
+ pp->raw.cared = caRed->getValue();
+ pp->raw.cablue = caBlue->getValue();
+
+ if (pedited) {
+ pedited->raw.caCorrection = !caAutocorrect->get_inconsistent();
+ pedited->raw.caRed = caRed->getEditedState ();
+ pedited->raw.caBlue = caBlue->getEditedState ();
+ }
+
+}
+
+void RAWCACorr::adjusterChanged (Adjuster* a, double newval)
+{
+ if (listener) {
+
+ Glib::ustring value = a->getTextValue();
+
+ if (a == caRed)
+ listener->panelChanged (EvPreProcessCARed, value );
+ else if (a == caBlue)
+ listener->panelChanged (EvPreProcessCABlue, value );
+ }
+}
+
+void RAWCACorr::setBatchMode(bool batchMode)
+{
+ ToolPanel::setBatchMode (batchMode);
+ caRed->showEditedCB ();
+ caBlue->showEditedCB ();
+}
+
+void RAWCACorr::setDefaults(const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited)
+{
+ caRed->setDefault( defParams->raw.cared);
+ caBlue->setDefault( defParams->raw.cablue);
+
+ if (pedited) {
+ caRed->setDefaultEditedState( pedited->raw.caRed ? Edited : UnEdited);
+ caBlue->setDefaultEditedState( pedited->raw.caBlue ? Edited : UnEdited);
+ } else {
+ caRed->setDefaultEditedState( Irrelevant );
+ caBlue->setDefaultEditedState( Irrelevant );
+ }
+}
+
+void RAWCACorr::caCorrectionChanged()
+{
+ if (batchMode) {
+ if (caAutocorrect->get_inconsistent()) {
+ caAutocorrect->set_inconsistent (false);
+ caacsconn.block (true);
+ caAutocorrect->set_active (false);
+ caacsconn.block (false);
+ }
+ else if (lastCA)
+ caAutocorrect->set_inconsistent (true);
+
+ lastCA = caAutocorrect->get_active ();
+
+ }
+ else {
+ // For non batch mode, we disable the red and blue slider if caAutocorrect is true
+ if (caAutocorrect->get_active ()) {
+ caRed->set_sensitive(false);
+ caBlue->set_sensitive(false);
+ }
+ else {
+ caRed->set_sensitive(true);
+ caBlue->set_sensitive(true);
+ }
+ }
+ if (listener)
+ listener->panelChanged (EvPreProcessAutoCA, caAutocorrect->get_active()?M("GENERAL_ENABLED"):M("GENERAL_DISABLED"));
+}
diff --git a/rtgui/rawcacorrection.h b/rtgui/rawcacorrection.h
new file mode 100644
index 000000000..868361a38
--- /dev/null
+++ b/rtgui/rawcacorrection.h
@@ -0,0 +1,49 @@
+/*
+ * This file is part of RawTherapee.
+ *
+ * Copyright (c) 2004-2010 Gabor Horvath
+ *
+ * RawTherapee is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * RawTherapee is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with RawTherapee. If not, see .
+ */
+#ifndef _RAWCACORRECTION_H_
+#define _RAWCACORRECTION_H_
+
+#include
+#include
+#include
+#include
+
+class RAWCACorr : public Gtk::VBox, public AdjusterListener, public FoldableToolPanel {
+
+protected:
+ Gtk::CheckButton* caAutocorrect;
+ Adjuster* caRed;
+ Adjuster* caBlue;
+ bool lastCA;
+ sigc::connection caacsconn;
+
+public:
+
+ RAWCACorr ();
+
+ void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited=NULL);
+ void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited=NULL);
+ void setBatchMode (bool batchMode);
+ void setDefaults (const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited=NULL);
+
+ void adjusterChanged (Adjuster* a, double newval);
+ void caCorrectionChanged ();
+};
+
+#endif
diff --git a/rtgui/rawexposure.cc b/rtgui/rawexposure.cc
new file mode 100644
index 000000000..087b1163a
--- /dev/null
+++ b/rtgui/rawexposure.cc
@@ -0,0 +1,101 @@
+/*
+ * This file is part of RawTherapee.
+ *
+ * Copyright (c) 2004-2010 Gabor Horvath
+ *
+ * RawTherapee is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * RawTherapee is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with RawTherapee. If not, see .
+ */
+#include
+#include
+#include
+#include
+
+using namespace rtengine;
+using namespace rtengine::procparams;
+
+RAWExposure::RAWExposure () : Gtk::VBox(), FoldableToolPanel(this)
+{
+ PexPos = Gtk::manage(new Adjuster (M("TP_RAWEXPOS_LINEAR"),0.2,4.0,0.1,1));
+ PexPos->setAdjusterListener (this);
+ if (PexPos->delay < 1000) PexPos->delay = 1000;
+ PexPos->show();
+ PexPreser = Gtk::manage(new Adjuster (M("TP_RAWEXPOS_PRESER"),0,2.5,0.1,0));
+ PexPreser->setAdjusterListener (this);
+ if (PexPreser->delay < 1000) PexPreser->delay = 1000;
+ PexPreser->show();
+
+ pack_start( *PexPos, Gtk::PACK_SHRINK, 4);//exposi
+ pack_start( *PexPreser, Gtk::PACK_SHRINK, 4);
+}
+
+void RAWExposure::read(const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited)
+{
+ disableListener ();
+
+ if(pedited ){
+ PexPos->setEditedState( pedited->raw.exPos ? Edited : UnEdited );
+ PexPreser->setEditedState( pedited->raw.exPreser ? Edited : UnEdited );
+ }
+
+ PexPos->setValue (pp->raw.expos);
+ PexPreser->setValue (pp->raw.preser);//exposi
+
+ enableListener ();
+}
+
+void RAWExposure::write( rtengine::procparams::ProcParams* pp, ParamsEdited* pedited)
+{
+ pp->raw.expos = PexPos->getValue();
+ pp->raw.preser = PexPreser->getValue();//exposi
+
+ if (pedited) {
+ pedited->raw.exPos = PexPos->getEditedState ();
+ pedited->raw.exPreser = PexPreser->getEditedState ();//exposi
+ }
+
+}
+
+void RAWExposure::adjusterChanged (Adjuster* a, double newval)
+{
+ if (listener) {
+
+ Glib::ustring value = a->getTextValue();
+
+ if (a == PexPos)
+ listener->panelChanged (EvPreProcessExpCorrLinear, value );
+ else if (a == PexPreser)
+ listener->panelChanged (EvPreProcessExpCorrPH, value );
+ }
+}
+
+void RAWExposure::setBatchMode(bool batchMode)
+{
+ ToolPanel::setBatchMode (batchMode);
+ PexPos->showEditedCB ();
+ PexPreser->showEditedCB ();//exposi
+}
+
+void RAWExposure::setDefaults(const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited)
+{
+ PexPos->setDefault( defParams->raw.expos);
+ PexPreser->setDefault( defParams->raw.preser);
+
+ if (pedited) {
+ PexPos->setDefaultEditedState( pedited->raw.exPos ? Edited : UnEdited);
+ PexPreser->setDefaultEditedState( pedited->raw.exPreser ? Edited : UnEdited);
+ } else {
+ PexPos->setDefaultEditedState( Irrelevant );
+ PexPreser->setDefaultEditedState( Irrelevant );
+ }
+}
diff --git a/rtgui/rawexposure.h b/rtgui/rawexposure.h
new file mode 100644
index 000000000..ad56b2d7c
--- /dev/null
+++ b/rtgui/rawexposure.h
@@ -0,0 +1,45 @@
+/*
+ * This file is part of RawTherapee.
+ *
+ * Copyright (c) 2004-2010 Gabor Horvath
+ *
+ * RawTherapee is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * RawTherapee is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with RawTherapee. If not, see .
+ */
+#ifndef _RAWEXPOSURE_H_
+#define _RAWEXPOSURE_H_
+
+#include
+#include
+#include
+#include
+
+class RAWExposure : public Gtk::VBox, public AdjusterListener, public FoldableToolPanel {
+
+protected:
+ Adjuster* PexPos;
+ Adjuster* PexPreser;
+
+public:
+
+ RAWExposure ();
+
+ void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited=NULL);
+ void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited=NULL);
+ void setBatchMode (bool batchMode);
+ void setDefaults (const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited=NULL);
+
+ void adjusterChanged (Adjuster* a, double newval);
+};
+
+#endif
diff --git a/rtgui/rawprocess.cc b/rtgui/rawprocess.cc
index 6484c6fb0..827b18ea4 100644
--- a/rtgui/rawprocess.cc
+++ b/rtgui/rawprocess.cc
@@ -25,7 +25,7 @@ using namespace rtengine::procparams;
RawProcess::RawProcess () : Gtk::VBox(), FoldableToolPanel(this)
{
Gtk::HBox* hb1 = Gtk::manage (new Gtk::HBox ());
- hb1->pack_start (*Gtk::manage (new Gtk::Label ( M("PREFERENCES_DMETHOD") +": ")));
+ hb1->pack_start (*Gtk::manage (new Gtk::Label ( M("TP_RAW_DMETHOD") +": ")));
dmethod = Gtk::manage (new Gtk::ComboBoxText ());
for( size_t i=0; i< procparams::RAWParams::numMethods;i++)
dmethod->append_text(procparams::RAWParams::methodstring[i]);
@@ -37,10 +37,11 @@ RawProcess::RawProcess () : Gtk::VBox(), FoldableToolPanel(this)
dcbOptions = Gtk::manage (new Gtk::VBox ());
dcbOptions->set_border_width(4);
- dcbIterations = Gtk::manage (new Adjuster (M("PREFERENCES_DCBITERATIONS"),0,5,1,2));
- dcbIterations ->setAdjusterListener (this);
- dcbIterations ->show();
- dcbEnhance = Gtk::manage (new Gtk::CheckButton(M("PREFERENCES_DCBENHANCE")));
+ dcbIterations = Gtk::manage (new Adjuster (M("TP_RAW_DCBITERATIONS"),0,5,1,2));
+ dcbIterations->setAdjusterListener (this);
+ if (dcbIterations->delay < 1000) dcbIterations->delay = 1000;
+ dcbIterations->show();
+ dcbEnhance = Gtk::manage (new Gtk::CheckButton(M("TP_RAW_DCBENHANCE")));
dcbOptions->pack_start(*dcbIterations);
dcbOptions->pack_start(*dcbEnhance);
pack_start( *dcbOptions, Gtk::PACK_SHRINK, 4);
@@ -48,8 +49,9 @@ RawProcess::RawProcess () : Gtk::VBox(), FoldableToolPanel(this)
ccOptions = Gtk::manage (new Gtk::VBox ());
ccOptions->set_border_width(4);
- ccSteps = Gtk::manage (new Adjuster (M("PREFERENCES_FALSECOLOR"),0,5,1,2 ));
+ ccSteps = Gtk::manage (new Adjuster (M("TP_RAW_FALSECOLOR"),0,5,1,2 ));
ccSteps->setAdjusterListener (this);
+ if (ccSteps->delay < 1000) ccSteps->delay = 1000;
ccSteps->show();
pack_start( *ccSteps, Gtk::PACK_SHRINK, 4);
@@ -103,8 +105,8 @@ void RawProcess::read(const rtengine::procparams::ProcParams* pp, const ParamsEd
void RawProcess::write( rtengine::procparams::ProcParams* pp, ParamsEdited* pedited)
{
- pp->raw.ccSteps = (int)ccSteps->getValue();
- pp->raw.dcb_iterations = (int)dcbIterations->getValue();
+ pp->raw.ccSteps = ccSteps->getIntValue();
+ pp->raw.dcb_iterations = dcbIterations->getIntValue();
pp->raw.dcb_enhance = dcbEnhance->get_active();
int currentRow = dmethod->get_active_row_number();
@@ -143,8 +145,12 @@ void RawProcess::setDefaults(const rtengine::procparams::ProcParams* defParams,
void RawProcess::adjusterChanged (Adjuster* a, double newval)
{
- if (listener)
- listener->panelChanged (EvDemosaic, Glib::ustring("params") );
+ if (listener) {
+ if (a == dcbIterations)
+ listener->panelChanged (EvDemosaicDCBIter, a->getTextValue() );
+ else if (a == ccSteps)
+ listener->panelChanged (EvDemosaicFalseColorIter, a->getTextValue() );
+ }
}
void RawProcess::methodChanged ()
@@ -160,7 +166,7 @@ void RawProcess::methodChanged ()
s = procparams::RAWParams::methodstring[curSelection];
if (listener)
- listener->panelChanged (EvDemosaic, Glib::ustring(M("PREFERENCES_DMETHOD"))+ "="+ s);
+ listener->panelChanged (EvDemosaicMethod, s);
}
void RawProcess::dcbEnhanceChanged ()
@@ -178,5 +184,5 @@ void RawProcess::dcbEnhanceChanged ()
lastDCBen = dcbEnhance->get_active ();
}
if (listener)
- listener->panelChanged (EvDemosaic, Glib::ustring("params") );
+ listener->panelChanged (EvDemosaicDCBEnhanced, dcbEnhance->get_active()?M("GENERAL_ENABLED"):M("GENERAL_DISABLED"));
}
diff --git a/rtgui/toolpanelcoord.cc b/rtgui/toolpanelcoord.cc
index 4aeb5ae95..819cabbf7 100644
--- a/rtgui/toolpanelcoord.cc
+++ b/rtgui/toolpanelcoord.cc
@@ -65,6 +65,10 @@ ToolPanelCoordinator::ToolPanelCoordinator () : ipc(NULL) {
hsvequalizer = Gtk::manage (new HSVEqualizer ());
rawprocess = Gtk::manage (new RawProcess ());
preprocess = Gtk::manage (new PreProcess ());
+ darkframe = Gtk::manage (new DarkFrame ());
+ flatfield = Gtk::manage (new FlatField ());
+ rawcacorrection = Gtk::manage (new RAWCACorr ());
+ rawexposure = Gtk::manage (new RAWExposure ());
addPanel (colorPanel, whitebalance, M("TP_WBALANCE_LABEL")); toolPanels.push_back (whitebalance);
addPanel (exposurePanel, curve, M("TP_EXPOSURE_LABEL")); toolPanels.push_back (curve);
@@ -92,8 +96,12 @@ ToolPanelCoordinator::ToolPanelCoordinator () : ipc(NULL) {
addPanel (lensgeom->getPackBox(), cacorrection, M("TP_CACORRECTION_LABEL")); toolPanels.push_back (cacorrection);
addPanel (lensgeom->getPackBox(), vignetting, M("TP_VIGNETTING_LABEL")); toolPanels.push_back (vignetting);
addPanel (colorPanel, icm, M("TP_ICM_LABEL")); toolPanels.push_back (icm);
- addPanel (rawPanel, rawprocess, M("TP_RAWPANEL_DEMOSAICING")); toolPanels.push_back (rawprocess);
- addPanel (rawPanel, preprocess, M("TP_RAWPANEL_PREPROCESSING"));toolPanels.push_back (preprocess);
+ addPanel (rawPanel, rawprocess, M("TP_RAW_LABEL")); toolPanels.push_back (rawprocess);
+ addPanel (rawPanel, preprocess, M("TP_PREPROCESS_LABEL")); toolPanels.push_back (preprocess);
+ addPanel (rawPanel, rawexposure, M("TP_EXPOSCORR_LABEL")); toolPanels.push_back (rawexposure);
+ addPanel (rawPanel, darkframe, M("TP_DARKFRAME_LABEL")); toolPanels.push_back (darkframe);
+ addPanel (rawPanel, flatfield, M("TP_FLATFIELD_LABEL")); toolPanels.push_back (flatfield);
+ addPanel (rawPanel, rawcacorrection, M("TP_CHROMATABERR_LABEL")); toolPanels.push_back (rawcacorrection);
toolPanels.push_back (coarse);
toolPanels.push_back (exifpanel);
@@ -173,8 +181,8 @@ ToolPanelCoordinator::ToolPanelCoordinator () : ipc(NULL) {
whitebalance->setWBProvider (this);
whitebalance->setSpotWBListener (this);
- preprocess->setDFProvider (this);
- preprocess->setFFProvider (this);
+ darkframe->setDFProvider (this);
+ flatfield->setFFProvider (this);
lensgeom->setLensGeomListener (this);
rotate->setLensGeomListener (this);
crop->setCropPanelListener (this);
diff --git a/rtgui/toolpanelcoord.h b/rtgui/toolpanelcoord.h
index be50afc0e..4f7516aab 100644
--- a/rtgui/toolpanelcoord.h
+++ b/rtgui/toolpanelcoord.h
@@ -59,6 +59,10 @@
#include
#include
#include
+#include
+#include
+#include
+#include
class ImageEditorCoordinator;
@@ -103,6 +107,10 @@ class ToolPanelCoordinator : public ToolPanelListener,
HSVEqualizer * hsvequalizer;
RawProcess* rawprocess;
PreProcess* preprocess;
+ DarkFrame* darkframe;
+ FlatField* flatfield;
+ RAWCACorr* rawcacorrection;
+ RAWExposure* rawexposure;
std::vector paramcListeners;