0.5 version, add bigger warning if MLT version is not recent enough

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

CMakeLists.txt

@@ -0,0 +1,2 @@
+SUBDIRS(kdenlive renderer graphics profiles pgm icons doc po)
+

Makefile.am

@@ -1,14 +1,4 @@
-####### kdevelop will overwrite this part!!! (begin)##########
-
-SUBDIRS = kdenlive po doc icons graphics profiles
-
-EXTRA_DIST = kdenlive.kdevprj admin AUTHORS COPYING ChangeLog INSTALL README TODO kdenlive.lsm kdenlive.spec 
-
-####### kdevelop will overwrite this part!!! (end)############
-# not a GNU package. You can remove this line, if 
-# have all needed files, that a GNU package needs
-AUTOMAKE_OPTIONS = foreign 
-POFILES=AUTO
+SUBDIRS = $(TOPSUBDIRS)
 
 $(top_srcdir)/configure.in: configure.in.in $(top_srcdir)/subdirs
 	cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common configure.in ;
@@ -21,16 +11,20 @@ $(top_srcdir)/acinclude.m4: $(top_srcdir)/admin/acinclude.m4.in $(top_srcdir)/ad
 
 MAINTAINERCLEANFILES = subdirs configure.in acinclude.m4 configure.files 
 
-# Create kdenlive.pot file
-# messages: 
-#	$(XGETTEXT) kdenlive/*.cpp -L C++    -o po/kdenlive.pot
-#	$(XGETTEXT) kdenlive/*.ui  -L C++ -j -o po/kdenlive.pot
+messages: rc.cpp
+	$(EXTRACTRC) kdenlive/*.rc >> kdenlive/rc.cpp
+	$(XGETTEXT) kdenlive/*.cpp -L C++    -o po/kdenlive.pot
+	$(XGETTEXT) kdenlive/*.ui  -L C++ -j -o po/kdenlive.pot
 
-# Update .po language files
 package-messages:
-	$(MAKE) -C po merge
 	
+	cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common package-messages
+
+package-merge:
+	cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common package-merge POFILES=po/*.po PACKAGE=po/kdenlive
+
+EXTRA_DIST = admin %{LICENSEFILE} configure.in.in
+
 dist-hook:
 	cd $(top_distdir) && perl admin/am_edit -padmin
 	cd $(top_distdir) && $(MAKE) -f admin/Makefile.common subdirs
-

NEWS

@@ -0,0 +1,3 @@
+This file is required by the build system
+
+version 0.3: Porting to MLT

configure.in.in

@@ -1,17 +1,8 @@
-#MIN_CONFIG(3.2)
-
-AM_INIT_AUTOMAKE(kdenlive,0.3)
-
-dnl CXXFLAGS="$NOOPT_CXXFLAGS" dnl __kdevelop[noopt]__
-dnl CFLAGS="$NOOPT_CFLAGS" dnl __kdevelop[noopt]__
-dnl CXXFLAGS="$CXXFLAGS $USE_EXCEPTIONS" dnl __kdevelop[exc]__
-
-CXXFLAGS="$CXXFLAGS $KDE_DEFAULT_CXXFLAGS"
-
-dnl KDE_NEED_FLEX dnl __kdevelop__
-dnl AC_PROG_YACC dnl __kdevelop__
-
+#MIN_CONFIG(3.2.0)
 
+AM_INIT_AUTOMAKE(kdenlive, 0.5)
+AC_C_BIGENDIAN
+AC_CHECK_KDEMAXPATHLEN
 
 KDE_FIND_PATH(mlt-config, MLT_CONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin], [
 	AC_MSG_WARN([Could not find mlt-config anywhere, check http://mlt.sourceforge.net/])
@@ -21,7 +12,7 @@ KDE_FIND_PATH(mlt-config, MLT_CONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/loc
 if test -n "$MLT_CONFIG"; 
 then
 	vers=`$MLT_CONFIG --version 2>/dev/null | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
-	if test -n "$vers" && test "$vers" -ge 0001001 
+	if test -n "$vers" && test "$vers" -ge 0002004 
 	then
 		LIBMLT_LIBS="`$MLT_CONFIG --libs`"
 
@@ -36,8 +27,19 @@ then
 
 		LIBMLT_RPATH=`echo $LIBMLT_RPATH | sed -e "s/-L/-R/g"`
 		LIBMLT_CFLAGS="`$MLT_CONFIG --cflags`"
+
+		MLT_PATH=`mlt-config --prefix`
+		CXXFLAGS="$CXXFLAGS -DMLT_PREFIX=\\\"\"$MLT_PATH\"\\\""
 	else
-		AC_MSG_WARN([You need at least mlt 0.1.1])	
+		AC_MSG_WARN([                                    ])
+		AC_MSG_WARN([************************************])
+		AC_MSG_WARN([*  WARNING: You need MLT >= 0.2.4  *])
+		AC_MSG_WARN([*  Please update your MLT version  *])
+		AC_MSG_WARN([*  from: http://mltframework.org.  *])
+		AC_MSG_WARN([*  Kdenlive will NOT work properly *])
+		AC_MSG_WARN([*  without an updated MLT version  *])
+		AC_MSG_WARN([************************************])
+		AC_MSG_WARN([                                    ])
 		HELP_SUBDIR=
 	fi
 fi	

debian/rules

@@ -1,20 +1,23 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
 
-# Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
+NCPUS := $(shell getconf _NPROCESSORS_ONLN 2>/dev/null || echo 1)
+
+ifeq ($(NCPUS),-1)
+        NCPUS:=1
+endif
+
+ifeq ($(NCPUS),0)
+        NCPUS:=1
+endif
+
+CC:=ccache $(CC)
+CXX:=ccache $(CXX)
+
 
 CFLAGS = -Wall -g
 
@@ -26,19 +29,15 @@ endif
 
 config.status: configure
 	dh_testdir
-	# Add here commands to configure the package.
-	CFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
 
+	CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) \
+	--build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --disable-rpath
 
 build: build-stamp
-
-build-stamp:  config.status
+build-stamp: config.status
 	dh_testdir
 
-	# Add here commands to compile the package.
-	#$(MAKE)
-	unsermake
-	#docbook-to-man debian/kdenlive.sgml > kdenlive.1
+	$(MAKE) -j $(NCPUS)
 
 	touch build-stamp
 
@@ -47,28 +46,22 @@ clean:
 	dh_testroot
 	rm -f build-stamp 
 
-	# Add here commands to clean up after the build process.
-	-$(MAKE) distclean
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
-	cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
-	cp -f /usr/share/misc/config.guess config.guess
-endif
+	[ ! -f Makefile ] || $(MAKE) distclean
 
-
-	dh_clean 
+	dh_clean po/*gmo
 
 install: build
 	dh_testdir
 	dh_testroot
 	dh_clean -k 
-	dh_installdirs
+	dh_installdirs usr/share/doc/kde
 
-	# Add here commands to install the package into debian/kdenlive.
-	#$(MAKE) install DESTDIR=$(CURDIR)/debian/kdenlive
-	unsermake install PREFIX=$(CURDIR)/debian/kdenlive/usr
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/kdenlive
 
+	mv debian/kdenlive/usr/share/doc/HTML debian/kdenlive/usr/share/doc/kde
+
+# Prune empty directories
+	find debian -type d | xargs rmdir -p --ignore-fail-on-non-empty
 
 # Build architecture-independent files here.
 binary-indep: build install
@@ -80,25 +73,11 @@ binary-arch: build install
 	dh_testroot
 	dh_installchangelogs ChangeLog
 	dh_installdocs
-	dh_installexamples
-#	dh_install
-#	dh_installmenu
-#	dh_installdebconf	
-#	dh_installlogrotate
-#	dh_installemacsen
-#	dh_installpam
-#	dh_installmime
-#	dh_installinit
-#	dh_installcron
-#	dh_installinfo
 	dh_installman
 	dh_link
 	dh_strip
 	dh_compress
 	dh_fixperms
-#	dh_perl
-#	dh_python
-#	dh_makeshlibs
 	dh_installdeb
 	dh_shlibdeps
 	dh_gencontrol
@@ -106,4 +85,4 @@ binary-arch: build install
 	dh_builddeb
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install 
+.PHONY: build clean binary-indep binary-arch binary install 

doc/CMakeLists.txt

@@ -0,0 +1 @@
+SUBDIRS(de)

graphics/CMakeLists.txt

@@ -0,0 +1 @@
+INSTALL (FILES norenderer.png kdenlive-splash.png music.png lighten.png darken.png DESTINATION share/apps/kdenlive/graphics)

graphics/Makefile.am

@@ -1,2 +1,3 @@
 kdenlivedir = $(kde_datadir)/kdenlive/graphics/
-kdenlive_DATA = norenderer.png kdenlive-splash.png music.png
+kdenlive_DATA = darken.png grid.png kdenlive-splash.png lighten.png music.png \
+	norenderer.png

icons/CMakeLists.txt

@@ -0,0 +1 @@
+SUBDIRS(hicolor)

icons/hicolor/22x22/CMakeLists.txt

@@ -0,0 +1 @@
+SUBDIRS(actions)

icons/hicolor/22x22/actions/CMakeLists.txt

@@ -0,0 +1,12 @@
+FILE(GLOB _icons *.png)
+FOREACH(_current_ICON ${_icons})
+    STRING(REGEX REPLACE "^.*/[a-zA-Z]+([0-9]+)\\-([a-z]+)\\-(.+\\.png)$" "\\1" _size  "${_current_ICON}")
+    STRING(REGEX REPLACE "^.*/[a-zA-Z]+([0-9]+)\\-([a-z]+)\\-(.+\\.png)$" "\\2" _group "${_current_ICON}")
+    STRING(REGEX REPLACE "^.*/[a-zA-Z]+([0-9]+)\\-([a-z]+)\\-(.+\\.png)$" "\\3" _name  "${_current_ICON}")
+    INSTALL (FILES ${_current_ICON} DESTINATION share/apps/kdenlive/icons/hicolor/${_size}x${_size}/actions RENAME ${_name})
+ENDFOREACH(_current_ICON)
+
+
+
+
+

icons/hicolor/32x32/CMakeLists.txt

@@ -0,0 +1 @@
+SUBDIRS(actions)

icons/hicolor/32x32/actions/CMakeLists.txt

@@ -0,0 +1,7 @@
+FILE(GLOB _icons *.png)
+FOREACH(_current_ICON ${_icons})
+    STRING(REGEX REPLACE "^.*/[a-zA-Z]+([0-9]+)\\-([a-z]+)\\-(.+\\.png)$" "\\1" _size  "${_current_ICON}")
+    STRING(REGEX REPLACE "^.*/[a-zA-Z]+([0-9]+)\\-([a-z]+)\\-(.+\\.png)$" "\\2" _group "${_current_ICON}")
+    STRING(REGEX REPLACE "^.*/[a-zA-Z]+([0-9]+)\\-([a-z]+)\\-(.+\\.png)$" "\\3" _name  "${_current_ICON}")
+    INSTALL (FILES ${_current_ICON} DESTINATION share/apps/kdenlive/icons/hicolor/${_size}x${_size}/actions RENAME ${_name})
+ENDFOREACH(_current_ICON)

icons/hicolor/32x32/actions/Makefile.am

@@ -1,10 +1,10 @@
 ####### kdevelop will overwrite this part!!! (begin)##########
 
-EXTRA_DIST = hi32-action-moveresize.png hi32-action-razor.png hi32-action-marker.png hi32-action-snaptoborder.png hi32-action-snaptoframe.png hi32-action-snaptomarker.png hi32-action-spacer.png hi32-action-loadlayout1.png hi32-action-loadlayout2.png hi32-action-loadlayout3.png hi32-action-loadlayout4.png hi32-action-exportvideo.png 
+EXTRA_DIST = hi32-action-moveresize.png hi32-action-razor.png hi32-action-marker.png hi32-action-snaptoborder.png hi32-action-snaptoframe.png hi32-action-snaptomarker.png hi32-action-spacer.png hi32-action-loadlayout1.png hi32-action-loadlayout2.png hi32-action-loadlayout3.png hi32-action-loadlayout4.png hi32-action-exportvideo.png hi32-action-title_rect.png hi32-action-title_text.png hi32-action-rolltool.png hi32-action-selecttool.png hi32-action-moveresize.png
 
 
 ####### kdevelop will overwrite this part!!! (end)############
 
 
 kdenliveiconsdir = $(kde_datadir)/kdenlive/icons
-kdenliveicons_ICON = AUTO
+kdenliveicons_ICON = AUTO

icons/hicolor/CMakeLists.txt

@@ -0,0 +1,2 @@
+KDE3_INSTALL_ICONS(hicolor)
+SUBDIRS(32x32 22x22)

icons/hicolor/Makefile.am

@@ -8,4 +8,17 @@ EXTRA_DIST = hi16-app-kdenlive.png hi32-app-kdenlive.png hi48-app-kdenlive.png h
 ####### kdevelop will overwrite this part!!! (end)############
 
 
-KDE_ICON = AUTO
+KDE_ICON = AUTO
+kde_icon_KDEICON = hi16-action-kdenlive_add_clip.png \
+	hi16-action-kdenlive_audiothumbs.png hi16-action-kdenlive_audiothumbsoff.png \
+	hi16-action-kdenlive_create_color.png hi16-action-kdenlive_create_image.png \
+	hi16-action-kdenlive_create_slide.png hi16-action-kdenlive_create_text.png hi16-action-kdenlive_delclip.png \
+	hi16-action-kdenlive_effects.png hi16-action-kdenlive_effectsoff.png hi16-action-kdenlive_guide.png \
+	hi16-action-kdenlive_markdown.png hi16-action-kdenlive_markup.png hi16-action-kdenlive_pause.png \
+	hi16-action-kdenlive_play.png hi16-action-kdenlive_thumbs.png hi16-action-kdenlive_thumbsoff.png \
+	hi16-action-kdenlive_trans_down.png hi16-action-kdenlive_trans_pip.png hi16-action-kdenlive_trans_up.png \
+	hi16-action-kdenlive_trans_wiped.png hi16-action-kdenlive_trans_wipel.png \
+	hi16-action-kdenlive_trans_wiper.png hi16-action-kdenlive_trans_wipeu.png \
+	hi16-action-kdenlive_transitionsoff.png hi22-action-kdenlive_new_clip.png hi22-action-razor_cursor.png \
+	hi22-action-resize_left_cursor.png hi22-action-resize_right_cursor.png hi32-action-hcenter.png \
+	hi32-action-vcenter.png

