X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fprojectlist.cpp;h=b3ede704f21c2561b601e4e5b5afb33bae799841;hb=d5363787d623deff631d695dead90aabba0610a3;hp=0f40dcc90f855ab407cf44fd50eba99437dcc799;hpb=6ad82e5cee925ef09193cec3c0805a54b026adb6;p=kdenlive

diff --git a/src/projectlist.cpp b/src/projectlist.cpp
index 0f40dcc9..b3ede704 100644
--- a/src/projectlist.cpp
+++ b/src/projectlist.cpp
@@ -31,6 +31,7 @@
 #include "renderer.h"
 #include "kthumb.h"
 #include "projectlistview.h"
+#include "timecodedisplay.h"
 #include "editclipcommand.h"
 #include "editclipcutcommand.h"
 #include "editfoldercommand.h"
@@ -59,6 +60,7 @@
 #include <QMenu>
 #include <QProcess>
 #include <QHeaderView>
+#include <QInputDialog>
 
 ProjectList::ProjectList(QWidget *parent) :
         QWidget(parent),
@@ -79,6 +81,7 @@ ProjectList::ProjectList(QWidget *parent) :
     m_listView = new ProjectListView(this);;
     QVBoxLayout *layout = new QVBoxLayout;
     layout->setContentsMargins(0, 0, 0, 0);
+    layout->setSpacing(0);
 
     // setup toolbar
     KTreeWidgetSearchLine *searchView = new KTreeWidgetSearchLine(this);
@@ -172,19 +175,24 @@ void ProjectList::setupMenu(QMenu *addMenu, QAction *defaultAction)
     m_menu->addActions(addMenu->actions());
 }
 
-void ProjectList::setupGeneratorMenu(QMenu *addMenu, QMenu *transcodeMenu)
+void ProjectList::setupGeneratorMenu(QMenu *addMenu, QMenu *transcodeMenu, QMenu *inTimelineMenu)
 {
-    if (!addMenu) return;
+    if (!addMenu)
+        return;
     QMenu *menu = m_addButton->menu();
     menu->addMenu(addMenu);
     m_addButton->setMenu(menu);
 
     m_menu->addMenu(addMenu);
-    if (addMenu->isEmpty()) addMenu->setEnabled(false);
+    if (addMenu->isEmpty())
+        addMenu->setEnabled(false);
     m_menu->addMenu(transcodeMenu);
-    if (transcodeMenu->isEmpty()) transcodeMenu->setEnabled(false);
+    if (transcodeMenu->isEmpty())
+        transcodeMenu->setEnabled(false);
     m_transcodeAction = transcodeMenu;
     m_menu->addAction(m_reloadAction);
+    m_menu->addMenu(inTimelineMenu);
+    inTimelineMenu->setEnabled(false);
     m_menu->addAction(m_editAction);
     m_menu->addAction(m_openAction);
     m_menu->addAction(m_deleteAction);
@@ -202,6 +210,11 @@ void ProjectList::setHeaderInfo(const QByteArray &state)
     m_listView->header()->restoreState(state);
 }
 
+void ProjectList::updateProjectFormat(Timecode t)
+{
+    m_timecode = t;
+}
+
 void ProjectList::slotEditClip()
 {
     QList<QTreeWidgetItem *> list = m_listView->selectedItems();
@@ -210,12 +223,13 @@ void ProjectList::slotEditClip()
         return;
     }
     ProjectItem *item;
-    if (!m_listView->currentItem() || m_listView->currentItem()->type() == PROJECTFOLDERTYPE) return;
-    if (m_listView->currentItem()->type() == PROJECTSUBCLIPTYPE) {
+    if (!m_listView->currentItem() || m_listView->currentItem()->type() == PROJECTFOLDERTYPE)
+        return;
+    if (m_listView->currentItem()->type() == PROJECTSUBCLIPTYPE)
         item = static_cast <ProjectItem*>(m_listView->currentItem()->parent());
-    } else item = static_cast <ProjectItem*>(m_listView->currentItem());
-    if (!(item->flags() & Qt::ItemIsDragEnabled)) return;
-    if (item) {
+    else
+        item = static_cast <ProjectItem*>(m_listView->currentItem());
+    if (item && (item->flags() & Qt::ItemIsDragEnabled)) {
         emit clipSelected(item->referencedClip());
         emit showClipProperties(item->referencedClip());
     }
@@ -233,18 +247,31 @@ void ProjectList::editClipSelection(QList<QTreeWidgetItem *> list)
     commonproperties.insert("video_index", "-");
     commonproperties.insert("audio_index", "-");
 
+    bool allowDurationChange = true;
+    int commonDuration = -1;
     ProjectItem *item;
     for (int i = 0; i < list.count(); i++) {
         item = NULL;
-        if (list.at(i)->type() == PROJECTFOLDERTYPE) continue;
-        if (list.at(i)->type() == PROJECTSUBCLIPTYPE) {
+        if (list.at(i)->type() == PROJECTFOLDERTYPE)
+            continue;
+        if (list.at(i)->type() == PROJECTSUBCLIPTYPE)
             item = static_cast <ProjectItem*>(list.at(i)->parent());
-        } else item = static_cast <ProjectItem*>(list.at(i));
-        if (!(item->flags() & Qt::ItemIsDragEnabled)) continue;
+        else
+            item = static_cast <ProjectItem*>(list.at(i));
+        if (!(item->flags() & Qt::ItemIsDragEnabled))
+            continue;
         if (item) {
             // check properties
             DocClipBase *clip = item->referencedClip();
             if (clipList.contains(clip)) continue;
+            if (clip->clipType() != COLOR && clip->clipType() != IMAGE && clip->clipType() != TEXT)
+                allowDurationChange = false;
+            if (allowDurationChange && commonDuration != 0) {
+                if (commonDuration == -1)
+                    commonDuration = clip->duration().frames(m_fps);
+                else if (commonDuration != clip->duration().frames(m_fps))
+                    commonDuration = 0;
+            }
             clipList.append(clip);
             QMap <QString, QString> clipprops = clip->properties();
             QMapIterator<QString, QString> p(commonproperties);
@@ -252,12 +279,18 @@ void ProjectList::editClipSelection(QList<QTreeWidgetItem *> list)
                 p.next();
                 if (p.value().isEmpty()) continue;
                 if (clipprops.contains(p.key())) {
-                    if (p.value() == "-") commonproperties.insert(p.key(), clipprops.value(p.key()));
-                    else if (p.value() != clipprops.value(p.key())) commonproperties.insert(p.key(), QString());
-                } else commonproperties.insert(p.key(), QString());
+                    if (p.value() == "-")
+                        commonproperties.insert(p.key(), clipprops.value(p.key()));
+                    else if (p.value() != clipprops.value(p.key()))
+                        commonproperties.insert(p.key(), QString());
+                } else {
+                    commonproperties.insert(p.key(), QString());
+                }
             }
         }
     }
