Merge branch 'master' into next

diff --git a/data/blacklisted_effects.txt b/data/blacklisted_effects.txt
index 53dc556f8bc9e81e0578ce1f5ecea980560c2f67..e7510c4225f36259095e53d2cbb4a629aa1e5ffd 100644 (file)
--- a/data/blacklisted_effects.txt
+++ b/data/blacklisted_effects.txt
@@ -38,6 +38,7 @@ frei0r.facedetect
 frei0r.facebl0r
 frei0r.flippo
 frei0r.glow
+frei0r.iirblur
 frei0r.hqdn3d
 frei0r.hueshift0r
 frei0r.lenscorrection

diff --git a/effects/CMakeLists.txt b/effects/CMakeLists.txt
index 0c7cd3ef3f07d94087d3483f0c11a3870efef87e..c32a199c40db763c8411a57844cceb496f412794 100644 (file)
--- a/effects/CMakeLists.txt
+++ b/effects/CMakeLists.txt
@@ -62,6 +62,7 @@ frei0r_flippo.xml
 frei0r_glow.xml
 frei0r_hqdn3d.xml
 frei0r_hueshift0r.xml
+frei0r_iirblur.xml
 frei0r_lenscorrection.xml
 frei0r_letterb0xed.xml
 frei0r_levels.xml

diff --git a/effects/frei0r_iirblur.xml b/effects/frei0r_iirblur.xml
new file mode 100644 (file)
index 0000000..f177508
--- /dev/null
+++ b/effects/frei0r_iirblur.xml
@@ -0,0 +1,23 @@
+<!DOCTYPE kpartgui>
+<effect tag="frei0r.IIRblur" id="frei0r.IIRblur">
+        <name>IIR Blur</name>
+        <description>Blur using 2D IIR filters</description>
+        <author>Marko Cebokli</author>
+        
+        <parameter type="simplekeyframe" name="Amount" default="40" min="0" max="1000" factor="1000">
+            <name>Amount</name>
+            <comment>Amount of blur</comment>
+        </parameter>
+        
+        <parameter type="list" name="Type" default="0.5" paramlist="0.0,0.5,0.999">
+            <paramlistdisplay>Exponential,Lowpass,Gaussian</paramlistdisplay>
+            <name>Type</name>
+            <comment>Select blurring algorithm</comment>
+        </parameter>
+
+        <parameter type="bool" name="Edge" default="1">
+            <name>Edge</name>
+            <comment>Enable edge compensation</comment>
+        </parameter>
+
+</effect>
\ No newline at end of file

diff --git a/git-workflow.svg b/git-workflow.svg
new file mode 100644 (file)
index 0000000..73b2465
--- /dev/null
+++ b/git-workflow.svg
@@ -0,0 +1,560 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="1400"
+   height="800"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.1 r9760"
+   sodipodi:docname="git-workflow.svg"
+   inkscape:export-filename="/tmp/kdenlive-git-workflow.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4">
+    <marker
+       inkscape:stockid="Arrow2Lend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Lend"
+       style="overflow:visible">
+      <path
+         id="path3935"
+         style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="matrix(-1.1,0,0,-1.1,-1.1,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Mend"
+       style="overflow:visible">
+      <path
+         id="path3941"
+         style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="scale(-0.6,-0.6)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Lend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Lend-9"
+       style="overflow:visible">
+      <path
+         id="path3935-3"
+         style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="matrix(-1.1,0,0,-1.1,-1.1,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="1"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.70710678"
+     inkscape:cx="774.51484"
+     inkscape:cy="378.04332"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1366"
+     inkscape:window-height="709"
+     inkscape:window-x="-3"
+     inkscape:window-y="-3"
+     inkscape:window-maximized="1"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-nodes="false"
+     inkscape:snap-global="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     showguides="false"
+     inkscape:guide-bbox="true"
+     inkscape:bbox-paths="true">
+    <sodipodi:guide
+       orientation="1,0"
+       position="350.72496,666.09459"
+       id="guide5235" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="412.95036,332.34019"
+       id="guide5237" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="779,274"
+       id="guide5239" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="1004,542"
+       id="guide5245" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="940.45202,657.60931"
+       id="guide3244" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(325.2691,253.92633)">
+    <rect
+       style="color:#000000;fill:#6c87d6;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect2985"
+       width="162"
+       height="72"
+       x="-789.76361"
+       y="-244.63782" />
+    <g
+       id="g3850"
+       transform="translate(20.681252,9.4129353)">
+      <use
+         height="1052.3622"
+         width="744.09448"
+         transform="translate(646.46509,470.75735)"
+         id="use3816"
+         xlink:href="#g3811"
+         y="0"
+         x="0" />
+      <text
+         sodipodi:linespacing="125%"
+         id="text2991"
+         y="278.65509"
+         x="94"
+         style="font-size:30px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+         xml:space="preserve"><tspan
+           y="278.65509"
+           x="94"
+           id="tspan2993"
+           sodipodi:role="line">Release</tspan></text>
+    </g>
+    <g
+       id="g3791"
+       transform="translate(-181.31874,-86.712769)">
+      <use
+         x="0"
+         y="0"
+         xlink:href="#rect2985"
+         id="use2995"
+         transform="translate(1058.7636,292)"
+         width="744.09448"
+         height="1052.3622" />
+      <text
+         sodipodi:linespacing="125%"
+         id="text2997"
+         y="99.362183"
+         x="296"
+         style="font-size:30px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+         xml:space="preserve"><tspan
+           y="99.362183"
+           x="296"
+           id="tspan2999"
+           sodipodi:role="line">Master</tspan></text>
+    </g>
+    <g
+       id="g3845"
+       transform="translate(15.730902,-2.5870447)">
+      <use
+         height="1052.3622"
+         width="744.09448"
+         transform="translate(1017.4651,482.75736)"
+         id="use3843"
+         xlink:href="#g3811"
+         y="0"
+         x="0" />
+      <text
+         sodipodi:linespacing="125%"
+         id="text3005"
+         y="289.24088"
+         x="461"
+         style="font-size:30px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+         xml:space="preserve"><tspan
+           y="289.24088"
+           x="461"
+           id="tspan3007"
+           sodipodi:role="line">Feature</tspan></text>
+    </g>
+    <g
+       id="g3781"
+       transform="translate(416.7309,-297.58704)">
+      <use
+         height="1052.3622"
+         width="744.09448"
+         transform="translate(826.76364,502)"
+         id="use3001"
+         xlink:href="#rect2985"
+         y="0"
+         x="0" />
+      <text
+         sodipodi:linespacing="125%"
+         id="text3009"
+         y="309.36218"
+         x="77"
+         style="font-size:30px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+         xml:space="preserve"><tspan
+           y="309.36218"
+           x="77"
+           id="tspan3011"
+           sodipodi:role="line">Next</tspan></text>
+    </g>
+    <g
+       id="g3811"
+       transform="translate(-791.14841,-65.171573)">
+      <rect
+         style="color:#000000;fill:#ebeef8;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect3805"
+         width="162"
+         height="72"
+         x="236.68333"
+         y="-162.2236" />
+      <rect
+         y="-170.2236"
+         x="224.68333"
+         height="72"
+         width="162"
+         id="rect3807"
+         style="color:#000000;fill:#b5c2e6;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <rect
+         style="color:#000000;fill:#6c87d6;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect3809"
+         width="162"
+         height="72"
+         x="211.68333"
+         y="-177.2236" />
+    </g>
+    <text
+       xml:space="preserve"
+       style="font-size:24px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:end;text-decoration:none;line-height:125%;letter-spacing:0px;word-spacing:0px;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:end;baseline-shift:baseline;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+       x="25.45586"
+       y="-40.224854"
+       id="text3874"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan3876"
+         x="25.45586"
+         y="-40.224854">Keep stable</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:24px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:0px;word-spacing:0px;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+       x="678.7309"
+       y="-40.224854"
+       id="text3878"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan3880"
+         x="678.7309"
+         y="-40.224854">Testing branch</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:24px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:0px;word-spacing:0px;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+       x="678.7309"
+       y="237.77515"
+       id="text3882"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan3884"
+         x="678.7309"
+         y="237.77515">Experimental features</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:24px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:end;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:end;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+       x="25.45586"
+       y="237.77515"
+       id="text3886"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan3888"
+         x="25.45586"
+         y="237.77515">Bugfix branches</tspan></text>
+    <path
+       style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Lend)"
+       d="m 160.13708,65.079645 0,141.421365"
+       id="path3909"
+       inkscape:connector-curvature="0" />
+    <text
+       xml:space="preserve"
+       style="font-size:16px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:end;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:end;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+       x="87.681259"
+       y="118.6328"
+       id="text4541"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan4543"
+         x="92.775009"
+         y="118.6328">Branch a tagged release </tspan><tspan
+         sodipodi:role="line"
+         x="87.681259"
+         y="138.6328"
+         id="tspan5179">for working on urgent fixes</tspan></text>
+    <path
+       style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Lend)"
+       d="m 539.28845,217.81471 0,-154.149285"
+       id="path4545"
+       inkscape:connector-curvature="0" />
+    <text
+       xml:space="preserve"
+       style="font-size:16px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:0px;word-spacing:0px;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+       x="615.18292"
+       y="118.6328"
+       id="text4731"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan4733"
+         x="615.18292"
+         y="118.6328">New features and bugfixes </tspan><tspan
+         sodipodi:role="line"
+         x="615.18292"
+         y="138.6328"
+         id="tspan5229">ready for testing</tspan></text>
+    <path
+       style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 428.12193,-2.6015947 z"
+       id="path4773"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Lend)"
+       d="m 426.70772,-14.622415 -154.14928,0"
+       id="path4775"
+       inkscape:connector-curvature="0" />
+    <text
+       xml:space="preserve"
+       style="font-size:16px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+       x="289.52899"
+       y="-28.057436"
+       id="text4961"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan4963"
+         x="289.52899"
+         y="-28.057436">Stable features</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:16px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:end;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:end;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+       x="25.45586"
+       y="-5.6674438"
+       id="text4965"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan4967"
+         x="30.54961"
+         y="-5.6674438">Trivial bugfixes and features </tspan><tspan
+         sodipodi:role="line"
+         x="25.45586"
+         y="14.332556"
+         id="tspan3242">are done here</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:16px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+       x="314.27774"
+       y="30.632429"
+       id="text5155"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan5157"
+         x="314.27774"
+         y="30.632429">Updates</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:16px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+       x="678.7309"
+       y="266.05316"
+       id="text5159"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan5161"
+         x="678.7309"
+         y="266.05316">Can be local or public</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:16px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+       x="678.7309"
+       y="-9.317338"
+       id="text5163"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         x="678.7309"
+         y="-9.317338"
+         id="tspan5167">Branch that is more or less stable</tspan><tspan
+         sodipodi:role="line"
+         x="678.7309"
+         y="10.682662"
+         id="tspan5259">with the newest features</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:36px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#484848;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+       x="-280.72137"
+       y="-116.26205"
+       id="text5171"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan5173"
+         x="-280.72137"
+         y="-116.26205">Kdenlive’s git workflow</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:16px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+       x="-750.03271"
+       y="-269.9263"
+       id="text5175"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan5177"
+         x="-750.03271"
+         y="-269.9263">Originals of the clones in the drawing</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:16px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:end;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:end;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+       x="25.45586"
+       y="270.67548"
+       id="text5181"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan5183"
+         x="25.45586"
+         y="270.67548">Urgent bugfixes are done here</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:16px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:end;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:end;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+       x="25.45586"
+       y="41.56461"
+       id="text5231"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan5233"
+         x="25.45586"
+         y="41.56461">Releases are tagged</tspan></text>
+    <path
+       inkscape:connector-curvature="0"
+       id="path5247"
+       d="m 271.73042,5.8836853 154.14928,0"
+       style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Lend)" />
+    <text
+       sodipodi:linespacing="125%"
+       id="text5249"
+       y="294.68268"
+       x="678.7309"
+       style="font-size:16px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+       xml:space="preserve"><tspan
+         id="tspan5253"
+         y="294.68268"
+         x="678.7309"
+         sodipodi:role="line">Normal development goes on here only</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:16px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+       x="678.7309"
+       y="324.26544"
+       id="text3179"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan3181"
+         x="678.7309"
+         y="324.26544">For new features and non-trivial bugfixes</tspan></text>
+    <text
+       sodipodi:linespacing="125%"
+       id="text3183"
+       y="298.95975"
+       x="25.45586"
+       style="font-size:16px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:end;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:end;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+       xml:space="preserve"><tspan
+         y="298.95975"
+         x="25.45586"
+         id="tspan3185"
+         sodipodi:role="line">(No need to create a new branch</tspan><tspan
+         y="318.95975"
+         x="25.45586"
+         sodipodi:role="line"
+         id="tspan3187">if no urgent bugfixes)</tspan></text>
+    <path
+       inkscape:connector-curvature="0"
+       id="path3189"
+       d="m 189.83556,207.32903 0,-141.421365"
+       style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Lend)" />
+    <text
+       sodipodi:linespacing="125%"
+       id="text3191"
+       y="118.6328"
+       x="207.04877"
+       style="font-size:16px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:0px;word-spacing:0px;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+       xml:space="preserve"><tspan
+         id="tspan3195"
+         y="118.6328"
+         x="207.04877"
+         sodipodi:role="line">Bugfixes</tspan></text>
+    <path
+       style="color:#000000;fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;marker-end:url(#Arrow2Lend);visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="M 274.35745,59.807513 425.6783,211.12836"
+       id="path3201"
+       inkscape:connector-curvature="0" />
+    <text
+       xml:space="preserve"
+       style="font-size:16px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+       x="215.48257"
+       y="-171.13846"
+       id="text3226"
+       sodipodi:linespacing="125%"
+       transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,0,0)"><tspan
+         sodipodi:role="line"
+         id="tspan3228"
+         x="215.48257"
+         y="-171.13846">Changes affecting development</tspan></text>
+    <text
+       sodipodi:linespacing="125%"
+       id="text3230"
+       y="404.93527"
+       x="26.639454"
+       style="font-size:24px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:end;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:end;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+       xml:space="preserve"><tspan
+         y="404.93527"
+         x="26.639454"
+         id="tspan3232"
+         sodipodi:role="line">Notes</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:16px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+       x="87.681259"
+       y="405.27512"
+       id="text3234"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan3236"
+         x="87.681259"
+         y="405.27512">When a new feature is implemented, its branch is first merged to Next. When the feature is regarded as stable,</tspan><tspan
+         sodipodi:role="line"
+         x="87.681259"
+         y="425.27512"
+         id="tspan3238">the feature branch is merged directly into Master.</tspan></text>
+  </g>
+</svg>

