]> git.sesse.net Git - kdenlive/commitdiff
Rename WIDGETS folder into UI.
authorJean-Nicolas Artaud <jeannicolasartaud@gmail.com>
Sat, 11 Jan 2014 13:19:31 +0000 (14:19 +0100)
committerJean-Nicolas Artaud <jeannicolasartaud@gmail.com>
Sat, 11 Jan 2014 13:19:31 +0000 (14:19 +0100)
81 files changed:
Messages.sh
src/CMakeLists.txt
src/projectlist.cpp
src/ui/addtrack_ui.ui [moved from src/widgets/addtrack_ui.ui with 100% similarity]
src/ui/archivewidget_ui.ui [moved from src/widgets/archivewidget_ui.ui with 100% similarity]
src/ui/audiospectrum_ui.ui [moved from src/widgets/audiospectrum_ui.ui with 100% similarity]
src/ui/backupdialog_ui.ui [moved from src/widgets/backupdialog_ui.ui with 100% similarity]
src/ui/bezierspline_ui.ui [moved from src/widgets/bezierspline_ui.ui with 100% similarity]
src/ui/boolval_ui.ui [moved from src/widgets/boolval_ui.ui with 100% similarity]
src/ui/clipdurationdialog_ui.ui [moved from src/widgets/clipdurationdialog_ui.ui with 100% similarity]
src/ui/clipproperties_ui.ui [moved from src/widgets/clipproperties_ui.ui with 100% similarity]
src/ui/clipstabilize_ui.ui [moved from src/widgets/clipstabilize_ui.ui with 100% similarity]
src/ui/cliptranscode_ui.ui [moved from src/widgets/cliptranscode_ui.ui with 100% similarity]
src/ui/collapsiblewidget_ui.ui [moved from src/widgets/collapsiblewidget_ui.ui with 100% similarity]
src/ui/colorclip_ui.ui [moved from src/widgets/colorclip_ui.ui with 100% similarity]
src/ui/colorplaneexport_ui.ui [moved from src/widgets/colorplaneexport_ui.ui with 100% similarity]
src/ui/configcapture_ui.ui [moved from src/widgets/configcapture_ui.ui with 100% similarity]
src/ui/configenv_ui.ui [moved from src/widgets/configenv_ui.ui with 100% similarity]
src/ui/configjogshuttle_ui.ui [moved from src/widgets/configjogshuttle_ui.ui with 100% similarity]
src/ui/configmisc_ui.ui [moved from src/widgets/configmisc_ui.ui with 100% similarity]
src/ui/configproject_ui.ui [moved from src/widgets/configproject_ui.ui with 100% similarity]
src/ui/configsdl_ui.ui [moved from src/widgets/configsdl_ui.ui with 100% similarity]
src/ui/configtimeline_ui.ui [moved from src/widgets/configtimeline_ui.ui with 100% similarity]
src/ui/configtranscode_ui.ui [moved from src/widgets/configtranscode_ui.ui with 100% similarity]
src/ui/cutjobdialog_ui.ui [moved from src/widgets/cutjobdialog_ui.ui with 100% similarity]
src/ui/dvdwizardchapters_ui.ui [moved from src/widgets/dvdwizardchapters_ui.ui with 100% similarity]
src/ui/dvdwizardmenu_ui.ui [moved from src/widgets/dvdwizardmenu_ui.ui with 100% similarity]
src/ui/dvdwizardstatus_ui.ui [moved from src/widgets/dvdwizardstatus_ui.ui with 100% similarity]
src/ui/dvdwizardvob_ui.ui [moved from src/widgets/dvdwizardvob_ui.ui with 100% similarity]
src/ui/effectlist_ui.ui [moved from src/widgets/effectlist_ui.ui with 100% similarity]
src/ui/effectstack2_ui.ui [moved from src/widgets/effectstack2_ui.ui with 100% similarity]
src/ui/effectstack_ui.ui [moved from src/widgets/effectstack_ui.ui with 100% similarity]
src/ui/fontval_ui.ui [moved from src/widgets/fontval_ui.ui with 100% similarity]
src/ui/freesound_ui.ui [moved from src/widgets/freesound_ui.ui with 100% similarity]
src/ui/geometryval_ui.ui [moved from src/widgets/geometryval_ui.ui with 100% similarity]
src/ui/geometrywidget_ui.ui [moved from src/widgets/geometrywidget_ui.ui with 100% similarity]
src/ui/histogram_ui.ui [moved from src/widgets/histogram_ui.ui with 100% similarity]
src/ui/importkeyframesdialog_ui.ui [moved from src/widgets/importkeyframesdialog_ui.ui with 100% similarity]
src/ui/keyframedialog_ui.ui [moved from src/widgets/keyframedialog_ui.ui with 100% similarity]
src/ui/keyframeeditor_ui.ui [moved from src/widgets/keyframeeditor_ui.ui with 100% similarity]
src/ui/keyframewidget_ui.ui [moved from src/widgets/keyframewidget_ui.ui with 100% similarity]
src/ui/keywordval_ui.ui [moved from src/widgets/keywordval_ui.ui with 100% similarity]
src/ui/listval_ui.ui [moved from src/widgets/listval_ui.ui with 100% similarity]
src/ui/managecaptures_ui.ui [moved from src/widgets/managecaptures_ui.ui with 100% similarity]
src/ui/manageencodingprofile_ui.ui [moved from src/widgets/manageencodingprofile_ui.ui with 100% similarity]
src/ui/markerdialog_ui.ui [moved from src/widgets/markerdialog_ui.ui with 100% similarity]
src/ui/missingclips_ui.ui [moved from src/widgets/missingclips_ui.ui with 100% similarity]
src/ui/monitor_ui.ui [moved from src/widgets/monitor_ui.ui with 100% similarity]
src/ui/monitoreditwidget_ui.ui [moved from src/widgets/monitoreditwidget_ui.ui with 100% similarity]
src/ui/profiledialog_ui.ui [moved from src/widgets/profiledialog_ui.ui with 100% similarity]
src/ui/projectsettings_ui.ui [moved from src/widgets/projectsettings_ui.ui with 100% similarity]
src/ui/recmonitor_ui.ui [moved from src/widgets/recmonitor_ui.ui with 100% similarity]
src/ui/renderwidget_ui.ui [moved from src/widgets/renderwidget_ui.ui with 100% similarity]
src/ui/resources.qrc [moved from src/widgets/resources.qrc with 100% similarity]
src/ui/rgbparade_ui.ui [moved from src/widgets/rgbparade_ui.ui with 100% similarity]
src/ui/saveprofile_ui.ui [moved from src/widgets/saveprofile_ui.ui with 100% similarity]
src/ui/scenecutdialog_ui.ui [moved from src/widgets/scenecutdialog_ui.ui with 100% similarity]
src/ui/slideshowclip_ui.ui [moved from src/widgets/slideshowclip_ui.ui with 100% similarity]
src/ui/smconfig_ui.ui [moved from src/widgets/smconfig_ui.ui with 100% similarity]
src/ui/spacerdialog_ui.ui [moved from src/widgets/spacerdialog_ui.ui with 100% similarity]
src/ui/spectrogram_ui.ui [moved from src/widgets/spectrogram_ui.ui with 100% similarity]
src/ui/stopmotion_ui.ui [moved from src/widgets/stopmotion_ui.ui with 100% similarity]
src/ui/stylesheet-branch-closed.png [moved from src/widgets/stylesheet-branch-closed.png with 100% similarity]
src/ui/stylesheet-branch-open.png [moved from src/widgets/stylesheet-branch-open.png with 100% similarity]
src/ui/templateclip_ui.ui [moved from src/widgets/templateclip_ui.ui with 100% similarity]
src/ui/timeline_ui.ui [moved from src/widgets/timeline_ui.ui with 100% similarity]
src/ui/timelinebuttons_ui.ui [moved from src/widgets/timelinebuttons_ui.ui with 100% similarity]
src/ui/titlewidget_ui.ui [moved from src/widgets/titlewidget_ui.ui with 100% similarity]
src/ui/trackheader_ui.ui [moved from src/widgets/trackheader_ui.ui with 100% similarity]
src/ui/tracksconfigdialog_ui.ui [moved from src/widgets/tracksconfigdialog_ui.ui with 100% similarity]
src/ui/transitionsettings_ui.ui [moved from src/widgets/transitionsettings_ui.ui with 100% similarity]
src/ui/unicodewidget_ui.ui [moved from src/widgets/unicodewidget_ui.ui with 100% similarity]
src/ui/urlval_ui.ui [moved from src/widgets/urlval_ui.ui with 100% similarity]
src/ui/vectorscope_ui.ui [moved from src/widgets/vectorscope_ui.ui with 100% similarity]
src/ui/waveform_ui.ui [moved from src/widgets/waveform_ui.ui with 100% similarity]
src/ui/wipeval_ui.ui [moved from src/widgets/wipeval_ui.ui with 100% similarity]
src/ui/wizardcapture_ui.ui [moved from src/widgets/wizardcapture_ui.ui with 100% similarity]
src/ui/wizardcheck_ui.ui [moved from src/widgets/wizardcheck_ui.ui with 100% similarity]
src/ui/wizardextra_ui.ui [moved from src/widgets/wizardextra_ui.ui with 100% similarity]
src/ui/wizardmltcheck_ui.ui [moved from src/widgets/wizardmltcheck_ui.ui with 100% similarity]
src/ui/wizardstandard_ui.ui [moved from src/widgets/wizardstandard_ui.ui with 100% similarity]