+    if (allowDurationChange)
+        commonproperties.insert("out", QString::number(commonDuration));
     QMapIterator<QString, QString> p(commonproperties);
     while (p.hasNext()) {
         p.next();
@@ -269,18 +302,24 @@ void ProjectList::editClipSelection(QList<QTreeWidgetItem *> list)
 void ProjectList::slotOpenClip()
 {
     ProjectItem *item;
-    if (!m_listView->currentItem() || m_listView->currentItem()->type() == PROJECTFOLDERTYPE) return;
-    if (m_listView->currentItem()->type() == QTreeWidgetItem::UserType + 1) {
+    if (!m_listView->currentItem() || m_listView->currentItem()->type() == PROJECTFOLDERTYPE)
+        return;
+    if (m_listView->currentItem()->type() == QTreeWidgetItem::UserType + 1)
         item = static_cast <ProjectItem*>(m_listView->currentItem()->parent());
-    } else item = static_cast <ProjectItem*>(m_listView->currentItem());
+    else
+        item = static_cast <ProjectItem*>(m_listView->currentItem());
     if (item) {
         if (item->clipType() == IMAGE) {
-            if (KdenliveSettings::defaultimageapp().isEmpty()) KMessageBox::sorry(this, i18n("Please set a default application to open images in the Settings dialog"));
-            else QProcess::startDetached(KdenliveSettings::defaultimageapp(), QStringList() << item->clipUrl().path());
+            if (KdenliveSettings::defaultimageapp().isEmpty())
+                KMessageBox::sorry(this, i18n("Please set a default application to open images in the Settings dialog"));
+            else
+                QProcess::startDetached(KdenliveSettings::defaultimageapp(), QStringList() << item->clipUrl().path());
         }
         if (item->clipType() == AUDIO) {
-            if (KdenliveSettings::defaultaudioapp().isEmpty()) KMessageBox::sorry(this, i18n("Please set a default application to open audio files in the Settings dialog"));
-            else QProcess::startDetached(KdenliveSettings::defaultaudioapp(), QStringList() << item->clipUrl().path());
+            if (KdenliveSettings::defaultaudioapp().isEmpty())
+                KMessageBox::sorry(this, i18n("Please set a default application to open audio files in the Settings dialog"));
+            else
+                QProcess::startDetached(KdenliveSettings::defaultaudioapp(), QStringList() << item->clipUrl().path());
         }
     }
 }
@@ -296,7 +335,8 @@ void ProjectList::cleanup()
             continue;
         }
         item = static_cast <ProjectItem *>(*it);
-        if (item->numReferences() == 0) item->setSelected(true);
+        if (item->numReferences() == 0)
+            item->setSelected(true);
         it++;
     }
     slotRemoveClip();
@@ -317,7 +357,8 @@ void ProjectList::trashUnusedClips()
         if (item->numReferences() == 0) {
             ids << item->clipId();
             KUrl url = item->clipUrl();
-            if (!url.isEmpty() && !urls.contains(url.path())) urls << url.path();
+            if (!url.isEmpty() && !urls.contains(url.path()))
+                urls << url.path();
         }
         it++;
     }
@@ -337,26 +378,37 @@ void ProjectList::trashUnusedClips()
         it2++;
     }
 
