move widget files

src/CMakeLists.txt

@@ -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)

src/capture/mltdevicecapture.cpp

@@ -20,7 +20,7 @@
 
 #include "kdenlivesettings.h"
 #include "definitions.h"
-#include "widgets/videosurface.h"
+#include "monitor/videosurface.h"
 
 #include <mlt++/Mlt.h>
 

src/dialogs/CMakeLists.txt

@@ -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)
 

src/doc/docclipbase.cpp

@@ -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>

src/doc/documentchecker.cpp

@@ -22,7 +22,7 @@
 #include "docclipbase.h"
 
 #include "kthumb.h"
-#include "widgets/titlewidget.h"
+#include "titler/titlewidget.h"
 #include "definitions.h"
 #include "kdenlivesettings.h"
 

src/doc/kdenlivedoc.cpp

@@ -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>

src/effectstack/effectstackview2.cpp

@@ -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>

src/effectstack/widgets/cornerswidget.cpp

@@ -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>

src/effectstack/widgets/geometrywidget.cpp

@@ -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"
 

src/mainwindow.cpp

@@ -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"
 
 

src/mainwindow.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;

src/monitor/CMakeLists.txt

@@ -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)
 

src/monitor/abstractmonitor.h

@@ -21,7 +21,7 @@
 #define ABSTRACTMONITOR_H
 
 #include "definitions.h"
-#include "widgets/videosurface.h"
+#include "monitor/videosurface.h"
 
 #include <stdint.h>
 

src/monitor/monitor.cpp

@@ -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>

src/monitor/monitor.h

@@ -27,7 +27,7 @@
 #include "definitions.h"
 #include "timecodedisplay.h"
 #ifdef USE_OPENGL
-#include "widgets/videoglwidget.h"
+#include "monitor/videoglwidget.h"
 #endif
 
 #include <QLabel>

src/widgets/monitoreditwidget.cpp → src/monitor/monitoreditwidget.cpp

@@ -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"

src/monitor/recmonitor.cpp

@@ -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>