diff --git a/src/definitions.h b/src/definitions.h
index 1a3a255769ca9f47a027050d24c3c213173eb6f7..f37a36335e2de6e6f35c919ed3ac65ee24c64589 100644 (file)
--- a/src/definitions.h
+++ b/src/definitions.h
@@ -97,6 +97,22 @@ struct MltVideoProfile {
     int display_aspect_num;
     int display_aspect_den;
     int colorspace;
+    bool operator==(const MltVideoProfile& point) const
+    {
+        if (!description.isEmpty() && point.description  == description) return true;
+        return      point.frame_rate_num == frame_rate_num &&
+                    point.frame_rate_den  == frame_rate_den  &&
+                    point.width == width &&
+                    point.height == height &&
+                    point.progressive == progressive &&
+                    point.sample_aspect_num == sample_aspect_num &&
+                    point.sample_aspect_den == sample_aspect_den &&
+                    point.display_aspect_den == display_aspect_den &&
+                    point.colorspace == colorspace;
+    }
+    bool operator!=(const MltVideoProfile &other) const {
+        return !(*this == other);
+    }
 };
 
 

diff --git a/src/kdenlive.desktop b/src/kdenlive.desktop
index bc8ab644e20cabbc76b423d0e7b233cfa67dc3bf..c290f22b8ecd2cf383983d8d6a899d11c622ae21 100644 (file)
--- a/src/kdenlive.desktop
+++ b/src/kdenlive.desktop
@@ -12,6 +12,7 @@ Name[sv]=Kdenlive
 Name[uk]=Kdenlive
 Name[x-test]=xxKdenlivexx
 Name[zh_CN]=Kdenlive