-    m_doc->deleteProjectClip(ids);
-    for (int i = 0; i < urls.count(); i++) {
+    emit deleteProjectClips(ids, QMap <QString, QString>());
+    for (int i = 0; i < urls.count(); i++)
         KIO::NetAccess::del(KUrl(urls.at(i)), this);
-    }
 }
 
 void ProjectList::slotReloadClip(const QString &id)
 {
     QList<QTreeWidgetItem *> selected;
-    if (id.isEmpty()) selected = m_listView->selectedItems();
-    else selected.append(getItemById(id));
+    if (id.isEmpty())
+        selected = m_listView->selectedItems();
+    else
+        selected.append(getItemById(id));
     ProjectItem *item;
     for (int i = 0; i < selected.count(); i++) {
-        if (selected.at(i)->type() != PROJECTCLIPTYPE) continue;
+        if (selected.at(i)->type() != PROJECTCLIPTYPE) {
+            if (selected.at(i)->type() == PROJECTFOLDERTYPE) {
+                for (int j = 0; j < selected.at(i)->childCount(); j++)
+                    selected.append(selected.at(i)->child(j));
+            }
+            continue;
+        }
         item = static_cast <ProjectItem *>(selected.at(i));
         if (item) {
-            if (item->clipType() == IMAGE) {
+            if (item->clipType() == TEXT) {
+                if (!item->referencedClip()->getProperty("xmltemplate").isEmpty())
+                    regenerateTemplate(item);
+            } else if (item->clipType() != COLOR && item->clipType() != SLIDESHOW && item->referencedClip() &&  item->referencedClip()->checkHash() == false) {
+                item->referencedClip()->setPlaceHolder(true);
+                item->setProperty("file_hash", QString());
+            } else if (item->clipType() == IMAGE) {
                 item->referencedClip()->producer()->set("force_reload", 1);
-            } else if (item->clipType() == TEXT) {
-                if (!item->referencedClip()->getProperty("xmltemplate").isEmpty()) regenerateTemplate(item);
             }
             //requestClipInfo(item->toXml(), item->clipId(), true);
             // Clear the file_hash value, which will cause a complete reload of the clip
@@ -365,6 +417,73 @@ void ProjectList::slotReloadClip(const QString &id)
     }
 }
 
+void ProjectList::slotModifiedClip(const QString &id)
+{
+    ProjectItem *item = getItemById(id);
+    if (item) {
+        QPixmap pixmap = qVariantValue<QPixmap>(item->data(0, Qt::DecorationRole));
+        if (!pixmap.isNull()) {
+            QPainter p(&pixmap);
+            p.fillRect(0, 0, pixmap.width(), pixmap.height(), QColor(255, 255, 255, 200));
+            p.drawPixmap(0, 0, KIcon("view-refresh").pixmap(m_listView->iconSize()));
+            p.end();
+        } else {
+            pixmap = KIcon("view-refresh").pixmap(m_listView->iconSize());
+        }
+        item->setData(0, Qt::DecorationRole, pixmap);
+    }
+}
+
+void ProjectList::slotMissingClip(const QString &id)
+{
+    ProjectItem *item = getItemById(id);
+    if (item) {
+        item->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled | Qt::ItemIsDropEnabled);
+        if (item->referencedClip()) {
+            item->referencedClip()->setPlaceHolder(true);
+            if (m_render == NULL) kDebug() << "*********  ERROR, NULL RENDR";
+            item->referencedClip()->setProducer(m_render->invalidProducer(id), true);
+            item->slotSetToolTip();
+            emit clipNeedsReload(id, true);
+        }
+    }
+    update();
+    emit displayMessage(i18n("Check missing clips"), -2);
+    emit updateRenderStatus();
+}
+
+void ProjectList::slotAvailableClip(const QString &id)
+{
+    ProjectItem *item = getItemById(id);
+    if (item == NULL)
+        return;
+    item->setFlags(Qt::ItemIsSelectable | Qt::ItemIsDragEnabled | Qt::ItemIsEnabled | Qt::ItemIsEditable | Qt::ItemIsDropEnabled);
+    if (item->referencedClip()) { // && item->referencedClip()->checkHash() == false) {
+        item->setProperty("file_hash", QString());
+        slotReloadClip(id);
+    }
+    /*else {
+    item->referencedClip()->setValid();
+    item->slotSetToolTip();
+    }
+    update();*/
+    emit updateRenderStatus();
+}
+
+bool ProjectList::hasMissingClips()
+{
+    bool missing = false;
+    QTreeWidgetItemIterator it(m_listView);
+    while (*it) {
+        if ((*it)->type() == PROJECTCLIPTYPE && !((*it)->flags() & Qt::ItemIsDragEnabled)) {
+            missing = true;
+            break;
+        }
+        it++;
+    }
+    return missing;
+}
+
 void ProjectList::setRenderer(Render *projectRender)
 {
     m_render = projectRender;
@@ -373,6 +492,7 @@ void ProjectList::setRenderer(Render *projectRender)
 
 void ProjectList::slotClipSelected()
 {
+    if (!m_listView->isEnabled()) return;
     if (m_listView->currentItem()) {
         if (m_listView->currentItem()->type() == PROJECTFOLDERTYPE) {
             emit clipSelected(NULL);
@@ -394,7 +514,8 @@ void ProjectList::slotClipSelected()
                 return;
             }
             clip = static_cast <ProjectItem*>(m_listView->currentItem());
-            if (clip) emit clipSelected(clip->referencedClip());
+            if (clip)
+                emit clipSelected(clip->referencedClip());
             m_editAction->setEnabled(true);
             m_deleteAction->setEnabled(true);
             m_reloadAction->setEnabled(true);
@@ -405,9 +526,13 @@ void ProjectList::slotClipSelected()
             } else if (clip && clip->clipType() == AUDIO && !KdenliveSettings::defaultaudioapp().isEmpty()) {
                 m_openAction->setIcon(KIcon(KdenliveSettings::defaultaudioapp()));
                 m_openAction->setEnabled(true);
-            } else m_openAction->setEnabled(false);
+            } else {
+                m_openAction->setEnabled(false);
+            }
             // Display relevant transcoding actions only
             adjustTranscodeActions(clip);
+            // Display uses in timeline
+            emit findInTimeline(clip->clipId());
         }
     } else {
         emit clipSelected(NULL);
@@ -421,7 +546,7 @@ void ProjectList::slotClipSelected()
 
 void ProjectList::adjustTranscodeActions(ProjectItem *clip) const
 {
-    if (clip == NULL || clip->type() != PROJECTCLIPTYPE || clip->clipType() == COLOR || clip->clipType() == TEXT || clip->clipType() == PLAYLIST) {
+    if (clip == NULL || clip->type() != PROJECTCLIPTYPE || clip->clipType() == COLOR || clip->clipType() == TEXT || clip->clipType() == PLAYLIST || clip->clipType() == SLIDESHOW) {
         m_transcodeAction->setEnabled(false);
         return;
     }
@@ -433,8 +558,10 @@ void ProjectList::adjustTranscodeActions(ProjectItem *clip) const
         data = transcodeActions.at(i)->data().toStringList();
         if (data.count() > 2) {
             condition = data.at(2);
-            if (condition.startsWith("vcodec")) transcodeActions.at(i)->setEnabled(clip->referencedClip()->hasVideoCodec(condition.section("=", 1, 1)));
-            else if (condition.startsWith("acodec")) transcodeActions.at(i)->setEnabled(clip->referencedClip()->hasVideoCodec(condition.section("=", 1, 1)));
+            if (condition.startsWith("vcodec"))
+                transcodeActions.at(i)->setEnabled(clip->referencedClip()->hasVideoCodec(condition.section("=", 1, 1)));
+            else if (condition.startsWith("acodec"))
+                transcodeActions.at(i)->setEnabled(clip->referencedClip()->hasVideoCodec(condition.section("=", 1, 1)));
         }
     }
 
@@ -442,7 +569,8 @@ void ProjectList::adjustTranscodeActions(ProjectItem *clip) const
 
 void ProjectList::slotPauseMonitor()
 {
-    if (m_render) m_render->pause();
+    if (m_render)
+        m_render->pause();
 }
 
 void ProjectList::slotUpdateClipProperties(const QString &id, QMap <QString, QString> properties)
@@ -461,7 +589,8 @@ void ProjectList::slotUpdateClipProperties(const QString &id, QMap <QString, QSt
 
 void ProjectList::slotUpdateClipProperties(ProjectItem *clip, QMap <QString, QString> properties)
 {
-    if (!clip) return;
+    if (!clip)
+        return;
     clip->setProperties(properties);
     if (properties.contains("name")) {
         m_listView->blockSignals(true);
@@ -500,15 +629,16 @@ void ProjectList::slotItemEdited(QTreeWidgetItem *item, int column)
         return;
     }
     if (item->type() == PROJECTFOLDERTYPE) {
-        if (column != 0) return;
-        FolderProjectItem *folder = static_cast <FolderProjectItem*>(item);
-        editFolder(item->text(0), folder->groupName(), folder->clipId());
-        folder->setGroupName(item->text(0));
-        m_doc->clipManager()->addFolder(folder->clipId(), item->text(0));
-        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(0));
+        if (column == 0) {
+            FolderProjectItem *folder = static_cast <FolderProjectItem*>(item);
+            editFolder(item->text(0), folder->groupName(), folder->clipId());
+            folder->setGroupName(item->text(0));
+            m_doc->clipManager()->addFolder(folder->clipId(), item->text(0));
+            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(0));
+            }
         }
         return;
     }
@@ -548,10 +678,7 @@ void ProjectList::slotItemEdited(QTreeWidgetItem *item, int column)
 
 void ProjectList::slotContextMenu(const QPoint &pos, QTreeWidgetItem *item)
 {
-    bool enable = false;
-    if (item) {
-        enable = true;
-    }
+    bool enable = item ? true : false;
     m_editAction->setEnabled(enable);
     m_deleteAction->setEnabled(enable);
     m_reloadAction->setEnabled(enable);
@@ -565,22 +692,31 @@ void ProjectList::slotContextMenu(const QPoint &pos, QTreeWidgetItem *item)
             clip = static_cast <ProjectItem*>(item);
             // Display relevant transcoding actions only
             adjustTranscodeActions(clip);
-        } else m_transcodeAction->setEnabled(false);
+            // Display uses in timeline
+            emit findInTimeline(clip->clipId());
+        } else {
+            m_transcodeAction->setEnabled(false);
+        }
         if (clip && clip->clipType() == IMAGE && !KdenliveSettings::defaultimageapp().isEmpty()) {
             m_openAction->setIcon(KIcon(KdenliveSettings::defaultimageapp()));
             m_openAction->setEnabled(true);
         } else if (clip && clip->clipType() == AUDIO && !KdenliveSettings::defaultaudioapp().isEmpty()) {
             m_openAction->setIcon(KIcon(KdenliveSettings::defaultaudioapp()));
             m_openAction->setEnabled(true);
-        } else m_openAction->setEnabled(false);
+        } else {
+            m_openAction->setEnabled(false);
+        }
 
-    } else m_openAction->setEnabled(false);
+    } else {
+        m_openAction->setEnabled(false);
+    }
     m_menu->popup(pos);
 }
 
 void ProjectList::slotRemoveClip()
 {
-    if (!m_listView->currentItem()) return;
+    if (!m_listView->currentItem())
+        return;
     QStringList ids;
     QMap <QString, QString> folderids;
     QList<QTreeWidgetItem *> selected = m_listView->selectedItems();
@@ -600,7 +736,8 @@ void ProjectList::slotRemoveClip()
             folderids[folder->groupName()] = folder->clipId();
             int children = folder->childCount();
 
-            if (children > 0 && KMessageBox::questionYesNo(this, i18np("Delete folder <b>%2</b>?<br>This will also remove the clip in that folder", "Delete folder <b>%2</b>?<br>This will also remove the %1 clips in that folder",  children, folder->text(1)), i18n("Delete Folder")) != KMessageBox::Yes) return;
+            if (children > 0 && KMessageBox::questionYesNo(this, i18np("Delete folder <b>%2</b>?<br />This will also remove the clip in that folder", "Delete folder <b>%2</b>?<br />This will also remove the %1 clips in that folder",  children, folder->text(1)), i18n("Delete Folder")) != KMessageBox::Yes)
+                return;
             for (int i = 0; i < children; ++i) {
                 ProjectItem *child = static_cast <ProjectItem *>(folder->child(i));
                 ids << child->clipId();
@@ -608,29 +745,47 @@ void ProjectList::slotRemoveClip()
         } else {
             ProjectItem *item = static_cast <ProjectItem *>(selected.at(i));
             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;
-            }
+            if (item->numReferences() > 0 && 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;
         }
     }
 
