Cleanup and add mimetype for TGA images, also add EXR, TIFF and TGA to the list of...

[kdenlive] / src / projectlist.cpp

diff --git a/src/projectlist.cpp b/src/projectlist.cpp
index 71dc6ede0d883a3e4922146d87b56f64a3f59bb7..f632976db3d4bd1432723cb0c4a2945cdb113087 100644 (file)
--- a/src/projectlist.cpp
+++ b/src/projectlist.cpp
@@ -60,7 +60,7 @@ ProjectList::ProjectList(QWidget *parent)
     listView = new ProjectListView(this);;
     QVBoxLayout *layout = new QVBoxLayout;
     layout->setContentsMargins(0, 0, 0, 0);
-    // mbd: I think this has died at some point: m_clipIdCounter = 0;
+
     // setup toolbar
     searchView = new KTreeWidgetSearchLine(this);
     m_toolbar = new QToolBar("projectToolBar", this);
@@ -537,11 +537,11 @@ void ProjectList::slotAddClip(KUrl givenUrl, QString group) {
     if (!m_commandStack) kDebug() << "!!!!!!!!!!!!!!!! NO CMD STK";
     KUrl::List list;
     if (givenUrl.isEmpty()) {
-        list = KFileDialog::getOpenUrls(KUrl("kfiledialog:///clipfolder"), "application/x-kdenlive video/x-flv application/vnd.rn-realmedia video/x-dv video/dv video/x-msvideo video/mpeg video/x-ms-wmv audio/mpeg audio/x-mp3 audio/x-wav application/ogg video/mp4 video/quicktime image/gif image/jpeg image/png image/x-bmp image/svg+xml image/tiff image/x-xcf-gimp image/x-vnd.adobe.photoshop image/x-pcx image/x-exr video/mlt-playlist audio/x-flac audio/mp4", this);
+        list = KFileDialog::getOpenUrls(KUrl("kfiledialog:///clipfolder"), "application/x-kdenlive video/x-flv application/vnd.rn-realmedia video/x-dv video/dv video/x-msvideo video/x-matroska video/mpeg video/x-ms-wmv audio/mpeg audio/x-mp3 audio/x-wav application/ogg video/mp4 video/quicktime image/gif image/jpeg image/png image/x-tga image/x-bmp image/svg+xml image/tiff image/x-xcf-gimp image/x-vnd.adobe.photoshop image/x-pcx image/x-exr video/mlt-playlist audio/x-flac audio/mp4", this);
     } else list.append(givenUrl);
     if (list.isEmpty()) return;
 
-    QString groupId = QString();
+    QString groupId;
     if (group.isEmpty()) {
         ProjectItem *item = static_cast <ProjectItem*>(listView->currentItem());
         if (item && !item->isGroup()) {
@@ -582,8 +582,8 @@ void ProjectList::slotAddColorClip() {
         QString color = dia_ui->clip_color->color().name();
         color = color.replace(0, 1, "0x") + "ff";
 
-        QString group = QString();
-        QString groupId = QString();
+        QString group;
+        QString groupId;
         ProjectItem *item = static_cast <ProjectItem*>(listView->currentItem());
         if (item && !item->isGroup()) {
             while (item->parent()) {
@@ -596,7 +596,8 @@ void ProjectList::slotAddColorClip() {
             groupId = item->clipId();
         }
 
-        m_doc->slotAddColorClipFile(dia_ui->clip_name->text(), color, dia_ui->clip_duration->text(), group, groupId);
+        m_doc->clipManager()->slotAddColorClipFile(dia_ui->clip_name->text(), color, dia_ui->clip_duration->text(), group, groupId);
+       m_doc->setModified(true);
     }
     delete dia_ui;
     delete dia;
@@ -609,8 +610,8 @@ void ProjectList::slotAddSlideshowClip() {
 
     if (dia->exec() == QDialog::Accepted) {
 
-        QString group = QString();
-        QString groupId = QString();
+        QString group;
+        QString groupId;
         ProjectItem *item = static_cast <ProjectItem*>(listView->currentItem());
         if (item && !item->isGroup()) {
             while (item->parent()) {
@@ -623,14 +624,15 @@ void ProjectList::slotAddSlideshowClip() {
             groupId = item->clipId();
         }
 
-        m_doc->slotAddSlideshowClipFile(dia->clipName(), dia->selectedPath(), dia->imageCount(), dia->clipDuration(), dia->loop(), dia->fade(), dia->lumaDuration(), dia->lumaFile(), dia->softness(), group, groupId);
+       m_doc->clipManager()->slotAddSlideshowClipFile(dia->clipName(), dia->selectedPath(), dia->imageCount(), dia->clipDuration(), dia->loop(), dia->fade(), dia->lumaDuration(), dia->lumaFile(), dia->softness(), group, groupId);
+       m_doc->setModified(true);
     }
     delete dia;
 }
 
 void ProjectList::slotAddTitleClip() {
-    QString group = QString();
-    QString groupId = QString();
+    QString group;
+    QString groupId;
     ProjectItem *item = static_cast <ProjectItem*>(listView->currentItem());
     if (item && !item->isGroup()) {
         while (item->parent()) {