+Name[zh_TW]=Kdenlive
 GenericName=Video Editor
 GenericName[cs]=Editor videí
 GenericName[da]=Videoredigering
@@ -23,6 +24,7 @@ GenericName[sv]=Videoeditor
 GenericName[uk]=Відеоредактор
 GenericName[x-test]=xxVideo Editorxx
 GenericName[zh_CN]=视频编辑器
+GenericName[zh_TW]=影像編輯器
 Comment=Nonlinear video editor for KDE
 Comment[da]=Ikke-lineær videoredigering til KDE
 Comment[de]=Nichtlinearer Video-Editor für KDE
@@ -33,6 +35,7 @@ Comment[sv]=Icke-linjär videoeditor för KDE
 Comment[uk]=Нелінійний редактор відео для KDE
 Comment[x-test]=xxNonlinear video editor for KDExx
 Comment[zh_CN]=KDE 的非线性视频编辑器
+Comment[zh_TW]=KDE 上的非線性影像編輯器
 Type=Application
 Exec=kdenlive %i -caption "%c" %u
 Icon=kdenlive

diff --git a/src/kdenlive.notifyrc b/src/kdenlive.notifyrc
index 77965154a7067d0c1c26cf23a6b09c814d99a143..188ddcd56cbdf0a54c3a95fd3981d0bf065e8f1c 100644 (file)
--- a/src/kdenlive.notifyrc
+++ b/src/kdenlive.notifyrc
@@ -12,6 +12,7 @@ Comment[sv]=Kdenlive
 Comment[uk]=Kdenlive
 Comment[x-test]=xxKdenlivexx
 Comment[zh_CN]=Kdenlive