kdenlive/CMakeLists.txt

@@ -0,0 +1,349 @@
+EXECUTE_PROCESS(COMMAND kde-config --prefix
+OUTPUT_VARIABLE ENV{KDEDIR})
+#MESSAGE(STATUS "ist:" ${TTT})
+#SET (ENV{KDEDIR} /usr/kde/3.5) 
+
+FIND_PACKAGE( KDE3 REQUIRED)
+
+KDE3_AUTOMOC(capturemonitor.cpp configureprojectdialog.cpp)
+
+SET ( SRC_FILES
+avfilelist.cpp
+aviconviewitem.cpp
+avlistviewitem.cpp
+clipdrag.cpp
+clipmanager.cpp
+clipproperties.cpp
+clippropertiesdialog.cpp
+capturemonitor.cpp
+configureprojectdialog.cpp
+createslideshowclip.cpp
+displayaudiodesc.cpp
+displayvideodesc.cpp
+docclipavfile.cpp
+docclipbase.cpp
+docclipbaselist.cpp
+docclipproject.cpp
+docclipref.cpp
+docclipreflist.cpp
+doccliptextfile.cpp
+docclipvirtual.cpp
+docsubclip.cpp
+doctrackbase.cpp
+doctrackbaselist.cpp
+doctrackclipiterator.cpp
+doctrackdecorator.cpp
+doctracksound.cpp
+doctrackvideo.cpp
+documentbasenode.cpp
+documentclipnode.cpp
+documentgroupnode.cpp
+documentmacrocommands.cpp
+dynamicToolTip.cpp
+effectcomplexkeyframe.cpp
+effect.cpp
+effectdesc.cpp
+effectdescriptionlist.cpp
+effectdoublekeyframe.cpp
+effectdrag.cpp
+effectkeyframe.cpp
+effectlistdialog.cpp
+effectparamcomplexdesc.cpp
+effectparamdesc.cpp
+effectparamdescfactory.cpp
+effectparamdialog.cpp
+effectparamdoubledesc.cpp
+effectparameter.cpp
+effectstack.cpp
+effectstackdialog.cpp
+effectstacklistview.cpp
+exportdvddialog.cpp
+exportwidget.cpp
+flatbutton.cpp
+gentime.cpp
+initeffects.cpp
+kaddavfilecommand.cpp
+kaddclipcommand.cpp
+kaddeffectcommand.cpp
+kaddmarkercommand.cpp
+kaddrefclipcommand.cpp
+kaddtransitioncommand.cpp
+kclipplacer.cpp
+kdenlive.cpp
+kdenlivedoc.cpp
+kdenlivesetupdlg.cpp
+kdenlivesplash.cpp
+keditclipcommand.cpp
+keditmarkercommand.cpp
+kfixedruler.cpp
+kmmclipkeyframepanel.cpp
+kmmeditpanel.cpp
+kmmmonitor.cpp
+kmmrecpanel.cpp
+kmmrulerpanel.cpp
+kmmscreen.cpp
+kmmtimeline.cpp
+kmmtrackkeyframepanel.cpp
+kmmtrackpanel.cpp
+kmmtracksoundpanel.cpp
+kmmtrackvideopanel.cpp
+kmonitor.cpp
+kmoveclipscommand.cpp
+kplacer.cpp
+krender.cpp
+krendermanager.cpp
+kresizecommand.cpp
+krollcommand.cpp
+kruler.cpp
+krulermodel.cpp
+krulersliderbase.cpp
+krulertimemodel.cpp
+kscalableruler.cpp
+kselectclipcommand.cpp
+kthumb.cpp
+ktimeline.cpp
+ktrackpanel.cpp
+ktrackplacer.cpp
+ktrackview.cpp
+listviewtagsearch.cpp
+loadprojectfilter.cpp
+loadprojectkinofilter.cpp
+loadprojectnativefilter.cpp
+main.cpp
+monitormanager.cpp
+newproject.cpp
+newstuff.cpp
+projectformatmanager.cpp
+projecticonview.cpp
+projectlist.cpp
+projectlistview.cpp
+rangelist.cpp
+saveprojectfilter.cpp
+saveprojectnativefilter.cpp
+saveprojectscenelistfilter.cpp
+snaptogrid.cpp
+timecode.cpp
+titlewidget.cpp
+trackpanelclipmovefunction.cpp
+trackpanelclipresizefunction.cpp
+trackpanelcliprollfunction.cpp
+trackpanelclipslipfunction.cpp
+trackpanelfunction.cpp
+trackpanelfunctionfactory.cpp
+trackpanelkeyframefunction.cpp
+trackpanelmarkerfunction.cpp
+trackpanelrazorfunction.cpp
+trackpanelselectnonefunction.cpp
+trackpanelspacerfunction.cpp
+trackpaneltransitionmovefunction.cpp
+trackpaneltransitionresizefunction.cpp
+trackviewaudiobackgrounddecorator.cpp
+trackviewbackgrounddecorator.cpp
+trackviewdecorator.cpp
+trackviewdoublekeyframedecorator.cpp
+trackviewmarkerdecorator.cpp
+trackviewnamedecorator.cpp
+trackviewtransitiondecorator.cpp
+trackviewvideobackgrounddecorator.cpp
+transition.cpp
+transitiondialog.cpp
+transitionpipwidget.cpp
+transitionstack.cpp
+transitionwipewidget.cpp
+)
+KDE3_ADD_UI_FILES(SRC_UI
+addmarker_ui.ui
+addtrackdialog_ui.ui
+clipproperties_ui.ui
+configcapture_ui.ui
+confighard_ui.ui
+configinterface_ui.ui
+configmisc_ui.ui
+configproject_ui.ui
+configtimeline_ui.ui
+configtitler_ui.ui
+configureproject_ui.ui
+createcolorclip_ui.ui
+createimageclip_ui.ui
+createslideshowclip_ui.ui
+editencoder_ui.ui
+editmetadata_ui.ui
+effectstackdialog_ui.ui
+exportbasewidget_ui.ui
+exportdvd_ui.ui
+firstrun_ui.ui
+kmmeditpanel_ui.ui
+kmmrecpanel_ui.ui
+kmmrulerpanel_ui.ui
+loadprogress_ui.ui
+newproject_ui.ui
+projectview_ui.ui
+titlebasewidget_ui.ui
+trackheader_ui.ui
+transitionaudiofade_ui.ui
+transitioncrossfade_ui.ui
+transitionlumafile_ui.ui
+transitionpip_ui.ui
+transitionwipe_ui.ui
+)
+KDE3_ADD_KCFG_FILES(SRC_KCFG kdenlivesettings.kcfgc)
+
+KDE3_ADD_MOC_FILES( SRC_MOC 
+
+avfile.h
+avfilelist.h
+aviconviewitem.h
+avlistviewitem.h
+capturemonitor.h
+clipdrag.h
+clipmanager.h
+clippropertiesdialog.h
+clipproperties.h
+configureprojectdialog.h
+createslideshowclip.h
+definitions.h
+displayaudiodesc.h
+displayvideodesc.h
+docclipavfile.h
+docclipbase.h
+docclipbaselist.h
+docclipproject.h
+docclipref.h
+docclipreflist.h
+doccliptextfile.h
+docclipvirtual.h
+docsubclip.h
+doctrackbase.h
+doctrackbaselist.h
+doctrackclipiterator.h
+doctrackdecorator.h
+doctracksound.h
+doctrackvideo.h
+documentbasenode.h
+documentclipnode.h
+documentgroupnode.h
+documentmacrocommands.h
+dynamicToolTip.h
+effectcomplexkeyframe.h
+effectdesc.h
+effectdescriptionlist.h
+effectdoublekeyframe.h
+effectdrag.h
+effect.h
+effectkeyframe.h
+effectlistdialog.h
+effectparamcomplexdesc.h
+effectparamdescfactory.h
+effectparamdesc.h
+effectparamdialog.h
+effectparamdoubledesc.h
+effectparameter.h
+effectstackdialog.h
+effectstack.h
+effectstacklistview.h
+exportdvddialog.h
+exportwidget.h
+flatbutton.h
+gentime.h
+initeffects.h
+kaddavfilecommand.h
+kaddclipcommand.h
+kaddeffectcommand.h
+kaddmarkercommand.h
+kaddrefclipcommand.h
+kaddtransitioncommand.h
+kclipplacer.h
+kdenlivedoc.h
+kdenlive.h
+kdenlivesetupdlg.h
+kdenlivesplash.h
+keditclipcommand.h
+keditmarkercommand.h
+kfixedruler.h
+kmmclipkeyframepanel.h
+kmmeditpanel.h
+kmmmonitor.h
+kmmrecpanel.h
+kmmrulerpanel.h
+kmmscreen.h
+kmmtrackkeyframepanel.h
+kmmtrackpanel.h
+kmmtracksoundpanel.h
+kmmtrackvideopanel.h
+kmonitor.h
+kmoveclipscommand.h
+kplacer.h
+krender.h
+krendermanager.h
+kresizecommand.h
+krollcommand.h
+kruler.h
+krulermodel.h
+krulersliderbase.h
+krulertimemodel.h
+kscalableruler.h
+kselectclipcommand.h
+kthumb.h
+ktimeline.h
+ktrackpanel.h
+ktrackplacer.h
+ktrackview.h
+listviewtagsearch.h
+loadprojectfilter.h
+loadprojectkinofilter.h
+loadprojectnativefilter.h
+monitormanager.h
+newproject.h
+newstuff.h
+projectformatmanager.h
+projecticonview.h
+projectlist.h
+projectlistview.h
+rangelist.h
+saveprojectfilter.h
+saveprojectnativefilter.h
+saveprojectscenelistfilter.h
+snaptogrid.h
+timecode.h
+titlewidget.h
+trackpanelclipmovefunction.h
+trackpanelclipresizefunction.h
+trackpanelcliprollfunction.h
+trackpanelclipslipfunction.h
+trackpanelfunctionfactory.h
+trackpanelfunction.h
+trackpanelkeyframefunction.h
+trackpanelmarkerfunction.h
+trackpanelrazorfunction.h
+trackpanelselectnonefunction.h
+trackpanelspacerfunction.h
+trackpaneltransitionmovefunction.h
+trackpaneltransitionresizefunction.h
+trackviewaudiobackgrounddecorator.h
+trackviewbackgrounddecorator.h
+trackviewdecorator.h
+trackviewdoublekeyframedecorator.h
+trackviewmarkerdecorator.h
+trackviewnamedecorator.h
+trackviewtransitiondecorator.h
+trackviewvideobackgrounddecorator.h
+transitiondialog.h
+transition.h
+transitionpipwidget.h
+transitionstack.h
+transitionwipewidget.h
+)
+
+ADD_DEFINITIONS ( ${QT_DEFINITIONS} -DVERSION=\\"0.5\\" -D__STDC_CONSTANT_MACROS)
+INCLUDE_DIRECTORIES(. ${KDE3_INCLUDE_DIR} ${QT_INCLUDE_DIR} /usr/include/mlt /usr/include/mlt++ )
+LINK_DIRECTORIES( ${KDE3_LIB_DIR} ) 
+ADD_EXECUTABLE(kdenlive ${SRC_FILES} ${SRC_MOC} ${SRC_UI} ${SRC_KCFG} )
+TARGET_LINK_LIBRARIES(kdenlive ${QT_LIBRARIES} kio kdeui mlt++ kdecore knewstuff)
+
+INSTALL (PROGRAMS kdenlive DESTINATION ${CMAKE_INSTALL_PREFIX}/bin )
+INSTALL (FILES kdenlive.kcfg DESTINATION share/config.cfg)
+INSTALL (FILES kdenliveui.rc eventsrc DESTINATION share/apps/kdenlive)
+INSTALL (FILES eventsrc DESTINATION share/applications/kde)
+INSTALL (FILES vnd.kde.kdenlive.desktop vnd.kde.kdenlive.scenelist.desktop DESTINATION share/mimelnk/application)
+
+INSTALL (FILES kdenlive.desktop DESTINATION share/applnk/Multimedia)

kdenlive/Makefile.am

@@ -10,59 +10,64 @@ if ENABLE_FIREWIRE
 LIB_FIREWIRE = -liec61883
 endif
 