-    if (delCommand->childCount() == 0) delete delCommand;
-    else m_commandStack->push(delCommand);
-    if (!ids.isEmpty()) m_doc->deleteProjectClip(ids);
-    if (!folderids.isEmpty()) deleteProjectFolder(folderids);
+    if (delCommand->childCount() == 0)
+        delete delCommand;
+    else
+        m_commandStack->push(delCommand);
+    emit deleteProjectClips(ids, folderids);
+}
+
+void ProjectList::updateButtons() const
+{
     if (m_listView->topLevelItemCount() == 0) {
-        m_editAction->setEnabled(false);
         m_deleteAction->setEnabled(false);
-        m_openAction->setEnabled(false);
-        m_reloadAction->setEnabled(false);
-        m_transcodeAction->setEnabled(false);
+    } else {
+        m_deleteAction->setEnabled(true);
+        if (!m_listView->currentItem())
+            m_listView->setCurrentItem(m_listView->topLevelItem(0));
+        QTreeWidgetItem *item = m_listView->currentItem();
+        if (item && item->type() == PROJECTCLIPTYPE) {
+            m_editAction->setEnabled(true);
+            m_openAction->setEnabled(true);
+            m_reloadAction->setEnabled(true);
+            m_transcodeAction->setEnabled(true);
+            return;
+        }
     }
+
+    m_editAction->setEnabled(false);
+    m_openAction->setEnabled(false);
+    m_reloadAction->setEnabled(false);
+    m_transcodeAction->setEnabled(false);
 }
 
 void ProjectList::selectItemById(const QString &clipId)
 {
     ProjectItem *item = getItemById(clipId);
-    if (item) m_listView->setCurrentItem(item);
+    if (item)
+        m_listView->setCurrentItem(item);
 }
 
 
@@ -642,10 +797,18 @@ void ProjectList::slotDeleteClip(const QString &clipId)
         return;
     }
     m_listView->blockSignals(true);
+    QTreeWidgetItem *newSelectedItem = m_listView->itemAbove(item);
+    if (!newSelectedItem)
+        newSelectedItem = m_listView->itemBelow(item);
     delete item;
     m_doc->clipManager()->deleteClip(clipId);
     m_listView->blockSignals(false);
-    slotClipSelected();
+    if (newSelectedItem) {
+        m_listView->setCurrentItem(newSelectedItem);
+    } else {
+        updateButtons();
+        emit clipSelected(NULL);
+    }
 }
 
 
@@ -668,7 +831,14 @@ void ProjectList::slotAddFolder(const QString foldername, const QString &clipId,
         FolderProjectItem *item = getFolderItemById(clipId);
         if (item) {
             m_doc->clipManager()->deleteFolder(clipId);
+            QTreeWidgetItem *newSelectedItem = m_listView->itemAbove(item);
+            if (!newSelectedItem)
+                newSelectedItem = m_listView->itemBelow(item);
             delete item;
+            if (newSelectedItem)
+                m_listView->setCurrentItem(newSelectedItem);
+            else
+                updateButtons();
         }
     } else {
         if (edit) {
@@ -685,13 +855,13 @@ void ProjectList::slotAddFolder(const QString foldername, const QString &clipId,
                 }
             }
         } else {
-            QStringList text;
-            text << foldername;
             m_listView->blockSignals(true);
-            m_listView->setCurrentItem(new FolderProjectItem(m_listView, text, clipId));
+            m_listView->setCurrentItem(new FolderProjectItem(m_listView, QStringList() << foldername, clipId));
             m_doc->clipManager()->addFolder(clipId, foldername);
             m_listView->blockSignals(false);
+            m_listView->editItem(m_listView->currentItem(), 0);
         }
+        updateButtons();
     }
     m_doc->setModified(true);
 }
@@ -722,6 +892,7 @@ void ProjectList::slotAddClip(DocClipBase *clip, bool getProperties)
         m_infoQueue.insert(clip->getId(), e);
         //m_render->getFileProperties(clip->toXML(), clip->getId(), true);
     }
+    clip->askForAudioThumbs();
     const QString parent = clip->getProperty("groupid");
     ProjectItem *item = NULL;
     if (!parent.isEmpty()) {
@@ -733,18 +904,22 @@ void ProjectList::slotAddClip(DocClipBase *clip, bool getProperties)
             if (groupName.isEmpty()) groupName = i18n("Folder");
             text << groupName;
             parentitem = new FolderProjectItem(m_listView, text, parent);
-        } else {
-            //kDebug() << "Adding clip to existing group: " << parentitem->groupName();
         }
-        if (parentitem) item = new ProjectItem(parentitem, clip);
+
+        if (parentitem)
+            item = new ProjectItem(parentitem, clip);
     }
-    if (item == NULL) item = new ProjectItem(m_listView, clip);
+    if (item == NULL)
+        item = new ProjectItem(m_listView, clip);
     KUrl url = clip->fileURL();
 
     if (getProperties == false && !clip->getClipHash().isEmpty()) {
         QString cachedPixmap = m_doc->projectFolder().path(KUrl::AddTrailingSlash) + "thumbs/" + clip->getClipHash() + ".png";
         if (QFile::exists(cachedPixmap)) {
-            item->setData(0, Qt::DecorationRole, QPixmap(cachedPixmap));
+            QPixmap pix(cachedPixmap);
+            if (pix.isNull())
+                KIO::NetAccess::del(KUrl(cachedPixmap), this);
+            item->setData(0, Qt::DecorationRole, pix);
         }
     }
 #ifdef NEPOMUK
@@ -764,14 +939,21 @@ void ProjectList::slotAddClip(DocClipBase *clip, bool getProperties)
             if (!clip->getClipHash().isEmpty()) {
                 QString cachedPixmap = m_doc->projectFolder().path(KUrl::AddTrailingSlash) + "thumbs/" + clip->getClipHash() + '#' + QString::number(cuts.at(i).zone.x()) + ".png";
                 if (QFile::exists(cachedPixmap)) {
-                    sub->setData(0, Qt::DecorationRole, QPixmap(cachedPixmap));
+                    QPixmap pix(cachedPixmap);
+                    if (pix.isNull())
+                        KIO::NetAccess::del(KUrl(cachedPixmap), this);
+                    sub->setData(0, Qt::DecorationRole, pix);
                 }
             }
         }
     }
-
-    if (getProperties && m_listView->isEnabled()) m_listView->blockSignals(false);
-    if (getProperties && !m_queueTimer.isActive()) m_queueTimer.start();
+    if (m_listView->isEnabled()) {
+        updateButtons();
+        if (getProperties)
+            m_listView->blockSignals(false);
+    }
+    if (getProperties && !m_queueTimer.isActive())
+        slotProcessNextClipInQueue();
 }
 
 void ProjectList::slotResetProjectList()
@@ -804,13 +986,14 @@ void ProjectList::slotProcessNextClipInQueue()
         m_infoQueue.remove(j.key());
         emit getFileProperties(dom, id, m_listView->iconSize().height(), false);
     }
