X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fprojectlist.cpp;h=0bdbba1b97a9808fcb8ae7501808fd57da1e2ecd;hb=db3a514547826b7d83b336f0bd93eed7c25c6b3c;hp=b5cb34959f5d1876926b572a75107628896281f4;hpb=98bd42baff71b45b6b44ec0d111433009ad810ad;p=kdenlive

diff --git a/src/projectlist.cpp b/src/projectlist.cpp
index b5cb3495..0bdbba1b 100644
--- a/src/projectlist.cpp
+++ b/src/projectlist.cpp
@@ -30,7 +30,6 @@
 #include <KLocale>
 #include <KFileDialog>
 #include <KInputDialog>
-#include <kio/netaccess.h>
 #include <KMessageBox>
 
 #include <nepomuk/global.h>
@@ -42,6 +41,7 @@
 #include "kdenlivesettings.h"
 #include "slideshowclip.h"
 #include "ui_colorclip_ui.h"
+#include "titlewidget.h"
 
 
 #include "definitions.h"
@@ -53,13 +53,13 @@
 #include "projectlistview.h"
 
 ProjectList::ProjectList(QWidget *parent)
-        : QWidget(parent), m_render(NULL), m_fps(-1), m_commandStack(NULL), m_selectedItem(NULL) {
+        : QWidget(parent), m_render(NULL), m_fps(-1), m_commandStack(NULL), m_selectedItem(NULL), m_infoQueue(QMap <QString, QDomElement> ()), m_thumbnailQueue(QList <QString> ()), m_refreshed(false) {
 
     QWidget *vbox = new QWidget;
     listView = new ProjectListView(this);;
     QVBoxLayout *layout = new QVBoxLayout;
+    layout->setContentsMargins(0, 0, 0, 0);
     m_clipIdCounter = 0;
-
     // setup toolbar
     searchView = new KTreeWidgetSearchLine(this);
     m_toolbar = new QToolBar("projectToolBar", this);
@@ -71,16 +71,16 @@ ProjectList::ProjectList(QWidget *parent)
     addButton->setPopupMode(QToolButton::MenuButtonPopup);
     m_toolbar->addWidget(addButton);
 
-    QAction *addClipButton = addMenu->addAction(KIcon("document-new"), i18n("Add Clip"));
+    QAction *addClipButton = addMenu->addAction(KIcon("kdenlive-add-clip"), i18n("Add Clip"));
     connect(addClipButton, SIGNAL(triggered()), this, SLOT(slotAddClip()));
 
-    QAction *addColorClip = addMenu->addAction(KIcon("document-new"), i18n("Add Color Clip"));
+    QAction *addColorClip = addMenu->addAction(KIcon("kdenlive-add-color-clip"), i18n("Add Color Clip"));
     connect(addColorClip, SIGNAL(triggered()), this, SLOT(slotAddColorClip()));
 
-    QAction *addSlideClip = addMenu->addAction(KIcon("document-new"), i18n("Add Slideshow Clip"));
+    QAction *addSlideClip = addMenu->addAction(KIcon("kdenlive-add-slide-clip"), i18n("Add Slideshow Clip"));
     connect(addSlideClip, SIGNAL(triggered()), this, SLOT(slotAddSlideshowClip()));
 
-    QAction *addTitleClip = addMenu->addAction(KIcon("document-new"), i18n("Add Title Clip"));
+    QAction *addTitleClip = addMenu->addAction(KIcon("kdenlive-add-text-clip"), i18n("Add Title Clip"));
     connect(addTitleClip, SIGNAL(triggered()), this, SLOT(slotAddTitleClip()));
 
     m_deleteAction = m_toolbar->addAction(KIcon("edit-delete"), i18n("Delete Clip"));
@@ -104,6 +104,7 @@ ProjectList::ProjectList(QWidget *parent)
     m_menu = new QMenu();
     m_menu->addAction(addClipButton);
     m_menu->addAction(addColorClip);
+    m_menu->addAction(addSlideClip);
     m_menu->addAction(addTitleClip);
     m_menu->addAction(m_editAction);
     m_menu->addAction(m_deleteAction);
@@ -112,6 +113,7 @@ ProjectList::ProjectList(QWidget *parent)
 
     connect(listView, SIGNAL(itemSelectionChanged()), this, SLOT(slotClipSelected()));
     connect(listView, SIGNAL(focusMonitor()), this, SLOT(slotClipSelected()));
+    connect(listView, SIGNAL(pauseMonitor()), this, SLOT(slotPauseMonitor()));
     connect(listView, SIGNAL(requestMenu(const QPoint &, QTreeWidgetItem *)), this, SLOT(slotContextMenu(const QPoint &, QTreeWidgetItem *)));
     connect(listView, SIGNAL(addClip()), this, SLOT(slotAddClip()));
     connect(listView, SIGNAL(addClip(QUrl, const QString &)), this, SLOT(slotAddClip(QUrl, const QString &)));
@@ -127,10 +129,20 @@ ProjectList::~ProjectList() {
     delete m_toolbar;
 }
 
+QByteArray ProjectList::headerInfo() {
+    return listView->header()->saveState();
+}
+
+void ProjectList::setHeaderInfo(const QByteArray &state) {
+    listView->header()->restoreState(state);
+}
+
 void ProjectList::slotEditClip() {
     ProjectItem *item = static_cast <ProjectItem*>(listView->currentItem());
-    if (item && !item->isGroup()) emit clipSelected(item->referencedClip());
-    emit showClipProperties(item->referencedClip());
+    if (item && !item->isGroup()) {
+        emit clipSelected(item->referencedClip());
+        emit showClipProperties(item->referencedClip());
+    }
 }
 
 
@@ -140,38 +152,50 @@ void ProjectList::setRenderer(Render *projectRender) {
 }
 
 void ProjectList::slotClipSelected() {
-    ProjectItem *item = static_cast <ProjectItem*>(listView->currentItem());
-    if (item && !item->isGroup()) {
-        if (item == m_selectedItem) {
-            // if user clicked on the active clip item, just focus monitor, don't update it.
-            emit clipSelected(NULL);
-            return;
+    if (listView->currentItem()) {
+        ProjectItem *clip = static_cast <ProjectItem*>(listView->currentItem());
+        if (!clip->isGroup()) {
+            m_selectedItem = clip;
+            emit clipSelected(clip->referencedClip());
         }
-        m_selectedItem = item;
-        emit clipSelected(item->referencedClip());
+        m_editAction->setEnabled(true);
+        m_deleteAction->setEnabled(true);
+    } else {
+        m_editAction->setEnabled(false);
+        m_deleteAction->setEnabled(false);
     }
 }
 
-void ProjectList::slotUpdateClipProperties(int id, QMap <QString, QString> properties) {
+void ProjectList::slotPauseMonitor() {
+    if (m_render) m_render->pause();
+}
+
+void ProjectList::slotUpdateClipProperties(const QString &id, QMap <QString, QString> properties) {
     ProjectItem *item = getItemById(id);
     if (item) {
         slotUpdateClipProperties(item, properties);
-        if (properties.contains("colour") || properties.contains("resource")) slotRefreshClipThumbnail(item);
+        if (properties.contains("colour") || properties.contains("resource") || properties.contains("xmldata")) slotRefreshClipThumbnail(item);
         if (properties.contains("out")) item->changeDuration(properties.value("out").toInt());
     }
 }
 
 void ProjectList::slotUpdateClipProperties(ProjectItem *clip, QMap <QString, QString> properties) {
     if (!clip) return;
-    clip->setProperties(properties);
+    if (!clip->isGroup()) clip->setProperties(properties);
     if (properties.contains("description")) {
         CLIPTYPE type = clip->clipType();
         clip->setText(2, properties.value("description"));
-        if (type == AUDIO || type == VIDEO || type == AV || type == IMAGE || type == PLAYLIST) {
+        if (KdenliveSettings::activate_nepomuk() && (type == AUDIO || type == VIDEO || type == AV || type == IMAGE || type == PLAYLIST)) {
             // Use Nepomuk system to store clip description
             Nepomuk::Resource f(clip->clipUrl().path());
-            if (f.isValid()) f.setDescription(properties.value("description"));
+            if (f.isValid()) {
+                f.setDescription(properties.value("description"));
+            } else {
+                KMessageBox::sorry(this, i18n("Cannot access Desktop Search info for %1.\nDisabling Desktop Search integration.", clip->clipUrl().path()));
+                KdenliveSettings::setActivate_nepomuk(false);
+            }
         }
+        emit projectModified();
     }
 }
 
@@ -181,8 +205,14 @@ void ProjectList::slotItemEdited(QTreeWidgetItem *item, int column) {
         QMap <QString, QString> props;
         props["description"] = item->text(2);
         slotUpdateClipProperties(clip, props);
-    } else if (column == 1 && clip->clipType() == FOLDER) {
+    } else if (column == 1 && clip->isGroup()) {
         m_doc->slotEditFolder(item->text(1), clip->groupName(), clip->clipId());
+        clip->setGroupName(item->text(1));
+        const int children = item->childCount();
+        for (int i = 0; i < children; i++) {
+            ProjectItem *child = static_cast <ProjectItem *>(item->child(i));
+            child->setProperty("groupname", item->text(1));
+        }
     }
 }
 
@@ -193,42 +223,49 @@ void ProjectList::slotContextMenu(const QPoint &pos, QTreeWidgetItem *item) {
     }
     m_editAction->setEnabled(enable);
     m_deleteAction->setEnabled(enable);
-
     m_menu->popup(pos);
 }
 
 void ProjectList::slotRemoveClip() {
     if (!listView->currentItem()) return;
-    ProjectItem *item = static_cast <ProjectItem *>(listView->currentItem());
-    QList <int> ids;
-    QMap <QString, int> folderids;
-    if (item->clipType() == FOLDER) folderids[item->groupName()] = item->clipId();
-    else ids << item->clipId();
-    if (item->numReferences() > 0) {
-        if (KMessageBox::questionYesNo(this, i18np("Delete clip <b>%2</b> ?<br>This will also remove the clip in timeline", "Delete clip <b>%2</b> ?<br>This will also remove its %1 clips in timeline", item->numReferences(), item->names().at(1)), i18n("Delete Clip")) != KMessageBox::Yes) return;
-    } else if (item->clipType() == FOLDER && item->childCount() > 0) {
-        int children = item->childCount();
-        if (KMessageBox::questionYesNo(this, i18n("Delete folder <b>%2</b> ?<br>This will also remove the %1 clips in that folder", children, item->names().at(1)), i18n("Delete Folder")) != KMessageBox::Yes) return;
-        for (int i = 0; i < children; ++i) {
-            ProjectItem *child = static_cast <ProjectItem *>(item->child(i));
-            ids << child->clipId();
+    QList <QString> ids;
+    QMap <QString, QString> folderids;
+    QList<QTreeWidgetItem *> selected = listView->selectedItems();
+    ProjectItem *item;
+    for (int i = 0; i < selected.count(); i++) {
+        item = static_cast <ProjectItem *>(selected.at(i));
+        if (item->isGroup()) folderids[item->groupName()] = item->clipId();
+        else ids << item->clipId();
+        if (item->numReferences() > 0) {
+            if (KMessageBox::questionYesNo(this, i18np("Delete clip <b>%2</b> ?<br>This will also remove the clip in timeline", "Delete clip <b>%2</b> ?<br>This will also remove its %1 clips in timeline", item->numReferences(), item->names().at(1)), i18n("Delete Clip")) != KMessageBox::Yes) return;
+        } else if (item->isGroup() && item->childCount() > 0) {
+            int children = item->childCount();
+            if (KMessageBox::questionYesNo(this, i18n("Delete folder <b>%2</b> ?<br>This will also remove the %1 clips in that folder", children, item->names().at(1)), i18n("Delete Folder")) != KMessageBox::Yes) return;
+            for (int i = 0; i < children; ++i) {
+                ProjectItem *child = static_cast <ProjectItem *>(item->child(i));
+                ids << child->clipId();
+            }
         }
     }
     if (!ids.isEmpty()) m_doc->deleteProjectClip(ids);
     if (!folderids.isEmpty()) m_doc->deleteProjectFolder(folderids);
+    if (listView->topLevelItemCount() == 0) {
+        m_editAction->setEnabled(false);
+        m_deleteAction->setEnabled(false);
+    }
 }
 
-void ProjectList::selectItemById(const int clipId) {
+void ProjectList::selectItemById(const QString &clipId) {
     ProjectItem *item = getItemById(clipId);
     if (item) listView->setCurrentItem(item);
 }
 
 
-void ProjectList::slotDeleteClip(int clipId) {
+void ProjectList::slotDeleteClip(const QString &clipId) {
     ProjectItem *item = getItemById(clipId);
     QTreeWidgetItem *p = item->parent();
     if (p) {
-        kDebug() << "///////  DELETEED CLIP HAS A PARENT... " << p->indexOfChild(item);
+        kDebug() << "///////  DELETED CLIP HAS A PARENT... " << p->indexOfChild(item);
         QTreeWidgetItem *clone = p->takeChild(p->indexOfChild(item));
     } else if (item) {
         delete item;
@@ -242,13 +279,13 @@ void ProjectList::slotAddFolder() {
     m_doc->slotAddFolder(i18n("Folder")); //folderName);
 }
 
-void ProjectList::slotAddFolder(const QString foldername, int clipId, bool remove, bool edit) {
+void ProjectList::slotAddFolder(const QString foldername, const QString &clipId, bool remove, bool edit) {
     if (remove) {
         ProjectItem *item;
         QTreeWidgetItemIterator it(listView);
         while (*it) {
             item = static_cast <ProjectItem *>(*it);
-            if (item->clipType() == FOLDER && item->clipId() == clipId) {
+            if (item->isGroup() && item->clipId() == clipId) {
                 delete item;
                 break;
             }
@@ -256,18 +293,23 @@ void ProjectList::slotAddFolder(const QString foldername, int clipId, bool remov
         }
     } else {
         if (edit) {
-            disconnect(listView, SIGNAL(itemChanged(QTreeWidgetItem *, int)), this, SLOT(slotUpdateItemDescription(QTreeWidgetItem *, int)));
+            listView->blockSignals(true);
             ProjectItem *item;
             QTreeWidgetItemIterator it(listView);
             while (*it) {
                 item = static_cast <ProjectItem *>(*it);
-                if (item->clipType() == FOLDER && item->clipId() == clipId) {
-                    item->setText(1, foldername);
+                if (item->isGroup() && item->clipId() == clipId) {
+                    item->setGroupName(foldername);
+                    const int children = item->childCount();
+                    for (int i = 0; i < children; i++) {
+                        ProjectItem *child = static_cast <ProjectItem *>(item->child(i));
+                        child->setProperty("groupname", foldername);
+                    }
                     break;
                 }
                 ++it;
             }
-            connect(listView, SIGNAL(itemChanged(QTreeWidgetItem *, int)), this, SLOT(slotUpdateItemDescription(QTreeWidgetItem *, int)));
+            listView->blockSignals(false);
         } else {
             QStringList text;
             text << QString() << foldername;
@@ -276,17 +318,30 @@ void ProjectList::slotAddFolder(const QString foldername, int clipId, bool remov
     }
 }
 
-void ProjectList::slotAddClip(DocClipBase *clip) {
-    const int parent = clip->toXML().attribute("groupid").toInt();
+void ProjectList::slotAddClip(DocClipBase *clip, bool getProperties) {
+    const QString parent = clip->getProperty("groupid");
+    //kDebug() << "Adding clip with groupid: " << parent;
     ProjectItem *item = NULL;
-    if (parent != 0) {
+    if (!parent.isEmpty()) {
         ProjectItem *parentitem = getItemById(parent);
+        if (!parentitem) {
+            QStringList text;
+            QString groupName = clip->getProperty("groupname");
+            //kDebug() << "Adding clip to new group: " << groupName;
+            if (groupName.isEmpty()) groupName = i18n("Folder");
+            text << QString() << groupName;
+            listView->blockSignals(true);
+            parentitem = new ProjectItem(listView, text, parent);
+            listView->blockSignals(false);
+        } else {
+            //kDebug() << "Adding clip to existing group: " << parentitem->groupName();
+        }
         if (parentitem) item = new ProjectItem(parentitem, clip);
     }
     if (item == NULL) item = new ProjectItem(listView, clip);
 
     KUrl url = clip->fileURL();
-    if (!url.isEmpty()) {
+    if (!url.isEmpty() && KdenliveSettings::activate_nepomuk()) {
         // if file has Nepomuk comment, use it
         Nepomuk::Resource f(url.path());
         QString annotation;
@@ -295,46 +350,115 @@ void ProjectList::slotAddClip(DocClipBase *clip) {
             /*
             Nepomuk::Tag tag("test");
             f.addTag(tag);*/
-        } else kDebug() << "---  CANNOT CONTACT NEPOMUK";
+        } else {
+            KMessageBox::sorry(this, i18n("Cannot access Desktop Search info for %1.\nDisabling Desktop Search integration.", url.path()));
+            KdenliveSettings::setActivate_nepomuk(false);
+        }
         if (!annotation.isEmpty()) item->setText(2, annotation);
     }
-    emit getFileProperties(clip->toXML(), clip->getId());
+    if (getProperties) requestClipInfo(clip->toXML(), clip->getId());
 }
 
-void ProjectList::slotUpdateClip(int id) {
+void ProjectList::requestClipInfo(const QDomElement xml, const QString id) {
+    kDebug() << " PRG LIST REQUEST CLP INFO: " << id;
+    m_infoQueue.insert(id, xml);
+    listView->setEnabled(false);
+    if (m_infoQueue.count() == 1) QTimer::singleShot(300, this, SLOT(slotProcessNextClipInQueue()));
+}
+
+void ProjectList::slotProcessNextClipInQueue() {
+    if (m_infoQueue.isEmpty()) {
+        listView->setEnabled(true);
+        return;
+    }
+    QMap<QString, QDomElement>::const_iterator i = m_infoQueue.constBegin();
+    if (i != m_infoQueue.constEnd()) {
+        const QDomElement dom = i.value();
+        const QString id = i.key();
+        m_infoQueue.remove(i.key());
+        emit getFileProperties(dom, id);
+    }
+    if (m_infoQueue.isEmpty()) listView->setEnabled(true);
+}
+
+void ProjectList::slotUpdateClip(const QString &id) {
     ProjectItem *item = getItemById(id);
     item->setData(1, UsageRole, QString::number(item->numReferences()));
 }
 
+void ProjectList::updateAllClips() {
+    QTreeWidgetItemIterator it(listView);
+    while (*it) {
+        ProjectItem *item = static_cast <ProjectItem *>(*it);
+        if (!item->isGroup()) {
+            if (item->referencedClip()->producer() == NULL) {
+                DocClipBase *clip = item->referencedClip();
+                if (clip->clipType() == TEXT && !QFile::exists(clip->fileURL().path())) {
+                    // regenerate text clip image if required
+                    TitleWidget *dia_ui = new TitleWidget(KUrl(), QString(), m_render, this);
+                    QDomDocument doc;
+                    doc.setContent(clip->getProperty("xmldata"));
+                    dia_ui->setXml(doc);
+                    QPixmap pix = dia_ui->renderedPixmap();
+                    pix.save(clip->fileURL().path());
+                    delete dia_ui;
+                }
+                requestClipInfo(clip->toXML(), clip->getId());
+            } else {
+                QString cachedPixmap = m_doc->projectFolder().path() + "/thumbs/" + item->getClipHash() + ".png";
+                if (QFile::exists(cachedPixmap)) {
+                    //kDebug()<<"// USING CACHED PIX: "<<cachedPixmap;
+                    item->setIcon(0, QPixmap(cachedPixmap));
+                } else requestClipThumbnail(item->clipId());
+                item->changeDuration(item->referencedClip()->producer()->get_playtime());
+            }
+            item->setData(1, UsageRole, QString::number(item->numReferences()));
+            qApp->processEvents();
+        }
+        ++it;
+    }
+    QTimer::singleShot(500, this, SLOT(slotCheckForEmptyQueue()));
+}
+
 void ProjectList::slotAddClip(QUrl givenUrl, QString group) {
-    if (!m_commandStack) kDebug() << "!!!!!!!!!!!!!!!!  NO CMD STK";
+    if (!m_commandStack) kDebug() << "!!!!!!!!!!!!!!!! NO CMD STK";
     KUrl::List list;
-    if (givenUrl.isEmpty())
-        list = KFileDialog::getOpenUrls(KUrl(), "application/vnd.kde.kdenlive application/vnd.westley.scenelist application/flv application/vnd.rn-realmedia video/x-dv video/x-msvideo video/mpeg video/x-ms-wmv audio/mpeg audio/x-mp3 audio/x-wav application/ogg *.m2t *.dv 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");
-    else list.append(givenUrl);
+    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);
+    } else list.append(givenUrl);
     if (list.isEmpty()) return;
-    KUrl::List::Iterator it;
-    int groupId = -1;
+
+    QString groupId = QString();
     if (group.isEmpty()) {
         ProjectItem *item = static_cast <ProjectItem*>(listView->currentItem());
-        if (item && item->clipType() != FOLDER) {
+        if (item && !item->isGroup()) {
             while (item->parent()) {
                 item = static_cast <ProjectItem*>(item->parent());
-                if (item->clipType() == FOLDER) break;
+                if (item->isGroup()) break;
             }
         }
-        if (item && item->clipType() == FOLDER) {
+        if (item && item->isGroup()) {
             group = item->groupName();
             groupId = item->clipId();
         }
     }
-    for (it = list.begin(); it != list.end(); it++) {
-        m_doc->slotAddClipFile(*it, group, groupId);
+    m_doc->slotAddClipList(list, group, groupId);
+}
+
+void ProjectList::slotRemoveInvalidClip(const QString &id) {
+    ProjectItem *item = getItemById(id);
+    if (item) {
+        const QString path = item->referencedClip()->fileURL().path();
+        if (!path.isEmpty()) KMessageBox::sorry(this, i18n("<qt>Clip <b>%1</b><br>is invalid, will be removed from project.", path));
+        QList <QString> ids;
+        ids << id;
+        m_doc->deleteProjectClip(ids);
     }
+    if (!m_infoQueue.isEmpty()) QTimer::singleShot(300, this, SLOT(slotProcessNextClipInQueue()));
 }
 
 void ProjectList::slotAddColorClip() {
-    if (!m_commandStack) kDebug() << "!!!!!!!!!!!!!!!!  NO CMD STK";
+    if (!m_commandStack) kDebug() << "!!!!!!!!!!!!!!!! NO CMD STK";
     QDialog *dia = new QDialog(this);
     Ui::ColorClip_UI *dia_ui = new Ui::ColorClip_UI();
     dia_ui->setupUi(dia);
@@ -345,15 +469,15 @@ void ProjectList::slotAddColorClip() {
         color = color.replace(0, 1, "0x") + "ff";
 
         QString group = QString();
-        int groupId = -1;
+        QString groupId = QString();
         ProjectItem *item = static_cast <ProjectItem*>(listView->currentItem());
-        if (item && item->clipType() != FOLDER) {
+        if (item && !item->isGroup()) {
             while (item->parent()) {
                 item = static_cast <ProjectItem*>(item->parent());
-                if (item->clipType() == FOLDER) break;
+                if (item->isGroup()) break;
             }
         }
-        if (item && item->clipType() == FOLDER) {
+        if (item && item->isGroup()) {
             group = item->groupName();
             groupId = item->clipId();
         }
@@ -366,40 +490,41 @@ void ProjectList::slotAddColorClip() {
 
 
 void ProjectList::slotAddSlideshowClip() {
-    if (!m_commandStack) kDebug() << "!!!!!!!!!!!!!!!!  NO CMD STK";
+    if (!m_commandStack) kDebug() << "!!!!!!!!!!!!!!!! NO CMD STK";
     SlideshowClip *dia = new SlideshowClip(this);
 
     if (dia->exec() == QDialog::Accepted) {
 
         QString group = QString();
-        int groupId = -1;
+        QString groupId = QString();
         ProjectItem *item = static_cast <ProjectItem*>(listView->currentItem());
-        if (item && item->clipType() != FOLDER) {
+        if (item && !item->isGroup()) {
             while (item->parent()) {
                 item = static_cast <ProjectItem*>(item->parent());
-                if (item->clipType() == FOLDER) break;
+                if (item->isGroup()) break;
             }
         }
-        if (item && item->clipType() == FOLDER) {
+        if (item && item->isGroup()) {
             group = item->groupName();
             groupId = item->clipId();
         }
 
-        m_doc->slotAddSlideshowClipFile(dia->clipName(), dia->selectedPath(), dia->imageCount(), dia->clipDuration(), dia->loop(), group, groupId);
+        m_doc->slotAddSlideshowClipFile(dia->clipName(), dia->selectedPath(), dia->imageCount(), dia->clipDuration(), dia->loop(), dia->fade(), dia->lumaDuration(), dia->lumaFile(), dia->softness(), group, groupId);
     }
     delete dia;
 }
+
 void ProjectList::slotAddTitleClip() {
     QString group = QString();
-    int groupId = -1;
+    QString groupId = QString();
     ProjectItem *item = static_cast <ProjectItem*>(listView->currentItem());
-    if (item && item->clipType() != FOLDER) {
+    if (item && !item->isGroup()) {
         while (item->parent()) {
             item = static_cast <ProjectItem*>(item->parent());
-            if (item->clipType() == FOLDER) break;
+            if (item->isGroup()) break;
         }
     }
-    if (item && item->clipType() == FOLDER) {
+    if (item && item->isGroup()) {
         group = item->groupName();
         groupId = item->clipId();
     }
@@ -408,10 +533,14 @@ void ProjectList::slotAddTitleClip() {
 }
 
 void ProjectList::setDocument(KdenliveDoc *doc) {
+    listView->blockSignals(true);
     listView->clear();
+    m_thumbnailQueue.clear();
+    m_infoQueue.clear();
+    m_refreshed = false;
     QList <DocClipBase*> list = doc->clipManager()->documentClipList();
     for (int i = 0; i < list.count(); i++) {
-        slotAddClip(list.at(i));
+        slotAddClip(list.at(i), false);
     }
 
     m_fps = doc->fps();
@@ -420,6 +549,7 @@ void ProjectList::setDocument(KdenliveDoc *doc) {
     m_doc = doc;
     QTreeWidgetItem *first = listView->topLevelItem(0);
     if (first) listView->setCurrentItem(first);
+    listView->blockSignals(false);
     m_toolbar->setEnabled(true);
 }
 
@@ -437,37 +567,75 @@ QDomElement ProjectList::producersList() {
     return prods;
 }
 
-void ProjectList::slotRefreshClipThumbnail(int clipId) {
+void ProjectList::slotCheckForEmptyQueue() {
+    if (!m_refreshed && m_thumbnailQueue.isEmpty() && m_infoQueue.isEmpty()) {
+        m_refreshed = true;
+        emit loadingIsOver();
+    } else QTimer::singleShot(500, this, SLOT(slotCheckForEmptyQueue()));
+}
+
+void ProjectList::requestClipThumbnail(const QString &id) {
+    m_thumbnailQueue.append(id);
+    if (m_thumbnailQueue.count() == 1) QTimer::singleShot(300, this, SLOT(slotProcessNextThumbnail()));
+}
+
+void ProjectList::slotProcessNextThumbnail() {
+    if (m_thumbnailQueue.isEmpty()) {
+        return;
+    }
+    slotRefreshClipThumbnail(m_thumbnailQueue.takeFirst(), false);
+}
+
+void ProjectList::slotRefreshClipThumbnail(const QString &clipId, bool update) {
     ProjectItem *item = getItemById(clipId);
-    if (item) slotRefreshClipThumbnail(item);
+    if (item) slotRefreshClipThumbnail(item, update);
+    else slotProcessNextThumbnail();
 }
 
-void ProjectList::slotRefreshClipThumbnail(ProjectItem *item) {
+void ProjectList::slotRefreshClipThumbnail(ProjectItem *item, bool update) {
     if (item) {
+        if (!item->referencedClip()) return;
         int height = 50;
         int width = (int)(height  * m_render->dar());
-        QPixmap pix = KThumb::getImage(item->toXml(), item->referencedClip()->getProjectThumbFrame(), width, height);
-        //QPixmap pix = KThumb::getFrame(item->toXml()), 0, width, height);
+        DocClipBase *clip = item->referencedClip();
+        if (!clip) slotProcessNextThumbnail();
+        QPixmap pix;
+        if (clip->clipType() == AUDIO) pix = KIcon("audio-x-generic").pixmap(QSize(width, height));
+        else pix = item->referencedClip()->thumbProducer()->extractImage(item->referencedClip()->getClipThumbFrame(), width, height);
         item->setIcon(0, pix);
+        m_doc->cachePixmap(item->getClipHash(), pix);
+        if (update) emit projectModified();
+        if (!m_thumbnailQueue.isEmpty()) QTimer::singleShot(300, this, SLOT(slotProcessNextThumbnail()));
     }
 }
 
-void ProjectList::slotReplyGetFileProperties(int clipId, const QMap < QString, QString > &properties, const QMap < QString, QString > &metadata) {
+void ProjectList::slotReplyGetFileProperties(const QString &clipId, Mlt::Producer *producer, const QMap < QString, QString > &properties, const QMap < QString, QString > &metadata) {
     ProjectItem *item = getItemById(clipId);
-    if (item) {
+    if (item && producer) {
         item->setProperties(properties, metadata);
-        listView->setCurrentItem(item);
+        item->referencedClip()->setProducer(producer);
         emit receivedClipDuration(clipId, item->clipMaxDuration());
-    }
+    } else kDebug() << "////////  COULD NOT FIND CLIP TO UPDATE PRPS...";
+    if (!m_infoQueue.isEmpty()) QTimer::singleShot(300, this, SLOT(slotProcessNextClipInQueue()));
 }
 
-void ProjectList::slotReplyGetImage(int clipId, int pos, const QPixmap &pix, int w, int h) {
+void ProjectList::slotReplyGetImage(const QString &clipId, int pos, const QPixmap &pix, int w, int h) {
     ProjectItem *item = getItemById(clipId);
-    if (item) item->setIcon(0, pix);
+    if (item) {
+        item->setIcon(0, pix);
+        m_doc->cachePixmap(item->getClipHash(), pix);
+    }
 }
 
-ProjectItem *ProjectList::getItemById(int id) {
+ProjectItem *ProjectList::getItemById(const QString &id) {
     QTreeWidgetItemIterator it(listView);
+    while (*it) {
+        if (((ProjectItem *)(*it))->clipId() == id)
+            return static_cast<ProjectItem *>(*it);
+        ++it;
+    }
+    return NULL;
+#ifdef USED_TO_BE_THIS
     while (*it) {
         if (((ProjectItem *)(*it))->clipId() == id)
             break;
@@ -475,6 +643,17 @@ ProjectItem *ProjectList::getItemById(int id) {
     }
     if (*it) return ((ProjectItem *)(*it));
     return NULL;
+#endif
+}
+
+void ProjectList::slotSelectClip(const QString &ix) {
+    ProjectItem *p = getItemById(ix);
+    if (p) {
+        listView->setCurrentItem(p);
+        listView->scrollToItem(p);
+        m_editAction->setEnabled(true);
+        m_deleteAction->setEnabled(true);
+    }
 }
 
 #include "projectlist.moc"