-kdenlive_SOURCES = avfileformatdesc.cpp avfileformatwidget.cpp avfilelist.cpp \
-		avformatdescbase.cpp avformatdescbool.cpp avformatdesccodec.cpp avformatdesccodeclist.cpp \
-		avformatdesccontainer.cpp avformatdesclist.cpp avformatwidgetbase.cpp avformatwidgetbool.cpp \
-		avformatwidgetcodec.cpp avformatwidgetcodeclist.cpp avformatwidgetcontainer.cpp \
-		avformatwidgetlist.cpp avlistviewitem.cpp clipdrag.cpp clippropertiesdialog.cpp \
-		displayaudiodesc.cpp displayvideodesc.cpp docclipavfile.cpp docclipbase.cpp \
-		docclipbaselist.cpp docclipproject.cpp doctrackbase.cpp doctrackbaselist.cpp \
-		doctrackclipiterator.cpp doctracksound.cpp doctrackvideo.cpp effect.cpp effectdesc.cpp \
-		effectlistdialog.cpp effectparamdialog.cpp exportdialog.cpp gentime.cpp kaddclipcommand.cpp \
-		kdenlive.cpp kdenlivedoc.cpp kdenlivesetupdlg.cpp kdenlivesplash.cpp kfixedruler.cpp \
-		kmmeditpanel.cpp kmmmonitor.cpp kmmrulerpanel.cpp kmmscreen.cpp \
-		kmmtrackkeyframepanel.cpp kmmtrackpanel.cpp kmmtracksoundpanel.cpp kmmtrackvideopanel.cpp \
-		kmoveclipscommand.cpp krender.cpp krendermanager.cpp kresizecommand.cpp kruler.cpp \
-		krulermodel.cpp krulersliderbase.cpp krulertimemodel.cpp kscalableruler.cpp \
-		kselectclipcommand.cpp main.cpp monitormanager.cpp projectlist.cpp projectlistview.cpp \
-		rangelist.cpp snaptogrid.cpp trackpanelclipmovefunction.cpp \
-		trackpanelclipresizefunction.cpp trackpanelfunction.cpp trackpanelrazorfunction.cpp \
-		trackpanelspacerfunction.cpp addtrackdialog_ui.ui kmmeditpanel_ui.ui kmmrulerpanel_ui.ui \
-		docclipref.cpp docclipreflist.cpp clipmanager.cpp documentclipnode.cpp \
-		documentgroupnode.cpp documentbasenode.cpp docsubclip.cpp kaddrefclipcommand.cpp \
-		configureproject_ui.ui configureproject.cpp configureprojectdialog.cpp exportconfig.cpp \
-		trackpanelmarkerfunction.cpp trackviewdecorator.cpp trackviewbackgrounddecorator.cpp \
-		trackviewvideobackgrounddecorator.cpp trackviewaudiobackgrounddecorator.cpp trackviewnamedecorator.cpp \
-		trackviewmarkerdecorator.cpp kaddmarkercommand.cpp saveprojectfilter.cpp saveprojectnativefilter.cpp \
-		loadprojectfilter.cpp loadprojectnativefilter.cpp projectformatmanager.cpp \
-		loadprojectkinofilter.cpp timecode.cpp ktimeline.cpp kmmtimeline.cpp ktrackview.cpp \
-		documentmacrocommands.cpp saveprojectscenelistfilter.cpp trackpanelfunctionfactory.cpp \
-		trackpanelselectnonefunction.cpp effectkeyframe.cpp effectdoublekeyframe.cpp effectparamdesc.cpp \
-		effectparamdoubledesc.cpp effectparameter.cpp effectparamdescfactory.cpp doctrackdecorator.cpp \
-		ktrackpanel.cpp ktrackclippanel.cpp trackviewdoublekeyframedecorator.cpp \
-		effectstack.cpp effectstackdialog_ui.ui effectstackdialog.cpp effectdrag.cpp \
-		kaddeffectcommand.cpp effectdescriptionlist.cpp effectstacklistview.cpp \
-		trackpanelclipslipfunction.cpp ktrackplacer.cpp kplacer.cpp kclipplacer.cpp kmmclipkeyframepanel.cpp \
-		trackpanelcliprollfunction.cpp krollcommand.cpp dynamicToolTip.cpp kmonitor.cpp capturemonitor.cpp \
-		configinterface_ui.ui configtimeline_ui.ui kdenlivesettings.kcfgc trackheader_ui.ui \
-		projectview_ui.ui createcolorclip_ui.ui createimageclip_ui.ui keditclipcommand.cpp \
-		keditclipcommand.h trackpanelkeyframefunction.cpp trackpanelkeyframefunction.h \
-		effectparamcomplexdesc.cpp effectparamcomplexdesc.h effectcomplexkeyframe.cpp \
-		effectcomplexkeyframe.h transition.cpp transition.h transitionstack.cpp transitionstack.h \
-		trackviewtransitiondecorator.cpp trackviewtransitiondecorator.h doccliptextfile.cpp doccliptextfile.h \
-		titlebasewidget_ui.ui titlewidget.cpp titlewidget.h kthumb.cpp kthumb.h \
-		trackpaneltransitionmovefunction.cpp trackpaneltransitionmovefunction.h \
-		trackpaneltransitionresizefunction.cpp trackpaneltransitionresizefunction.h transitiondialog.cpp \
-		transitiondialog.h transitioncrossfade_ui.ui transitionwipe_ui.ui configproject_ui.ui \
-		flatbutton.cpp flatbutton.h clipproperties_ui.ui clipproperties.cpp clipproperties.h \
-		transitionpip_ui.ui transitionpipwidget.cpp exportbasewidget_ui.ui exportwidget.cpp \
-		exportwidget.h configmisc_ui.ui
+kdenlive_SOURCES = addmarker_ui.ui addtrackdialog_ui.ui avfilelist.cpp \
+	aviconviewitem.cpp aviconviewitem.h avlistviewitem.cpp capturemonitor.cpp clipdrag.cpp \
+	clipmanager.cpp clipproperties.cpp clipproperties.h clipproperties_ui.ui \
+	clippropertiesdialog.cpp configcapture_ui.ui confighard_ui.ui configinterface_ui.ui \
+	configmisc_ui.ui configproject_ui.ui configtimeline_ui.ui configtitler_ui.ui \
+	configureproject_ui.ui configureprojectdialog.cpp createcolorclip_ui.ui createimageclip_ui.ui \
+	createslideshowclip.cpp createslideshowclip.h createslideshowclip_ui.ui definitions.h \
+	displayaudiodesc.cpp displayvideodesc.cpp docclipavfile.cpp docclipbase.cpp \
+	docclipbaselist.cpp docclipproject.cpp docclipref.cpp docclipreflist.cpp \
+	doccliptextfile.cpp doccliptextfile.h docclipvirtual.cpp docclipvirtual.h docsubclip.cpp \
+	doctrackbase.cpp doctrackbaselist.cpp doctrackclipiterator.cpp doctrackdecorator.cpp \
+	doctracksound.cpp doctrackvideo.cpp documentbasenode.cpp documentclipnode.cpp \
+	documentgroupnode.cpp documentmacrocommands.cpp dynamicToolTip.cpp editencoder_ui.ui \
+	editmetadata_ui.ui effect.cpp effectcomplexkeyframe.cpp effectcomplexkeyframe.h \
+	effectdesc.cpp effectdescriptionlist.cpp effectdoublekeyframe.cpp effectdrag.cpp \
+	effectkeyframe.cpp effectlistdialog.cpp effectparamcomplexdesc.cpp \
+	effectparamcomplexdesc.h effectparamdesc.cpp effectparamdescfactory.cpp effectparamdialog.cpp \
+	effectparamdoubledesc.cpp effectparameter.cpp effectstack.cpp effectstackdialog.cpp \
+	effectstackdialog_ui.ui effectstacklistview.cpp exportbasewidget_ui.ui exportdvd_ui.ui \
+	exportdvddialog.cpp exportdvddialog.h exportwidget.cpp exportwidget.h firstrun_ui.ui \
+	flatbutton.cpp flatbutton.h gentime.cpp initeffects.cpp initeffects.h \
+	kaddclipcommand.cpp kaddeffectcommand.cpp kaddmarkercommand.cpp kaddrefclipcommand.cpp \
+	kaddtransitioncommand.cpp kaddtransitioncommand.h kclipplacer.cpp kdenlive.cpp kdenlivedoc.cpp \
+	kdenlivesettings.kcfgc kdenlivesetupdlg.cpp kdenlivesplash.cpp keditclipcommand.cpp \
+	keditclipcommand.h keditmarkercommand.cpp keditmarkercommand.h kfixedruler.cpp \
+	kmmclipkeyframepanel.cpp kmmeditpanel.cpp kmmeditpanel_ui.ui kmmmonitor.cpp kmmrecpanel.cpp \
+	kmmrecpanel.h kmmrecpanel_ui.ui kmmrulerpanel.cpp kmmrulerpanel_ui.ui kmmscreen.cpp \
+	kmmtimeline.cpp kmmtrackkeyframepanel.cpp kmmtrackpanel.cpp kmmtracksoundpanel.cpp \
+	kmmtrackvideopanel.cpp kmonitor.cpp kmoveclipscommand.cpp kplacer.cpp krender.cpp \
+	krendermanager.cpp kresizecommand.cpp krollcommand.cpp kruler.cpp krulermodel.cpp \
+	krulersliderbase.cpp krulertimemodel.cpp kscalableruler.cpp kselectclipcommand.cpp \
+	kthumb.cpp kthumb.h ktimeline.cpp ktrackpanel.cpp ktrackplacer.cpp ktrackview.cpp \
+	listviewtagsearch.cpp listviewtagsearch.h \
+	loadprogress_ui.ui loadprojectfilter.cpp loadprojectkinofilter.cpp \
+	loadprojectnativefilter.cpp main.cpp monitormanager.cpp newproject.cpp newproject_ui.ui \
+	newstuff.cpp newstuff.h projectformatmanager.cpp projecticonview.cpp \
+	projecticonview.h projectlist.cpp projectlistview.cpp projectview_ui.ui rangelist.cpp \
+	saveprojectfilter.cpp saveprojectnativefilter.cpp saveprojectscenelistfilter.cpp \
+	snaptogrid.cpp timecode.cpp titlebasewidget_ui.ui titlewidget.cpp titlewidget.h \
+	trackheader_ui.ui trackpanelclipmovefunction.cpp trackpanelclipresizefunction.cpp \
+	trackpanelcliprollfunction.cpp trackpanelclipslipfunction.cpp trackpanelfunction.cpp \
+	trackpanelfunctionfactory.cpp trackpanelkeyframefunction.cpp trackpanelkeyframefunction.h \
+	trackpanelmarkerfunction.cpp trackpanelrazorfunction.cpp trackpanelselectnonefunction.cpp \
+	trackpanelspacerfunction.cpp trackpaneltransitionmovefunction.cpp trackpaneltransitionmovefunction.h \
+	trackpaneltransitionresizefunction.cpp trackpaneltransitionresizefunction.h \
+	trackviewaudiobackgrounddecorator.cpp trackviewbackgrounddecorator.cpp trackviewdecorator.cpp \
+	trackviewdoublekeyframedecorator.cpp trackviewmarkerdecorator.cpp trackviewnamedecorator.cpp \
+	trackviewtransitiondecorator.cpp trackviewtransitiondecorator.h trackviewvideobackgrounddecorator.cpp \
+	transition.cpp transition.h transitionaudiofade_ui.ui transitioncrossfade_ui.ui \
+	transitiondialog.cpp transitiondialog.h transitionlumafile_ui.ui transitionpip_ui.ui \
+	transitionpipwidget.cpp transitionstack.cpp transitionstack.h transitionwipe_ui.ui \
+	transitionwipewidget.cpp transitionwipewidget.h
 