+Comment[zh_TW]=Kdenlive
 
 [Event/RenderFinished]
 Name=Rendering finished
@@ -24,6 +25,7 @@ Name[sv]=Framställning klar
 Name[uk]=Обробку завершено
 Name[x-test]=xxRendering finishedxx
 Name[zh_CN]=渲染结束
+Name[zh_TW]=已完成導出
 Comment=Rendering is over
 Comment[cs]=Renderování je hotové
 Comment[da]=Renderingen er slut
@@ -34,6 +36,7 @@ Comment[sv]=Framställning är gjord
 Comment[uk]=Виконання обробки завершено
 Comment[x-test]=xxRendering is overxx
 Comment[zh_CN]=渲染结束
+Comment[zh_TW]=導出已結束
 Action=Popup
 
 [Event/RenderStarted]
@@ -47,6 +50,7 @@ Name[sv]=Framställning startad
 Name[uk]=Обробку розпочато
 Name[x-test]=xxRendering startedxx
 Name[zh_CN]=渲染开始
+Name[zh_TW]=導出已開始
 Comment=Rendering was started
 Comment[cs]=Renderování bylo začato
 Comment[da]=Renderingen blev startet
@@ -57,6 +61,7 @@ Comment[sv]=Framställning har startats
 Comment[uk]=Було розпочато обробку
 Comment[x-test]=xxRendering was startedxx
 Comment[zh_CN]=渲染开始