+    if (!m_infoQueue.isEmpty()) m_queueTimer.start();
 }
 
 void ProjectList::slotUpdateClip(const QString &id)
 {
     ProjectItem *item = getItemById(id);
     m_listView->blockSignals(true);
-    if (item) item->setData(1, UsageRole, QString::number(item->numReferences()));
+    if (item) item->setData(0, UsageRole, QString::number(item->numReferences()));
     m_listView->blockSignals(false);
 }
 
@@ -841,49 +1024,94 @@ void ProjectList::updateAllClips()
             item = static_cast <ProjectItem *>(*it);
             clip = item->referencedClip();
             if (item->referencedClip()->producer() == NULL) {
-                if (clip->isPlaceHolder() == false) {
+                if (clip->isPlaceHolder() == false)
                     requestClipInfo(clip->toXML(), clip->getId());
-                } else item->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
+                else if (!clip->isPlaceHolder())
+                    item->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled | Qt::ItemIsDropEnabled);
             } else {
-                if (item->data(0, Qt::DecorationRole).isNull()) {
+                if (item->data(0, Qt::DecorationRole).isNull())
                     requestClipThumbnail(clip->getId());
-                }
-                if (item->data(0, DurationRole).toString().isEmpty()) {
+                if (item->data(0, DurationRole).toString().isEmpty())
                     item->changeDuration(item->referencedClip()->producer()->get_playtime());
-                }
             }
-            item->setData(1, UsageRole, QString::number(item->numReferences()));
+            item->setData(0, UsageRole, QString::number(item->numReferences()));
         }
         //qApp->processEvents();
         ++it;
     }
-    if (!m_queueTimer.isActive()) m_queueTimer.start();
-    if (m_listView->isEnabled()) m_listView->blockSignals(false);
+    if (!m_queueTimer.isActive())
+        m_queueTimer.start();
+    if (m_listView->isEnabled())
+        m_listView->blockSignals(false);
     m_listView->setSortingEnabled(true);
-    if (m_infoQueue.isEmpty()) slotProcessNextThumbnail();
+    if (m_infoQueue.isEmpty())
+        slotProcessNextThumbnail();
+}
+
+// static
+QString ProjectList::getExtensions()
+{
+    // Build list of mime types
+    QStringList mimeTypes = QStringList() << "application/x-kdenlive" << "application/x-kdenlivetitle" << "video/mlt-playlist" << "text/plain"
+                            << "video/x-flv" << "application/vnd.rn-realmedia" << "video/x-dv" << "video/dv" << "video/x-msvideo" << "video/x-matroska" << "video/mpeg" << "video/ogg" << "video/x-ms-wmv" << "video/mp4" << "video/quicktime"
+                            << "audio/x-flac" << "audio/x-matroska" << "audio/mp4" << "audio/mpeg" << "audio/x-mp3" << "audio/ogg" << "audio/x-wav" << "application/ogg"
+                            << "image/gif" << "image/jpeg" << "image/png" << "image/x-tga" << "image/x-bmp" << "image/svg+xml" << "image/tiff" << "image/x-xcf" << "image/x-xcf-gimp" << "image/x-vnd.adobe.photoshop" << "image/x-pcx" << "image/x-exr";
+
+    QString allExtensions;
+    foreach(const QString& mimeType, mimeTypes) {
+        KMimeType::Ptr mime(KMimeType::mimeType(mimeType));
+        if (mime) {
+            allExtensions.append(mime->patterns().join(" "));
+            allExtensions.append(' ');
+        }
+    }
+    return allExtensions.simplified();
 }
 
 void ProjectList::slotAddClip(const QList <QUrl> givenList, const QString &groupName, const QString &groupId)
 {
-    if (!m_commandStack) {
+    if (!m_commandStack)
         kDebug() << "!!!!!!!!!!!!!!!! NO CMD STK";
-    }
+
     KUrl::List list;
     if (givenList.isEmpty()) {
-        // Build list of mime types
-        QStringList mimeTypes = QStringList() << "application/x-kdenlive" << "application/x-kdenlivetitle" << "video/x-flv" << "application/vnd.rn-realmedia" << "video/x-dv" << "video/dv" << "video/x-msvideo" << "video/x-matroska" << "video/mlt-playlist" << "video/mpeg" << "video/ogg" << "video/x-ms-wmv" << "audio/x-flac" << "audio/x-matroska" << "audio/mp4" << "audio/mpeg" << "audio/x-mp3" << "audio/ogg" << "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";
-
-        QString allExtensions;
-        foreach(const QString& mimeType, mimeTypes) {
-            KMimeType::Ptr mime(KMimeType::mimeType(mimeType));
-            if (mime) {
-                allExtensions.append(mime->patterns().join(" "));
-                allExtensions.append(' ');
+        QString allExtensions = getExtensions();
+        const QString dialogFilter = allExtensions + ' ' + QLatin1Char('|') + i18n("All Supported Files") + "\n* " + QLatin1Char('|') + i18n("All Files");
+        QCheckBox *b = new QCheckBox(i18n("Import image sequence"));
+        b->setChecked(KdenliveSettings::autoimagesequence());
+        KFileDialog *d = new KFileDialog(KUrl("kfiledialog:///clipfolder"), dialogFilter, this, b);
+        d->setOperationMode(KFileDialog::Opening);
+        d->setMode(KFile::Files);
+        d->exec();
+        list = d->selectedUrls();
+        if (b->isChecked() && list.count() == 1) {
+            // Check for image sequence
+            KUrl url = list.at(0);
+            QString fileName = url.fileName().section('.', 0, -2);
+            if (fileName.at(fileName.size() - 1).isDigit()) {
+                KFileItem item(KFileItem::Unknown, KFileItem::Unknown, url);
+                if (item.mimetype().startsWith("image")) {
+                    int count = SlideshowClip::sequenceCount(url);
+                    // import as sequence if we found at least 5 images in the sequence
+                    if (count > 4) {
+                        delete d;
+                        QStringList groupInfo = getGroup();
+
+                        // get image sequence base name
+                        while (fileName.at(fileName.size() - 1).isDigit()) {
+                            fileName.chop(1);
+                        }
+                        QString folder = url.directory(KUrl::AppendTrailingSlash);
+                        QString ext = url.path().section('.', -1);
+                        folder.append(fileName + "%d." + ext);
+
+                        m_doc->slotCreateSlideshowClipFile(fileName, folder, count, m_timecode.reformatSeparators(KdenliveSettings::sequence_duration()), false, false, m_timecode.getTimecodeFromFrames(int(ceil(m_timecode.fps()))), QString(), 0, groupInfo.at(0), groupInfo.at(1));
+                        return;
+                    }
+                }
             }
         }
-        const QString dialogFilter = allExtensions.simplified() + ' ' + QLatin1Char('|') + i18n("All Supported Files") + "\n* " + QLatin1Char('|') + i18n("All Files");
-        list = KFileDialog::getOpenUrls(KUrl("kfiledialog:///clipfolder"), dialogFilter, this);
-
+        delete d;
     } else {
         for (int i = 0; i < givenList.count(); i++)
             list << givenList.at(i);
@@ -898,12 +1126,15 @@ void ProjectList::slotAddClip(const QList <QUrl> givenList, const QString &group
         }
     }
 
-    if (list.isEmpty()) return;
+    if (list.isEmpty())
+        return;
 
     if (givenList.isEmpty()) {
         QStringList groupInfo = getGroup();
         m_doc->slotAddClipList(list, groupInfo.at(0), groupInfo.at(1));
-    } else m_doc->slotAddClipList(list, groupName, groupId);
+    } else {
+        m_doc->slotAddClipList(list, groupName, groupId);
+    }
 }
 
 void ProjectList::slotRemoveInvalidClip(const QString &id, bool replace)
@@ -912,48 +1143,58 @@ void ProjectList::slotRemoveInvalidClip(const QString &id, bool replace)
     QTimer::singleShot(300, this, SLOT(slotProcessNextClipInQueue()));
     if (item) {
         const QString path = item->referencedClip()->fileURL().path();
+        if (item->referencedClip()->isPlaceHolder()) replace = false;
         if (!path.isEmpty()) {
-            if (replace) KMessageBox::sorry(this, i18n("Clip <b>%1</b><br>is invalid, will be removed from project.", path));
-            else {
-                if (KMessageBox::questionYesNo(this, i18n("Clip <b>%1</b><br>is missing or invalid. Remove it from project?", path), i18n("Invalid clip")) == KMessageBox::Yes) replace = true;
-            }
+            if (replace)
+                KMessageBox::sorry(this, i18n("Clip <b>%1</b><br />is invalid, will be removed from project.", path));
+            else if (KMessageBox::questionYesNo(this, i18n("Clip <b>%1</b><br />is missing or invalid. Remove it from project?", path), i18n("Invalid clip")) == KMessageBox::Yes)
+                replace = true;
         }
-        QStringList ids;
-        ids << id;
-        if (replace) m_doc->deleteProjectClip(ids);
+        if (replace)
+            emit deleteProjectClips(QStringList() << id, QMap <QString, QString>());
     }
 }
 
 void ProjectList::slotAddColorClip()
 {
-    if (!m_commandStack) {
+    if (!m_commandStack)
         kDebug() << "!!!!!!!!!!!!!!!! NO CMD STK";
-    }
+
     QDialog *dia = new QDialog(this);
     Ui::ColorClip_UI dia_ui;
     dia_ui.setupUi(dia);
+    dia->setWindowTitle(i18n("Color Clip"));
     dia_ui.clip_name->setText(i18n("Color Clip"));
-    dia_ui.clip_duration->setText(KdenliveSettings::color_duration());
+
+    TimecodeDisplay *t = new TimecodeDisplay(m_timecode);
+    t->setValue(KdenliveSettings::color_duration());
+    t->setTimeCodeFormat(false);
+    dia_ui.clip_durationBox->addWidget(t);
+    dia_ui.clip_color->setColor(KdenliveSettings::colorclipcolor());
+
     if (dia->exec() == QDialog::Accepted) {
         QString color = dia_ui.clip_color->color().name();
+        KdenliveSettings::setColorclipcolor(color);
         color = color.replace(0, 1, "0x") + "ff";
         QStringList groupInfo = getGroup();
-        m_doc->slotCreateColorClip(dia_ui.clip_name->text(), color, dia_ui.clip_duration->text(), groupInfo.at(0), groupInfo.at(1));
+        m_doc->slotCreateColorClip(dia_ui.clip_name->text(), color, m_timecode.getTimecode(t->gentime()), groupInfo.at(0), groupInfo.at(1));
     }
+    delete t;
     delete dia;
 }
 
 
 void ProjectList::slotAddSlideshowClip()
 {
-    if (!m_commandStack) {
+    if (!m_commandStack)
         kDebug() << "!!!!!!!!!!!!!!!! NO CMD STK";
-    }
+
     SlideshowClip *dia = new SlideshowClip(m_timecode, this);
 
     if (dia->exec() == QDialog::Accepted) {
         QStringList groupInfo = getGroup();
-        m_doc->slotCreateSlideshowClipFile(dia->clipName(), dia->selectedPath(), dia->imageCount(), dia->clipDuration(), dia->loop(), dia->fade(), dia->lumaDuration(), dia->lumaFile(), dia->softness(), groupInfo.at(0), groupInfo.at(1));
+        m_doc->slotCreateSlideshowClipFile(dia->clipName(), dia->selectedPath(), dia->imageCount(), dia->clipDuration(), dia->loop(), dia->fade(),
+                                           dia->lumaDuration(), dia->lumaFile(), dia->softness(), groupInfo.at(0), groupInfo.at(1));
     }
     delete dia;
 }
