Commit 530e99f9 authored by Vincent Pinon's avatar Vincent Pinon

move widget files

parent 369a3352
......@@ -85,7 +85,6 @@ add_subdirectory(doc)
add_subdirectory(project)
add_subdirectory(timeline)
add_subdirectory(effectstack)
add_subdirectory(widgets)
add_subdirectory(dialogs)
add_subdirectory(effectslist)
add_subdirectory(scopes)
......@@ -194,7 +193,7 @@ kde4_add_ui_files(kdenlive_UIS
)
if(OPENGL_FOUND)
list(APPEND kdenlive_SRCS widgets/videoglwidget.cpp)
list(APPEND kdenlive_SRCS monitor/videoglwidget.cpp)
endif(OPENGL_FOUND)
if(BUILD_JogShuttle)
......
......@@ -20,7 +20,7 @@
#include "kdenlivesettings.h"
#include "definitions.h"
#include "widgets/videosurface.h"
#include "monitor/videosurface.h"
#include <mlt++/Mlt.h>
......
......@@ -3,8 +3,7 @@ set(kdenlive_SRCS
dialogs/encodingprofilesdialog.cpp
dialogs/kdenlivesettingsdialog.cpp
dialogs/profilesdialog.cpp
dialogs/projectsettings.cpp
dialogs/slideshowclip.cpp
dialogs/renderwidget.cpp
dialogs/wizard.cpp
PARENT_SCOPE)
......@@ -27,7 +27,7 @@
#include "kdenlivesettings.h"
#include "kthumb.h"
#include "project/clipmanager.h"
#include "dialogs/slideshowclip.h"
#include "project/dialogs/slideshowclip.h"
#include <KIO/NetAccess>
#include <KStandardDirs>
......
......@@ -22,7 +22,7 @@
#include "docclipbase.h"
#include "kthumb.h"
#include "widgets/titlewidget.h"
#include "titler/titlewidget.h"
#include "definitions.h"
#include "kdenlivesettings.h"
......
......@@ -31,7 +31,7 @@
#include "project/projectlist.h"
#include "effectslist/initeffects.h"
#include "dialogs/profilesdialog.h"
#include "widgets/titlewidget.h"
#include "titler/titlewidget.h"
#include <KDebug>
#include <KStandardDirs>
......
......@@ -26,7 +26,7 @@
#include "project/projectlist.h"
#include "effectslist/effectslist.h"
#include "timeline/clipitem.h"
#include "widgets/monitoreditwidget.h"
#include "monitor/monitoreditwidget.h"
#include "monitor/monitorscene.h"
#include <KDebug>
......
......@@ -23,7 +23,7 @@
#include "kdenlivesettings.h"
#include "monitor/monitor.h"
#include "monitor/monitorscene.h"
#include "widgets/monitoreditwidget.h"
#include "monitor/monitoreditwidget.h"
#include "onmonitoritems/onmonitorcornersitem.h"
#include <QGraphicsView>
......
......@@ -27,7 +27,7 @@
#include "timecodedisplay.h"
#include "monitor/monitor.h"
#include "monitor/monitorscene.h"
#include "widgets/monitoreditwidget.h"
#include "monitor/monitoreditwidget.h"
#include "onmonitoritems/onmonitorrectitem.h"
#include "onmonitoritems/onmonitorpathitem.h"
......
......@@ -24,7 +24,7 @@
#include "dialogs/kdenlivesettingsdialog.h"
#include "effectslist/initeffects.h"
#include "dialogs/profilesdialog.h"
#include "dialogs/projectsettings.h"
#include "project/dialogs/projectsettings.h"
#include "project/clipmanager.h"
#include "project/projectlist.h"
#include "monitor/monitor.h"
......@@ -36,7 +36,7 @@
#include "effectslist/effectslistview.h"
#include "effectstack/effectstackview2.h"
#include "project/transitionsettings.h"
#include "widgets/renderwidget.h"
#include "dialogs/renderwidget.h"
#include "renderer.h"
#ifdef USE_JOGSHUTTLE
#include "jogshuttle/jogshuttle.h"
......@@ -46,7 +46,7 @@
#include "project/clipproperties.h"
#include "dialogs/wizard.h"
#include "project/projectcommands.h"
#include "widgets/titlewidget.h"
#include "titler/titlewidget.h"
#include "timeline/markerdialog.h"
#include "timeline/clipitem.h"
#include "interfaces.h"
......@@ -61,8 +61,8 @@
#include "scopes/audioscopes/audiosignal.h"
#include "scopes/audioscopes/audiospectrum.h"
#include "scopes/audioscopes/spectrogram.h"
#include "widgets/archivewidget.h"
#include "widgets/backupwidget.h"
#include "project/dialogs/archivewidget.h"
#include "project/dialogs/backupwidget.h"
#include "utils/resourcewidget.h"
......
......@@ -48,7 +48,7 @@
#include "statusbarmessagelabel.h"
#include "dvdwizard/dvdwizard.h"
#include "stopmotion/stopmotion.h"
#include "widgets/noteswidget.h"
#include "project/dialogs/noteswidget.h"
#include "ui_backupdialog_ui.h"
class KdenliveDoc;
......
......@@ -2,9 +2,11 @@ set(kdenlive_SRCS
${kdenlive_SRCS}
monitor/abstractmonitor.cpp
monitor/monitor.cpp
monitor/monitoreditwidget.cpp
monitor/monitormanager.cpp
monitor/monitorscene.cpp
monitor/recmonitor.cpp
monitor/smallruler.cpp
monitor/videosurface.cpp
PARENT_SCOPE)
......@@ -21,7 +21,7 @@
#define ABSTRACTMONITOR_H
#include "definitions.h"
#include "widgets/videosurface.h"
#include "monitor/videosurface.h"
#include <stdint.h>
......
......@@ -20,13 +20,13 @@
#include "monitor.h"
#include "monitorscene.h"
#include "monitoreditwidget.h"
#include "videosurface.h"
#include "smallruler.h"
#include "kdenlivesettings.h"
#include "doc/docclipbase.h"
#include "timeline/abstractclipitem.h"
#include "widgets/monitoreditwidget.h"
#include "widgets/videosurface.h"
#include <KDebug>
#include <KLocalizedString>
......
......@@ -27,7 +27,7 @@
#include "definitions.h"
#include "timecodedisplay.h"
#ifdef USE_OPENGL
#include "widgets/videoglwidget.h"
#include "monitor/videoglwidget.h"
#endif
#include <QLabel>
......
......@@ -20,7 +20,7 @@
#include "monitoreditwidget.h"
#include "kdenlivesettings.h"
#include "renderer.h"
#include "monitor/monitorscene.h"
#include "monitorscene.h"
#include "onmonitoritems/onmonitorrectitem.h"
#include "onmonitoritems/onmonitorpathitem.h"
......
......@@ -26,7 +26,7 @@
#include "capture/mltdevicecapture.h"
#include "capture/managecapturesdialog.h"
#include "dialogs/profilesdialog.h"
#include "widgets/videosurface.h"
#include "videosurface.h"
#include <config-kdenlive.h>
#include <KDebug>
......
......@@ -23,7 +23,7 @@
#include "renderer.h"
#include "monitor/monitor.h"
#include "monitor/monitorscene.h"
#include "widgets/monitoreditwidget.h"
#include "monitor/monitoreditwidget.h"
#include "simplekeyframes/simplekeyframewidget.h"
#include "kdenlivesettings.h"
......
add_subdirectory(dialogs)
set(kdenlive_SRCS
${kdenlive_SRCS}
project/clipmanager.cpp
......@@ -5,6 +6,7 @@ set(kdenlive_SRCS
project/clipstabilize.cpp
project/cliptranscode.cpp
project/folderprojectitem.cpp
project/invaliddialog.cpp
project/projectcommands.cpp
project/projectitem.cpp
project/projectlist.cpp
......@@ -16,4 +18,3 @@ set(kdenlive_SRCS
project/jobs/cutclipjob.cpp
project/jobs/meltjob.cpp
PARENT_SCOPE)
......@@ -19,13 +19,13 @@
#include "clipmanager.h"
#include "subprojectitem.h"
#include "kdenlivesettings.h"
#include "kthumb.h"
#include "doc/doccommands.h"
#include "doc/docclipbase.h"
#include "doc/kdenlivedoc.h"
#include "project/subprojectitem.h"
#include "timeline/abstractclipitem.h"
#include "timeline/abstractgroupitem.h"
#include "titler/titledocument.h"
......
......@@ -347,7 +347,7 @@ ClipProperties::ClipProperties(DocClipBase *clip, const Timecode &tc, double fps
m_view.tabWidget->removeTab(AUDIOTAB);
m_view.tabWidget->removeTab(VIDEOTAB);
//WARNING: Keep in sync with dialogs/slideshowclip.cpp
//WARNING: Keep in sync with project/dialogs/slideshowclip.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");
......
set(kdenlive_SRCS
${kdenlive_SRCS}
project/dialogs/archivewidget.cpp
project/dialogs/backupwidget.cpp
project/dialogs/noteswidget.cpp
project/dialogs/projectsettings.cpp
project/dialogs/slideshowclip.cpp
PARENT_SCOPE)
......@@ -19,8 +19,8 @@
#include "archivewidget.h"
#include "titlewidget.h"
#include "dialogs/projectsettings.h"
#include "projectsettings.h"
#include "titler/titlewidget.h"
#include <KLocalizedString>
#include <KDiskFreeSpaceInfo>
......
......@@ -18,12 +18,12 @@
***************************************************************************/
#include "projectsettings.h"
#include "profilesdialog.h"
#include "kdenlivesettings.h"
#include "doc/docclipbase.h"
#include "widgets/titlewidget.h"
#include "titler/titlewidget.h"
#include "effectslist/effectslist.h"
#include "dialogs/profilesdialog.h"
#include <KStandardDirs>
#include <KMessageBox>
......
......@@ -26,14 +26,14 @@
#include "clipmanager.h"
#include "projectlistview.h"
#include "clipstabilize.h"
#include "dialogs/slideshowclip.h"
#include "kdenlivesettings.h"
#include "renderer.h"
#include "kthumb.h"
#include "definitions.h"
#include "timecodedisplay.h"
#include "dialogs/slideshowclip.h"
#include "widgets/titlewidget.h"
#include "titler/titlewidget.h"
#include "doc/docclipbase.h"
#include "doc/kdenlivedoc.h"
#include "dialogs/profilesdialog.h"
......
......@@ -28,7 +28,7 @@
#include "definitions.h"
#include "timecode.h"
#include "kdenlivesettings.h"
#include "widgets/invaliddialog.h"
#include "project/invaliddialog.h"
#include <QDomNodeList>
#include <QHash>
......
......@@ -24,7 +24,7 @@
#include "timeline/transition.h"
#include "effectslist/effectslist.h"
#include "effectstack/effectstackedit.h"
#include "widgets/monitoreditwidget.h"
#include "monitor/monitoreditwidget.h"
#include "monitor/monitorscene.h"
#include <KDebug>
......
......@@ -27,7 +27,7 @@
#include "kdenlivesettings.h"
#include "kthumb.h"
#include "definitions.h"
#include "dialogs/slideshowclip.h"
#include "project/dialogs/slideshowclip.h"
#include "dialogs/profilesdialog.h"
#include <mlt++/Mlt.h>
......
......@@ -19,7 +19,7 @@
#ifdef USE_V4L
#include "capture/v4lcapture.h"
#endif
#include "dialogs/slideshowclip.h"
#include "project/dialogs/slideshowclip.h"
#include "dialogs/profilesdialog.h"
#include "capture/mltdevicecapture.h"
#include "monitor/recmonitor.h"
......
......@@ -2,6 +2,7 @@ set(kdenlive_SRCS
${kdenlive_SRCS}
titler/KoSliderCombo.cpp
titler/titledocument.cpp
titler/titlewidget.cpp
titler/unicodedialog.cpp
PARENT_SCOPE)
set(kdenlive_SRCS
${kdenlive_SRCS}
widgets/archivewidget.cpp
widgets/backupwidget.cpp
widgets/invaliddialog.cpp
widgets/monitoreditwidget.cpp
widgets/noteswidget.cpp
widgets/renderwidget.cpp
widgets/titlewidget.cpp
widgets/videosurface.cpp
PARENT_SCOPE)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment