From 5bcb9b7ead3d053cb2b0498d84a2622626bf7f14 Mon Sep 17 00:00:00 2001 From: Jean-Nicolas Artaud Date: Sun, 12 Jan 2014 17:00:43 +0100 Subject: [PATCH] Moving widget files into widgets folder. Following widget are moved: - archivewidget - cornerswidget - doubleparameterwidget - effectslistwidget - geometrywidget - kis_curve_widget - monitoreditwidget - noteswidget - renderwidget - titlewidget - videoglwidget --- src/CMakeLists.txt | 10 ---------- src/clipstabilize.cpp | 2 +- src/documentchecker.cpp | 2 +- src/effectslistview.cpp | 2 +- src/effectstack/effectstackview2.cpp | 2 +- src/effectstack/parametercontainer.cpp | 8 ++++---- src/kdenlivedoc.cpp | 2 +- src/keyframeedit.cpp | 2 +- src/mainwindow.cpp | 6 +++--- src/mainwindow.h | 2 +- src/monitor.cpp | 2 +- src/projectlist.cpp | 2 +- src/projectsettings.cpp | 2 +- src/rotoscoping/rotowidget.cpp | 2 +- src/transitionsettings.cpp | 2 +- src/widgets/CMakeLists.txt | 11 ++++++++++- src/{ => widgets}/archivewidget.cpp | 0 src/{ => widgets}/archivewidget.h | 0 src/{ => widgets}/cornerswidget.cpp | 0 src/{ => widgets}/cornerswidget.h | 0 src/{ => widgets}/doubleparameterwidget.cpp | 0 src/{ => widgets}/doubleparameterwidget.h | 0 src/{ => widgets}/effectslistwidget.cpp | 0 src/{ => widgets}/effectslistwidget.h | 0 src/{ => widgets}/geometrywidget.cpp | 0 src/{ => widgets}/geometrywidget.h | 0 src/{ => widgets}/kis_curve_widget.cpp | 0 src/{ => widgets}/kis_curve_widget.h | 0 src/{ => widgets}/monitoreditwidget.cpp | 0 src/{ => widgets}/monitoreditwidget.h | 0 src/{ => widgets}/noteswidget.cpp | 0 src/{ => widgets}/noteswidget.h | 0 src/{ => widgets}/renderwidget.cpp | 0 src/{ => widgets}/renderwidget.h | 0 src/{ => widgets}/titlewidget.cpp | 0 src/{ => widgets}/titlewidget.h | 0 36 files changed, 29 insertions(+), 30 deletions(-) rename src/{ => widgets}/archivewidget.cpp (100%) rename src/{ => widgets}/archivewidget.h (100%) rename src/{ => widgets}/cornerswidget.cpp (100%) rename src/{ => widgets}/cornerswidget.h (100%) rename src/{ => widgets}/doubleparameterwidget.cpp (100%) rename src/{ => widgets}/doubleparameterwidget.h (100%) rename src/{ => widgets}/effectslistwidget.cpp (100%) rename src/{ => widgets}/effectslistwidget.h (100%) rename src/{ => widgets}/geometrywidget.cpp (100%) rename src/{ => widgets}/geometrywidget.h (100%) rename src/{ => widgets}/kis_curve_widget.cpp (100%) rename src/{ => widgets}/kis_curve_widget.h (100%) rename src/{ => widgets}/monitoreditwidget.cpp (100%) rename src/{ => widgets}/monitoreditwidget.h (100%) rename src/{ => widgets}/noteswidget.cpp (100%) rename src/{ => widgets}/noteswidget.h (100%) rename src/{ => widgets}/renderwidget.cpp (100%) rename src/{ => widgets}/renderwidget.h (100%) rename src/{ => widgets}/titlewidget.cpp (100%) rename src/{ => widgets}/titlewidget.h (100%) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 30328c9a..7caa091b 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -112,7 +112,6 @@ list(APPEND kdenlive_SRCS abstractclipitem.cpp abstractgroupitem.cpp abstractmonitor.cpp - archivewidget.cpp clipdurationdialog.cpp clipitem.cpp clipmanager.cpp @@ -122,7 +121,6 @@ list(APPEND kdenlive_SRCS colorplaneexport.cpp colortools.cpp complexparameter.cpp - cornerswidget.cpp customruler.cpp customtrackscene.cpp customtrackview.cpp @@ -130,7 +128,6 @@ list(APPEND kdenlive_SRCS docclipbase.cpp documentchecker.cpp documentvalidator.cpp - doubleparameterwidget.cpp dragvalue.cpp dvdwizard.cpp dvdwizardchapters.cpp @@ -138,13 +135,11 @@ list(APPEND kdenlive_SRCS dvdwizardvob.cpp effectslist.cpp effectslistview.cpp - effectslistwidget.cpp effectstackedit.cpp encodingprofilesdialog.cpp folderprojectitem.cpp gentime.cpp geometryval.cpp - geometrywidget.cpp graphicsscenerectmove.cpp guide.cpp headertrack.cpp @@ -154,16 +149,13 @@ list(APPEND kdenlive_SRCS keyframeedit.cpp keyframehelper.cpp kis_cubic_curve.cpp - kis_curve_widget.cpp kthumb.cpp managecapturesdialog.cpp markerdialog.cpp mltdevicecapture.cpp monitor.cpp - monitoreditwidget.cpp monitormanager.cpp monitorscene.cpp - noteswidget.cpp parameterplotter.cpp positionedit.cpp profilesdialog.cpp @@ -173,7 +165,6 @@ list(APPEND kdenlive_SRCS projectsettings.cpp recmonitor.cpp renderer.cpp - renderwidget.cpp slideshowclip.cpp smallruler.cpp spacerdialog.cpp @@ -182,7 +173,6 @@ list(APPEND kdenlive_SRCS timecode.cpp timecodedisplay.cpp titledocument.cpp - titlewidget.cpp trackdialog.cpp tracksconfigdialog.cpp trackview.cpp diff --git a/src/clipstabilize.cpp b/src/clipstabilize.cpp index c35586a8..8c983a0c 100644 --- a/src/clipstabilize.cpp +++ b/src/clipstabilize.cpp @@ -20,7 +20,7 @@ #include "clipstabilize.h" -#include "doubleparameterwidget.h" +#include "widgets/doubleparameterwidget.h" #include #include diff --git a/src/documentchecker.cpp b/src/documentchecker.cpp index 042b95cc..da32ec34 100644 --- a/src/documentchecker.cpp +++ b/src/documentchecker.cpp @@ -21,7 +21,7 @@ #include "documentchecker.h" #include "kthumb.h" #include "docclipbase.h" -#include "titlewidget.h" +#include "widgets/titlewidget.h" #include "definitions.h" #include "kdenlivesettings.h" diff --git a/src/effectslistview.cpp b/src/effectslistview.cpp index 567fa3e2..90d9dd96 100644 --- a/src/effectslistview.cpp +++ b/src/effectslistview.cpp @@ -19,7 +19,7 @@ #include "effectslistview.h" -#include "effectslistwidget.h" +#include "widgets/effectslistwidget.h" #include "effectslist.h" #include "kdenlivesettings.h" diff --git a/src/effectstack/effectstackview2.cpp b/src/effectstack/effectstackview2.cpp index 8fe4d1fe..47b66665 100644 --- a/src/effectstack/effectstackview2.cpp +++ b/src/effectstack/effectstackview2.cpp @@ -23,7 +23,7 @@ #include "docclipbase.h" #include "projectlist.h" #include "kthumb.h" -#include "monitoreditwidget.h" +#include "widgets/monitoreditwidget.h" #include "monitorscene.h" #include "kdenlivesettings.h" #include "collapsibleeffect.h" diff --git a/src/effectstack/parametercontainer.cpp b/src/effectstack/parametercontainer.cpp index 3b86c721..e1e12c4a 100644 --- a/src/effectstack/parametercontainer.cpp +++ b/src/effectstack/parametercontainer.cpp @@ -26,13 +26,13 @@ #include "complexparameter.h" #include "geometryval.h" #include "positionedit.h" -#include "kis_curve_widget.h" +#include "widgets/kis_curve_widget.h" #include "kis_cubic_curve.h" #include "widgets/choosecolorwidget.h" -#include "geometrywidget.h" +#include "widgets/geometrywidget.h" #include "colortools.h" -#include "doubleparameterwidget.h" -#include "cornerswidget.h" +#include "widgets/doubleparameterwidget.h" +#include "widgets/cornerswidget.h" #include "dragvalue.h" #include "beziercurve/beziersplinewidget.h" #ifdef USE_QJSON diff --git a/src/kdenlivedoc.cpp b/src/kdenlivedoc.cpp index 01cd32e3..ffd73333 100644 --- a/src/kdenlivedoc.cpp +++ b/src/kdenlivedoc.cpp @@ -24,7 +24,7 @@ #include "kdenlivesettings.h" #include "renderer.h" #include "clipmanager.h" -#include "titlewidget.h" +#include "widgets/titlewidget.h" #include "mainwindow.h" #include "documentchecker.h" #include "documentvalidator.h" diff --git a/src/keyframeedit.cpp b/src/keyframeedit.cpp index ac367215..a7e157ff 100644 --- a/src/keyframeedit.cpp +++ b/src/keyframeedit.cpp @@ -16,7 +16,7 @@ ***************************************************************************/ #include "keyframeedit.h" -#include "doubleparameterwidget.h" +#include "widgets/doubleparameterwidget.h" #include "positionedit.h" #include "kdenlivesettings.h" diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 517e321e..ae9c289d 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -37,7 +37,7 @@ #include "effectslistview.h" #include "effectstack/effectstackview2.h" #include "transitionsettings.h" -#include "renderwidget.h" +#include "widgets/renderwidget.h" #include "renderer.h" #ifdef USE_JOGSHUTTLE #include "jogshuttle.h" @@ -47,7 +47,7 @@ #include "clipproperties.h" #include "wizard.h" #include "commands/editclipcommand.h" -#include "titlewidget.h" +#include "widgets/titlewidget.h" #include "markerdialog.h" #include "clipitem.h" #include "interfaces.h" @@ -62,7 +62,7 @@ #include "scopes/audioscopes/audiosignal.h" #include "scopes/audioscopes/audiospectrum.h" #include "scopes/audioscopes/spectrogram.h" -#include "archivewidget.h" +#include "widgets/archivewidget.h" #include "databackup/backupwidget.h" #include "utils/resourcewidget.h" diff --git a/src/mainwindow.h b/src/mainwindow.h index 2324af53..486e887c 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -48,7 +48,7 @@ #include "statusbarmessagelabel.h" #include "dvdwizard.h" #include "stopmotion/stopmotion.h" -#include "noteswidget.h" +#include "widgets/noteswidget.h" #include "ui_backupdialog_ui.h" class KdenliveDoc; diff --git a/src/monitor.cpp b/src/monitor.cpp index d8c28dd5..8e86d23f 100644 --- a/src/monitor.cpp +++ b/src/monitor.cpp @@ -23,7 +23,7 @@ #include "docclipbase.h" #include "abstractclipitem.h" #include "monitorscene.h" -#include "monitoreditwidget.h" +#include "widgets/monitoreditwidget.h" #include "kdenlivesettings.h" #include diff --git a/src/projectlist.cpp b/src/projectlist.cpp index 1cc47e57..dce5dacd 100644 --- a/src/projectlist.cpp +++ b/src/projectlist.cpp @@ -26,7 +26,7 @@ #include "kdenlivesettings.h" #include "slideshowclip.h" #include "ui_colorclip_ui.h" -#include "titlewidget.h" +#include "widgets/titlewidget.h" #include "definitions.h" #include "clipmanager.h" #include "docclipbase.h" diff --git a/src/projectsettings.cpp b/src/projectsettings.cpp index 75f5956c..a844bf58 100644 --- a/src/projectsettings.cpp +++ b/src/projectsettings.cpp @@ -21,7 +21,7 @@ #include "kdenlivesettings.h" #include "profilesdialog.h" #include "docclipbase.h" -#include "titlewidget.h" +#include "widgets/titlewidget.h" #include "effectslist.h" #include diff --git a/src/rotoscoping/rotowidget.cpp b/src/rotoscoping/rotowidget.cpp index e8d83ec3..d5832f6a 100644 --- a/src/rotoscoping/rotowidget.cpp +++ b/src/rotoscoping/rotowidget.cpp @@ -20,7 +20,7 @@ #include "monitor.h" #include "renderer.h" #include "monitorscene.h" -#include "monitoreditwidget.h" +#include "widgets/monitoreditwidget.h" #include "onmonitoritems/rotoscoping/bpointitem.h" #include "onmonitoritems/rotoscoping/splineitem.h" #include "simplekeyframes/simplekeyframewidget.h" diff --git a/src/transitionsettings.cpp b/src/transitionsettings.cpp index 39943683..4a641b10 100644 --- a/src/transitionsettings.cpp +++ b/src/transitionsettings.cpp @@ -23,7 +23,7 @@ #include "effectstackedit.h" #include "kdenlivesettings.h" #include "mainwindow.h" -#include "monitoreditwidget.h" +#include "widgets/monitoreditwidget.h" #include "monitorscene.h" #include diff --git a/src/widgets/CMakeLists.txt b/src/widgets/CMakeLists.txt index 1272b203..2b3e574e 100644 --- a/src/widgets/CMakeLists.txt +++ b/src/widgets/CMakeLists.txt @@ -3,6 +3,15 @@ set(kdenlive_SRCS widgets/invaliddialog.cpp widgets/choosecolorwidget.cpp widgets/colorpickerwidget.cpp + widgets/archivewidget.cpp + widgets/cornerswidget.cpp + widgets/doubleparameterwidget.cpp + widgets/effectslistwidget.cpp + widgets/geometrywidget.cpp + widgets/kis_curve_widget.cpp + widgets/monitoreditwidget.cpp + widgets/noteswidget.cpp + widgets/renderwidget.cpp + widgets/titlewidget.cpp PARENT_SCOPE ) - diff --git a/src/archivewidget.cpp b/src/widgets/archivewidget.cpp similarity index 100% rename from src/archivewidget.cpp rename to src/widgets/archivewidget.cpp diff --git a/src/archivewidget.h b/src/widgets/archivewidget.h similarity index 100% rename from src/archivewidget.h rename to src/widgets/archivewidget.h diff --git a/src/cornerswidget.cpp b/src/widgets/cornerswidget.cpp similarity index 100% rename from src/cornerswidget.cpp rename to src/widgets/cornerswidget.cpp diff --git a/src/cornerswidget.h b/src/widgets/cornerswidget.h similarity index 100% rename from src/cornerswidget.h rename to src/widgets/cornerswidget.h diff --git a/src/doubleparameterwidget.cpp b/src/widgets/doubleparameterwidget.cpp similarity index 100% rename from src/doubleparameterwidget.cpp rename to src/widgets/doubleparameterwidget.cpp diff --git a/src/doubleparameterwidget.h b/src/widgets/doubleparameterwidget.h similarity index 100% rename from src/doubleparameterwidget.h rename to src/widgets/doubleparameterwidget.h diff --git a/src/effectslistwidget.cpp b/src/widgets/effectslistwidget.cpp similarity index 100% rename from src/effectslistwidget.cpp rename to src/widgets/effectslistwidget.cpp diff --git a/src/effectslistwidget.h b/src/widgets/effectslistwidget.h similarity index 100% rename from src/effectslistwidget.h rename to src/widgets/effectslistwidget.h diff --git a/src/geometrywidget.cpp b/src/widgets/geometrywidget.cpp similarity index 100% rename from src/geometrywidget.cpp rename to src/widgets/geometrywidget.cpp diff --git a/src/geometrywidget.h b/src/widgets/geometrywidget.h similarity index 100% rename from src/geometrywidget.h rename to src/widgets/geometrywidget.h diff --git a/src/kis_curve_widget.cpp b/src/widgets/kis_curve_widget.cpp similarity index 100% rename from src/kis_curve_widget.cpp rename to src/widgets/kis_curve_widget.cpp diff --git a/src/kis_curve_widget.h b/src/widgets/kis_curve_widget.h similarity index 100% rename from src/kis_curve_widget.h rename to src/widgets/kis_curve_widget.h diff --git a/src/monitoreditwidget.cpp b/src/widgets/monitoreditwidget.cpp similarity index 100% rename from src/monitoreditwidget.cpp rename to src/widgets/monitoreditwidget.cpp diff --git a/src/monitoreditwidget.h b/src/widgets/monitoreditwidget.h similarity index 100% rename from src/monitoreditwidget.h rename to src/widgets/monitoreditwidget.h diff --git a/src/noteswidget.cpp b/src/widgets/noteswidget.cpp similarity index 100% rename from src/noteswidget.cpp rename to src/widgets/noteswidget.cpp diff --git a/src/noteswidget.h b/src/widgets/noteswidget.h similarity index 100% rename from src/noteswidget.h rename to src/widgets/noteswidget.h diff --git a/src/renderwidget.cpp b/src/widgets/renderwidget.cpp similarity index 100% rename from src/renderwidget.cpp rename to src/widgets/renderwidget.cpp diff --git a/src/renderwidget.h b/src/widgets/renderwidget.h similarity index 100% rename from src/renderwidget.h rename to src/widgets/renderwidget.h diff --git a/src/titlewidget.cpp b/src/widgets/titlewidget.cpp similarity index 100% rename from src/titlewidget.cpp rename to src/widgets/titlewidget.cpp diff --git a/src/titlewidget.h b/src/widgets/titlewidget.h similarity index 100% rename from src/titlewidget.h rename to src/widgets/titlewidget.h -- 2.39.2