@@ -966,10 +1207,10 @@ void ProjectList::slotAddTitleClip()
 
 void ProjectList::slotAddTitleTemplateClip()
 {
-    QStringList groupInfo = getGroup();
-    if (!m_commandStack) {
+    if (!m_commandStack)
         kDebug() << "!!!!!!!!!!!!!!!! NO CMD STK";
-    }
+
+    QStringList groupInfo = getGroup();
 
     // Get the list of existing templates
     QStringList filter;
@@ -980,9 +1221,11 @@ void ProjectList::slotAddTitleTemplateClip()
     QDialog *dia = new QDialog(this);
     Ui::TemplateClip_UI dia_ui;
     dia_ui.setupUi(dia);
-    for (int i = 0; i < templateFiles.size(); ++i) {
+    for (int i = 0; i < templateFiles.size(); ++i)
         dia_ui.template_list->comboBox()->addItem(templateFiles.at(i), path + templateFiles.at(i));
-    }
+
+    if (!templateFiles.isEmpty())
+        dia_ui.buttonBox->button(QDialogButtonBox::Ok)->setFocus();
     dia_ui.template_list->fileDialog()->setFilter("*.kdenlivetitle");
     //warning: setting base directory doesn't work??
     KUrl startDir(path);
@@ -1001,15 +1244,15 @@ QStringList ProjectList::getGroup() const
 {
     QStringList result;
     QTreeWidgetItem *item = m_listView->currentItem();
-    while (item && item->type() != PROJECTFOLDERTYPE) {
+    while (item && item->type() != PROJECTFOLDERTYPE)
         item = item->parent();
-    }
 
     if (item) {
         FolderProjectItem *folder = static_cast <FolderProjectItem *>(item);
-        result << folder->groupName();
-        result << folder->clipId();
-    } else result << QString() << QString();
+        result << folder->groupName() << folder->clipId();
+    } else {
+        result << QString() << QString();
+    }
     return result;
 }
 
@@ -1035,19 +1278,23 @@ void ProjectList::setDocument(KdenliveDoc *doc)
     }
 
     QList <DocClipBase*> list = doc->clipManager()->documentClipList();
-    for (int i = 0; i < list.count(); i++) {
+    for (int i = 0; i < list.count(); i++)
         slotAddClip(list.at(i), false);
-    }
 
     m_listView->blockSignals(false);
     m_toolbar->setEnabled(true);
     connect(m_doc->clipManager(), SIGNAL(reloadClip(const QString &)), this, SLOT(slotReloadClip(const QString &)));
+    connect(m_doc->clipManager(), SIGNAL(modifiedClip(const QString &)), this, SLOT(slotModifiedClip(const QString &)));
+    connect(m_doc->clipManager(), SIGNAL(missingClip(const QString &)), this, SLOT(slotMissingClip(const QString &)));
+    connect(m_doc->clipManager(), SIGNAL(availableClip(const QString &)), this, SLOT(slotAvailableClip(const QString &)));
     connect(m_doc->clipManager(), SIGNAL(checkAllClips()), this, SLOT(updateAllClips()));
 }
 
 QList <DocClipBase*> ProjectList::documentClipList() const
 {
-    if (m_doc == NULL) return QList <DocClipBase*> ();
+    if (m_doc == NULL)
+        return QList <DocClipBase*> ();
+
     return m_doc->clipManager()->documentClipList();
 }
 