+Comment[zh_TW]=導出已開始
 Action=Popup
 
 [Event/FrameCaptured]
@@ -69,6 +74,7 @@ Name[sv]=Ram lagrad
 Name[uk]=Захоплено кадр
 Name[x-test]=xxFrame capturedxx
 Name[zh_CN]=已抓取帧
+Name[zh_TW]=影格已擷取
 Comment=A frame was captured to disk
 Comment[da]=Et billed blev indfanget til disken
 Comment[nl]=Een frame is op schijf opgenomen
@@ -78,6 +84,7 @@ Comment[sv]=En ram har lagrats på disk
 Comment[uk]=Було захоплено кадр, програма зберегла його на диску
 Comment[x-test]=xxA frame was captured to diskxx
 Comment[zh_CN]=一帧图像已被抓取到磁盘
+Comment[zh_TW]=已擷取一個影格到磁碟中
 Sound=KDE-Sys-App-Message.ogg
 Action=Sound
 
@@ -91,6 +98,7 @@ Name[sv]=Klar att lagra
 Name[uk]=Приготовано до захоплення
 Name[x-test]=xxReady to capturexx
 Name[zh_CN]=准备抓取
+Name[zh_TW]=準備擷取
 Sound=KDE-Sys-App-Positive.ogg
 Action=Sound
 
@@ -107,6 +115,7 @@ Name[sv]=Fel
 Name[uk]=Помилка
 Name[x-test]=xxErrorxx
 Name[zh_CN]=错误
+Name[zh_TW]=錯誤
 Comment=An error occurred in Kdenlive
 Comment[da]=En fejl opstod i Kdenlive
 Comment[de]=Es ist ein Fehler in Kdenlive aufgetreten
@@ -117,5 +126,6 @@ Comment[sv]=Ett fel uppstod i Kdenlive
 Comment[uk]=У коді Kdenlive сталася помилка
 Comment[x-test]=xxAn error occurred in Kdenlivexx
 Comment[zh_CN]=Kdenlive 发生了一个错误
+Comment[zh_TW]=Kdenlive 中發生錯誤
 Sound=KDE-Sys-Warning.ogg
 Action=Sound

diff --git a/src/kdenlivesettings.kcfg b/src/kdenlivesettings.kcfg
index a2a3cb871f401f41c39f3598eb7691b7ee2d8015..4abadc83ca3f479b4928674486ab30e43ed3d209 100644 (file)
--- a/src/kdenlivesettings.kcfg
+++ b/src/kdenlivesettings.kcfg
@@ -591,6 +591,11 @@
       <label>Show ratings in project tree view.</label>
       <default>false</default>
     </entry>
+    
+    <entry name="showdatecolumn" type="Bool">
+      <label>Show dates in project tree view.</label>
+      <default>false</default>
+    </entry>
 
     <entry name="frametimecode" type="Bool">
       <label>Show timecodes as frame number instead of hh:mm:ss:ff.</label>