-kdenlive_LDADD   =  $(LIB_KFILE) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) \ 
-		    $(LIBSOCKET) $(LIB_FIREWIRE)
+kdenlive_LDADD   =  $(LIB_KFILE) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) \
+		    $(LIBSOCKET) $(LIB_FIREWIRE) $(LIB_KNEWSTUFF)
 
 
-EXTRA_DIST = $(mime_DATA) main.cpp kdenlive.cpp kdenlive.h kdenlivedoc.cpp kdenlivedoc.h kdenliveui.rc kdenlive.desktop avlistviewitem.cpp doctrackbase.cpp doctracksound.cpp doctrackvideo.cpp kmmmonitor.cpp kmmscreen.cpp kmmtimeline.cpp projectlist.cpp avlistviewitem.h doctrackbase.h doctracksound.h doctrackvideo.h kmmmonitor.h kmmscreen.h kmmtimeline.h projectlist.h clipdrag.cpp clipdrag.h kmmtrackvideopanel.cpp kmmtrackvideopanel.h kmmtracksoundpanel.cpp kmmtracksoundpanel.h docclipavfile.cpp docclipavfile.h docclipbase.cpp docclipbase.h docclipproject.cpp docclipproject.h projectlistview.cpp projectlistview.h kruler.cpp kruler.h kfixedruler.cpp kfixedruler.h krulermodel.cpp krulermodel.h kscalableruler.cpp kscalableruler.h krulersliderbase.cpp krulersliderbase.h krulertimemodel.cpp krulertimemodel.h kmmtrackpanel.cpp kmmtrackpanel.h kmmtimelinetrackview.cpp kmmtimelinetrackview.h docclipbaselist.cpp docclipbaselist.h kmmeditpanel_ui.ui kmmeditpanel.cpp kmmeditpanel.h kmmrulerpanel.cpp kmmrulerpanel.h kmmrulerpanel_ui.ui gentime.cpp gentime.h avfilelist.cpp avfilelist.h doctrackbaselist.cpp doctrackbaselist.h krender.cpp krender.h doctrackclipiterator.cpp doctrackclipiterator.h kmmtrackkeyframepanel.cpp kmmtrackkeyframepanel.h rangelist.cpp rangelist.h kmoveclipscommand.cpp kmoveclipscommand.h kselectclipcommand.cpp kselectclipcommand.h kaddclipcommand.cpp kaddclipcommand.h kresizecommand.cpp kresizecommand.h kdenlivesetupdlg.cpp kdenlivesetupdlg.h krendermanager.cpp krendermanager.h exportdialog.cpp exportdialog.h avfileformatdesc.cpp avfileformatdesc.h avformatdescbase.cpp avformatdescbase.h avformatdescbool.cpp avformatdescbool.h avformatdesclist.cpp avformatdesclist.h avformatwidgetbase.cpp avformatwidgetbase.h avformatwidgetbool.cpp avformatwidgetbool.h avformatwidgetlist.cpp avformatwidgetlist.h avformatdesccontainer.cpp avformatdesccontainer.h avformatwidgetcontainer.cpp avformatwidgetcontainer.h avfileformatwidget.cpp avfileformatwidget.h avformatdesccodeclist.cpp avformatdesccodeclist.h avformatwidgetcodeclist.cpp avformatwidgetcodeclist.h avformatdesccodec.cpp avformatdesccodec.h avformatwidgetcodec.cpp avformatwidgetcodec.h effectlistdialog.cpp effectlistdialog.h effectparamdialog.cpp effectparamdialog.h effectdesc.cpp effectdesc.h displayvideodesc.cpp displayvideodesc.h displayaudiodesc.cpp displayaudiodesc.h effect.cpp effect.h clippropertiesdialog.cpp clippropertiesdialog.h kdenlivesplash.cpp kdenlivesplash.h monitormanager.cpp monitormanager.h docclipref.cpp docclipref.h docclipreflist.cpp docclipreflist.h clipmanager.cpp clipmanager.h documentbasenode.cpp documentbasenode.h documentclipnode.cpp documentclipnode.h documentgroupnode.cpp documentgroupnode.h docsubclip.h docsubclip.cpp trackpanelclipslipfunction.cpp trackpanelclipslipfunction.h
+EXTRA_DIST = $(mime_DATA) main.cpp kdenlive.cpp kdenlive.h kdenlivedoc.cpp kdenlivedoc.h kdenliveui.rc eventsrc kdenlive.desktop avlistviewitem.cpp doctrackbase.cpp doctracksound.cpp doctrackvideo.cpp kmmmonitor.cpp kmmscreen.cpp kmmtimeline.cpp projectlist.cpp avlistviewitem.h doctrackbase.h doctracksound.h doctrackvideo.h kmmmonitor.h kmmscreen.h kmmtimeline.h projectlist.h clipdrag.cpp clipdrag.h kmmtrackvideopanel.cpp kmmtrackvideopanel.h kmmtracksoundpanel.cpp kmmtracksoundpanel.h docclipavfile.cpp docclipavfile.h docclipbase.cpp docclipbase.h docclipproject.cpp docclipproject.h projectlistview.cpp projectlistview.h kruler.cpp kruler.h kfixedruler.cpp kfixedruler.h krulermodel.cpp krulermodel.h kscalableruler.cpp kscalableruler.h krulersliderbase.cpp krulersliderbase.h krulertimemodel.cpp krulertimemodel.h kmmtrackpanel.cpp kmmtrackpanel.h kmmtimelinetrackview.cpp kmmtimelinetrackview.h docclipbaselist.cpp docclipbaselist.h kmmeditpanel_ui.ui loadprogress_ui.ui kmmeditpanel.cpp kmmeditpanel.h kmmrulerpanel.cpp kmmrulerpanel.h kmmrulerpanel_ui.ui gentime.cpp gentime.h avfilelist.cpp avfilelist.h doctrackbaselist.cpp doctrackbaselist.h krender.cpp krender.h doctrackclipiterator.cpp doctrackclipiterator.h kmmtrackkeyframepanel.cpp kmmtrackkeyframepanel.h rangelist.cpp rangelist.h kmoveclipscommand.cpp kmoveclipscommand.h kselectclipcommand.cpp kselectclipcommand.h kaddclipcommand.cpp kaddclipcommand.h kresizecommand.cpp kresizecommand.h kdenlivesetupdlg.cpp kdenlivesetupdlg.h krendermanager.cpp krendermanager.h avfileformatdesc.cpp avfileformatdesc.h avformatdescbase.cpp avformatdescbase.h avformatdescbool.cpp avformatdescbool.h avformatdesclist.cpp avformatdesclist.h avformatwidgetbase.cpp avformatwidgetbase.h avformatwidgetbool.cpp avformatwidgetbool.h avformatwidgetlist.cpp avformatwidgetlist.h avformatdesccontainer.cpp avformatdesccontainer.h avformatwidgetcontainer.cpp avformatwidgetcontainer.h avfileformatwidget.cpp avfileformatwidget.h avformatdesccodeclist.cpp avformatdesccodeclist.h avformatwidgetcodeclist.cpp avformatwidgetcodeclist.h avformatdesccodec.cpp avformatdesccodec.h avformatwidgetcodec.cpp avformatwidgetcodec.h effectlistdialog.cpp effectlistdialog.h effectparamdialog.cpp effectparamdialog.h effectdesc.cpp effectdesc.h displayvideodesc.cpp displayvideodesc.h displayaudiodesc.cpp displayaudiodesc.h effect.cpp effect.h clippropertiesdialog.cpp clippropertiesdialog.h kdenlivesplash.cpp kdenlivesplash.h monitormanager.cpp monitormanager.h docclipref.cpp docclipref.h docclipreflist.cpp docclipreflist.h clipmanager.cpp clipmanager.h documentbasenode.cpp documentbasenode.h documentclipnode.cpp documentclipnode.h documentgroupnode.cpp documentgroupnode.h docsubclip.h docsubclip.cpp trackpanelclipslipfunction.cpp trackpanelclipslipfunction.h
 
 
 xdg_apps_DATA = kdenlive.desktop
@@ -91,7 +96,7 @@ xdg_apps_DATA = kdenlive.desktop
 # kde_designerdir     Where Qt Designer plugins should go to (new in KDE 3).
 
 # set the include path for X, qt and KDE
-INCLUDES= $(all_includes) $(LIBMLT_CFLAGS) @LIBIEC61883_CFLAGS@
+INCLUDES= $(all_includes) $(LIBMLT_CFLAGS) @LIBIEC61883_CFLAGS@ -D__STDC_CONSTANT_MACROS
 
 kde_kcfg_DATA = kdenlive.kcfg
 METASOURCES = AUTO
@@ -100,22 +105,21 @@ METASOURCES = AUTO
 kdenlive_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIBMLT_LIBS) -lmlt++
 
 rcdir = $(kde_datadir)/kdenlive
-rc_DATA = kdenliveui.rc
+rc_DATA = kdenliveui.rc eventsrc
 
-
-noinst_HEADERS = configureproject.h configureprojectdialog.h exportconfig.h \
-	trackpanelmarkerfunction.h trackviewdecorator.h trackviewbackgrounddecorator.h \
-	trackviewnamedecorator.h trackviewmarkerdecorator.h kaddmarkercommand.h saveprojectfilter.h \
-	saveprojectnativefilter.h loadprojectfilter.h loadprojectnativefilter.h projectformatmanager.h \
+noinst_HEADERS = configureprojectdialog.h trackpanelmarkerfunction.h \
+	trackviewdecorator.h trackviewbackgrounddecorator.h trackviewnamedecorator.h \
+	trackviewmarkerdecorator.h kaddmarkercommand.h saveprojectfilter.h saveprojectnativefilter.h \
+	loadprojectfilter.h loadprojectnativefilter.h projectformatmanager.h \
 	loadprojectkinofilter.h timecode.h ktimeline.h kmmtimeline.h ktrackview.h \
 	documentmacrocommands.h trackpanelfunctionfactory.h trackpanelselectnonefunction.h \
 	effectkeyframe.h effectdoublekeyframe.h effectparamdesc.h effectparamdoubledesc.h \
 	effectparameter.h effectparamdescfactory.h doctrackdecorator.h ktrackpanel.h \
-	ktrackclippanel.h trackviewdoublekeyframedecorator.h trackviewaudiobackgrounddecorator.h \
-	effectstack.h effectstackdialog.h effectdrag.h kaddeffectcommand.h \
-	effectdescriptionlist.h effectstacklistview.h saveprojectscenelistfilter.h ktrackplacer.h \
-	kplacer.h kclipplacer.h kmmclipkeyframepanel.h trackpanelcliprollfunction.h \
-	krollcommand.h dynamicToolTip.h kmonitor.h capturemonitor.h
+	trackviewdoublekeyframedecorator.h trackviewaudiobackgrounddecorator.h effectstack.h effectstackdialog.h \
+	effectdrag.h kaddeffectcommand.h effectdescriptionlist.h effectstacklistview.h \
+	saveprojectscenelistfilter.h ktrackplacer.h kplacer.h kclipplacer.h kmmclipkeyframepanel.h \
+	trackpanelcliprollfunction.h krollcommand.h dynamicToolTip.h kmonitor.h capturemonitor.h \
+	newproject.h definitions.h
 
 
 

kdenlive/addmarker_ui.ui

@@ -0,0 +1,213 @@
+<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
+<class>AddMarker_UI</class>
+<widget class="QDialog">
+    <property name="name">
+        <cstring>AddMarker_UI</cstring>
+    </property>
+    <property name="geometry">
+        <rect>
+            <x>0</x>
+            <y>0</y>
+            <width>258</width>
+            <height>208</height>
+        </rect>
+    </property>
+    <property name="sizeGripEnabled">
+        <bool>false</bool>
+    </property>
+    <grid>
+        <property name="name">
+            <cstring>unnamed</cstring>
+        </property>
+        <widget class="KRestrictedLine" row="0" column="1">
+            <property name="name">
+                <cstring>marker_position</cstring>
+            </property>
+            <property name="text">
+                <string>:::</string>
+            </property>
+            <property name="inputMask">
+                <string>99:99:99:99; </string>
+            </property>
+        </widget>
+        <widget class="QLineEdit" row="1" column="1">
+            <property name="name">
+                <cstring>marker_comment</cstring>
+            </property>
+        </widget>
+        <widget class="QLabel" row="1" column="0">
+            <property name="name">
+                <cstring>label_duration_2</cstring>
+            </property>
+            <property name="text">
+                <string>Comment</string>
+            </property>
+        </widget>
+        <widget class="QLabel" row="0" column="0">
+            <property name="name">
+                <cstring>label_duration</cstring>
+            </property>
+            <property name="text">
+                <string>Position</string>
+            </property>
+        </widget>
+        <widget class="QLayoutWidget" row="4" column="0" rowspan="1" colspan="2">
+            <property name="name">
+                <cstring>Layout1</cstring>
+            </property>
+            <hbox>
+                <property name="name">
+                    <cstring>unnamed</cstring>
+                </property>
+                <property name="margin">
+                    <number>0</number>
+                </property>
+                <property name="spacing">
+                    <number>6</number>
+                </property>
+                <spacer>
+                    <property name="name">
+                        <cstring>Horizontal Spacing2</cstring>
+                    </property>
+                    <property name="orientation">
+                        <enum>Horizontal</enum>
+                    </property>
+                    <property name="sizeType">
+                        <enum>Expanding</enum>
+                    </property>
+                    <property name="sizeHint">
+                        <size>
+                            <width>20</width>
+                            <height>20</height>
+                        </size>
+                    </property>
+                </spacer>
+                <widget class="QPushButton">
+                    <property name="name">
+                        <cstring>buttonOk</cstring>
+                    </property>
+                    <property name="text">
+                        <string>&amp;OK</string>
+                    </property>
+                    <property name="accel">
+                        <string></string>
+                    </property>
+                    <property name="autoDefault">
+                        <bool>true</bool>
+                    </property>
+                    <property name="default">
+                        <bool>true</bool>
+                    </property>
+                </widget>
+                <widget class="QPushButton">
+                    <property name="name">
+                        <cstring>buttonCancel</cstring>
+                    </property>
+                    <property name="text">
+                        <string>&amp;Cancel</string>
+                    </property>
+                    <property name="accel">
+                        <string></string>
+                    </property>
+                    <property name="autoDefault">
+                        <bool>true</bool>
+                    </property>
+                </widget>
+            </hbox>
+        </widget>
+        <spacer row="3" column="1">
+            <property name="name">
+                <cstring>spacer6</cstring>
+            </property>
+            <property name="orientation">
+                <enum>Vertical</enum>
+            </property>
+            <property name="sizeType">
+                <enum>Expanding</enum>
+            </property>
+            <property name="sizeHint">
+                <size>
+                    <width>20</width>
+                    <height>70</height>
+                </size>
+            </property>
+        </spacer>
+        <widget class="QButtonGroup" row="2" column="0" rowspan="1" colspan="2">
+            <property name="name">
+                <cstring>dvd_marker</cstring>
+            </property>
+            <property name="title">
+                <string>DVD Marker</string>
+            </property>
+            <property name="checkable">
+                <bool>true</bool>
+            </property>
+            <property name="checked">
+                <bool>false</bool>
+            </property>
+            <property name="exclusive">
+                <bool>true</bool>
+            </property>
+            <property name="radioButtonExclusive">
+                <bool>false</bool>
+            </property>
+            <grid>
+                <property name="name">
+                    <cstring>unnamed</cstring>
+                </property>
+                <widget class="QCheckBox" row="1" column="0">
+                    <property name="name">
+                        <cstring>chapter_end</cstring>
+                    </property>
+                    <property name="enabled">
+                        <bool>true</bool>
+                    </property>
+                    <property name="text">
+                        <string>End of Dvd</string>
+                    </property>
+                </widget>
+                <widget class="QCheckBox" row="0" column="0">
+                    <property name="name">
+                        <cstring>chapter_start</cstring>
+                    </property>
+                    <property name="enabled">
+                        <bool>true</bool>
+                    </property>
+                    <property name="text">
+                        <string>New chapter</string>
+                    </property>
+                    <property name="checked">
+                        <bool>true</bool>
+                    </property>
+                </widget>
+            </grid>
+        </widget>
+    </grid>
+</widget>
+<customwidgets>
+</customwidgets>
+<connections>
+    <connection>
+        <sender>buttonOk</sender>
+        <signal>clicked()</signal>
+        <receiver>AddMarker_UI</receiver>
+        <slot>accept()</slot>
+    </connection>
+    <connection>
+        <sender>buttonCancel</sender>
+        <signal>clicked()</signal>
+        <receiver>AddMarker_UI</receiver>
+        <slot>reject()</slot>
+    </connection>
+</connections>
+<tabstops>
+    <tabstop>marker_comment</tabstop>
+    <tabstop>marker_position</tabstop>
+    <tabstop>buttonOk</tabstop>
+    <tabstop>buttonCancel</tabstop>
+</tabstops>
+<layoutdefaults spacing="6" margin="11"/>
+<includehints>
+    <includehint>krestrictedline.h</includehint>
+</includehints>
+</UI>

kdenlive/addtrackdialog_ui.ui

@@ -1,115 +1,191 @@
-<!DOCTYPE UI><UI>
-<class>AddTrackDialog_UI</class>
-<widget>
-    <class>QDialog</class>
-    <property stdset="1">
-        <name>name</name>
-        <cstring>AddTrackDialog_UI</cstring>
+<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
+<class>addTrackDialog_UI</class>
+<widget class="QDialog">
+    <property name="name">
+        <cstring>addTrackDialog_UI</cstring>
     </property>