@@ -1078,7 +1325,10 @@ void ProjectList::slotCheckForEmptyQueue()
         emit displayMessage(QString(), -1);
         m_listView->blockSignals(false);
         m_listView->setEnabled(true);
-    } else if (!m_refreshed) QTimer::singleShot(300, this, SLOT(slotCheckForEmptyQueue()));
+        updateButtons();
+    } else if (!m_refreshed) {
+        QTimer::singleShot(300, this, SLOT(slotCheckForEmptyQueue()));
+    }
 }
 
 void ProjectList::reloadClipThumbnails()
@@ -1123,8 +1373,10 @@ void ProjectList::slotProcessNextThumbnail()
 void ProjectList::slotRefreshClipThumbnail(const QString &clipId, bool update)
 {
     QTreeWidgetItem *item = getAnyItemById(clipId);
-    if (item) slotRefreshClipThumbnail(item, update);
-    else slotProcessNextThumbnail();
+    if (item)
+        slotRefreshClipThumbnail(item, update);
+    else
+        slotProcessNextThumbnail();
 }
 
 void ProjectList::slotRefreshClipThumbnail(QTreeWidgetItem *it, bool update)
@@ -1152,56 +1404,82 @@ void ProjectList::slotRefreshClipThumbnail(QTreeWidgetItem *it, bool update)
         QPixmap pix;
         int height = m_listView->iconSize().height();
         int width = (int)(height  * m_render->dar());
-        if (clip->clipType() == AUDIO) pix = KIcon("audio-x-generic").pixmap(QSize(width, height));
-        else if (clip->clipType() == IMAGE) pix = QPixmap::fromImage(KThumb::getFrame(item->referencedClip()->producer(), 0, width, height));
-        else pix = item->referencedClip()->thumbProducer()->extractImage(frame, width, height);
+        if (clip->clipType() == AUDIO)
+            pix = KIcon("audio-x-generic").pixmap(QSize(width, height));
+        else if (clip->clipType() == IMAGE)
+            pix = QPixmap::fromImage(KThumb::getFrame(item->referencedClip()->producer(), 0, width, height));
+        else
+            pix = item->referencedClip()->thumbProducer()->extractImage(frame, width, height);
 
         if (!pix.isNull()) {
             m_listView->blockSignals(true);
             it->setData(0, Qt::DecorationRole, pix);
-            if (m_listView->isEnabled()) m_listView->blockSignals(false);
-            if (!isSubItem) m_doc->cachePixmap(item->getClipHash(), pix);
-            else m_doc->cachePixmap(item->getClipHash() + '#' + QString::number(frame), pix);
+            if (m_listView->isEnabled())
+                m_listView->blockSignals(false);
+            if (!isSubItem)
+                m_doc->cachePixmap(item->getClipHash(), pix);
+            else
+                m_doc->cachePixmap(item->getClipHash() + '#' + QString::number(frame), pix);
         }
-        if (update) emit projectModified();
+        if (update)
+            emit projectModified();
         QTimer::singleShot(30, this, SLOT(slotProcessNextThumbnail()));
     }
 }
 
 void ProjectList::slotReplyGetFileProperties(const QString &clipId, Mlt::Producer *producer, const QMap < QString, QString > &properties, const QMap < QString, QString > &metadata, bool replace)
 {
+    QString toReload;
     ProjectItem *item = getItemById(clipId);
     if (item && producer) {
         m_listView->blockSignals(true);
         item->setProperties(properties, metadata);
+        if (item->referencedClip()->isPlaceHolder() && producer->is_valid()) {
+            item->referencedClip()->setValid();
+            item->setFlags(Qt::ItemIsSelectable | Qt::ItemIsDragEnabled | Qt::ItemIsEnabled | Qt::ItemIsEditable | Qt::ItemIsDropEnabled);
+            toReload = clipId;
+        }
         //Q_ASSERT_X(item->referencedClip(), "void ProjectList::slotReplyGetFileProperties", QString("Item with groupName %1 does not have a clip associated").arg(item->groupName()).toLatin1());
         item->referencedClip()->setProducer(producer, replace);
-        if (!replace && item->data(0, Qt::DecorationRole).isNull()) {
+        item->referencedClip()->askForAudioThumbs();
+        if (!replace && item->data(0, Qt::DecorationRole).isNull())
             requestClipThumbnail(clipId);
-        }
+        if (!toReload.isEmpty())
+            item->slotSetToolTip();
+
         //emit receivedClipDuration(clipId);
         if (m_listView->isEnabled() && replace) {
             // update clip in clip monitor
             emit clipSelected(NULL);
             emit clipSelected(item->referencedClip());
+            //TODO: Make sure the line below has no side effect
+            toReload = clipId;
         }
         /*else {
             // Check if duration changed.
             emit receivedClipDuration(clipId);
             delete producer;
         }*/
-        if (m_listView->isEnabled()) m_listView->blockSignals(false);
+        if (m_listView->isEnabled())
+            m_listView->blockSignals(false);
         /*if (item->icon(0).isNull()) {
             requestClipThumbnail(clipId);
         }*/
     } else kDebug() << "////////  COULD NOT FIND CLIP TO UPDATE PRPS...";
     int max = m_doc->clipManager()->clipsCount();
-    emit displayMessage(i18n("Loading clips"), (int)(100 *(max - m_infoQueue.count()) / max));
-    // small delay so that the app can display the progress info
     if (item && m_infoQueue.isEmpty() && m_thumbnailQueue.isEmpty()) {
         m_listView->setCurrentItem(item);
+        if (item->parent()) {
+            if (item->parent()->type() == PROJECTFOLDERTYPE)
+                static_cast <FolderProjectItem *>(item->parent())->switchIcon();
+        }
         emit clipSelected(item->referencedClip());
+    } else {
+        emit displayMessage(i18n("Loading clips"), (int)(100 *(max - m_infoQueue.count()) / max));
     }
+    if (!toReload.isEmpty())
+        emit clipNeedsReload(toReload, true);
+    // small delay so that the app can display the progress info
     QTimer::singleShot(30, this, SLOT(slotProcessNextClipInQueue()));
 }
 
@@ -1212,7 +1490,8 @@ void ProjectList::slotReplyGetImage(const QString &clipId, const QPixmap &pix)
         m_listView->blockSignals(true);
         item->setData(0, Qt::DecorationRole, pix);
         m_doc->cachePixmap(item->getClipHash(), pix);
-        if (m_listView->isEnabled()) m_listView->blockSignals(false);
+        if (m_listView->isEnabled())
+            m_listView->blockSignals(false);
     }
 }
 
@@ -1220,9 +1499,8 @@ QTreeWidgetItem *ProjectList::getAnyItemById(const QString &id)
 {
     QTreeWidgetItemIterator it(m_listView);
     QString lookId = id;
-    if (id.contains('#')) {
+    if (id.contains('#'))
         lookId = id.section('#', 0, 0);
-    }
 
     ProjectItem *result = NULL;
     while (*it) {
@@ -1238,13 +1516,15 @@ QTreeWidgetItem *ProjectList::getAnyItemById(const QString &id)
         }
         ++it;
     }
