Commit d0fa610d authored by Vincent Pinon's avatar Vincent Pinon

moving files (continued)

parent bb452704
......@@ -81,108 +81,39 @@ macro_log_feature(QJSON_FOUND
install(FILES kdenlivesettings.kcfg DESTINATION ${KCFG_INSTALL_DIR})
kde4_add_kcfg_files(kdenlive_SRCS kdenlivesettings.kcfgc)
add_subdirectory(beziercurve)
add_subdirectory(lib)
add_subdirectory(utils)
add_subdirectory(doc)
add_subdirectory(project)
add_subdirectory(timeline)
add_subdirectory(effectstack)
add_subdirectory(onmonitoritems)
add_subdirectory(widgets)
add_subdirectory(dialogs)
add_subdirectory(effectslist)
add_subdirectory(scopes)
add_subdirectory(capture)
add_subdirectory(dvdwizard)
add_subdirectory(lib)
add_subdirectory(monitor)
add_subdirectory(onmonitoritems)
add_subdirectory(simplekeyframes)
add_subdirectory(stopmotion)
add_subdirectory(widgets)
add_subdirectory(monitor)
add_subdirectory(project)
add_subdirectory(titler)
add_subdirectory(utils)
if(QJSON_FOUND)
add_subdirectory(onmonitoritems/rotoscoping)
add_subdirectory(rotoscoping)
endif(QJSON_FOUND)
if(LIBV4L2_FOUND)
add_subdirectory(v4l)
endif()
list(APPEND kdenlive_SRCS
${monitor_SRCS}
${project_SRCS}
clipmanager.cpp
clipproperties.cpp
cliptranscode.cpp
colortools.cpp
definitions.cpp
doc/docclipbase.cpp
doc/doccommands.cpp
doc/documentchecker.cpp
doc/documentvalidator.cpp
doc/kdenlivedoc.cpp
dvdwizard/dvdwizard.cpp
dvdwizard/dvdwizardchapters.cpp
dvdwizard/dvdwizardmenu.cpp
dvdwizard/dvdwizardvob.cpp
effectslist.cpp
effectslistview.cpp
effectstack/complexparameter.cpp
effectstack/dragvalue.cpp
effectstack/effectstackedit.cpp
effectstack/geometryval.cpp
effectstack/keyframeedit.cpp
effectstack/keyframehelper.cpp
effectstack/positionedit.cpp
effectstack/widgets/kis_cubic_curve.cpp
encodingprofilesdialog.cpp
gentime.cpp
graphicsscenerectmove.cpp
initeffects.cpp
kdenlivesettingsdialog.cpp
KoSliderCombo.cpp
kthumb.cpp
main.cpp
mainwindow.cpp
managecapturesdialog.cpp
markerdialog.cpp
mltdevicecapture.cpp
monitor/smallruler.cpp
parameterplotter.cpp
profilesdialog.cpp
project/clipstabilize.cpp
project/folderprojectitem.cpp
projectitem.cpp
project/projectcommands.cpp
project/projectlist.cpp
project/projectlistview.cpp
projectsettings.cpp
project/subprojectitem.cpp
project/transitionsettings.cpp
renderer.cpp
scopes/colorscopes/colorplaneexport.cpp
scopes/colorscopes/histogramgenerator.cpp
scopes/colorscopes/rgbparadegenerator.cpp
scopes/colorscopes/vectorscopegenerator.cpp
scopes/colorscopes/waveformgenerator.cpp
slideshowclip.cpp
statusbarmessagelabel.cpp
timecode.cpp
timecodedisplay.cpp
timeline/abstractgroupitem.cpp
timeline/abstractclipitem.cpp
timeline/clipdurationdialog.cpp
timeline/clipitem.cpp
timeline/customruler.cpp
timeline/customtrackscene.cpp
timeline/customtrackview.cpp
timeline/guide.cpp
timeline/headertrack.cpp
timeline/spacerdialog.cpp
timeline/timelinecommands.cpp
timeline/trackdialog.cpp
timeline/tracksconfigdialog.cpp
timeline/trackview.cpp
timeline/transition.cpp
titledocument.cpp
unicodedialog.cpp
widgets/backupwidget.cpp
wizard.cpp
)
kde4_add_ui_files(kdenlive_UIS
......
set(kdenlive_SRCS
${kdenlive_SRCS}
beziercurve/beziersplineeditor.cpp
beziercurve/beziersplinewidget.cpp
beziercurve/bpoint.cpp
beziercurve/cubicbezierspline.cpp
PARENT_SCOPE
)
if(LIBV4L2_FOUND)
list(APPEND kdenlive_SRCS
capture/v4lcapture.cpp
)
endif()
set(kdenlive_SRCS
${kdenlive_SRCS}
capture/managecapturesdialog.cpp
capture/mltdevicecapture.cpp
PARENT_SCOPE)
......@@ -17,6 +17,7 @@
#include "mltdevicecapture.h"
#include "kdenlivesettings.h"
#include "definitions.h"
#include "widgets/videosurface.h"
......
/***************************************************************************
editkeyframecommand.cpp - description
-------------------
begin : 2008
copyright : (C) 2008 by Jean-Baptiste Mardelle
email : jb@kdenlive.org
***************************************************************************/
/***************************************************************************
* *
* 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 "editkeyframecommand.h"
#include "customtrackview.h"
#include <KLocalizedString>
EditKeyFrameCommand::EditKeyFrameCommand(CustomTrackView *view, const int track, const GenTime &pos, const int effectIndex, const QString& oldkeyframes, const QString& newkeyframes, bool doIt) :
QUndoCommand(),
m_view(view),
m_oldkfr(oldkeyframes),
m_newkfr(newkeyframes),
m_track(track),
m_index(effectIndex),
m_pos(pos),
m_doIt(doIt)
{
int prev = m_oldkfr.split(QLatin1Char(';'), QString::SkipEmptyParts).count();
int next = m_newkfr.split(QLatin1Char(';'), QString::SkipEmptyParts).count();
if (prev == next)
setText(i18n("Edit keyframe"));
else if (prev > next)
setText(i18n("Delete keyframe"));
else
setText(i18n("Add keyframe"));
//kDebug() << "/// CREATE GUIDE COMMAND, TIMES: " << m_oldPos.frames(25) << 'x' << m_pos.frames(25);
}
// virtual
void EditKeyFrameCommand::undo()
{
m_view->editKeyFrame(m_pos, m_track, m_index, m_oldkfr);
m_doIt = true;
}
// virtual
void EditKeyFrameCommand::redo()
{
if (m_doIt) {
m_view->editKeyFrame(m_pos, m_track, m_index, m_newkfr);
}
m_doIt = true;
}
/***************************************************************************
editkeyframecommand.h - description
-------------------
begin : 2008
copyright : (C) 2008 by Jean-Baptiste Mardelle
email : jb@kdenlive.org
***************************************************************************/
/***************************************************************************
* *
* 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 KEYFRAMECOMMAND_H
#define KEYFRAMECOMMAND_H
#include <QUndoCommand>
#include "gentime.h"
#include "definitions.h"
class CustomTrackView;
class EditKeyFrameCommand : public QUndoCommand
{
public:
EditKeyFrameCommand(CustomTrackView *view, const int track, const GenTime &pos, const int effectIndex, const QString& oldkeyframes, const QString& newkeyframes, bool doIt);
void undo();
void redo();
private:
CustomTrackView *m_view;
const QString m_oldkfr;
const QString m_newkfr;
const int m_track;
const int m_index;
const GenTime m_pos;
bool m_doIt;
};
#endif
......@@ -22,7 +22,7 @@
#define DEFINITIONS_H
#include "gentime.h"
#include "effectslist.h"
#include "effectslist/effectslist.h"
#include <KLocalizedString>
#include <QDebug>
......
set(kdenlive_SRCS
${kdenlive_SRCS}
dialogs/encodingprofilesdialog.cpp
dialogs/kdenlivesettingsdialog.cpp
dialogs/profilesdialog.cpp
dialogs/projectsettings.cpp
dialogs/slideshowclip.cpp
dialogs/wizard.cpp
PARENT_SCOPE)
......@@ -18,6 +18,7 @@
***************************************************************************/
#include "encodingprofilesdialog.h"
#include "kdenlivesettings.h"
#include <KStandardDirs>
......@@ -186,5 +187,5 @@ void EncodingProfilesDialog::slotEditProfile()
delete d;
}
#include "encodingprofilesdialog.moc"
......@@ -19,12 +19,13 @@
#include "kdenlivesettingsdialog.h"
#include "profilesdialog.h"
#ifdef USE_V4L
#include "v4l/v4lcapture.h"
#endif
#include "encodingprofilesdialog.h"
#include "kdenlivesettings.h"
#include "renderer.h"
#ifdef USE_V4L
#include "capture/v4lcapture.h"
#endif
#include <KStandardDirs>
#include <KDebug>
......
......@@ -18,6 +18,7 @@
***************************************************************************/
#include "profilesdialog.h"
#include "kdenlivesettings.h"
#include <KStandardDirs>
......
......@@ -18,11 +18,12 @@
***************************************************************************/
#include "projectsettings.h"
#include "kdenlivesettings.h"
#include "profilesdialog.h"
#include "kdenlivesettings.h"
#include "doc/docclipbase.h"
#include "widgets/titlewidget.h"
#include "effectslist.h"
#include "effectslist/effectslist.h"
#include <KStandardDirs>
#include <KMessageBox>
......
......@@ -50,7 +50,7 @@ SlideshowClip::SlideshowClip(const Timecode &tc, QWidget * parent) :
connect(m_view.slide_fade, SIGNAL(stateChanged(int)), this, SLOT(slotEnableLuma(int)));
connect(m_view.luma_fade, SIGNAL(stateChanged(int)), this, SLOT(slotEnableLumaFile(int)));
//WARNING: keep in sync with clipproperties.cpp
//WARNING: keep in sync with project/clipproperties.cpp
m_view.image_type->addItem("JPG (*.jpg)", "jpg");
m_view.image_type->addItem("JPEG (*.jpeg)", "jpeg");
m_view.image_type->addItem("PNG (*.png)", "png");
......
......@@ -18,11 +18,12 @@
***************************************************************************/
#include "wizard.h"
#include "kdenlivesettings.h"
#include "profilesdialog.h"
#include "kdenlivesettings.h"
#include "renderer.h"
#ifdef USE_V4L
#include "v4l/v4lcapture.h"
#include "capture/v4lcapture.h"
#endif
#include <config-kdenlive.h>
......
set(kdenlive_SRCS
${kdenlive_SRCS}
doc/docclipbase.cpp
doc/doccommands.cpp
doc/documentchecker.cpp
doc/documentvalidator.cpp
doc/kdenlivedoc.cpp
PARENT_SCOPE)
......@@ -22,13 +22,12 @@
***************************************************************************/
#include "docclipbase.h"
#include "doc/docclipbase.h"
#include "kdenlivesettings.h"
#include "kthumb.h"
#include "clipmanager.h"
#include "slideshowclip.h"
#include "project/clipmanager.h"
#include "dialogs/slideshowclip.h"
#include <KIO/NetAccess>
#include <KStandardDirs>
......@@ -1410,3 +1409,4 @@ QMap <QString, QString> DocClipBase::analysisData() const
#include "docclipbase.moc"
/***************************************************************************
doc/docclipbase.h - description
docclipbase.h - description
-------------------
begin : Fri Apr 12 2002
copyright : (C) 2002 by Jason Wood
......
......@@ -17,8 +17,9 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA *
***************************************************************************/
#include "doc/doccommands.h"
#include "doc/kdenlivedoc.h"
#include "doccommands.h"
#include "kdenlivedoc.h"
#include <KLocalizedString>
AddClipCommand::AddClipCommand(KdenliveDoc *doc, const QDomElement &xml, const QString &id, bool doIt, QUndoCommand * parent) :
......
......@@ -18,9 +18,10 @@
***************************************************************************/
#include "doc/documentchecker.h"
#include "documentchecker.h"
#include "docclipbase.h"
#include "kthumb.h"
#include "doc/docclipbase.h"
#include "widgets/titlewidget.h"
#include "definitions.h"
#include "kdenlivesettings.h"
......@@ -961,4 +962,3 @@ void DocumentChecker::slotCheckButtons()
#include "documentchecker.moc"
......@@ -18,9 +18,10 @@
***************************************************************************/
#include "doc/documentvalidator.h"
#include "documentvalidator.h"
#include "definitions.h"
#include "initeffects.h"
#include "effectslist/initeffects.h"
#include "mainwindow.h"
#include <KDebug>
......@@ -1204,3 +1205,4 @@ bool DocumentValidator::updateEffectParameters(const QDomNodeList &parameters, c
}
return updated;
}
......@@ -18,20 +18,20 @@
***************************************************************************/
#include "doc/kdenlivedoc.h"
#include "kdenlivedoc.h"
#include "docclipbase.h"
#include "documentchecker.h"
#include "documentvalidator.h"
#include <config-kdenlive.h>
#include "doc/docclipbase.h"
#include "profilesdialog.h"
#include "kdenlivesettings.h"
#include "renderer.h"
#include "clipmanager.h"
#include "widgets/titlewidget.h"
#include "mainwindow.h"
#include "doc/documentchecker.h"
#include "doc/documentvalidator.h"
#include "initeffects.h"
#include "mainwindow.h"
#include "project/clipmanager.h"
#include "project/projectlist.h"
#include "effectslist/initeffects.h"
#include "dialogs/profilesdialog.h"
#include "widgets/titlewidget.h"
#include <KDebug>
#include <KStandardDirs>
......
......@@ -244,3 +244,4 @@ signals:
};
#endif
set(kdenlive_SRCS
${kdenlive_SRCS}
dvdwizard/dvdwizardchapters.cpp
dvdwizard/dvdwizard.cpp
dvdwizard/dvdwizardmenu.cpp
dvdwizard/dvdwizardvob.cpp
PARENT_SCOPE)
......@@ -18,10 +18,11 @@
***************************************************************************/
#include "dvdwizard/dvdwizard.h"
#include "dvdwizard/dvdwizardvob.h"
#include "dvdwizard.h"
#include "dvdwizardvob.h"
#include "kdenlivesettings.h"
#include "profilesdialog.h"
#include "dialogs/profilesdialog.h"
#include "timecode.h"
#include "monitor/monitormanager.h"
......
......@@ -21,20 +21,19 @@
#ifndef DVDWIZARD_H
#define DVDWIZARD_H
#include "dvdwizard/dvdwizardvob.h"
#include "dvdwizard/dvdwizardmenu.h"
#include "dvdwizard/dvdwizardchapters.h"
#include "ui_dvdwizardstatus_ui.h"
#include "ui_dvdwizardchapters_ui.h"
#include <QWizard>
#include <QPainter>
#include <QProcess>
#include <KDebug>
#include <KTemporaryFile>
#include "dvdwizard/dvdwizardvob.h"
#include "dvdwizard/dvdwizardmenu.h"
#include "dvdwizard/dvdwizardchapters.h"
#include "ui_dvdwizardstatus_ui.h"
#include "ui_dvdwizardchapters_ui.h"
typedef QMap <QString, QRect> stringRectMap;
class DvdWizard : public QWizard
......
......@@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA *
***************************************************************************/
#include "dvdwizard/dvdwizardchapters.h"
#include "dvdwizardchapters.h"
#include <KDebug>
......@@ -258,4 +258,4 @@ QDomElement DvdWizardChapters::toXml() const
return doc.documentElement();
}
#include "dvdwizard/dvdwizardchapters.moc"
#include "dvdwizardchapters.moc"
......@@ -21,15 +21,15 @@
#ifndef DVDWIZARDCHAPTERS_H
#define DVDWIZARDCHAPTERS_H
#include <QWizardPage>
#include <KDebug>
#include "ui_dvdwizardchapters_ui.h"
#include "dvdwizardvob.h"
#include "monitor/monitor.h"
#include "dvdwizard/dvdwizardvob.h"
#include "monitor/monitormanager.h"
#include <QWizardPage>
#include <KDebug>
class DvdWizardChapters : public QWizardPage
{
Q_OBJECT
......
......@@ -17,7 +17,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA *
***************************************************************************/
#include "dvdwizard/dvdwizardmenu.h"
#include "dvdwizardmenu.h"
#include "kdenlivesettings.h"
#include <KDebug>
......
......@@ -21,6 +21,9 @@
#ifndef DVDWIZARDMENU_H
#define DVDWIZARDMENU_H
#include "dvdwizardvob.h"
#include "ui_dvdwizardmenu_ui.h"
#include <QWizardPage>
#include <QGraphicsScene>
#include <QGraphicsTextItem>
......@@ -35,9 +38,6 @@
#include <KMessageWidget>
#endif
#include "dvdwizard/dvdwizardvob.h"
#include "ui_dvdwizardmenu_ui.h"
class DvdScene : public QGraphicsScene
{
Q_OBJECT
......
......@@ -17,10 +17,10 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA *
***************************************************************************/
#include "dvdwizard/dvdwizardvob.h"
#include "dvdwizardvob.h"
#include "kthumb.h"
#include "timecode.h"
#include "cliptranscode.h"
#include "project/cliptranscode.h"
#include <mlt++/Mlt.h>
......
set(kdenlive_SRCS
${kdenlive_SRCS}
effectslist/effectslist.cpp
effectslist/effectslistview.cpp
effectslist/effectslistwidget.cpp
effectslist/initeffects.cpp
PARENT_SCOPE)
......@@ -19,8 +19,9 @@
#include "effectslistview.h"
#include "effectstack/widgets/effectslistwidget.h"
#include "effectslist.h"
#include "effectslistwidget.h"
#include "kdenlivesettings.h"
#include <KDebug>
......
......@@ -19,7 +19,7 @@
#include "effectslistwidget.h"
#include "effectslist.h"
#include "effectslist/effectslist.h"
#include "mainwindow.h"
#include <KDebug>
......