-    <property stdset="1">
-        <name>geometry</name>
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>213</width>
-            <height>360</height>
+            <width>276</width>
+            <height>158</height>
         </rect>
     </property>
-    <property stdset="1">
-        <name>caption</name>
-        <string>Add Tracks...</string>
+    <property name="caption">
+        <string></string>
     </property>
-    <property stdset="1">
-        <name>sizeGripEnabled</name>
-        <bool>true</bool>
+    <property name="sizeGripEnabled">
+        <bool>false</bool>
     </property>
-    <vbox>
-        <property stdset="1">
-            <name>margin</name>
-            <number>11</number>
+    <grid>
+        <property name="name">
+            <cstring>unnamed</cstring>
         </property>
-        <property stdset="1">
-            <name>spacing</name>
-            <number>6</number>
-        </property>
-        <widget>
-            <class>QListBox</class>
-            <item>
-                <property>
-                    <name>text</name>
-                    <string>Video Track</string>
-                </property>
-            </item>
-            <item>
-                <property>
-                    <name>text</name>
-                    <string>Audio Track</string>
-                </property>
-            </item>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>m_trackList</cstring>
-            </property>
-        </widget>
-        <widget>
-            <class>QLayoutWidget</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>Layout4</cstring>
+        <widget class="QLayoutWidget" row="1" column="0">
+            <property name="name">
+                <cstring>Layout1</cstring>
             </property>
             <hbox>
-                <property stdset="1">
-                    <name>margin</name>
+                <property name="name">
+                    <cstring>unnamed</cstring>
+                </property>
+                <property name="margin">
                     <number>0</number>
                 </property>
-                <property stdset="1">
-                    <name>spacing</name>
+                <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget>
-                    <class>QPushButton</class>
-                    <property stdset="1">
-                        <name>name</name>
-                        <cstring>m_buttonAdd</cstring>
+                <spacer>
+                    <property name="name">
+                        <cstring>Horizontal Spacing2</cstring>
                     </property>
-                    <property stdset="1">
-                        <name>text</name>
-                        <string>&amp;Add</string>
+                    <property name="orientation">
+                        <enum>Horizontal</enum>
                     </property>
-                    <property stdset="1">
-                        <name>autoDefault</name>
+                    <property name="sizeType">
+                        <enum>Expanding</enum>
+                    </property>
+                    <property name="sizeHint">
+                        <size>
+                            <width>20</width>
+                            <height>20</height>
+                        </size>
+                    </property>
+                </spacer>
+                <widget class="QPushButton">
+                    <property name="name">
+                        <cstring>buttonOk</cstring>
+                    </property>
+                    <property name="text">
+                        <string>&amp;OK</string>
+                    </property>
+                    <property name="accel">
+                        <string></string>
+                    </property>
+                    <property name="autoDefault">
                         <bool>true</bool>
                     </property>
-                    <property stdset="1">
-                        <name>default</name>
+                    <property name="default">
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget>
-                    <class>QPushButton</class>
-                    <property stdset="1">
-                        <name>name</name>
-                        <cstring>m_buttonHelp</cstring>
+                <widget class="QPushButton">
+                    <property name="name">
+                        <cstring>buttonCancel</cstring>
                     </property>
-                    <property stdset="1">
-                        <name>text</name>
-                        <string>&amp;Help</string>
+                    <property name="text">
+                        <string>&amp;Cancel</string>
                     </property>
-                    <property stdset="1">
-                        <name>autoDefault</name>
+                    <property name="accel">
+                        <string></string>
+                    </property>
+                    <property name="autoDefault">
                         <bool>true</bool>
                     </property>
                 </widget>
             </hbox>
         </widget>
-    </vbox>
+        <widget class="QButtonGroup" row="0" column="0">
+            <property name="name">
+                <cstring>buttonGroup1</cstring>
+            </property>
+            <property name="title">
+                <string></string>
+            </property>
+            <grid>
+                <property name="name">
+                    <cstring>unnamed</cstring>
+                </property>
+                <widget class="QRadioButton" row="1" column="0" rowspan="1" colspan="2">
+                    <property name="name">
+                        <cstring>trackAudio</cstring>
+                    </property>
+                    <property name="text">
+                        <string>Audio Track</string>
+                    </property>
+                </widget>
+                <widget class="QComboBox" row="2" column="1">
+                    <item>
+                        <property name="text">
+                            <string>Above</string>
+                        </property>
+                    </item>
+                    <item>
+                        <property name="text">
+                            <string>Under</string>
+                        </property>
+                    </item>
+                    <property name="name">
+                        <cstring>trackPosition</cstring>
+                    </property>
+                </widget>
+                <widget class="QSpinBox" row="2" column="3">
+                    <property name="name">
+                        <cstring>trackNumber</cstring>
+                    </property>
+                </widget>
+                <widget class="QLabel" row="2" column="0">
+                    <property name="name">
+                        <cstring>textLabel2</cstring>
+                    </property>
+                    <property name="text">
+                        <string>Insert</string>
+                    </property>
+                </widget>
+                <widget class="QLabel" row="2" column="2">
+                    <property name="name">
+                        <cstring>textLabel3</cstring>
+                    </property>
+                    <property name="text">
+                        <string>track</string>
+                    </property>
+                </widget>
+                <widget class="QRadioButton" row="0" column="0" rowspan="1" colspan="2">
+                    <property name="name">
+                        <cstring>trackVideo</cstring>
+                    </property>
+                    <property name="text">
+                        <string>Video Track</string>
+                    </property>
+                    <property name="checked">
+                        <bool>true</bool>
+                    </property>
+                </widget>
+                <spacer row="2" column="4">
+                    <property name="name">
+                        <cstring>spacer4</cstring>
+                    </property>
+                    <property name="orientation">
+                        <enum>Horizontal</enum>
+                    </property>
+                    <property name="sizeType">
+                        <enum>Expanding</enum>
+                    </property>
+                    <property name="sizeHint">
+                        <size>
+                            <width>71</width>
+                            <height>20</height>
+                        </size>
+                    </property>
+                </spacer>
+            </grid>
+        </widget>
+    </grid>
 </widget>
 <connections>
     <connection>
-        <sender>m_buttonAdd</sender>
+        <sender>buttonOk</sender>
         <signal>clicked()</signal>
-        <receiver>AddTrackDialog_UI</receiver>
+        <receiver>addTrackDialog_UI</receiver>
         <slot>accept()</slot>
     </connection>
+    <connection>
+        <sender>buttonCancel</sender>
+        <signal>clicked()</signal>
+        <receiver>addTrackDialog_UI</receiver>
+        <slot>reject()</slot>
+    </connection>
 </connections>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>

kdenlive/avfile.cpp

@@ -31,7 +31,7 @@ AVFile::AVFile(const QString & name, const KURL & url):m_framesPerSecond(0)
 
     m_referers.setAutoDelete(false);
 
-    calculateFileProperties(QMap < QString, QString > ());
+    calculateFileProperties(QMap < QString, QString > (), NULL);
 }
 
 AVFile::~AVFile()

kdenlive/avfileformatdesc.cpp

@@ -1,50 +0,0 @@
-/***************************************************************************
-                         avfileformatdesc.cpp  -  description
-                            -------------------
-   begin                : Tue Jan 21 2003
-   copyright            : (C) 2003 by Jason Wood
-   email                : jasonwood@blueyonder.co.uk
-***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program 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 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include <qwidget.h>
-
-#include "avfileformatdesc.h"
-#include "avfileformatwidget.h"
-
-AVFileFormatDesc::AVFileFormatDesc(const QString & description, const char *&name):
-AVFormatDescContainer(description, name), m_fileExtension(QString::null)
-{
-}
-
-AVFileFormatDesc::~AVFileFormatDesc()
-{
-}
-
-/** Create and return a widget that embodies this file format description. */
-AVFormatWidgetBase *AVFileFormatDesc::createWidget(QWidget * parent)
-{
-    AVFileFormatWidget *widget =
-	new AVFileFormatWidget(this, parent, m_name);
-    return widget;
-}
-
-/** Sets the file extenstion for this description. */
-void AVFileFormatDesc::setFileExtension(const QString & extension)
-{
-    m_fileExtension = extension;
-}
-
-/** Returns the file extension for this file format. */
-const QString & AVFileFormatDesc::fileExtension()
-{
-    return m_fileExtension;
-}

kdenlive/avfileformatdesc.h

@@ -1,46 +0,0 @@
-/***************************************************************************
-                          avfileformatdesc.h  -  description
-                             -------------------
-    begin                : Tue Jan 21 2003
-    copyright            : (C) 2003 by Jason Wood
-    email                : jasonwood@blueyonder.co.uk
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program 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 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef AVFILEFORMATDESC_H
-#define AVFILEFORMATDESC_H
-
-#include <qstring.h>
-#include "avformatdesccontainer.h"
-
-/** Describes a file format. That is to say, it says what can and cannot exist within a
-    file format, what parameters exist and can be set, etc.
-  *@author Jason Wood
-  */
-
-class QWidget;
-
-class AVFileFormatDesc:public AVFormatDescContainer {
-  public:
-    AVFileFormatDesc(const QString & description, const char *&name);
-    ~AVFileFormatDesc();
-  /** Create and return a widget that embodies this file format description. */
-    AVFormatWidgetBase *createWidget(QWidget * parent);
-  /** Sets the file extenstion for this description. */
-    void setFileExtension(const QString & extension);
-  /** Returns the file extension for this file format. */
-    const QString & fileExtension();
-  private:			// Private attributes
-  /** Specifies the file extension used by this file format. */
-     QString m_fileExtension;
-};
-
-#endif

kdenlive/avfileformatwidget.cpp

@@ -1,64 +0,0 @@
-/***************************************************************************
-                          avfileformatwidget.cpp  -  description
-                             -------------------
-    begin                : Fri Jan 24 2003
-    copyright            : (C) 2003 by Jason Wood
-    email                : jasonwood@blueyonder.co.uk
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program 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 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include <qptrlist.h>
-
-#include <kdebug.h>
-#include <klocale.h>
-#include <kurlrequester.h>
-#include <qlabel.h>
-#include <qhbox.h>
-#include <qtooltip.h>
-#include <qwhatsthis.h>
-
-#include "avfileformatdesc.h"
-#include "avfileformatwidget.h"
-
-AVFileFormatWidget::AVFileFormatWidget(AVFileFormatDesc * desc, QWidget * parent, const char *name):
-QVBox(parent, name),
-m_fileHBox(new QHBox(this, "file_hbox")),
-m_fileLabel(new QLabel(i18n("Filename:"), m_fileHBox, "file_label")),
-m_filename(new KURLRequester(m_fileHBox, "browser")), m_desc(desc)
-{
-    QToolTip::add(m_fileHBox, i18n("The name of ouput video file"));
-
-    QPtrListIterator < AVFormatDescBase > itt(desc->list());
-
-    while (itt.current()) {
-	itt.current()->createWidget(this);
-	++itt;
-    }
-}
-
-AVFileFormatWidget::~AVFileFormatWidget()
-{
-}
-
-QWidget *AVFileFormatWidget::widget()
-{
-    return this;
-}
-
-KURL AVFileFormatWidget::fileUrl() const
-{
-    return m_filename->url();
-}
-
-AVFileFormatWidget *AVFileFormatWidget::fileFormatWidget()
-{
-    return this;
-}

kdenlive/avfileformatwidget.h

@@ -1,50 +0,0 @@
-/***************************************************************************
-                          avfileformatwidget.h  -  description
-                             -------------------
-    begin                : Fri Jan 24 2003
-    copyright            : (C) 2003 by Jason Wood
-    email                : jasonwood@blueyonder.co.uk
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program 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 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef AVFILEFORMATWIDGET_H
-#define AVFILEFORMATWIDGET_H
-
-#include <qvbox.h>
-#include <kurl.h>
-
-#include "avformatwidgetbase.h"
-/**This widget contains an entire file format description.
-  *@author Jason Wood
-  */
-
-class AVFileFormatDesc;
-class KURLRequester;
-class QHBox;
-class QLabel;
-
-class AVFileFormatWidget:public QVBox, public AVFormatWidgetBase {
-  Q_OBJECT public:
-    AVFileFormatWidget(AVFileFormatDesc * desc, QWidget * parent =
-	0, const char *name = 0);
-    ~AVFileFormatWidget();
-    QWidget *widget();
-   /** Returns the url of this file widget. */
-    KURL fileUrl() const;
-    AVFileFormatWidget *fileFormatWidget();
-  private:
-     QHBox * m_fileHBox;
-    QLabel *m_fileLabel;
-    KURLRequester *m_filename;
-    AVFileFormatDesc *m_desc;
-};
-
-#endif

kdenlive/avformatdescbase.cpp

@@ -1,53 +0,0 @@
-/***************************************************************************
-                         avformatdescbase.cpp  -  description
-                            -------------------
-   begin                : Thu Jan 23 2003
-   copyright            : (C) 2003 by Jason Wood
-   email                : jasonwood@blueyonder.co.uk
-***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program 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 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include "avformatdescbase.h"
-
-AVFormatDescBase::AVFormatDescBase(const QString & description,
-    const char *&name)
-{
-    m_description = description;
-    m_name = name;
-}
-
-AVFormatDescBase::~AVFormatDescBase()
-{
-}
-
-/** Returns the name of this description element. */
-const char *&AVFormatDescBase::name()
-{
-    return m_name;
-}
-
-/** Sets the name of this Desc element to the one specified */
-void AVFormatDescBase::setName(const char *&name)
-{
-    m_name = name;
-}
-
-/** Sets the description of this desc element. */
-void AVFormatDescBase::setDescription(const QString & description)
-{
-    m_description = description;
-}
-
-/** Returns the description of this desc element. */
-const QString & AVFormatDescBase::description()
-{
-    return m_description;
-}

kdenlive/avformatdescbase.h