diff --git a/src/kdenliveui.rc b/src/kdenliveui.rc
index ba3cede3d27a9134b3549407c8198ac0e77f5a40..0a350be99db311c9aaa1e5c16fa9f080d3efe7d4 100644 (file)
--- a/src/kdenliveui.rc
+++ b/src/kdenliveui.rc
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<gui name="kdenlive" version="64">
+<gui name="kdenlive" version="65">
   <ToolBar name="extraToolBar" >
     <text>Extra Toolbar</text>
        <Action name="project_render" />

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index a3250118bc21c98042ec4d459582a9be0e721ea6..53fb77bb249deba922601e416e587b1fb36de53f 100644 (file)
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -2355,7 +2355,9 @@ void MainWindow::slotRenderProject()
 {
     if (!m_renderWidget) {
         QString projectfolder = m_activeDocument ? m_activeDocument->projectFolder().path(KUrl::AddTrailingSlash) : KdenliveSettings::defaultprojectfolder();
-        m_renderWidget = new RenderWidget(projectfolder, m_projectList->useProxy(), this);
+        MltVideoProfile profile;
+        if (m_activeDocument) profile = m_activeDocument->mltProfile();
+        m_renderWidget = new RenderWidget(projectfolder, m_projectList->useProxy(), profile, this);
         connect(m_renderWidget, SIGNAL(shutdown()), this, SLOT(slotShutdown()));
         connect(m_renderWidget, SIGNAL(selectedRenderProfile(QMap <QString, QString>)), this, SLOT(slotSetDocumentRenderProfile(QMap <QString, QString>)));
         connect(m_renderWidget, SIGNAL(prepareRenderingData(bool, bool, const QString&)), this, SLOT(slotPrepareRendering(bool, bool, const QString&)));

diff --git a/src/projectlist.cpp b/src/projectlist.cpp
index 6b6b8f3fcbfec7055e5a2b9cbcbe90d062bd5a40..d28a11892ea6b104212ebf2176ea0589c3594131 100644 (file)
--- a/src/projectlist.cpp
+++ b/src/projectlist.cpp
@@ -1143,6 +1143,13 @@ void ProjectList::slotAddClip(DocClipBase *clip, bool getProperties)
         item->setText(2, QString::number(f.rating()));
     }
 #endif
+
+    // Add info to date column
+    QFileInfo fileInfo(url.path());
+    if (fileInfo.exists()) {
+       item->setText(3, fileInfo.lastModified().toString(QString("yyyy/MM/dd hh:mm:ss")));
+    }
+
     // Add cut zones
     QList <CutZoneInfo> cuts = clip->cutZones();
     if (!cuts.isEmpty()) {

diff --git a/src/projectlistview.cpp b/src/projectlistview.cpp
index 450670368024aabb093cec7b639ef13620d981ee..e08fd4b743bfba42f63893c90c6e6526bae1478d 100644 (file)
--- a/src/projectlistview.cpp
+++ b/src/projectlistview.cpp
@@ -55,9 +55,9 @@ ProjectListView::ProjectListView(QWidget *parent) :
 
     setStyleSheet(style);
 
-    setColumnCount(3);
+    setColumnCount(4);
     QStringList headers;
-    headers << i18n("Clip") << i18n("Description") << i18n("Rating");
+    headers << i18n("Clip") << i18n("Description") << i18n("Rating") << i18n("Date");
     setHeaderLabels(headers);
     setIndentation(12);
     
@@ -75,6 +75,7 @@ ProjectListView::ProjectListView(QWidget *parent) :
     installEventFilter(this);
     if (!KdenliveSettings::showdescriptioncolumn()) hideColumn(1);
     if (!KdenliveSettings::showratingcolumn()) hideColumn(2);
+    if (!KdenliveSettings::showdatecolumn()) hideColumn(3);
 }
 
 ProjectListView::~ProjectListView()
@@ -113,6 +114,9 @@ void ProjectListView::configureColumns(const QPoint& pos)
         case 2:
             KdenliveSettings::setShowratingcolumn(show);
             break;
+        case 3:
+            KdenliveSettings::setShowdatecolumn(show);
+            break;
         default:
             break;
         }

diff --git a/src/renderwidget.cpp b/src/renderwidget.cpp
index 121a1d8bcd038212debc99a367e532b41dd57ce2..24132878933ba613eae9e7e05b3e4bbedc613049 100644 (file)
--- a/src/renderwidget.cpp
+++ b/src/renderwidget.cpp
@@ -66,9 +66,10 @@ const int RUNNINGJOB = 1;
 const int FINISHEDJOB = 2;
 
 
-RenderWidget::RenderWidget(const QString &projectfolder, bool enableProxy, QWidget * parent) :
+RenderWidget::RenderWidget(const QString &projectfolder, bool enableProxy, MltVideoProfile profile, QWidget * parent) :
         QDialog(parent),
         m_projectFolder(projectfolder),