-    if (result == NULL || !id.contains('#')) return result;
-    else for (int i = 0; i < result->childCount(); i++) {
+    if (result == NULL || !id.contains('#')) {
+        return result;
+    } else {
+        for (int i = 0; i < result->childCount(); i++) {
             SubProjectItem *sub = static_cast <SubProjectItem *>(result->child(i));
-            if (sub && sub->zone().x() == id.section('#', 1, 1).toInt()) {
+            if (sub && sub->zone().x() == id.section('#', 1, 1).toInt())
                 return sub;
-            }
         }
+    }
 
     return NULL;
 }
@@ -1275,7 +1555,8 @@ FolderProjectItem *ProjectList::getFolderItemById(const QString &id)
     while (*it) {
         if ((*it)->type() == PROJECTFOLDERTYPE) {
             item = static_cast<FolderProjectItem *>(*it);
-            if (item->clipId() == id) return item;
+            if (item->clipId() == id)
+                return item;
         }
         ++it;
     }
@@ -1298,7 +1579,9 @@ void ProjectList::slotSelectClip(const QString &ix)
         } else if (clip->clipType() == AUDIO && !KdenliveSettings::defaultaudioapp().isEmpty()) {
             m_openAction->setIcon(KIcon(KdenliveSettings::defaultaudioapp()));
             m_openAction->setEnabled(true);
-        } else m_openAction->setEnabled(false);
+        } else {
+            m_openAction->setEnabled(false);
+        }
     }
 }
 
@@ -1309,8 +1592,11 @@ QString ProjectList::currentClipUrl() const
     if (m_listView->currentItem()->type() == PROJECTSUBCLIPTYPE) {
         // subitem
         item = static_cast <ProjectItem*>(m_listView->currentItem()->parent());
-    } else item = static_cast <ProjectItem*>(m_listView->currentItem());
-    if (item == NULL) return QString();
+    } else {
+        item = static_cast <ProjectItem*>(m_listView->currentItem());
+    }
+    if (item == NULL)
+        return QString();
     return item->clipUrl().path();
 }
 
@@ -1320,17 +1606,22 @@ KUrl::List ProjectList::getConditionalUrls(const QString &condition) const
     ProjectItem *item;
     QList<QTreeWidgetItem *> list = m_listView->selectedItems();
     for (int i = 0; i < list.count(); i++) {
-        if (list.at(i)->type() == PROJECTFOLDERTYPE) continue;
+        if (list.at(i)->type() == PROJECTFOLDERTYPE)
+            continue;
         if (list.at(i)->type() == PROJECTSUBCLIPTYPE) {
             // subitem
             item = static_cast <ProjectItem*>(list.at(i)->parent());
-        } else item = static_cast <ProjectItem*>(list.at(i));
-        if (item == NULL) continue;
-        if (item->type() == COLOR || item->type() == SLIDESHOW || item->type() == TEXT) continue;
+        } else {
+            item = static_cast <ProjectItem*>(list.at(i));
+        }
+        if (item == NULL || item->type() == COLOR || item->type() == SLIDESHOW || item->type() == TEXT)
+            continue;
         DocClipBase *clip = item->referencedClip();
         if (!condition.isEmpty()) {
-            if (condition.startsWith("vcodec") && !clip->hasVideoCodec(condition.section("=", 1, 1))) continue;
-            else if (condition.startsWith("acodec") && !clip->hasAudioCodec(condition.section("=", 1, 1))) continue;
+            if (condition.startsWith("vcodec") && !clip->hasVideoCodec(condition.section("=", 1, 1)))
+                continue;
+            else if (condition.startsWith("acodec") && !clip->hasAudioCodec(condition.section("=", 1, 1)))
+                continue;
         }
         result.append(item->clipUrl());
     }
@@ -1340,7 +1631,8 @@ KUrl::List ProjectList::getConditionalUrls(const QString &condition) const
 void ProjectList::regenerateTemplate(const QString &id)
 {
     ProjectItem *clip = getItemById(id);
-    if (clip) regenerateTemplate(clip);
+    if (clip)
+        regenerateTemplate(clip);
 }
 
 void ProjectList::regenerateTemplate(ProjectItem *clip)
@@ -1376,8 +1668,8 @@ QDomDocument ProjectList::generateTemplateXml(QString path, const QString &repla
 void ProjectList::slotAddClipCut(const QString &id, int in, int out)
 {
     ProjectItem *clip = getItemById(id);
-    if (clip == NULL) return;
-    if (clip->referencedClip()->hasCutZone(QPoint(in, out))) return;
+    if (clip == NULL || clip->referencedClip()->hasCutZone(QPoint(in, out)))
+        return;
     AddClipCutCommand *command = new AddClipCutCommand(this, id, in, out, QString(), true, false);
     m_commandStack->push(command);
 }
@@ -1391,7 +1683,9 @@ void ProjectList::addClipCut(const QString &id, int in, int out, const QString d
         m_listView->blockSignals(true);
         SubProjectItem *sub = new SubProjectItem(clip, in, out, desc);
         if (newItem && desc.isEmpty() && !m_listView->isColumnHidden(1)) {
-            if (!clip->isExpanded()) clip->setExpanded(true);
+            if (!clip->isExpanded())
+                clip->setExpanded(true);
+            m_listView->scrollToItem(sub);
             m_listView->editItem(sub, 1);
         }
         QPixmap p = clip->referencedClip()->thumbProducer()->extractImage(in, (int)(sub->sizeHint(0).height()  * m_render->dar()), sub->sizeHint(0).height() - 2);
@@ -1426,8 +1720,10 @@ SubProjectItem *ProjectList::getSubItem(ProjectItem *clip, QPoint zone)
             QTreeWidgetItem *it = clip->child(i);
             if (it->type() == PROJECTSUBCLIPTYPE) {
                 sub = static_cast <SubProjectItem*>(it);
-                if (sub->zone() == zone) break;
-                else sub = NULL;
+                if (sub->zone() == zone)
+                    break;
+                else
+                    sub = NULL;
             }
         }
     }
@@ -1436,7 +1732,8 @@ SubProjectItem *ProjectList::getSubItem(ProjectItem *clip, QPoint zone)
 
 void ProjectList::slotUpdateClipCut(QPoint p)
 {
-    if (!m_listView->currentItem() || m_listView->currentItem()->type() != PROJECTSUBCLIPTYPE) return;
+    if (!m_listView->currentItem() || m_listView->currentItem()->type() != PROJECTSUBCLIPTYPE)
+        return;
     SubProjectItem *sub = static_cast <SubProjectItem*>(m_listView->currentItem());
     ProjectItem *item = static_cast <ProjectItem *>(sub->parent());
     EditClipCutCommand *command = new EditClipCutCommand(this, item->clipId(), sub->zone(), p, sub->text(1), sub->text(1), true);
@@ -1447,7 +1744,8 @@ void ProjectList::doUpdateClipCut(const QString &id, const QPoint oldzone, const
 {
     ProjectItem *clip = getItemById(id);
     SubProjectItem *sub = getSubItem(clip, oldzone);
-    if (sub == NULL || clip == NULL) return;
+    if (sub == NULL || clip == NULL)
+        return;
     DocClipBase *base = clip->referencedClip();
     base->updateCutZone(oldzone.x(), oldzone.y(), zone.x(), zone.y(), comment);
     m_listView->blockSignals(true);
@@ -1457,4 +1755,11 @@ void ProjectList::doUpdateClipCut(const QString &id, const QPoint oldzone, const
     emit projectModified();
 }
 
+void ProjectList::slotForceProcessing(const QString &id)
+{
+    while (m_infoQueue.contains(id)) {
+        slotProcessNextClipInQueue();
+    }
+}
+
 #include "projectlist.moc"