@@ -1,52 +0,0 @@
-/***************************************************************************
-                          avformatdescbase.h  -  description
-                             -------------------
-    begin                : Thu Jan 23 2003
-    copyright            : (C) 2003 by Jason Wood
-    email                : jasonwood@blueyonder.co.uk
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program 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 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef AVFORMATDESCBASE_H
-#define AVFORMATDESCBASE_H
-
-#include <qstring.h>
-
-class AVFormatWidgetBase;
-class QWidget;
-
-/**The base class for a file format parameter. A parameter specifies, amongst other things, what values the parameter can take, and how the widget that contains it should be created.
-
-  *@author Jason Wood
-  */
-
-class AVFormatDescBase {
-  public:
-    AVFormatDescBase(const QString & description, const char *&name);
-     virtual ~ AVFormatDescBase();
-  /** Generates a widget that holds the specified value(s). */
-    virtual AVFormatWidgetBase *createWidget(QWidget * parent) = 0;
-  /** Returns the name of this description element. */
-    const char *&name();
-  /** Sets the name of this Desc element to the one specified */
-    void setName(const char *&name);
-  /** Sets the description of this desc element. */
-    void setDescription(const QString & description);
-  /** Returns the description of this desc element. */
-    const QString & description();
-  protected:			// Protected attributes
-  /** The text description for the widget created - displayed in tooltips. */
-     QString m_description;
-  /** The name (text label) to be used by the widget created. */
-    const char *m_name;
-};
-
-#endif

kdenlive/avformatdescbool.cpp

@@ -1,34 +0,0 @@
-/***************************************************************************
-                          avformatdescbool.cpp  -  description
-                             -------------------
-    begin                : Thu Jan 23 2003
-    copyright            : (C) 2003 by Jason Wood
-    email                : jasonwood@blueyonder.co.uk
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program 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 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include "avformatdescbool.h"
-#include <avformatwidgetbool.h>
-
-AVFormatDescBool::AVFormatDescBool(const QString & description, const char *&name):
-AVFormatDescBase(description, name)
-{
-}
-
-AVFormatDescBool::~AVFormatDescBool()
-{
-}
-
-/** Create a widget to handle a boolean value. Most likely, this will be a check box. */
-AVFormatWidgetBase *AVFormatDescBool::createWidget(QWidget * parent)
-{
-    return new AVFormatWidgetBool(this, parent, m_name);
-}

kdenlive/avformatdescbool.h

@@ -1,35 +0,0 @@
-/***************************************************************************
-                          avformatdescbool.h  -  description
-                             -------------------
-    begin                : Thu Jan 23 2003
-    copyright            : (C) 2003 by Jason Wood
-    email                : jasonwood@blueyonder.co.uk
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program 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 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef AVFORMATDESCBOOL_H
-#define AVFORMATDESCBOOL_H
-
-#include <avformatdescbase.h>
-
-/**Holds a boolean value in an AVFormat description.
-  *@author Jason Wood
-  */
-
-class AVFormatDescBool:public AVFormatDescBase {
-  public:
-    AVFormatDescBool(const QString & description, const char *&name);
-    ~AVFormatDescBool();
-  /** Create a widget to handle a boolean value. Most likely, this will be a check box. */
-    AVFormatWidgetBase *createWidget(QWidget * parent);
-};
-
-#endif

kdenlive/avformatdesccodec.cpp

@@ -1,33 +0,0 @@
-/***************************************************************************
-                          avformatdesccodec.cpp  -  description
-                             -------------------
-    begin                : Tue Feb 4 2003
-    copyright            : (C) 2003 by Jason Wood
-    email                : jasonwood@blueyonder.co.uk
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program 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 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include "avformatdesccodec.h"
-#include "avformatwidgetcodec.h"
-
-AVFormatDescCodec::AVFormatDescCodec(const QString & description, const char *&name):
-AVFormatDescBase(description, name)
-{
-}
-
-AVFormatDescCodec::~AVFormatDescCodec()
-{
-}
-
-AVFormatWidgetBase *AVFormatDescCodec::createWidget(QWidget * parent)
-{
-    return new AVFormatWidgetCodec(this, parent, m_name);
-}

kdenlive/avformatdesccodec.h

@@ -1,37 +0,0 @@
-/***************************************************************************
-                          avformatdesccodec.h  -  description
-                             -------------------
-    begin                : Tue Feb 4 2003
-    copyright            : (C) 2003 by Jason Wood
-    email                : jasonwood@blueyonder.co.uk
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program 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 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef AVFORMATDESCCODEC_H
-#define AVFORMATDESCCODEC_H
-
-#include <avformatdescbase.h>
-
-class QString;
-
-/**Holds the description of a particular file codec, including parameters for that codec.
-  *@author Jason Wood
-  */
-
-class AVFormatDescCodec:public AVFormatDescBase {
-  public:
-    AVFormatDescCodec(const QString & description, const char *&name);
-    ~AVFormatDescCodec();
-  /** Generates a widget that holds the specified value(s). */
-    AVFormatWidgetBase *createWidget(QWidget * parent);
-};
-
-#endif

kdenlive/avformatdesccodeclist.cpp

@@ -1,53 +0,0 @@
-/***************************************************************************
-                          AVFormatDescCodecList.cpp  -  description
-                             -------------------
-    begin                : Tue Feb 4 2003
-    copyright            : (C) 2003 by Jason Wood
-    email                : jasonwood@blueyonder.co.uk
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program 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 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include "avformatdesccodeclist.h"
-#include "avformatwidgetcodeclist.h"
-#include "krender.h"
-
-AVFormatDescCodecList::AVFormatDescCodecList(KRender * renderer, const QString & description, const char *&name):
-AVFormatDescBase(description, name), m_renderer(renderer)
-{
-}
-
-AVFormatDescCodecList::~AVFormatDescCodecList()
-{
-}
-
-/** Constructs a widget to display this container. Most likely, a qgroupbox with a combo list box + widget stack. */
-AVFormatWidgetBase *AVFormatDescCodecList::createWidget(QWidget * parent)
-{
-    return new AVFormatWidgetCodecList(this, parent, m_name);
-}
-
-/** Returns the codec name list */
-const QStringList & AVFormatDescCodecList::codecList()
-{
-    return m_codecList;
-}
-
-/** Adds a codec by name to this codec list. */
-void AVFormatDescCodecList::addCodec(const QString & codec)
-{
-    m_codecList.append(codec);
-}
-
-/** Returns the renderer that generated this desc codec list */
-KRender *AVFormatDescCodecList::renderer()
-{
-    return m_renderer;
-}

kdenlive/avformatdesccodeclist.h

@@ -1,51 +0,0 @@
-/***************************************************************************
-                          AVFormatDescCodecList.h  -  description
-                             -------------------
-    begin                : Tue Feb 4 2003
-    copyright            : (C) 2003 by Jason Wood
-    email                : jasonwood@blueyonder.co.uk
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program 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 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef AVFormatDescCodecList_H
-#define AVFormatDescCodecList_H
-
-#include <avformatdescbase.h>
-
-#include <qstringlist.h>
-
-class KRender;
-
-/**The Codec description lists all codecs that this class can accept, and allows differing codecs to be chosen and inputted.
-  *@author Jason Wood
-  */
-
-class AVFormatDescCodecList:public AVFormatDescBase {
-  public:
-    AVFormatDescCodecList(KRender * renderer, const QString & description,
-	const char *&name);
-    ~AVFormatDescCodecList();
-  /** Constructs a widget to display this container. Most likely, a qgroupbox with a combo list box + widget stack. */
-    AVFormatWidgetBase *createWidget(QWidget * parent);
-  /** Returns the codec name list */
-    const QStringList & codecList();
-  /** Returns the renderer that generated this desc codec list */
-    KRender *renderer();
-  /** Adds a codec by name to this codec list. */
-    void addCodec(const QString & codec);
-  private:			// Private attributes
-  /** A list of codec names in this codec list. */
-     QStringList m_codecList;
-  /** Holds a pointer to the renderer that generated this desc codec list. */
-    KRender *m_renderer;
-};
-
-#endif

kdenlive/avformatdesccontainer.cpp

@@ -1,49 +0,0 @@
-/***************************************************************************
-                          avformatdesccontainer.cpp  -  description
-                             -------------------
-    begin                : Fri Jan 24 2003
-    copyright            : (C) 2003 by Jason Wood
-    email                : jasonwood@blueyonder.co.uk
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program 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 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include "avformatdesccontainer.h"
-#include "avformatwidgetcontainer.h"
-
-#include <kdebug.h>
-
-AVFormatDescContainer::AVFormatDescContainer(const QString & description, const char *&name):
-AVFormatDescBase(description, name)
-{
-    m_descList.setAutoDelete(true);
-}
-
-AVFormatDescContainer::~AVFormatDescContainer()
-{
-}
-
-/** Constructs a widget to display this container. Most likely, a qgroupbox. */
-AVFormatWidgetBase *AVFormatDescContainer::createWidget(QWidget * parent)
-{
-    return new AVFormatWidgetContainer(this, parent, m_name);
-}
-
-/** Appends a new description element into this container. */
-void AVFormatDescContainer::append(AVFormatDescBase * elem)
-{
-    m_descList.append(elem);
-}
-
-/** Returns the format list. */
-const QPtrList < AVFormatDescBase > &AVFormatDescContainer::list()
-{
-    return m_descList;
-}

kdenlive/avformatdesccontainer.h

@@ -1,44 +0,0 @@
-/***************************************************************************
-                          avformatdesccontainer.h  -  description
-                             -------------------
-    begin                : Fri Jan 24 2003
-    copyright            : (C) 2003 by Jason Wood
-    email                : jasonwood@blueyonder.co.uk
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program 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 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef AVFORMATDESCCONTAINER_H
-#define AVFORMATDESCCONTAINER_H
-
-#include "avformatdescbase.h"
-
-#include <qptrlist.h>
-
-/**A container description. A container groups and contains other descriptive elements.
-  *@author Jason Wood
-  */
-
-class AVFormatDescContainer:public AVFormatDescBase {
-  public:
-    AVFormatDescContainer(const QString & description, const char *&name);
-    ~AVFormatDescContainer();
-  /** Constructs a widget to display this container. Most likely, a qgroupbox. */
-    virtual AVFormatWidgetBase *createWidget(QWidget * parent);
-  /** Appends a new description element into this container. */
-    void append(AVFormatDescBase * elem);
-  /** Returns the format list. */
-    const QPtrList < AVFormatDescBase > &list();
-  protected:
-  /** A list of all dsecription elements contained within this description. */
-     QPtrList < AVFormatDescBase > m_descList;
-};
-
-#endif

kdenlive/avformatdesclist.cpp

@@ -1,45 +0,0 @@
-/***************************************************************************
-                          avformatdesclist.cpp  -  description
-                             -------------------
-    begin                : Thu Jan 23 2003
-    copyright            : (C) 2003 by Jason Wood
-    email                : jasonwood@blueyonder.co.uk
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program 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 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include "avformatdesclist.h"
-#include "avformatwidgetlist.h"
-
-AVFormatDescList::AVFormatDescList(const QString & description, const char *&name):
-AVFormatDescBase(description, name)
-{
-}
-
-AVFormatDescList::~AVFormatDescList()
-{
-}
-
-AVFormatWidgetBase *AVFormatDescList::createWidget(QWidget * parent)
-{
-    return new AVFormatWidgetList(this, parent, m_name);
-}
-
-/** Adds the specified string to the item list. */
-void AVFormatDescList::addItem(const QString & item)
-{
-    m_itemList.push_back(item);
-}
-
-/** Returns the item list. */
-QValueVector < QString > AVFormatDescList::itemList()
-{
-    return m_itemList;
-}

kdenlive/avformatwidgetbase.cpp

@@ -1,32 +0,0 @@
-/***************************************************************************
-                          avformatwidgetbase.cpp  -  description
-                             -------------------
-    begin                : Thu Jan 23 2003
-    copyright            : (C) 2003 by Jason Wood
-    email                : jasonwood@blueyonder.co.uk
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program 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 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include "avformatwidgetbase.h"
-
-AVFormatWidgetBase::AVFormatWidgetBase()
-{
-}
-
-AVFormatWidgetBase::~AVFormatWidgetBase()
-{
-}
-
-/** Returns a pointer to this widget cast as an AVFileFormatWidget if that is what this widget it, otherwise it returns 0. */
-AVFileFormatWidget *AVFormatWidgetBase::fileFormatWidget()
-{
-    return 0;
-}

kdenlive/avformatwidgetbase.h

@@ -1,43 +0,0 @@
-/***************************************************************************
-                          avformatwidgetbase.h  -  description
-                             -------------------
-    begin                : Thu Jan 23 2003
-    copyright            : (C) 2003 by Jason Wood
-    email                : jasonwood@blueyonder.co.uk
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program 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 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef AVFORMATWIDGETBASE_H
-#define AVFORMATWIDGETBASE_H
-
-
-class QWidget;
-class KURL;
-class AVFileFormatWidget;
-
-/**A base class for all AVFormat related widgets.
-
-This class provides a standard set of functions for building and reading an AVFileFormat from them.
-  *@author Jason Wood
-  */
-
-class AVFormatWidgetBase {
-  public:
-    AVFormatWidgetBase();
-    virtual ~ AVFormatWidgetBase();
-
-  /** Returns a pointer to this widget, as a QWidget. */
-    virtual QWidget *widget() = 0;
-  /** Returns a pointer to this widget cast as an AVFileFormatWidget if that is what this widget it, otherwise it returns 0. */
-    virtual AVFileFormatWidget *fileFormatWidget();
-};
-
-#endif

kdenlive/avformatwidgetbool.cpp

