Commit c00846b0 authored by Vincent Pinon's avatar Vincent Pinon

Merge branch 'master' into frameworks

Conflicts:
	README
	src/mainwindow.cpp
	src/mainwindow.h
	src/project/dialogs/slideshowclip.cpp
	src/project/projectlist.cpp
parents abb3cacd bf8f6804
......@@ -2,12 +2,12 @@ project(Kdenlive)
# An odd patch version number means development version, while an even one means
# stable release. An additional number can be used for bugfix-only releases.
set(KDENLIVE_VERSION 0.9.99)
set(KDENLIVE_VERSION 15.03.80)
cmake_minimum_required(VERSION 2.8.12)
# Minimum versions of main dependencies.
set(MLT_MIN_MAJOR_VERSION 0)
set(MLT_MIN_MINOR_VERSION 8)
set(MLT_MIN_PATCH_VERSION 8)
set(MLT_MIN_MINOR_VERSION 9)
set(MLT_MIN_PATCH_VERSION 4)
set(MLT_MIN_VERSION ${MLT_MIN_MAJOR_VERSION}.${MLT_MIN_MINOR_VERSION}.${MLT_MIN_PATCH_VERSION})
set(QT_MIN_VERSION 5.2.0)
......
15.04
Changes:
* Port to KDE Frameworks 5
* Add ripple delete function
* Add stem audio export
* Make images sequences generation more convenient
* Save and restore title widget size
* Start some refactoring
* Fix warnings from compiler, static analyzers, execution...
Bug fix:
* #3407 don't copy clips if project is also on removable drive
* #3408 crash on selecting clip with grouped effects
* #3405 crash on adding 1st clip not matching project profile
* #3338 import clip keyframes
* #3160 Autosave new projects before saving
* #3415 FFmpeg recording freeze
0.9.10
Changes:
* handle VBR encoding profiles, and use it!
......
......@@ -2,7 +2,7 @@ About Kdenlive
==============
Kdenlive is a video editing application,
based on MLT Framework and KDE Platform 4.
based on MLT Framework and KDE Frameworks 5
Please check the project page for more information:
https://kdenlive.org
......
......@@ -5,4 +5,4 @@ frei0r.composition
frei0r.alphainjection
frei0r.blend
frei0r.xfade0r
webvfx
install(FILES
visible.png
novisible.png
DESTINATION ${DATA_INSTALL_DIR}/kdenlive/pics)
#TODO: add icon names
#ecm_install_icons( ${ICON_INSTALL_DIR} )
visible.png
novisible.png
DESTINATION ${DATA_INSTALL_DIR}/kdenlive/pics)
ecm_install_icons(ICONS
128-actions-kdenlive-select-all.png
128-mimetypes-application-x-kdenlivetitle.png
16-actions-kdenlive-add-clip.png
16-actions-kdenlive-add-color-clip.png
16-actions-kdenlive-add-slide-clip.png
16-actions-kdenlive-add-text-clip.png
16-actions-kdenlive-align-bottom.png
16-actions-kdenlive-align-hor.png
16-actions-kdenlive-align-left.png
16-actions-kdenlive-align-none.png
16-actions-kdenlive-align-right.png
16-actions-kdenlive-align-top.png
16-actions-kdenlive-align-vert.png
16-actions-kdenlive-custom-effect.png
16-actions-kdenlive-deleffect.png
16-actions-kdenlive-down.png
16-actions-kdenlive-hide-audio.png
16-actions-kdenlive-hide-video.png
16-actions-kdenlive-insert-edit.png
16-actions-kdenlive-insert-rect.png
16-actions-kdenlive-insert-unicode.png
16-actions-kdenlive-lock.png
16-actions-kdenlive-menu.png
16-actions-kdenlive-normal-edit.png
16-actions-kdenlive-object-height.png
16-actions-kdenlive-object-width.png
16-actions-kdenlive-overwrite-edit.png
16-actions-kdenlive-select-all.png
16-actions-kdenlive-select-images.png
16-actions-kdenlive-select-rects.png
16-actions-kdenlive-select-texts.png
16-actions-kdenlive-select-tool.png
16-actions-kdenlive-show-audio.png
16-actions-kdenlive-show-audiothumb.png
16-actions-kdenlive-show-markers.png
16-actions-kdenlive-show-video.png
16-actions-kdenlive-show-videothumb.png
16-actions-kdenlive-snap.png
16-actions-kdenlive-spacer-tool.png
16-actions-kdenlive-split-audio.png
16-actions-kdenlive-track_has_effect.png
16-actions-kdenlive-unlock.png
16-actions-kdenlive-unselect-all.png
16-actions-kdenlive-up.png
16-actions-kdenlive-zindex-bottom.png
16-actions-kdenlive-zindex-down.png
16-actions-kdenlive-zindex-top.png
16-actions-kdenlive-zindex-up.png
16-actions-kdenlive-zone-end.png
16-actions-kdenlive-zone-start.png
16-actions-kdenlive-zoom-large.png
16-actions-kdenlive-zoom-small.png
22-actions-kdenlive-select-all.png
22-actions-kdenlive-spacer-tool.png
32-actions-kdenlive-select-all.png
32-apps-kdenlive.png
32-mimetypes-application-x-kdenlivetitle.png
48-actions-kdenlive-select-all.png
48-apps-kdenlive.png
64-actions-kdenlive-select-all.png
64-apps-kdenlive.png
64-mimetypes-application-x-kdenlivetitle.png
sc-actions-kdenlive-align-none.svgz
sc-actions-kdenlive-insert-rect.svgz
sc-actions-kdenlive-insert-unicode.svgz
sc-actions-kdenlive-object-height.svgz
sc-actions-kdenlive-object-width.svgz
sc-actions-kdenlive-select-all.svgz
sc-actions-kdenlive-select-images.svgz
sc-actions-kdenlive-select-rects.svgz
sc-actions-kdenlive-select-texts.svgz
sc-actions-kdenlive-select-tool.svgz
sc-actions-kdenlive-spacer-tool.svgz
sc-actions-kdenlive-unselect-all.svgz
sc-actions-kdenlive-zindex-bottom.svgz
sc-actions-kdenlive-zindex-down.svgz
sc-actions-kdenlive-zindex-top.svgz
sc-actions-kdenlive-zindex-up.svgz
sc-actions-kdenlive-zone-end.svgz
sc-actions-kdenlive-zone-start.svgz
sc-mimetypes-application-x-kdenlive.svgz
sc-mimetypes-application-x-kdenlivetitle.svgz
sc-mimetypes-video-mlt-playlist.svgz
DESTINATION ${ICON_INSTALL_DIR})
#!/bin/bash
cp ox16-action-kdenlive-zindex-up.png hi16-action-kdenlive-zindex-up.png
cp oxsc-action-kdenlive-zindex-up.svgz hisc-action-kdenlive-zindex-up.svgz
cp ox16-action-kdenlive-zindex-down.png hi16-action-kdenlive-zindex-down.png
cp oxsc-action-kdenlive-zindex-down.svgz hisc-action-kdenlive-zindex-down.svgz
cp ox16-action-kdenlive-zindex-top.png hi16-action-kdenlive-zindex-top.png
cp oxsc-action-kdenlive-zindex-top.svgz hisc-action-kdenlive-zindex-top.svgz
cp ox16-action-kdenlive-zindex-bottom.png hi16-action-kdenlive-zindex-bottom.png
cp oxsc-action-kdenlive-zindex-bottom.svgz hisc-action-kdenlive-zindex-bottom.svgz
cp ox16-action-kdenlive-object-width.png hi16-action-kdenlive-object-width.png
cp oxsc-action-kdenlive-object-width.svgz hisc-action-kdenlive-object-width.svgz
cp ox16-action-kdenlive-object-height.png hi16-action-kdenlive-object-height.png
cp oxsc-action-kdenlive-object-height.svgz hisc-action-kdenlive-object-height.svgz
cp oxsc-action-kdenlive-insert-rect.svgz hisc-action-kdenlive-insert-rect.svgz
cp oxsc-action-kdenlive-select-rects.svgz hisc-action-kdenlive-select-rects.svgz
cp ox16-action-kdenlive-select-rects.png hi16-action-kdenlive-select-rects.png
cp oxsc-action-kdenlive-select-texts.svgz hisc-action-kdenlive-select-texts.svgz
cp oxsc-action-kdenlive-unselect-all.svgz hisc-action-kdenlive-unselect-all.svgz
cp oxsc-action-kdenlive-select-all.svgz hisc-action-kdenlive-select-all.svgz
cp ox16-action-kdenlive-unselect-all.png hi16-action-kdenlive-unselect-all.png
cp ox16-action-kdenlive-select-texts.png hi16-action-kdenlive-select-texts.png
cp ox16-action-kdenlive-select-images.png hi16-action-kdenlive-select-images.png
cp ox16-action-kdenlive-select-all.png hi16-action-kdenlive-select-all.png
\ No newline at end of file
<?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://web.resource.org/cc/"
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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
version="1.0"
width="158.97142"
height="158.97142"
id="svg2"
sodipodi:version="0.32"
inkscape:version="0.45.1"
sodipodi:docname="kdenlive_trans_down.svg"
sodipodi:docbase="/home/marco/Projekte/kdenlive-kde4/icons"
inkscape:output_extension="org.inkscape.output.svg.inkscape">
<metadata
id="metadata2214">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
</cc:Work>
</rdf:RDF>
</metadata>
<sodipodi:namedview
inkscape:window-height="586"
inkscape:window-width="797"
inkscape:pageshadow="2"
inkscape:pageopacity="0.0"
guidetolerance="10.0"
gridtolerance="10.0"
objecttolerance="10.0"
borderopacity="1.0"
bordercolor="#666666"
pagecolor="#ffffff"
id="base"
inkscape:zoom="2.5272207"
inkscape:cx="74.785714"
inkscape:cy="74.785711"
inkscape:window-x="429"
inkscape:window-y="50"
inkscape:current-layer="layer1"
showguides="true"
inkscape:guide-bbox="true" />
<defs
id="defs4">
<marker
refX="0"
refY="0"
orient="auto"
style="overflow:visible"
id="Arrow2Lstart">
<path
d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.97309,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
transform="matrix(1.1,0,0,1.1,1.1,0)"
style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
id="path4128" />
</marker>
</defs>
<g
id="layer1"
transform="translate(-77.059064,-175.41684)"
style="opacity:1">
<rect
width="148.57143"
height="148.57143"
rx="30"
ry="30"
x="82.259064"
y="180.61684"
style="opacity:1;fill:#ffffff;fill-opacity:0.52464791;fill-rule:nonzero;stroke:#000000;stroke-width:10.39999962;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:0;stroke-dasharray:none;stroke-opacity:1"
id="rect2160" />
<path
style="fill:#000000;fill-opacity:0.46830983;fill-rule:evenodd;stroke:#000000;stroke-width:1.28557682px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="M 128.44804,198.06575 L 175.72185,256.723 L 203.88498,232.0252 L 203.88498,313.32211 L 121.40725,313.32211 L 149.57038,285.53709 L 101.29074,222.76353 L 128.44804,198.06575 z "
id="path3198"
sodipodi:nodetypes="cccccccc" />
</g>
</svg>
<?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://web.resource.org/cc/"
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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
version="1.0"
width="158.97142"
height="158.97142"
id="svg2"
sodipodi:version="0.32"
inkscape:version="0.45.1"
sodipodi:docname="kdenlive_trans_up.svg"
sodipodi:docbase="/home/marco/Projekte/kdenlive-kde4/icons"
inkscape:output_extension="org.inkscape.output.svg.inkscape">
<metadata
id="metadata2214">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
</cc:Work>
</rdf:RDF>
</metadata>
<sodipodi:namedview
inkscape:window-height="586"
inkscape:window-width="797"
inkscape:pageshadow="2"
inkscape:pageopacity="0.0"
guidetolerance="10.0"
gridtolerance="10.0"
objecttolerance="10.0"
borderopacity="1.0"
bordercolor="#666666"
pagecolor="#ffffff"
id="base"
inkscape:zoom="2.5272207"
inkscape:cx="74.785714"
inkscape:cy="74.785711"
inkscape:window-x="429"
inkscape:window-y="50"
inkscape:current-layer="layer1"
showguides="true"
inkscape:guide-bbox="true" />
<defs
id="defs4">
<marker
refX="0"
refY="0"
orient="auto"
style="overflow:visible"
id="Arrow2Lstart">
<path
d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.97309,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
transform="matrix(1.1,0,0,1.1,1.1,0)"
style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
id="path4128" />
</marker>
</defs>
<g
id="layer1"
transform="translate(-77.059064,-175.41684)"
style="opacity:1">
<rect
width="148.57143"
height="148.57143"
rx="30"
ry="30"
x="82.259064"
y="180.61684"
style="opacity:1;fill:#ffffff;fill-opacity:0.52464791;fill-rule:nonzero;stroke:#000000;stroke-width:10.39999962;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:0;stroke-dasharray:none;stroke-opacity:1"
id="rect2160" />
<path
style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.28557682px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.46830985"
d="M 94.959675,279.83375 L 153.61693,232.55994 L 128.91913,204.39681 L 210.21604,204.39681 L 210.21604,286.87454 L 182.43102,258.71141 L 119.65746,306.99105 L 94.959675,279.83375 z "
id="path3198"
sodipodi:nodetypes="cccccccc" />
</g>
</svg>
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.