+        m_profile(profile),
         m_blockProcessing(false)
 {
     m_view.setupUi(this);
@@ -1057,7 +1058,6 @@ int RenderWidget::waitingJobsCount() const
 
 void RenderWidget::setProfile(MltVideoProfile profile)
 {
-    m_profile = profile;
     m_view.scanning_list->setCurrentIndex(0);
     m_view.rescale_width->setValue(KdenliveSettings::defaultrescalewidth());
     if (!m_view.rescale_keep->isChecked()) {
@@ -1065,7 +1065,10 @@ void RenderWidget::setProfile(MltVideoProfile profile)
         m_view.rescale_height->setValue(KdenliveSettings::defaultrescaleheight());
         m_view.rescale_height->blockSignals(false);
     }
-    refreshView();
+    if (m_profile != profile) {
+        m_profile = profile;
+        refreshView();
+    }
 }
 
 void RenderWidget::refreshCategory()
@@ -1244,10 +1247,14 @@ void RenderWidget::refreshView()
     m_view.size_list->setVisible(m_view.size_list->count() > 1 || m_view.format_list->count() <= 1);
     m_view.size_list->blockSignals(false);
     m_view.format_list->blockSignals(false);
-    if (m_view.size_list->count() > 0)
+    if (m_view.size_list->count() > 0) {
         refreshParams();
-    else
+    }
+    else {
+        // No matching profile
+        errorMessage(i18n("No matching profile"));
         m_view.advanced_params->clear();
+    }
 }
 
 KUrl RenderWidget::filenameWithExtension(KUrl url, QString extension)
@@ -1278,6 +1285,7 @@ void RenderWidget::refreshParams()
     // Format not available (e.g. codec not installed); Disable start button
     QListWidgetItem *item = m_view.size_list->currentItem();
     if (!item || item->isHidden()) {
+        if (!item) errorMessage(i18n("No matching profile"));
         m_view.advanced_params->clear();
         m_view.buttonRender->setEnabled(false);
         m_view.buttonGenerateScript->setEnabled(false);

diff --git a/src/renderwidget.h b/src/renderwidget.h
index b6137b181d88f17c53db5786249b9e591134b372..ea9b122a10bb32217077c48c880b4c8669dce238 100644 (file)
--- a/src/renderwidget.h
+++ b/src/renderwidget.h
@@ -114,7 +114,7 @@ class RenderWidget : public QDialog
     Q_OBJECT
 
 public:
-    explicit RenderWidget(const QString &projectfolder, bool enableProxy, QWidget * parent = 0);
+    explicit RenderWidget(const QString &projectfolder, bool enableProxy, MltVideoProfile profile, QWidget * parent = 0);
     virtual ~RenderWidget();
     void setGuides(QDomElement guidesxml, double duration);
     void focusFirstVisibleItem();
@@ -181,8 +181,8 @@ private slots:
 
 private:
     Ui::RenderWidget_UI m_view;
-    MltVideoProfile m_profile;
     QString m_projectFolder;
+    MltVideoProfile m_profile;
     RenderViewDelegate *m_scriptsDelegate;
     RenderViewDelegate *m_jobsDelegate;
     bool m_blockProcessing;

diff --git a/thumbnailer/westleypreview.desktop b/thumbnailer/westleypreview.desktop
index a871f02feb2abe187f14c75847fc1046fb5d3577..c86461f117f64392f7794024205085221f42b77e 100644 (file)
--- a/thumbnailer/westleypreview.desktop
+++ b/thumbnailer/westleypreview.desktop
@@ -11,6 +11,7 @@ Name[sv]=MLT-spellista
 Name[uk]=Список відтворення MLT
 Name[x-test]=xxMLT Playlistxx
 Name[zh_CN]=MLT 播放列表
+Name[zh_TW]=MLT 播放清單
 X-KDE-ServiceTypes=ThumbCreator
 CacheThumbnail=true
 IgnoreMaximumSize=true