@@ -1,33 +0,0 @@
-/***************************************************************************
-                          avformatwidgetbool.cpp  -  description
-                             -------------------
-    begin                : Thu Jan 23 2003
-    copyright            : (C) 2003 by Jason Wood
-    email                : jasonwood@blueyonder.co.uk
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program 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 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include "avformatwidgetbool.h"
-#include "avformatdescbool.h"
-
-AVFormatWidgetBool::AVFormatWidgetBool(AVFormatDescBool * desc, QWidget * parent, const char *name):
-QCheckBox(desc->name(), parent, name), AVFormatWidgetBase()
-{
-}
-
-AVFormatWidgetBool::~AVFormatWidgetBool()
-{
-}
-
-QWidget *AVFormatWidgetBool::widget()
-{
-    return this;
-}

kdenlive/avformatwidgetbool.h

@@ -1,40 +0,0 @@
-/***************************************************************************
-                          avformatwidgetbool.h  -  description
-                             -------------------
-    begin                : Thu Jan 23 2003
-    copyright            : (C) 2003 by Jason Wood
-    email                : jasonwood@blueyonder.co.uk
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program 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 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef AVFORMATWIDGETBOOL_H
-#define AVFORMATWIDGETBOOL_H
-
-#include <qcheckbox.h>
-
-#include "avformatwidgetbase.h"
-
-class AVFormatDescBool;
-
-/**This widget displays a boolean value, in alignment with what the AVFormatDescBool class describes.
-  *@author Jason Wood
-  */
-
-class AVFormatWidgetBool:public QCheckBox, public AVFormatWidgetBase {
-  Q_OBJECT public:
-    AVFormatWidgetBool(AVFormatDescBool * desc, QWidget * parent =
-	0, const char *name = 0);
-    ~AVFormatWidgetBool();
-    virtual QWidget *widget();
-    const KURL & fileUrl() const;
-};
-
-#endif

kdenlive/avformatwidgetcodec.cpp

@@ -1,39 +0,0 @@
-/***************************************************************************
-                          avformatwidgetcodec.cpp  -  description
-                             -------------------
-    begin                : Tue Feb 4 2003
-    copyright            : (C) 2003 by Jason Wood
-    email                : jasonwood@blueyonder.co.uk
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program 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 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include <qtextedit.h>
-
-#include "avformatwidgetcodec.h"
-#include "avformatdesccodec.h"
-
-AVFormatWidgetCodec::AVFormatWidgetCodec(AVFormatDescCodec * desc, QWidget * parent, const char *name):
-QVBox(parent, name), AVFormatWidgetBase()
-{
-    QTextEdit *edit =
-	new QTextEdit(desc->description(), QString::null, this, "label");
-    edit->setReadOnly(true);
-
-}
-
-AVFormatWidgetCodec::~AVFormatWidgetCodec()
-{
-}
-
-QWidget *AVFormatWidgetCodec::widget()
-{
-    return this;
-}

kdenlive/avformatwidgetcodec.h

@@ -1,39 +0,0 @@
-/***************************************************************************
-                          avformatwidgetcodec.h  -  description
-                             -------------------
-    begin                : Tue Feb 4 2003
-    copyright            : (C) 2003 by Jason Wood
-    email                : jasonwood@blueyonder.co.uk
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program 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 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef AVFORMATWIDGETCODEC_H
-#define AVFORMATWIDGETCODEC_H
-
-#include <qvbox.h>
-
-#include <avformatwidgetbase.h>
-
-class AVFormatDescCodec;
-
-/**A widget that encapsulates the information in an avformatdesccodec object.
-  *@author Jason Wood
-  */
-
-class AVFormatWidgetCodec:public QVBox, public AVFormatWidgetBase {
-  Q_OBJECT public:
-    AVFormatWidgetCodec(AVFormatDescCodec * desc, QWidget * parent =
-	0, const char *name = 0);
-    ~AVFormatWidgetCodec();
-    virtual QWidget *widget();
-};
-
-#endif

kdenlive/avformatwidgetcodeclist.cpp

@@ -1,66 +0,0 @@
-/***************************************************************************
-                          AVFormatWidgetCodecList.cpp  -  description
-                             -------------------
-    begin                : Tue Feb 4 2003
-    copyright            : (C) 2003 by Jason Wood
-    email                : jasonwood@blueyonder.co.uk
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program 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 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include "qhbox.h"
-#include "qlabel.h"
-#include "qcombobox.h"
-#include "qwidgetstack.h"
-#include <qtooltip.h>
-#include <qwhatsthis.h>
-
-#include <klocale.h>
-#include <kdebug.h>
-
-#include "avformatwidgetcodeclist.h"
-#include "avformatdesccodeclist.h"
-#include "avformatdesccodec.h"
-#include "krender.h"
-
-AVFormatWidgetCodecList::AVFormatWidgetCodecList(AVFormatDescCodecList * desc, QWidget * parent, const char *name):
-QGroupBox(1, Horizontal, desc->name(), parent, name),
-AVFormatWidgetBase(),
-m_codecLayout(new QHBox(this, "codec_layout")),
-m_codecLabel(new QLabel(i18n("Codec:"), m_codecLayout, "codec_label")),
-m_codecSelect(new QComboBox(m_codecLayout, "codec_select")),
-m_widgetStack(new QWidgetStack(this, "widget_stack"))
-{
-    QToolTip::add(m_codecSelect,
-	i18n("Select the codec for your output file"));
-
-    QValueListConstIterator < QString > itt = desc->codecList().begin();
-    int count = 0;
-
-    while (itt != desc->codecList().end()) {
-	AVFormatDescCodec *codecDesc = 0;
-	if (codecDesc != 0) {
-	    m_codecSelect->insertItem(codecDesc->name(), count);
-	    m_widgetStack->addWidget(codecDesc->
-		createWidget(m_widgetStack)->widget(), count);
-	    ++count;
-	}
-	++itt;
-    }
-}
-
-AVFormatWidgetCodecList::~AVFormatWidgetCodecList()
-{
-}
-
-QWidget *AVFormatWidgetCodecList::widget()
-{
-    return this;
-}

kdenlive/avformatwidgetcodeclist.h

@@ -1,55 +0,0 @@
-/***************************************************************************
-                          AVFormatWidgetCodecList.h  -  description
-                             -------------------
-    begin                : Tue Feb 4 2003
-    copyright            : (C) 2003 by Jason Wood
-    email                : jasonwood@blueyonder.co.uk
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program 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 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef AVFormatWidgetCodecList_H
-#define AVFormatWidgetCodecList_H
-
-#include <qgroupbox.h>
-
-#include "avformatwidgetbase.h"
-
-class QHBox;
-class QLabel;
-class QComboBox;
-class QWidgetStack;
-
-class AVFormatDescCodecList;
-
-/**Displays all information described in AVFormatDescCodec
-  *@author Jason Wood
-  */
-
-class AVFormatWidgetCodecList:public QGroupBox, public AVFormatWidgetBase {
-  Q_OBJECT public:
-    AVFormatWidgetCodecList(AVFormatDescCodecList * desc,
-	QWidget * parent = 0, const char *name = 0);
-    ~AVFormatWidgetCodecList();
-    virtual QWidget *widget();
-  private:			// Private attributes
-  /** This bnox lays out the codec and label side by side */
-     QHBox * m_codecLayout;
-  /** This label names the codec select box */
-    QLabel *m_codecLabel;
-  /** This combo box contains all known combo names. Choosing an entry changes the topmost widget in
-   m_widgetStack. */
-    QComboBox *m_codecSelect;
-  /** The widgetStack contains the various dialogs for different codecs. The top-most is specified by
-  QComboBox. */
-    QWidgetStack *m_widgetStack;
-};
-
-#endif

kdenlive/avformatwidgetcontainer.cpp

@@ -1,41 +0,0 @@
-/***************************************************************************
-                          avformatwidgetcontainer.cpp  -  description
-                             -------------------
-    begin                : Fri Jan 24 2003
-    copyright            : (C) 2003 by Jason Wood
-    email                : jasonwood@blueyonder.co.uk
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program 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 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include "avformatwidgetcontainer.h"
-#include "avformatdesccontainer.h"
-
-#include <kdebug.h>
-
-AVFormatWidgetContainer::AVFormatWidgetContainer(AVFormatDescContainer * desc, QWidget * parent, const char *name):
-QGroupBox(1, Horizontal, desc->name(), parent, name), AVFormatWidgetBase()
-{
-    QPtrListIterator < AVFormatDescBase > itt(desc->list());
-
-    while (itt.current()) {
-	itt.current()->createWidget(this);
-	++itt;
-    }
-}
-
-AVFormatWidgetContainer::~AVFormatWidgetContainer()
-{
-}
-
-QWidget *AVFormatWidgetContainer::widget()
-{
-    return this;
-}

kdenlive/avformatwidgetcontainer.h

@@ -1,39 +0,0 @@
-/***************************************************************************
-                          avformatwidgetcontainer.h  -  description
-                             -------------------
-    begin                : Fri Jan 24 2003
-    copyright            : (C) 2003 by Jason Wood
-    email                : jasonwood@blueyonder.co.uk
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program 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 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef AVFORMATWIDGETCONTAINER_H
-#define AVFORMATWIDGETCONTAINER_H
-
-#include <qgroupbox.h>
-
-#include "avformatwidgetbase.h"
-
-class AVFormatDescContainer;
-
-/**A widget that will contain and display the information required by an AVFormatDescContainer.
-  *@author Jason Wood
-  */
-
-class AVFormatWidgetContainer:public QGroupBox, public AVFormatWidgetBase {
-  Q_OBJECT public:
-    AVFormatWidgetContainer(AVFormatDescContainer * desc,
-	QWidget * parent = 0, const char *name = 0);
-    ~AVFormatWidgetContainer();
-    virtual QWidget *widget();
-};
-
-#endif

kdenlive/avformatwidgetlist.cpp

@@ -1,45 +0,0 @@
-/***************************************************************************
-                          avformatwidgetlist.cpp  -  description
-                             -------------------
-    begin                : Thu Jan 23 2003
-    copyright            : (C) 2003 by Jason Wood
-    email                : jasonwood@blueyonder.co.uk
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program 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 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include "avformatwidgetlist.h"
-#include "avformatdesclist.h"
-
-#include <qlabel.h>
-#include <qcombobox.h>
-#include <qvaluevector.h>
-
-AVFormatWidgetList::AVFormatWidgetList(AVFormatDescList * desc, QWidget * parent, const char *name):
-QHBox(parent, name),
-AVFormatWidgetBase(),
-m_label(new QLabel(desc->name(), this, name)),
-m_comboBox(new QComboBox(this, name))
-{
-    const QValueVector < QString > &list = desc->itemList();
-
-    for (unsigned int count = 0; count < list.size(); ++count) {
-	m_comboBox->insertItem(list[count]);
-    }
-}
-
-AVFormatWidgetList::~AVFormatWidgetList()
-{
-}
-
-QWidget *AVFormatWidgetList::widget()
-{
-    return this;
-}

kdenlive/avformatwidgetlist.h

@@ -1,44 +0,0 @@
-/***************************************************************************
-                          avformatwidgetlist.h  -  description
-                             -------------------
-    begin                : Thu Jan 23 2003
-    copyright            : (C) 2003 by Jason Wood
-    email                : jasonwood@blueyonder.co.uk
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program 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 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef AVFORMATWIDGETLIST_H
-#define AVFORMATWIDGETLIST_H
-
-#include <qhbox.h>
-
-#include "avformatwidgetbase.h"
-
-class QLabel;
-class QComboBox;
-
-/**A widget which handles the selection of a list, provided by the relevant AVFileDescList object.
-  *@author Jason Wood
-  */
-class AVFormatDescList;
-
-class AVFormatWidgetList:public QHBox, public AVFormatWidgetBase {
-  Q_OBJECT public:
-    AVFormatWidgetList(AVFormatDescList * desc, QWidget * parent =
-	0, const char *name = 0);
-    ~AVFormatWidgetList();
-    virtual QWidget *widget();
-  private:
-     QLabel * m_label;
-    QComboBox *m_comboBox;
-};
-
-#endif

kdenlive/aviconviewitem.cpp