index f69bd55238535007a9bedbeb71260dded0c8a12b..4cd557477100884f91490e7b8413b220e5f09da3 100755 (executable)
@@ -1,6 +1,6 @@
 #!bin/sh
 
-kdenlive_subdirs="plugins renderer src src/widgets"
+kdenlive_subdirs="plugins renderer src src/ui"
 
 $EXTRACTRC --tag=name --tag=description --tag=label --tag=comment --tag=paramlistdisplay effects/*.xml data/kdenliveeffectscategory.rc >> rc.cpp
 $EXTRACTRC `find $kdenlive_subdirs -name \*.rc -a ! -name encodingprofiles.rc -o -name \*.ui` >> rc.cpp
index 5555746df71148e6853ee7db0c05d865657bf75f..57283cf373061bafd44a08195c7fb66f8704050a 100644 (file)
@@ -194,80 +194,80 @@ list(APPEND kdenlive_SRCS
 )
 
 kde4_add_ui_files(kdenlive_UIS
-  widgets/addtrack_ui.ui
-  widgets/archivewidget_ui.ui
-  widgets/audiospectrum_ui.ui
-  widgets/backupdialog_ui.ui
-  widgets/bezierspline_ui.ui
-  widgets/boolval_ui.ui
-  widgets/clipdurationdialog_ui.ui
-  widgets/clipproperties_ui.ui
-  widgets/cliptranscode_ui.ui
-  widgets/collapsiblewidget_ui.ui
-  widgets/clipstabilize_ui.ui
-  widgets/colorclip_ui.ui
-  widgets/colorplaneexport_ui.ui
-  widgets/configcapture_ui.ui
-  widgets/configenv_ui.ui
-  widgets/configjogshuttle_ui.ui
-  widgets/configmisc_ui.ui
-  widgets/configproject_ui.ui
-  widgets/configsdl_ui.ui
-  widgets/configtimeline_ui.ui
-  widgets/configtranscode_ui.ui
-  widgets/dvdwizardchapters_ui.ui
-  widgets/dvdwizardmenu_ui.ui
-  widgets/dvdwizardstatus_ui.ui
-  widgets/dvdwizardvob_ui.ui
-  widgets/effectlist_ui.ui
-  widgets/effectstack_ui.ui
-  widgets/effectstack2_ui.ui
-  widgets/freesound_ui.ui
-  widgets/geometryval_ui.ui
-  widgets/geometrywidget_ui.ui
-  widgets/histogram_ui.ui
-  widgets/keyframedialog_ui.ui
-  widgets/keyframeeditor_ui.ui
-  widgets/keyframewidget_ui.ui
-  widgets/listval_ui.ui
-  widgets/managecaptures_ui.ui
-  widgets/manageencodingprofile_ui.ui
-  widgets/markerdialog_ui.ui
-  widgets/missingclips_ui.ui
-  widgets/monitoreditwidget_ui.ui
-  widgets/profiledialog_ui.ui
-  widgets/projectsettings_ui.ui
-  widgets/recmonitor_ui.ui
-  widgets/renderwidget_ui.ui
-  widgets/rgbparade_ui.ui
-  widgets/saveprofile_ui.ui
-  widgets/slideshowclip_ui.ui
-  widgets/smconfig_ui.ui
-  widgets/spacerdialog_ui.ui
-  widgets/spectrogram_ui.ui
-  widgets/stopmotion_ui.ui
-  widgets/templateclip_ui.ui
-  widgets/timeline_ui.ui
-  widgets/timelinebuttons_ui.ui
-  widgets/titlewidget_ui.ui
-  widgets/trackheader_ui.ui
-  widgets/tracksconfigdialog_ui.ui
-  widgets/transitionsettings_ui.ui
-  widgets/unicodewidget_ui.ui
-  widgets/urlval_ui.ui
-  widgets/vectorscope_ui.ui
-  widgets/waveform_ui.ui
-  widgets/wipeval_ui.ui
-  widgets/wizardcapture_ui.ui
-  widgets/wizardcheck_ui.ui
-  widgets/wizardextra_ui.ui
-  widgets/wizardmltcheck_ui.ui
-  widgets/wizardstandard_ui.ui
-  widgets/keywordval_ui.ui
-  widgets/fontval_ui.ui
-  widgets/cutjobdialog_ui.ui
-  widgets/scenecutdialog_ui.ui
-  widgets/importkeyframesdialog_ui.ui
+  ui/addtrack_ui.ui
+  ui/archivewidget_ui.ui
+  ui/audiospectrum_ui.ui
+  ui/backupdialog_ui.ui
+  ui/bezierspline_ui.ui
+  ui/boolval_ui.ui
+  ui/clipdurationdialog_ui.ui
+  ui/clipproperties_ui.ui
+  ui/cliptranscode_ui.ui
+  ui/collapsiblewidget_ui.ui
+  ui/clipstabilize_ui.ui
+  ui/colorclip_ui.ui
+  ui/colorplaneexport_ui.ui
+  ui/configcapture_ui.ui
+  ui/configenv_ui.ui
+  ui/configjogshuttle_ui.ui
+  ui/configmisc_ui.ui
+  ui/configproject_ui.ui
+  ui/configsdl_ui.ui
+  ui/configtimeline_ui.ui
+  ui/configtranscode_ui.ui
+  ui/dvdwizardchapters_ui.ui
+  ui/dvdwizardmenu_ui.ui
+  ui/dvdwizardstatus_ui.ui
+  ui/dvdwizardvob_ui.ui
+  ui/effectlist_ui.ui
+  ui/effectstack_ui.ui
+  ui/effectstack2_ui.ui
+  ui/freesound_ui.ui
+  ui/geometryval_ui.ui
+  ui/geometrywidget_ui.ui
+  ui/histogram_ui.ui
+  ui/keyframedialog_ui.ui
+  ui/keyframeeditor_ui.ui
+  ui/keyframewidget_ui.ui
+  ui/listval_ui.ui
+  ui/managecaptures_ui.ui
+  ui/manageencodingprofile_ui.ui
+  ui/markerdialog_ui.ui
+  ui/missingclips_ui.ui
+  ui/monitoreditwidget_ui.ui
+  ui/profiledialog_ui.ui
+  ui/projectsettings_ui.ui
+  ui/recmonitor_ui.ui
+  ui/renderwidget_ui.ui
+  ui/rgbparade_ui.ui
+  ui/saveprofile_ui.ui
+  ui/slideshowclip_ui.ui
+  ui/smconfig_ui.ui
+  ui/spacerdialog_ui.ui
+  ui/spectrogram_ui.ui
+  ui/stopmotion_ui.ui
+  ui/templateclip_ui.ui
+  ui/timeline_ui.ui
+  ui/timelinebuttons_ui.ui
+  ui/titlewidget_ui.ui
+  ui/trackheader_ui.ui
+  ui/tracksconfigdialog_ui.ui
+  ui/transitionsettings_ui.ui
+  ui/unicodewidget_ui.ui
+  ui/urlval_ui.ui
+  ui/vectorscope_ui.ui
+  ui/waveform_ui.ui
+  ui/wipeval_ui.ui
+  ui/wizardcapture_ui.ui
+  ui/wizardcheck_ui.ui
+  ui/wizardextra_ui.ui
+  ui/wizardmltcheck_ui.ui
+  ui/wizardstandard_ui.ui
+  ui/keywordval_ui.ui
+  ui/fontval_ui.ui
+  ui/cutjobdialog_ui.ui
+  ui/scenecutdialog_ui.ui
+  ui/importkeyframesdialog_ui.ui
 )
 
 if(OPENGL_FOUND)
@@ -288,7 +288,7 @@ qt4_add_dbus_adaptor(kdenlive_SRCS
   mainwindow.h
   MainWindow
 )
-qt4_add_resources(kdenlive_SRCS widgets/resources.qrc)
+qt4_add_resources(kdenlive_SRCS ui/resources.qrc)
 kde4_add_executable(kdenlive
   ${kdenlive_SRCS}
   ${kdenlive_UIS}
index d35e062c9fd576893d1f2e4baf0e1e28f2a45ee9..ccdaed495d30cbd333efe0654b6ea158aa08ac5e 100644 (file)
@@ -1854,9 +1854,11 @@ void ProjectList::slotRemoveInvalidClip(const QString &id, bool replace)
         if (!path.isEmpty()) {
             if (m_invalidClipDialog) {
                 m_invalidClipDialog->addClip(id, path);
+                qDebug() << "Toto";
                 return;
             }
             else {
+                qDebug() << "Tata";
                 if (replace)
                     m_invalidClipDialog = new InvalidDialog(i18n("Invalid clip"),  i18n("Clip is invalid, will be removed from project."), replace, kapp->activeWindow());
                 else {
similarity index 100%
rename from src/widgets/urlval_ui.ui
rename to src/ui/urlval_ui.ui