Make list parameter in effects translatable

svn path=/trunk/kdenlive/; revision=5288

diff --git a/Messages.sh b/Messages.sh
index 81d69201510ced2958ef7e435e34cd7e3d417b47..097dcd009a24d0cc61aff785e6a58a43703623f7 100755 (executable)
--- a/Messages.sh
+++ b/Messages.sh
@@ -14,7 +14,7 @@ else
    kde_inc=""
 fi
 
-$EXTRACTRC --tag=name --tag=description --tag=label --tag=comment effects/*.xml data/*.rc >> rc.cpp || exit 11
+$EXTRACTRC --tag=name --tag=description --tag=label --tag=comment --tag=paramlistdisplay effects/*.xml data/*.rc >> rc.cpp || exit 11
 
 $EXTRACTRC `find $kdenlive_subdirs -name \*.ui` >> rc.cpp || exit 11
 $EXTRACTRC `find $kdenlive_subdirs -name \*.rc` >> rc.cpp || exit 11

diff --git a/effects/audiopan.xml b/effects/audiopan.xml
index c3d1ec88d36491a3bbf2a0608584e0d7549d7c7a..97b2b3edf20deb562174b51a0b01fc4d5a5d85e7 100644 (file)
--- a/effects/audiopan.xml
+++ b/effects/audiopan.xml
@@ -3,8 +3,8 @@
        <name>Pan</name>
        <description>Adjust the left/right spread of a channel</description>
        <author>Dan Dennedy</author>
-        <parameter type="list" name="channel" default="0" paramlist="0,1"
-            paramlistdisplay="Left,Right">
+        <parameter type="list" name="channel" default="0" paramlist="0,1">
+                <paramlistdisplay>Left,Right</paramlistdisplay>
                 <name>Channel</name>
         </parameter>
        <parameter type="keyframe" name="start" max="1000" min="0" default="500" factor="1000">

diff --git a/effects/channelcopy.xml b/effects/channelcopy.xml
index 77706a23134a6959cf09672ce1e9e5f17ef8a2d1..1cfac8e876d862927b8644fdd092efa492e056bd 100644 (file)
--- a/effects/channelcopy.xml
+++ b/effects/channelcopy.xml
@@ -3,10 +3,12 @@
          <name>Mono to stereo</name>
          <description>Copy one channel to another</description>
          <author>Dan Dennedy</author>
-         <parameter type="list" name="from" default="0" paramlist="0,1" paramlistdisplay="Left,Right">
+         <parameter type="list" name="from" default="0" paramlist="0,1">
+                 <paramlistdisplay>Left,Right</paramlistdisplay>
                  <name>From</name>
          </parameter>
-         <parameter type="list" name="to" default="1" paramlist="0,1" paramlistdisplay="Left,Right">
+         <parameter type="list" name="to" default="1" paramlist="0,1">
+                 <paramlistdisplay>Left,Right</paramlistdisplay>
                  <name>To</name>
          </parameter>
  </effect>

diff --git a/effects/frei0r_alpha0ps.xml b/effects/frei0r_alpha0ps.xml
index a6c918d43f98dc9a19c9831f968124c66215bc92..7ac05659d729fac9d49c2842c728821a556a1a6a 100644 (file)
--- a/effects/frei0r_alpha0ps.xml
+++ b/effects/frei0r_alpha0ps.xml
@@ -4,8 +4,8 @@
         <description>Display and manipulation of the alpha channel</description>
         <author>Marko Cebokli</author>
         
-        <parameter type="list" name="Display" default="0.0" paramlist="0.0,0.21,0.36,0.50,0.64,0.79,1.0"
-                   paramlistdisplay="Image,Alpha as gray,Gray + red,Selection on black,Selection on gray,Selection on white,Selection on checkers">
+        <parameter type="list" name="Display" default="0.0" paramlist="0.0,0.21,0.36,0.50,0.64,0.79,1.0">
+                <paramlistdisplay>Image,Alpha as gray,Gray + red,Selection on black,Selection on gray,Selection on white,Selection on checkers</paramlistdisplay>
                 <name>Display</name>
         </parameter>
         
@@ -13,8 +13,8 @@
                 <name>Display input alpha</name>
         </parameter>
         
-        <parameter type="list" name="Operation" default="0.0" paramlist="0.0,0.21,0.36,0.50,0.64,0.79,1.0"
-                   paramlistdisplay="NO OP,Shave,Shrink hard,Shrink soft,Grow hard,Grow soft,Threshold">
+        <parameter type="list" name="Operation" default="0.0" paramlist="0.0,0.21,0.36,0.50,0.64,0.79,1.0">
+                <paramlistdisplay>NO OP,Shave,Shrink hard,Shrink soft,Grow hard,Grow soft,Threshold</paramlistdisplay>
                 <name>Operation</name>
         </parameter>
         

diff --git a/effects/frei0r_alphagrad.xml b/effects/frei0r_alphagrad.xml
index ba62037f12b52d40d90805a2a5edc81a1c850b84..4c516ccebacd7f9ca7a9674a2071569b7f400743 100644 (file)
--- a/effects/frei0r_alphagrad.xml
+++ b/effects/frei0r_alphagrad.xml
@@ -25,8 +25,8 @@
                 <name>Max</name>
         </parameter>
         
-        <parameter type="list" name="Operation" default="0.0" paramlist="0.0,0.3,0.5,0.7,1.0"
-                   paramlistdisplay="Write on clear, Max, Min, Add, Subtract">
+        <parameter type="list" name="Operation" default="0.0" paramlist="0.0,0.3,0.5,0.7,1.0">
+                <paramlistdisplay>Write on clear,Max,Min,Add,Subtract</paramlistdisplay>
                 <name>Operation</name>
         </parameter>
         

diff --git a/effects/frei0r_alphaspot.xml b/effects/frei0r_alphaspot.xml
index f9e91737d635099e88b61ed04caa12b57dfcf72b..1731742ec7e960bf7e6816e220633981d6c7d57c 100644 (file)
--- a/effects/frei0r_alphaspot.xml
+++ b/effects/frei0r_alphaspot.xml
@@ -5,8 +5,8 @@
         <author>Marko Cebokli</author>
         
         
-        <parameter type="list" name="Shape" default="0.0" paramlist="0.0,0.38,0.62,1.0"
-                   paramlistdisplay="Rectangle,Ellipse,Triangle,Diamond">
+        <parameter type="list" name="Shape" default="0.0" paramlist="0.0,0.38,0.62,1.0">
+                <paramlistdisplay>Rectangle,Ellipse,Triangle,Diamond</paramlistdisplay>
                 <name>Shape</name>
         </parameter>
         
@@ -42,8 +42,8 @@
                 <name>Max</name>
         </parameter>
         
-        <parameter type="list" name="Operation" default="0.0" paramlist="0.0,0.3,0.5,0.7,1.0"
-                   paramlistdisplay="Write on clear, Max, Min, Add, Subtract">
+        <parameter type="list" name="Operation" default="0.0" paramlist="0.0,0.3,0.5,0.7,1.0">
+                <paramlistdisplay>Write on clear, Max, Min, Add, Subtract</paramlistdisplay>
                 <name>Operation</name>
         </parameter>
         

diff --git a/effects/frei0r_bezier_curves.xml b/effects/frei0r_bezier_curves.xml
index 5bdc3c9a0bb1a2d36cb932379a9c384e9feca82b..10dcb6e14f033e94bfc31e6db3b8f4b34cd4d778 100644 (file)
--- a/effects/frei0r_bezier_curves.xml
+++ b/effects/frei0r_bezier_curves.xml
@@ -4,11 +4,13 @@
         <description>Color curves adjustment</description>
         <author>Till Theato, Maksim Golovkin</author>
 
-        <parameter type="list" name="Channel" default="0.5" paramlist="0.5,0,0.1,0.2,0.3,0.4,0.6,0.71" paramlistdisplay="RGB,Red,Green,Blue,Alpha,Luma,Hue,Saturation">
+        <parameter type="list" name="Channel" default="0.5" paramlist="0.5,0,0.1,0.2,0.3,0.4,0.6,0.71">
+                <paramlistdisplay>RGB,Red,Green,Blue,Alpha,Luma,Hue,Saturation</paramlistdisplay>
                 <name>Channel</name>
         </parameter>
 
-        <parameter type="list" name="Luma formula" default="1" paramlist="0,1" paramlistdisplay="Rec. 601,Rec. 709">
+        <parameter type="list" name="Luma formula" default="1" paramlist="0,1">
+                <paramlistdisplay>Rec. 601,Rec. 709</paramlistdisplay>
                 <name>Luma formula</name>
         </parameter>
 

diff --git a/effects/frei0r_c0rners.xml b/effects/frei0r_c0rners.xml
index eeb08fe79207e6623be57aa5b57d0bd956409e09..07854667e08b468c37a9997bd2447d236e77d0c5 100644 (file)
--- a/effects/frei0r_c0rners.xml
+++ b/effects/frei0r_c0rners.xml
@@ -54,8 +54,8 @@
                <name>Stretch Y</name>
        </parameter>
        
-       <parameter type="list" name="Interpolator" default="0.166" paramlist="0,0.166,0.333,0.5,0.666,0.833,1.0"
-                  paramlistdisplay="nearest neighbor,bilinear,bicubic smooth,bicibic sharp,spline 4x4,spline 6x6,lanczos">
+        <parameter type="list" name="Interpolator" default="0.166" paramlist="0,0.166,0.333,0.5,0.666,0.833,1.0">
+                <paramlistdisplay>Nearest neighbor,Bilinear,Bicubic smooth,Bicubic sharp,Spline 4x4,Spline 6x6,Lanczos</paramlistdisplay>
                <name>Interpolator</name>
        </parameter>
 

diff --git a/effects/frei0r_coloradj_rgb.xml b/effects/frei0r_coloradj_rgb.xml
index 97c799726e040ac9a769cfcae00e8113780e4848..b5abd62bb6b590ddd33f2eebb05d0b6ef8a8ef34 100644 (file)
--- a/effects/frei0r_coloradj_rgb.xml
+++ b/effects/frei0r_coloradj_rgb.xml
@@ -16,8 +16,8 @@
                 <name>B</name>
         </parameter>
         
-        <parameter type="list" name="Action" default="0.5" paramlist="0.0,0.5,1.0"
-                   paramlistdisplay="Add constant,Change gamma,Multiply">
+        <parameter type="list" name="Action" default="0.5" paramlist="0.0,0.5,1.0">
+                <paramlistdisplay>Add constant,Change gamma,Multiply</paramlistdisplay>
                 <name>Action</name>
         </parameter>
 
@@ -29,8 +29,8 @@
                 <name>Alpha controlled</name>
         </parameter>
         
-        <parameter type="list" name="Luma formula" default="1.0" paramlist="0.0,1.0"
-                   paramlistdisplay="rec 601,rec 709">
+        <parameter type="list" name="Luma formula" default="1.0" paramlist="0.0,1.0">
+                <paramlistdisplay>Rec. 601,Rec. 709</paramlistdisplay>
                 <name>Luma formula</name>
         </parameter>
         

diff --git a/effects/frei0r_curves.xml b/effects/frei0r_curves.xml
index 9e8d4d5800c79cf8c33dd006760f25703742b078..2dd36349d5f8bf62c55abc716521b192ccff2d6f 100644 (file)
--- a/effects/frei0r_curves.xml
+++ b/effects/frei0r_curves.xml
@@ -3,10 +3,12 @@
        <name>Curves</name>
        <description>Color curves adjustment</description>
        <author>Maksim Golovkin</author>
-       <parameter type="list" name="Channel" default="0" paramlist="0,1,2,3" paramlistdisplay="Red,Green,Blue,Luma">
+        <parameter type="list" name="Channel" default="0" paramlist="0,1,2,3">
+                <paramlistdisplay>Red,Green,Blue,Luma</paramlistdisplay>
                <name>Channel</name>
        </parameter>
-        <parameter type="list" name="Luma formula" default="1" paramlist="0,1" paramlistdisplay="Rec. 601,Rec. 709">
+        <parameter type="list" name="Luma formula" default="1" paramlist="0,1">
+                <paramlistdisplay>Rec. 601,Rec. 709</paramlistdisplay>
                 <name>Luma formula</name>
         </parameter>
         
@@ -51,7 +53,8 @@
        <parameter type="bool" name="Show curves" default="0">
                 <name>Show graph in picture</name>
         </parameter>
-        <parameter type="list" name="Graph position" default="3" paramlist="0,1,2,3" paramlistdisplay="Top Left,Top Right,Bottom Left,Bottom Right">
+        <parameter type="list" name="Graph position" default="3" paramlist="0,1,2,3">
+                <paramlistdisplay>Top Left,Top Right,Bottom Left,Bottom Right</paramlistdisplay>
                 <name>Graph position</name>
         </parameter>
 </effect>

diff --git a/effects/frei0r_defish0r.xml b/effects/frei0r_defish0r.xml
index d9e7d8cdb6429a315b58284d6231c7787bab0da7..77ccb219dfaecf8837d30a2a1469669fd3d7ee2d 100644 (file)
--- a/effects/frei0r_defish0r.xml
+++ b/effects/frei0r_defish0r.xml
@@ -9,23 +9,23 @@
        <parameter type="bool" name="DeFish" default="1">
                <name>DeFish</name>
        </parameter>
-       <parameter type="list" name="Type" default="0.666" paramlist="0,0.333,0.666,1.0"
-                  paramlistdisplay="equidistant,orthographic,equiarea,stereographic">
+        <parameter type="list" name="Type" default="0.666" paramlist="0,0.333,0.666,1.0">
+                <paramlistdisplay>Equidistant,Orthographic,Equiarea,Stereographic</paramlistdisplay>
                <name>Type</name>
        </parameter>
-       <parameter type="list" name="Scaling" default="0" paramlist="0,0.333,0.666,1.0"
-                  paramlistdisplay="fill,center,fit,manual">
+        <parameter type="list" name="Scaling" default="0" paramlist="0,0.333,0.666,1.0">
+                <paramlistdisplay>Fill,Center,Fit,Manual</paramlistdisplay>
                <name>Scaling</name>
        </parameter>
        <parameter type="constant" name="Manual Scale" default="500" min="0" max="1000" factor="1000">
                <name>Manual Scale</name>
        </parameter>
-       <parameter type="list" name="Interpolator" default="0.166" paramlist="0,0.166,0.333,0.5,0.666,0.833,1.0"
-                  paramlistdisplay="nearest neighbor,bilinear,bicubic smooth,bicibic sharp,spline 4x4,spline 6x6,lanczos">
+        <parameter type="list" name="Interpolator" default="0.166" paramlist="0,0.166,0.333,0.5,0.666,0.833,1.0">
+                <paramlistdisplay>Nearest neighbor,Bilinear,Bicubic smooth,Bicubic sharp,Spline 4x4,Spline 6x6,Lanczos</paramlistdisplay>
                <name>Interpolator</name>
        </parameter>
-       <parameter type="list" name="Aspect type" default="0" paramlist="0,0.25,0.5,0.75,1.0"
-                  paramlistdisplay="square,PAL DV,NTSC DV,HDV,manual">
+        <parameter type="list" name="Aspect type" default="0" paramlist="0,0.25,0.5,0.75,1.0">
+                <paramlistdisplay>Square,PAL DV,NTSC DV,HDV,Manual</paramlistdisplay>
                <name>Aspect type</name>
        </parameter>
        <parameter type="constant" name="Manual Aspect" default="500" min="0" max="1000" factor="1000">

diff --git a/effects/frei0r_levels.xml b/effects/frei0r_levels.xml
index 1269fc94deb9ce392833180833acbfaad3a16334..8e0ca42a994a78c47c898bdacec7b49255da0e12 100644 (file)
--- a/effects/frei0r_levels.xml
+++ b/effects/frei0r_levels.xml
@@ -3,7 +3,8 @@
        <name>Levels</name>
        <description>Adjust levels</description>
        <author>Maksim Golovkin</author>
-       <parameter type="list" name="Channel" default="0" paramlist="0,1,2,3" paramlistdisplay="Red,Green,Blue,Luma">
+        <parameter type="list" name="Channel" default="0" paramlist="0,1,2,3">
+                <paramlistdisplay>Red,Green,Blue,Luma</paramlistdisplay>
                <name>Channel</name>
        </parameter>
         <parameter type="simplekeyframe" name="Input black level" default="0" min="0" max="1000" factor="1000">
@@ -24,7 +25,8 @@
        <parameter type="bool" name="Show histogram" default="0">
                <name>Show histogram</name>
        </parameter>
-       <parameter type="list" name="Histogram position" default="3" paramlist="0,1,2,3" paramlistdisplay="Top Left,Top Right,Bottom Left,Bottom Right">
+        <parameter type="list" name="Histogram position" default="3" paramlist="0,1,2,3">
+                <paramlistdisplay>Top Left,Top Right,Bottom Left,Bottom Right</paramlistdisplay>
                <name>Histogram position</name>
        </parameter>
 </effect>

diff --git a/effects/frei0r_pr0be.xml b/effects/frei0r_pr0be.xml
index da4efe243366de8289e8130ba72414a2472b17b3..375806f204f2ea6ca003ff0b22d4d83c814ac7fa 100644 (file)
--- a/effects/frei0r_pr0be.xml
+++ b/effects/frei0r_pr0be.xml
@@ -4,8 +4,8 @@
         <description>Measure video values</description>
         <author>Marko Cebokli</author>
         
-        <parameter type="list" name="Measurement" default="0.0" paramlist="0.0,0.3,0.5,0.7,1.0"
-                   paramlistdisplay="RGB,Y'PbPr - rec 601,Y'PbPr - rec 709,HSV,HSL">
+        <parameter type="list" name="Measurement" default="0.0" paramlist="0.0,0.3,0.5,0.7,1.0">
+                <paramlistdisplay>RGB,Y'PbPr - rec. 601,Y'PbPr - rec. 709,HSV,HSL</paramlistdisplay>
                 <name>Measurement</name>
         </parameter>
         

diff --git a/effects/frei0r_pr0file.xml b/effects/frei0r_pr0file.xml
index dff5044895d868eadeec6e7d5928d3de95ad185e..afd5511913a06ce9f58f39ff277c220baf870215 100644 (file)
--- a/effects/frei0r_pr0file.xml
+++ b/effects/frei0r_pr0file.xml
@@ -20,8 +20,8 @@
                 <name>Length</name>
         </parameter>
         
-        <parameter type="list" name="Channel" default="0.5" paramlist="0.0,0.2,0.4,0.5,0.6,0.8,1.0"
-                   paramlistdisplay="R,G,B,Y',Pr,Pb,alpha">
+        <parameter type="list" name="Channel" default="0.5" paramlist="0.0,0.2,0.4,0.5,0.6,0.8,1.0">
+                <paramlistdisplay>R,G,B,Y',Pr,Pb,Alpha</paramlistdisplay>
                 <name>Channel</name>
         </parameter>
         
@@ -81,8 +81,8 @@
                 <name>256 scale</name>
         </parameter>
         
-        <parameter type="list" name="Color" default="0.0" paramlist="0.0,1.0"
-                   paramlistdisplay="CCIR rec 601,CCIR rec 709">
+        <parameter type="list" name="Color" default="0.0" paramlist="0.0,1.0">
+                <paramlistdisplay>CCIR rec. 601,CCIR rec. 709</paramlistdisplay>
                 <name>Color</name>
         </parameter>
 

diff --git a/effects/frei0r_select0r.xml b/effects/frei0r_select0r.xml
index 8e772203aa6139bd9f444cddf7d07d85ede12e04..c5b20ac66bc921858eec36d374ab26bc37e17c69 100644 (file)
--- a/effects/frei0r_select0r.xml
+++ b/effects/frei0r_select0r.xml
@@ -24,23 +24,23 @@
                 <name>Delta B / I / I</name>
         </parameter>
         
-        <parameter type="list" name="Selection subspace" default="0.0" paramlist="0.0,0.5,1.0"
-                   paramlistdisplay="RGB,ABI,HCI">
+        <parameter type="list" name="Selection subspace" default="0.0" paramlist="0.0,0.5,1.0">
+                <paramlistdisplay>RGB,ABI,HCI</paramlistdisplay>
                 <name>Selection subspace</name>
         </parameter>
         
-        <parameter type="list" name="Subspace shape" default="0.0" paramlist="0.0,0.5,1.0"
-                   paramlistdisplay="Box,Ellipsoid,Diamond">
+        <parameter type="list" name="Subspace shape" default="0.0" paramlist="0.0,0.5,1.0">
+                <paramlistdisplay>Box,Ellipsoid,Diamond</paramlistdisplay>
                 <name>Subspace shape</name>
         </parameter>
         
-        <parameter type="list" name="Edge mode" default="0.0" paramlist="0.0,0.35,0.60,1.0"
-                   paramlistdisplay="Hard,Fat,Normal,Skiny">
+        <parameter type="list" name="Edge mode" default="0.0" paramlist="0.0,0.35,0.60,1.0">
+                <paramlistdisplay>Hard,Fat,Normal,Skiny</paramlistdisplay>
                 <name>Edge mode</name>
         </parameter>
         
-        <parameter type="list" name="Operation" default="0.0" paramlist="0.0,0.3,0.5,0.7,1.0"
-                   paramlistdisplay="Write on clear, Max, Min, Add, Subtract">
+        <parameter type="list" name="Operation" default="0.0" paramlist="0.0,0.3,0.5,0.7,1.0">
+                <paramlistdisplay>Write on clear,Max,Min,Add,Substract</paramlistdisplay>
                 <name>Operation</name>
         </parameter>
         

diff --git a/src/effectstackedit.cpp b/src/effectstackedit.cpp
index 360c62f1d03c172ffd07a8d54539ca2b650091c9..5508271853bec7a8fdef68f0cf25b4a83c3c2ca1 100644 (file)
--- a/src/effectstackedit.cpp
+++ b/src/effectstackedit.cpp
@@ -260,7 +260,10 @@ void EffectStackEdit::transferParamDesc(const QDomElement d, int pos, int in, in
             Listval *lsval = new Listval;
             lsval->setupUi(toFillin);
             QStringList listitems = pa.attribute("paramlist").split(',');
-            QStringList listitemsdisplay = pa.attribute("paramlistdisplay").split(',');
+            QDomElement list = pa.firstChildElement("paramlistdisplay");
+            QStringList listitemsdisplay;
+            if (!list.isNull()) listitemsdisplay = i18n(list.text().toUtf8().data()).split(',');
+            else listitemsdisplay = i18n(pa.attribute("paramlistdisplay").toUtf8().data()).split(',');
             if (listitemsdisplay.count() != listitems.count())
                 listitemsdisplay = listitems;
             lsval->list->setIconSize(QSize(30, 30));