@@ -0,0 +1,173 @@
+/***************************************************************************
+                          avlistviewitem.cpp  -  description
+                             -------------------
+    begin                : Wed Mar 20 2002
+    copyright            : (C) 2002 by Jason Wood
+    email                : jasonwood@blueyonder.co.uk
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program 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 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+#include "aviconviewitem.h"
+#include "docclipavfile.h"
+
+#include <qptrlist.h>
+#include <qpainter.h>
+#include <qheader.h>
+
+#include <klocale.h>
+#include <kdebug.h>
+#include <kiconloader.h>
+
+#include "kdenlivedoc.h"
+#include "documentbasenode.h"
+#include "documentclipnode.h"
+#include "timecode.h"
+#include "kdenlivesettings.h"
+
+AVIconViewItem::AVIconViewItem(KdenliveDoc * doc, QIconViewItem * parent, DocumentBaseNode * node):
+KIconViewItem(parent->iconView(), parent),
+m_iconView(parent->iconView()), m_node(node), m_doc(doc)
+{
+    if (node == NULL) {
+	kdError() <<
+	    "Creating AVIconViewItem with no DocumentBaseNode defined!!!"
+	    << endl;
+    }
+    doCommonCtor();
+}
+
+AVIconViewItem::AVIconViewItem(KdenliveDoc * doc, QIconView * parent, DocumentBaseNode * node):
+KIconViewItem(parent), m_iconView(parent), m_node(node), m_doc(doc)
+{
+    DocumentClipNode *clipNode = m_node->asClipNode();
+    setText(m_node->name());
+    if (clipNode) {
+	DocClipRef *clip = clipNode->clipRef();
+	setPixmap(clip->referencedClip()->thumbnail());
+    }
+    else {
+	setPixmap(QPixmap(KGlobal::iconLoader()->loadIcon("folder", KIcon::Toolbar)));
+    }
+    doCommonCtor();
+}
+
+void AVIconViewItem::doCommonCtor()
+{
+    // recursively populate the rest of the node tree.
+    QPtrListIterator < DocumentBaseNode > child(m_node->children());
+    while (child.current()) {
+	if (child.current()) {
+		new AVIconViewItem(m_doc, this, child.current());
+	}
+	++child;
+    }
+
+}
+
+AVIconViewItem::~AVIconViewItem()
+{
+}
+
+QString AVIconViewItem::text() const
+{
+    return m_node->name();
+}
+
+
+QPixmap *AVIconViewItem::pixmap() const
+{
+    DocumentClipNode *clipNode = m_node->asClipNode();
+    if (clipNode) {
+	DocClipRef *clip = clipNode->clipRef();
+	DocClipBase *baseClip = clip->referencedClip();
+	return new QPixmap(baseClip->thumbnail());
+    }
+    else {
+	return new QPixmap(KGlobal::iconLoader()->loadIcon("folder", KIcon::Toolbar));
+    }
+}
+
+QString AVIconViewItem::clipDuration() const {
+	QString text;
+	DocumentClipNode *clipNode = m_node->asClipNode();
+	if (clipNode) {
+	    DocClipRef *clip = clipNode->clipRef();
+            text = Timecode::getEasyTimecode(clip->duration(), KdenliveSettings::defaultfps());
+	    int usage = clip->referencedClip()->numReferences();
+	    if (usage > 0) {
+	    	text.append(", [" + QString::number(usage) + "]");
+	    }
+	}
+	return text;
+}
+
+QString AVIconViewItem::getInfo() const
+{
+	QString text;
+	DocumentClipNode *clipNode = NULL;
+	if (m_node) clipNode = m_node->asClipNode();
+	if (clipNode) {
+	    DocClipRef *clip = clipNode->clipRef();
+	    DocClipBase::CLIPTYPE fileType = clip->clipType();
+		if (fileType == DocClipBase::AV)
+		    text = "<b>"+i18n("Video Clip")+"</b><br>";
+		else if (fileType == DocClipBase::VIDEO)
+		    text = "<b>"+i18n("Mute Video Clip")+"</b><br>";
+		else if (fileType == DocClipBase::AUDIO)
+		    text = "<b>"+i18n("Audio Clip")+"</b><br>";
+	    	else if (fileType == DocClipBase::COLOR)
+		    text = "<b>"+i18n("Color Clip")+"</b><br>";
+	    	else if (fileType == DocClipBase::VIRTUAL)
+		    text = "<b>"+i18n("Virtual Clip")+"</b><br>";
+	    	else if (fileType == DocClipBase::IMAGE)
+		    text = "<b>"+i18n("Image Clip")+"</b><br>";
+		else if (fileType == DocClipBase::SLIDESHOW)
+		    text = "<b>"+i18n("Slideshow Clip")+"</b><br>";
+            	else if (fileType == DocClipBase::TEXT)
+                    text = "<b>"+i18n("Text Clip")+"</b><br>";
+
+	    if (fileType != DocClipBase::TEXT && fileType != DocClipBase::COLOR && fileType != DocClipBase::VIRTUAL) {
+		text.append(i18n("Path: %1").arg(clip->fileURL().directory()) + "<br>" );
+	    	text.append(i18n("File Size: ") + clip->formattedFileSize() + "<br>" );
+	    }
+	if (clip->audioChannels() + clip->audioFrequency() != 0) {
+	    QString soundChannels;
+	    switch (clip->audioChannels()) {
+	        case 1:
+		    soundChannels = i18n("Mono");
+		    break;
+	        case 2:
+		    soundChannels = i18n("Stereo");
+		    break;
+	        default:
+		    soundChannels = i18n("%1 Channels").arg(clip->audioChannels());
+		    break;
+	    }
+	    text.append(i18n("Audio: %1Hz %2").arg(QString::number(clip->audioFrequency())).arg(soundChannels) + "<br>");
+	}
+	text.append(i18n("Usage: %1").arg(QString::number(clip->numReferences())));
+	}
+	else {
+		text = "<b>"+i18n("Folder")+"</b><br>";
+		//text.append(i18n("%1 clips").arg(count()));
+
+	}
+	return text;
+}
+
+DocClipRef *AVIconViewItem::clip() const
+{
+    DocumentClipNode *clipNode = m_node->asClipNode();
+    if (clipNode) {
+	return clipNode->clipRef();
+    }
+    return 0;
+}

kdenlive/aviconviewitem.h

@@ -1,8 +1,8 @@
 /***************************************************************************
-                          avformatdesclist.h  -  description
+                          avlistviewitem.h  -  description
                              -------------------
-    begin                : Thu Jan 23 2003
-    copyright            : (C) 2003 by Jason Wood
+    begin                : Wed Mar 20 2002
+    copyright            : (C) 2002 by Jason Wood
     email                : jasonwood@blueyonder.co.uk
  ***************************************************************************/
 
@@ -15,30 +15,39 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef AVFORMATDESCLIST_H
-#define AVFORMATDESCLIST_H
+#ifndef AVICONVIEWITEM_H
+#define AVICONVIEWITEM_H
 
-#include <avformatdescbase.h>
+#include <kiconview.h>
 
-#include <qvaluevector.h>
-#include <qstring.h>
+class DocClipRef;
+class DocumentBaseNode;
+class KdenliveDoc;
 
-/**Holds a list of possible values in an AVFormat Description.
+/**Allows clips to be displayed in a QListView
   *@author Jason Wood
   */
 
-class AVFormatDescList:public AVFormatDescBase {
+class AVIconViewItem:public KIconViewItem {
   public:
-    AVFormatDescList(const QString & description, const char *&name);
-    ~AVFormatDescList();
-  /** Create a widget to handle a list value. Most likely, this will be a listbox. */
-    AVFormatWidgetBase *createWidget(QWidget * parent);
-  /** Adds the specified string to the item list. */
-    void addItem(const QString & item);
-  /** Returns the item list. */
-     QValueVector < QString > itemList();
+	/** Create an AVIconViewItem. Note that AVList takes ownership of the clip passed in. */
+    AVIconViewItem(KdenliveDoc * doc, QIconViewItem * parent,
+	DocumentBaseNode * node);
+    AVIconViewItem(KdenliveDoc * doc, QIconView * parent,
+	DocumentBaseNode * node);
+    ~AVIconViewItem();
+    DocClipRef *clip() const;
+    QString getInfo() const;
+    virtual QString text() const;
+    virtual QPixmap *pixmap() const;
+
+
   private:
-     QValueVector < QString > m_itemList;
+    void doCommonCtor();
+    QString clipDuration() const;
+    QIconView *m_iconView;
+    DocumentBaseNode *m_node;
+    KdenliveDoc *m_doc;
 };
 
 #endif

kdenlive/avlistviewitem.cpp

@@ -23,16 +23,14 @@
 #include <qheader.h>
 
 #include <klocale.h>
-#include <kdenlivedoc.h>
 #include <kdebug.h>
+#include <kiconloader.h>
 
-#include <math.h>
-
-#include <documentbasenode.h>
-#include <documentclipnode.h>
-#include <timecode.h>
-
-#include <iostream>
+#include "kdenlivedoc.h"
+#include "documentbasenode.h"
+#include "documentclipnode.h"
+#include "timecode.h"
+#include "kdenlivesettings.h"
 
 AVListViewItem::AVListViewItem(KdenliveDoc * doc, QListViewItem * parent, DocumentBaseNode * node):
 KListViewItem(parent),
@@ -54,19 +52,30 @@ KListViewItem(parent), m_listView(parent), m_node(node), m_doc(doc)
 
 void AVListViewItem::doCommonCtor()
 {
-    setRenameEnabled(2, true);
+    if (m_node->asClipNode()) setRenameEnabled(2, true);
     // recursively populate the rest of the node tree.
     QPtrListIterator < DocumentBaseNode > child(m_node->children());
     while (child.current()) {
-	new AVListViewItem(m_doc, this, child.current());
+	if (child.current()) {
+		new AVListViewItem(m_doc, this, child.current());
+	}
 	++child;
     }
 
 }
 
+QString AVListViewItem::key ( int column, bool ascending ) const
+{
+  if (column == 0) column = 1;
+  QString key = QListViewItem::key(column, ascending);
+  // Hack to make folders appear first in the list
+  if (!m_node->asClipNode()) key = "000000" + key;
+  return key; 
+} 
+
 void AVListViewItem::paintCell(QPainter *p, const QColorGroup &cg, int column, int width, int align)
 {
-    if (column == 1 && childCount() == 0) {
+    if (column == 1 && m_node->asClipNode()) {
         // Draw the clip name with duration underneath
         QFont font = p->font();
         font.setPointSize(font.pointSize() - 2 );
@@ -95,7 +104,7 @@ AVListViewItem::~AVListViewItem()
 
 void AVListViewItem::setText(int column, const QString & text)
 {
-    kdDebug() << "setText ( " << column << ", " << text << " ) " << endl;
+    //kdDebug() << "setText ( " << column << ", " << text << " ) " << endl;
     if (m_listView->columnText(column) == i18n("Description")) {
 	DocumentClipNode *clipNode = m_node->asClipNode();
 	if (clipNode) {
@@ -109,9 +118,66 @@ QString AVListViewItem::clipDuration() const {
 	DocumentClipNode *clipNode = m_node->asClipNode();
 	if (clipNode) {
 	    DocClipRef *clip = clipNode->clipRef();
-	    Timecode timecode;
-            text = timecode.getEasyTimecode(clip->duration(), KdenliveSettings::defaultfps());
+            text = Timecode::getEasyTimecode(clip->duration(), KdenliveSettings::defaultfps());
+	    int usage = clip->referencedClip()->numReferences();
+	    if (usage > 0) {
+	    	text.append(", [" + QString::number(usage) + "]");
 	    }
+	    }
+	return text;
+}
+
+QString AVListViewItem::getInfo() const
+{
+	QString text;
+	DocumentClipNode *clipNode = NULL;
+	if (m_node) clipNode = m_node->asClipNode();
+	if (clipNode) {
+	    DocClipRef *clip = clipNode->clipRef();
+	    DocClipBase::CLIPTYPE fileType = clip->clipType();
+		if (fileType == DocClipBase::AV)
+		    text = "<b>"+i18n("Video Clip")+"</b><br>";
+		else if (fileType == DocClipBase::VIDEO)
+		    text = "<b>"+i18n("Mute Video Clip")+"</b><br>";
+		else if (fileType == DocClipBase::AUDIO)
+		    text = "<b>"+i18n("Audio Clip")+"</b><br>";
+	    	else if (fileType == DocClipBase::COLOR)
+		    text = "<b>"+i18n("Color Clip")+"</b><br>";
+	    	else if (fileType == DocClipBase::VIRTUAL)
+		    text = "<b>"+i18n("Virtual Clip")+"</b><br>";
+	    	else if (fileType == DocClipBase::IMAGE)
+		    text = "<b>"+i18n("Image Clip")+"</b><br>";
+		else if (fileType == DocClipBase::SLIDESHOW)
+		    text = "<b>"+i18n("Slideshow Clip")+"</b><br>";
+            	else if (fileType == DocClipBase::TEXT)
+                    text = "<b>"+i18n("Text Clip")+"</b><br>";
+
+	    if (fileType != DocClipBase::TEXT && fileType != DocClipBase::COLOR && fileType != DocClipBase::VIRTUAL) {
+		text.append(i18n("Path: %1").arg(clip->fileURL().directory()) + "<br>" );
+	    	text.append(i18n("File Size: ") + clip->formattedFileSize() + "<br>" );
+	    }
+	if (clip->audioChannels() + clip->audioFrequency() != 0) {
+	    QString soundChannels;
+	    switch (clip->audioChannels()) {
+	        case 1:
+		    soundChannels = i18n("Mono");
+		    break;
+	        case 2:
+		    soundChannels = i18n("Stereo");
+		    break;
+	        default:
+		    soundChannels = i18n("%1 Channels").arg(clip->audioChannels());
+		    break;
+	    }
+	    text.append(i18n("Audio: %1Hz %2").arg(QString::number(clip->audioFrequency())).arg(soundChannels) + "<br>");
+	}
+	text.append(i18n("Usage: %1").arg(QString::number(clip->numReferences())));
+	}
+	else {
+		text = "<b>"+i18n("Folder")+"</b><br>";
+		text.append(i18n("%1 clips").arg(childCount()));
+
+	}
 	return text;
 }
 
@@ -125,10 +191,10 @@ QString AVListViewItem::text(int column) const
 	if (clipNode) {
 	    DocClipRef *clip = clipNode->clipRef();
 	    if (clip->durationKnown()) {
-		Timecode timecode;
+		/*Timecode timecode;
 		timecode.setFormat(Timecode::Frames);
 
-                text = timecode.getTimecode(clip->duration(), KdenliveSettings::defaultfps());
+                text = timecode.getTimecode(clip->duration(), KdenliveSettings::defaultfps());*/
 	    } else {
 		text = i18n("unknown");
 	    }
@@ -137,25 +203,7 @@ QString AVListViewItem::text(int column) const
 	DocumentClipNode *clipNode = m_node->asClipNode();
 	if (clipNode) {
 	    DocClipRef *clip = clipNode->clipRef();
-	    long fileSize = clip->fileSize();
-	    long tenth;
-	    if (fileSize < 1024) {
-		text = QString::number(fileSize) + i18n(" byte(s)");
-	    } else {
-		fileSize = (int) floor((fileSize / 1024.0) + 0.5);
-
-		if (fileSize < 1024) {
-		    text = QString::number(fileSize) + i18n(" Kb");
-		} else {
-		    fileSize = (int) floor((fileSize / 102.4) + 0.5);
-
-		    tenth = fileSize % 10;
-		    fileSize /= 10;
-
-		    text = QString::number(fileSize) + "." +
-			QString::number(tenth) + i18n(" Mb");
-		}
-	    }
+	    text = clip->formattedFileSize();
 	}
     } else if (m_listView->columnText(column) == i18n("Type")) {
 	if (m_node->asClipNode()) {
@@ -205,6 +253,9 @@ const QPixmap *AVListViewItem::pixmap(int column) const
 	    if (pixmap->isNull())
 		pixmap = NULL;
 	}
+	else {
+	    pixmap = new QPixmap(KGlobal::iconLoader()->loadIcon("folder", KIcon::Toolbar));
+	}
     }
 
     return pixmap;