From ae376d86761ffacad564d6741b68a2c2ce6b3fd9 Mon Sep 17 00:00:00 2001 From: Hombre Date: Thu, 20 Jan 2011 03:01:34 +0100 Subject: [PATCH] Reordered procevents enum to stay in synch with Branch3.0. Note to the translators: HISTORY_MSG_108 and above may need to be reordered accordingly (already done in default and Francais) --- rtdata/languages/Francais | 14 +++++++------- rtdata/languages/default | 14 +++++++------- rtengine/procevents.h | 14 +++++++------- rtengine/refreshmap.cc | 5 ++--- 4 files changed, 23 insertions(+), 24 deletions(-) diff --git a/rtdata/languages/Francais b/rtdata/languages/Francais index 775862e69..9720b2b11 100644 --- a/rtdata/languages/Francais +++ b/rtdata/languages/Francais @@ -151,13 +151,13 @@ HISTORY_MSG_104;Égaliseur TSV HISTORY_MSG_105;Corr. aberr. chromatique HISTORY_MSG_106;Corr. a.c. - Rayon HISTORY_MSG_107;Corr. a.c. - Seuil -HISTORY_MSG_108;Redim. - boîte englobante -HISTORY_MSG_109;Redim. s'applique à -HISTORY_MSG_110;Champ Uniforme - Fichier -HISTORY_MSG_111;Champ Uniforme - Auto sélection -HISTORY_MSG_112;Champ Uniforme - Rayon -HISTORY_MSG_113;Champ Uniforme - Type de floutage -HISTORY_MSG_114;Seuil de compr. des hautes lumières +HISTORY_MSG_108;Seuil de compr. des hautes lumières +HISTORY_MSG_109;Redim. - boîte englobante +HISTORY_MSG_110;Redim. s'applique à +HISTORY_MSG_111;Champ Uniforme - Fichier +HISTORY_MSG_112;Champ Uniforme - Auto sélection +HISTORY_MSG_113;Champ Uniforme - Rayon +HISTORY_MSG_114;Champ Uniforme - Type de floutage HISTORY_MSG_10;Compression des ombres HISTORY_MSG_11;Courbe tonale HISTORY_MSG_12;Exposition auto diff --git a/rtdata/languages/default b/rtdata/languages/default index 419bb3c7b..bea651b81 100644 --- a/rtdata/languages/default +++ b/rtdata/languages/default @@ -153,13 +153,13 @@ HISTORY_MSG_104;HSV Equalizer HISTORY_MSG_105;Defringing HISTORY_MSG_106;Defringing Radius HISTORY_MSG_107;Defringing Threshold -HISTORY_MSG_108;Resize bounding box -HISTORY_MSG_109;Resizing applies to -HISTORY_MSG_110;Flat Field File -HISTORY_MSG_111;Flat Field Auto Select -HISTORY_MSG_112;Flat Field Blur Radius -HISTORY_MSG_113;Flat Field Blur Type -HISTORY_MSG_114;Highlight Compr. Threshold +HISTORY_MSG_108;Highlight Compr. Threshold +HISTORY_MSG_109;Resize bounding box +HISTORY_MSG_110;Resizing applies to +HISTORY_MSG_111;Flat Field File +HISTORY_MSG_112;Flat Field Auto Select +HISTORY_MSG_113;Flat Field Blur Radius +HISTORY_MSG_114;Flat Field Blur Type HISTORY_MSG_10;Shadow Compression HISTORY_MSG_11;Tone Curve HISTORY_MSG_12;Auto Exposure diff --git a/rtengine/procevents.h b/rtengine/procevents.h index 56baee7e1..01b34ac4f 100644 --- a/rtengine/procevents.h +++ b/rtengine/procevents.h @@ -129,13 +129,13 @@ enum ProcEvent { EvDefringeEnabled=104, EvDefringeRadius=105, EvDefringeThreshold=106, - EvResizeBoundingBox=107, - EvResizeAppliesTo=108, - EvFlatFieldFile=109, - EvFlatFieldAutoSelect=110, - EvFlatFieldBlurRadius=111, - EvFlatFieldBlurType=112, - EvHLComprThreshold=113, + EvHLComprThreshold=107, + EvResizeBoundingBox=108, + EvResizeAppliesTo=109, + EvFlatFieldFile=110, + EvFlatFieldAutoSelect=111, + EvFlatFieldBlurRadius=112, + EvFlatFieldBlurType=113, NUMOFEVENTS=114 }; diff --git a/rtengine/refreshmap.cc b/rtengine/refreshmap.cc index 295be9e97..736006af5 100644 --- a/rtengine/refreshmap.cc +++ b/rtengine/refreshmap.cc @@ -127,14 +127,13 @@ RGBCURVE, // EvHSVEqEnabled, DEFRINGE, // EvDefringeEnabled, DEFRINGE, // EvDefringeRadius, DEFRINGE, // EvDefringeThreshold, +RGBCURVE, // EvHLComprThreshold, RESIZE, // EvResizeBoundingBox RESIZE, // EvResizeAppliesTo FLATFIELD, // EvFlatFieldFile, FLATFIELD, // EvFlatFieldAutoSelect, FLATFIELD, // EvFlatFieldBlurRadius, -FLATFIELD, // EvFlatFieldBlurType, -RGBCURVE // EvHLComprThreshold, - +FLATFIELD // EvFlatFieldBlurType, };