X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fprojectlist.cpp;h=ce01e8281801206d05a52ef6ca029df2134d6303;hb=a3eee7be24126f5a3458d488f44cd61c66135e17;hp=47d89c7f7c5eba8f8f26b7c1c2460f3285fb4a7a;hpb=16e28d660e6c5754dbc5eb8a04d607285e749cd8;p=kdenlive

diff --git a/src/projectlist.cpp b/src/projectlist.cpp
index 47d89c7f..fcbc8e56 100644
--- a/src/projectlist.cpp
+++ b/src/projectlist.cpp
@@ -20,10 +20,13 @@
 #include "projectlist.h"
 #include "projectitem.h"
 #include "commands/addfoldercommand.h"
+#include "projecttree/proxyclipjob.h"
+#include "projecttree/cutclipjob.h"
+#include "projecttree/meltjob.h"
 #include "kdenlivesettings.h"
 #include "slideshowclip.h"
 #include "ui_colorclip_ui.h"
-#include "titlewidget.h"
+#include "widgets/titlewidget.h"
 #include "definitions.h"
 #include "clipmanager.h"
 #include "docclipbase.h"
@@ -33,16 +36,19 @@
 #include "projectlistview.h"
 #include "timecodedisplay.h"
 #include "profilesdialog.h"
+#include "clipstabilize.h"
 #include "commands/editclipcommand.h"
 #include "commands/editclipcutcommand.h"
 #include "commands/editfoldercommand.h"
 #include "commands/addclipcutcommand.h"
 
 #include "ui_templateclip_ui.h"
+#include "ui_cutjobdialog_ui.h"
+#include "ui_scenecutdialog_ui.h"
 
 #include <KDebug>
 #include <KAction>
-#include <KLocale>
+#include <KLocalizedString>
 #include <KFileDialog>
 #include <KInputDialog>
 #include <KMessageBox>
@@ -50,11 +56,22 @@
 #include <KFileItem>
 #include <KApplication>
 #include <KStandardDirs>
+#include <KColorScheme>
+#include <KActionCollection>
+#include <KUrlRequester>
+#include <KVBox>
+#include <KHBox>
+
+#ifdef USE_NEPOMUK
+  #include <nepomuk/global.h>
+  #include <nepomuk/resourcemanager.h>
+  #include <Nepomuk/Resource>
+  //#include <nepomuk/tag.h>
+#endif
 
-#ifdef NEPOMUK
-#include <nepomuk/global.h>
-#include <nepomuk/resourcemanager.h>
-//#include <nepomuk/tag.h>
+#ifdef USE_NEPOMUKCORE
+  #include <nepomuk2/resourcemanager.h>
+  #include <Nepomuk2/Resource>
 #endif
 
 #include <QMouseEvent>
@@ -63,64 +80,134 @@
 #include <QIcon>
 #include <QMenu>
 #include <QProcess>
+#include <QScrollBar>
 #include <QHeaderView>
 #include <QInputDialog>
 #include <QtConcurrentRun>
 #include <QVBoxLayout>
+#include <KPassivePopup>
+#include <QGLWidget>
 
-InvalidDialog::InvalidDialog(const QString &caption, const QString &message, bool infoOnly, QWidget *parent) : KDialog(parent)
-{
-    setCaption(caption);
-    if (infoOnly) setButtons(KDialog::Ok);
-    else setButtons(KDialog::Yes | KDialog::No);
-    QWidget *w = new QWidget(this);
-    QVBoxLayout *l = new QVBoxLayout;
-    l->addWidget(new QLabel(message));
-    m_clipList = new QListWidget;
-    l->addWidget(m_clipList);
-    w->setLayout(l);
-    setMainWidget(w);
+
+MyMessageWidget::MyMessageWidget(QWidget *parent) : KMessageWidget(parent) {}
+MyMessageWidget::MyMessageWidget(const QString &text, QWidget *parent) : KMessageWidget(text, parent) {}
+
+
+bool MyMessageWidget::event(QEvent* ev) {
+    if (ev->type() == QEvent::Hide || ev->type() == QEvent::Close) emit messageClosing();
+    return KMessageWidget::event(ev);
 }
 
-InvalidDialog::~InvalidDialog()
+SmallInfoLabel::SmallInfoLabel(QWidget *parent) : QPushButton(parent)
 {
-    delete m_clipList;
+    setFixedWidth(0);
+    setFlat(true);
+    
+    /*QString style = "QToolButton {background-color: %1;border-style: outset;border-width: 2px;
+     border-radius: 5px;border-color: beige;}";*/
+    m_timeLine = new QTimeLine(500, this);
+    QObject::connect(m_timeLine, SIGNAL(valueChanged(qreal)), this, SLOT(slotTimeLineChanged(qreal)));
+    QObject::connect(m_timeLine, SIGNAL(finished()), this, SLOT(slotTimeLineFinished()));
+    hide();
 }
 
+const QString SmallInfoLabel::getStyleSheet(const QPalette &p)
+{
+    KColorScheme scheme(p.currentColorGroup(), KColorScheme::Window, KSharedConfig::openConfig(KdenliveSettings::colortheme()));
+    QColor bg = scheme.background(KColorScheme::LinkBackground).color();
+    QColor fg = scheme.foreground(KColorScheme::LinkText).color();
+    QString style = QString("QPushButton {padding:2px;background-color: rgb(%1, %2, %3);border-radius: 4px;border: none;color: rgb(%4, %5, %6)}").arg(bg.red()).arg(bg.green()).arg(bg.blue()).arg(fg.red()).arg(fg.green()).arg(fg.blue());
+    
+    bg = scheme.background(KColorScheme::ActiveBackground).color();
+    fg = scheme.foreground(KColorScheme::ActiveText).color();
+    style.append(QString("\nQPushButton:hover {padding:2px;background-color: rgb(%1, %2, %3);border-radius: 4px;border: none;color: rgb(%4, %5, %6)}").arg(bg.red()).arg(bg.green()).arg(bg.blue()).arg(fg.red()).arg(fg.green()).arg(fg.blue()));
+    
+    return style;
+}
 
-void InvalidDialog::addClip(const QString &id, const QString &path)
+void SmallInfoLabel::slotTimeLineChanged(qreal value)
 {
-    QListWidgetItem *item = new QListWidgetItem(path);
-    item->setData(Qt::UserRole, id);
-    m_clipList->addItem(item);
+    setFixedWidth(qMin(value * 2, qreal(1.0)) * sizeHint().width());
+    update();
 }
 
-QStringList InvalidDialog::getIds() const
+void SmallInfoLabel::slotTimeLineFinished()
 {
-    QStringList ids;
-    for (int i = 0; i < m_clipList->count(); i++) {
-        ids << m_clipList->item(i)->data(Qt::UserRole).toString();
+    if (m_timeLine->direction() == QTimeLine::Forward) {
+        // Show
+        show();
+    } else {
+        // Hide
+        hide();
+        setText(QString());
     }
-    return ids;
 }
 
-
-ProjectList::ProjectList(QWidget *parent) :
-    QWidget(parent),
-    m_render(NULL),
-    m_fps(-1),
-    m_commandStack(NULL),
-    m_openAction(NULL),
-    m_reloadAction(NULL),
-    m_stabilizeAction(NULL),
-    m_transcodeAction(NULL),
-    m_doc(NULL),
-    m_refreshed(false),
-    m_allClipsProcessed(false),
-    m_thumbnailQueue(),
-    m_abortAllProxies(false),
-    m_invalidClipDialog(NULL)
+void SmallInfoLabel::slotSetJobCount(int jobCount)
 {
+    if (jobCount > 0) {
+        // prepare animation
+        setText(i18np("%1 job", "%1 jobs", jobCount));
+        setToolTip(i18np("%1 pending job", "%1 pending jobs", jobCount));
+        
+        if (!(KGlobalSettings::graphicEffectsLevel() & KGlobalSettings::SimpleAnimationEffects)) {
+            setFixedWidth(sizeHint().width());
+            show();
+            return;
+        }
+        
+        if (isVisible()) {
+            setFixedWidth(sizeHint().width());
+            update();
+            return;
+        }
+        
+        setFixedWidth(0);
+        show();
+        int wantedWidth = sizeHint().width();
+        setGeometry(-wantedWidth, 0, wantedWidth, height());
+        m_timeLine->setDirection(QTimeLine::Forward);
+        if (m_timeLine->state() == QTimeLine::NotRunning) {
+            m_timeLine->start();
+        }
+    }
+    else {
+        if (!(KGlobalSettings::graphicEffectsLevel() & KGlobalSettings::SimpleAnimationEffects)) {
+            setFixedWidth(0);
+            hide();
+            return;
+        }
+        // hide
+        m_timeLine->setDirection(QTimeLine::Backward);
+        if (m_timeLine->state() == QTimeLine::NotRunning) {
+            m_timeLine->start();
+        }
+    }
+    
+}
+
+ProjectList::ProjectList(QGLWidget *glContext, QWidget *parent) :
+    QWidget(parent)
+  , m_render(NULL)
+  , m_fps(-1)
+  , m_menu(NULL)
+  , m_commandStack(NULL)
+  , m_openAction(NULL)
+  , m_reloadAction(NULL)
+  , m_extractAudioAction(NULL)
+  , m_transcodeAction(NULL)
+  , m_clipsActionsMenu(NULL)
+  , m_doc(NULL)
+  , m_refreshed(false)
+  , m_allClipsProcessed(false)
+  , m_thumbnailQueue()
+  , m_proxyAction(NULL)
+  , m_abortAllJobs(false)
+  , m_closing(false)
+  , m_invalidClipDialog(NULL)
+  , m_mainGLContext(glContext)
+{
+    qRegisterMetaType<stringMap> ("stringMap");
     QVBoxLayout *layout = new QVBoxLayout;
     layout->setContentsMargins(0, 0, 0, 0);
     layout->setSpacing(0);
@@ -129,8 +216,28 @@ ProjectList::ProjectList(QWidget *parent) :
     QFrame *frame = new QFrame;
     frame->setFrameStyle(QFrame::NoFrame);
     QHBoxLayout *box = new QHBoxLayout;
+    box->setContentsMargins(0, 0, 0, 0);
+    
     KTreeWidgetSearchLine *searchView = new KTreeWidgetSearchLine;
     box->addWidget(searchView);
+    
+    // small info button for pending jobs
+    m_infoLabel = new SmallInfoLabel(this);
+    m_infoLabel->setStyleSheet(SmallInfoLabel::getStyleSheet(palette()));
+    connect(this, SIGNAL(jobCount(int)), m_infoLabel, SLOT(slotSetJobCount(int)));
+    m_jobsMenu = new QMenu(this);
+    connect(m_jobsMenu, SIGNAL(aboutToShow()), this, SLOT(slotPrepareJobsMenu()));
+    QAction *cancelJobs = new QAction(i18n("Cancel All Jobs"), this);
+    cancelJobs->setCheckable(false);
+    connect(cancelJobs, SIGNAL(triggered()), this, SLOT(slotCancelJobs()));
+    connect(this, SIGNAL(checkJobProcess()), this, SLOT(slotCheckJobProcess()));
+    m_discardCurrentClipJobs = new QAction(i18n("Cancel Current Clip Jobs"), this);
+    m_discardCurrentClipJobs->setCheckable(false);
+    connect(m_discardCurrentClipJobs, SIGNAL(triggered()), this, SLOT(slotDiscardClipJobs()));
+    m_jobsMenu->addAction(cancelJobs);
+    m_jobsMenu->addAction(m_discardCurrentClipJobs);
+    m_infoLabel->setMenu(m_jobsMenu);
+    box->addWidget(m_infoLabel);
 
     int size = style()->pixelMetric(QStyle::PM_SmallIconSize);
     QSize iconSize(size, size);
@@ -153,26 +260,48 @@ ProjectList::ProjectList(QWidget *parent) :
     frame->setLayout(box);
     layout->addWidget(frame);
 
-    m_listView = new ProjectListView;
+    m_listView = new ProjectListView(this);
     layout->addWidget(m_listView);
+    
+#if KDE_IS_VERSION(4,7,0)
+    m_infoMessage = new MyMessageWidget;
+    layout->addWidget(m_infoMessage);
+    m_infoMessage->setCloseButtonVisible(true);
+    connect(m_infoMessage, SIGNAL(messageClosing()), this, SLOT(slotResetInfoMessage()));
+    //m_infoMessage->setWordWrap(true);
+    m_infoMessage->hide();
+    m_logAction = new QAction(i18n("Show Log"), this);
+    m_logAction->setCheckable(false);
+    connect(m_logAction, SIGNAL(triggered()), this, SLOT(slotShowJobLog()));
+#endif
+
     setLayout(layout);
     searchView->setTreeWidget(m_listView);
 
     connect(this, SIGNAL(processNextThumbnail()), this, SLOT(slotProcessNextThumbnail()));
     connect(m_listView, SIGNAL(projectModified()), this, SIGNAL(projectModified()));
     connect(m_listView, SIGNAL(itemSelectionChanged()), this, SLOT(slotClipSelected()));
-    connect(m_listView, SIGNAL(focusMonitor()), this, SIGNAL(raiseClipMonitor()));
-    connect(m_listView, SIGNAL(pauseMonitor()), this, SLOT(slotPauseMonitor()));
-    connect(m_listView, SIGNAL(requestMenu(const QPoint &, QTreeWidgetItem *)), this, SLOT(slotContextMenu(const QPoint &, QTreeWidgetItem *)));
+    connect(m_listView, SIGNAL(focusMonitor(bool)), this, SIGNAL(raiseClipMonitor(bool)));
+    connect(m_listView, SIGNAL(pauseMonitor()), this, SIGNAL(pauseMonitor()));
+    connect(m_listView, SIGNAL(requestMenu(QPoint,QTreeWidgetItem*)), this, SLOT(slotContextMenu(QPoint,QTreeWidgetItem*)));
+    connect(m_listView, SIGNAL(addClip()), this, SIGNAL(pauseMonitor()));
     connect(m_listView, SIGNAL(addClip()), this, SLOT(slotAddClip()));
-    connect(m_listView, SIGNAL(addClip(const QList <QUrl>, const QString &, const QString &)), this, SLOT(slotAddClip(const QList <QUrl>, const QString &, const QString &)));
-    connect(m_listView, SIGNAL(addClipCut(const QString &, int, int)), this, SLOT(slotAddClipCut(const QString &, int, int)));
-    connect(m_listView, SIGNAL(itemChanged(QTreeWidgetItem *, int)), this, SLOT(slotItemEdited(QTreeWidgetItem *, int)));
-    connect(m_listView, SIGNAL(showProperties(DocClipBase *)), this, SIGNAL(showClipProperties(DocClipBase *)));
-
+    connect(m_listView, SIGNAL(addClip(QList<QUrl>,QString,QString)), this, SLOT(slotAddClip(QList<QUrl>,QString,QString)));
+    connect(this, SIGNAL(addClip(QString,QString,QString)), this, SLOT(slotAddClip(QString,QString,QString)));
+    connect(m_listView, SIGNAL(addClipCut(QString,int,int)), this, SLOT(slotAddClipCut(QString,int,int)));
+    connect(m_listView, SIGNAL(itemChanged(QTreeWidgetItem*,int)), this, SLOT(slotItemEdited(QTreeWidgetItem*,int)));
+    connect(m_listView, SIGNAL(showProperties(DocClipBase*)), this, SIGNAL(showClipProperties(DocClipBase*)));
+    
+    connect(this, SIGNAL(cancelRunningJob(QString,stringMap)), this, SLOT(slotCancelRunningJob(QString,stringMap)));
+    connect(this, SIGNAL(processLog(QString,int,int,QString)), this, SLOT(slotProcessLog(QString,int,int,QString)));
+    
+    connect(this, SIGNAL(updateJobStatus(QString,int,int,QString,QString,QString)), this, SLOT(slotUpdateJobStatus(QString,int,int,QString,QString,QString)));
+    
+    connect(this, SIGNAL(gotProxy(QString)), this, SLOT(slotGotProxyForId(QString)));
+    
     m_listViewDelegate = new ItemDelegate(m_listView);
     m_listView->setItemDelegate(m_listViewDelegate);
-#ifdef NEPOMUK
+#ifdef USE_NEPOMUK
     if (KdenliveSettings::activate_nepomuk()) {
         Nepomuk::ResourceManager::instance()->init();
         if (!Nepomuk::ResourceManager::instance()->initialized()) {
@@ -181,16 +310,37 @@ ProjectList::ProjectList(QWidget *parent) :
         }
     }
 #endif
+#ifdef USE_NEPOMUKCORE
+    if (KdenliveSettings::activate_nepomuk()) {
+        Nepomuk2::ResourceManager::instance()->init();
+        if (!Nepomuk2::ResourceManager::instance()->initialized()) {
+            kDebug() << "Cannot communicate with Nepomuk, DISABLING it";
+            KdenliveSettings::setActivate_nepomuk(false);
+        }
+    }
+#endif
+
 }
 
 ProjectList::~ProjectList()
 {
-    m_abortAllProxies = true;
+    m_abortAllJobs = true;
+    for (int i = 0; i < m_jobList.count(); ++i) {
+        m_jobList.at(i)->setStatus(JobAborted);
+    }
+    m_closing = true;
     m_thumbnailQueue.clear();
-    delete m_menu;
+    m_jobThreads.waitForFinished();
+    m_jobThreads.clearFutures();
+    if (!m_jobList.isEmpty()) qDeleteAll(m_jobList);
+    m_jobList.clear();
+    if (m_menu) delete m_menu;
     m_listView->blockSignals(true);
     m_listView->clear();
     delete m_listViewDelegate;
+#if KDE_IS_VERSION(4,7,0)
+    delete m_infoMessage;
+#endif
 }
 
 void ProjectList::focusTree() const
@@ -201,27 +351,27 @@ void ProjectList::focusTree() const
 void ProjectList::setupMenu(QMenu *addMenu, QAction *defaultAction)
 {
     QList <QAction *> actions = addMenu->actions();
-    for (int i = 0; i < actions.count(); i++) {
+    for (int i = 0; i < actions.count(); ++i) {
         if (actions.at(i)->data().toString() == "clip_properties") {
             m_editButton->setDefaultAction(actions.at(i));
             actions.removeAt(i);
-            i--;
+            --i;
         } else if (actions.at(i)->data().toString() == "delete_clip") {
             m_deleteButton->setDefaultAction(actions.at(i));
             actions.removeAt(i);
-            i--;
+            --i;
         } else if (actions.at(i)->data().toString() == "edit_clip") {
             m_openAction = actions.at(i);
             actions.removeAt(i);
-            i--;
+            --i;
         } else if (actions.at(i)->data().toString() == "reload_clip") {
             m_reloadAction = actions.at(i);
             actions.removeAt(i);
-            i--;
+            --i;
         } else if (actions.at(i)->data().toString() == "proxy_clip") {
             m_proxyAction = actions.at(i);
             actions.removeAt(i);
-            i--;
+            --i;
         }
     }
 
@@ -235,40 +385,47 @@ void ProjectList::setupMenu(QMenu *addMenu, QAction *defaultAction)
 
 void ProjectList::setupGeneratorMenu(const QHash<QString,QMenu*>& menus)
 {
+    if (!m_menu) {
+        kDebug()<<"Warning, menu was not created, something is wrong";
+        return;
+    }
     if (!menus.contains("addMenu") && ! menus.value("addMenu") )
         return;
     QMenu *menu = m_addButton->menu();
-	if (menus.contains("addMenu") && menus.value("addMenu")){ 
-		QMenu* addMenu=menus.value("addMenu");
-		menu->addMenu(addMenu);
-		m_addButton->setMenu(menu);
-
-		m_menu->addMenu(addMenu);
-		if (addMenu->isEmpty())
-			addMenu->setEnabled(false);
-	}
-	if (menus.contains("transcodeMenu") && menus.value("transcodeMenu") ){
-		QMenu* transcodeMenu=menus.value("transcodeMenu");
-		m_menu->addMenu(transcodeMenu);
-		if (transcodeMenu->isEmpty())
-			transcodeMenu->setEnabled(false);
-		m_transcodeAction = transcodeMenu;
-	}
-	if (menus.contains("stabilizeMenu") && menus.value("stabilizeMenu") ){
-		QMenu* stabilizeMenu=menus.value("stabilizeMenu");
-		m_menu->addMenu(stabilizeMenu);
-		if (stabilizeMenu->isEmpty())
-			stabilizeMenu->setEnabled(false);
-		m_stabilizeAction=stabilizeMenu;
-
-	}
-    m_menu->addAction(m_reloadAction);
-    m_menu->addAction(m_proxyAction);
-	if (menus.contains("inTimelineMenu") && menus.value("inTimelineMenu")){
-		QMenu* inTimelineMenu=menus.value("inTimelineMenu");
-		m_menu->addMenu(inTimelineMenu);
-		inTimelineMenu->setEnabled(false);
-	}
+    if (menus.contains("addMenu") && menus.value("addMenu")){
+        QMenu* addMenu=menus.value("addMenu");
+        menu->addMenu(addMenu);
+        m_addButton->setMenu(menu);
+        if (addMenu->isEmpty())
+            addMenu->setEnabled(false);
+    }
+    if (menus.contains("extractAudioMenu") && menus.value("extractAudioMenu") ){
+        QMenu* extractAudioMenu = menus.value("extractAudioMenu");
+        m_menu->addMenu(extractAudioMenu);
+        m_extractAudioAction = extractAudioMenu;
+    }
+    if (menus.contains("transcodeMenu") && menus.value("transcodeMenu") ){
+        QMenu* transcodeMenu = menus.value("transcodeMenu");
+        m_menu->addMenu(transcodeMenu);
+        if (transcodeMenu->isEmpty())
+            transcodeMenu->setEnabled(false);
+        m_transcodeAction = transcodeMenu;
+    }
+    if (menus.contains("clipActionsMenu") && menus.value("clipActionsMenu") ){
+        QMenu* stabilizeMenu=menus.value("clipActionsMenu");
+        m_menu->addMenu(stabilizeMenu);
+        if (stabilizeMenu->isEmpty())
+            stabilizeMenu->setEnabled(false);
+        m_clipsActionsMenu = stabilizeMenu;
+
+    }
+    if (m_reloadAction) m_menu->addAction(m_reloadAction);
+    if (m_proxyAction) m_menu->addAction(m_proxyAction);
+    if (menus.contains("inTimelineMenu") && menus.value("inTimelineMenu")){
+        QMenu* inTimelineMenu=menus.value("inTimelineMenu");
+        m_menu->addMenu(inTimelineMenu);
+        inTimelineMenu->setEnabled(false);
+    }
     m_menu->addAction(m_editButton->defaultAction());
     m_menu->addAction(m_openAction);
     m_menu->addAction(m_deleteButton->defaultAction());
@@ -299,14 +456,14 @@ void ProjectList::slotEditClip()
 {
     QList<QTreeWidgetItem *> list = m_listView->selectedItems();
     if (list.isEmpty()) return;
-    if (list.count() > 1 || list.at(0)->type() == PROJECTFOLDERTYPE) {
+    if (list.count() > 1 || list.at(0)->type() == ProjectFoldeType) {
         editClipSelection(list);
         return;
     }
     ProjectItem *item;
-    if (!m_listView->currentItem() || m_listView->currentItem()->type() == PROJECTFOLDERTYPE)
+    if (!m_listView->currentItem() || m_listView->currentItem()->type() == ProjectFoldeType)
         return;
-    if (m_listView->currentItem()->type() == PROJECTSUBCLIPTYPE)
+    if (m_listView->currentItem()->type() == ProjectSubclipType)
         item = static_cast <ProjectItem*>(m_listView->currentItem()->parent());
     else
         item = static_cast <ProjectItem*>(m_listView->currentItem());
@@ -337,9 +494,9 @@ void ProjectList::editClipSelection(QList<QTreeWidgetItem *> list)
     int commonDuration = -1;
     bool hasImages = false;;
     ProjectItem *item;
-    for (int i = 0; i < list.count(); i++) {
+    for (int i = 0; i < list.count(); ++i) {
         item = NULL;
-        if (list.at(i)->type() == PROJECTFOLDERTYPE) {
+        if (list.at(i)->type() == ProjectFoldeType) {
             // Add folder items to the list
             int ct = list.at(i)->childCount();
             for (int j = 0; j < ct; j++) {
@@ -347,7 +504,7 @@ void ProjectList::editClipSelection(QList<QTreeWidgetItem *> list)
             }
             continue;
         }
-        else if (list.at(i)->type() == PROJECTSUBCLIPTYPE)
+        else if (list.at(i)->type() == ProjectSubclipType)
             item = static_cast <ProjectItem*>(list.at(i)->parent());
         else
             item = static_cast <ProjectItem*>(list.at(i));
@@ -357,12 +514,12 @@ void ProjectList::editClipSelection(QList<QTreeWidgetItem *> list)
             // check properties
             DocClipBase *clip = item->referencedClip();
             if (clipList.contains(clip)) continue;
-            if (clip->clipType() == IMAGE) {
+            if (clip->clipType() == Image) {
                 hasImages = true;
                 if (clip->getProperty("transparency").isEmpty() || clip->getProperty("transparency").toInt() == 0) {
                     if (transparency == "-") {
                         // first non transparent image
-                        transparency = "0";
+                        transparency = '0';
                     }
                     else if (transparency == "1") {
                         // we have transparent and non transparent clips
@@ -372,7 +529,7 @@ void ProjectList::editClipSelection(QList<QTreeWidgetItem *> list)
                 else {
                     if (transparency == "-") {
                         // first transparent image
-                        transparency = "1";
+                        transparency = '1';
                     }
                     else if (transparency == "0") {
                         // we have transparent and non transparent clips
@@ -380,7 +537,7 @@ void ProjectList::editClipSelection(QList<QTreeWidgetItem *> list)
                     }
                 }
             }
-            if (clip->clipType() != COLOR && clip->clipType() != IMAGE && clip->clipType() != TEXT)
+            if (clip->clipType() != Color && clip->clipType() != Image && clip->clipType() != Text)
                 allowDurationChange = false;
             if (allowDurationChange && commonDuration != 0) {
                 if (commonDuration == -1)
@@ -414,26 +571,29 @@ void ProjectList::editClipSelection(QList<QTreeWidgetItem *> list)
         p.next();
         kDebug() << "Result: " << p.key() << " = " << p.value();
     }*/
-    emit showClipProperties(clipList, commonproperties);
+    if (clipList.isEmpty()) {
+        emit displayMessage(i18n("No available clip selected"), -2, ErrorMessage);
+    }
+    else emit showClipProperties(clipList, commonproperties);
 }
 
 void ProjectList::slotOpenClip()
 {
     ProjectItem *item;
-    if (!m_listView->currentItem() || m_listView->currentItem()->type() == PROJECTFOLDERTYPE)
+    if (!m_listView->currentItem() || m_listView->currentItem()->type() == ProjectFoldeType)
         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());
     if (item) {
-        if (item->clipType() == IMAGE) {
+        if (item->clipType() == Image) {
             if (KdenliveSettings::defaultimageapp().isEmpty())
                 KMessageBox::sorry(kapp->activeWindow(), 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 (item->clipType() == Audio) {
             if (KdenliveSettings::defaultaudioapp().isEmpty())
                 KMessageBox::sorry(kapp->activeWindow(), i18n("Please set a default application to open audio files in the Settings dialog"));
             else
@@ -448,7 +608,7 @@ void ProjectList::cleanup()
     QTreeWidgetItemIterator it(m_listView);
     ProjectItem *item;
     while (*it) {
-        if ((*it)->type() != PROJECTCLIPTYPE) {
+        if ((*it)->type() != ProjectClipType) {
             it++;
             continue;
         }
@@ -467,7 +627,7 @@ void ProjectList::trashUnusedClips()
     QStringList ids;
     QStringList urls;
     while (*it) {
-        if ((*it)->type() != PROJECTCLIPTYPE) {
+        if ((*it)->type() != ProjectClipType) {
             it++;
             continue;
         }
@@ -484,7 +644,7 @@ void ProjectList::trashUnusedClips()
     // Check that we don't use the URL in another clip
     QTreeWidgetItemIterator it2(m_listView);
     while (*it2) {
-        if ((*it2)->type() != PROJECTCLIPTYPE) {
+        if ((*it2)->type() != ProjectClipType) {
             it2++;
             continue;
         }
@@ -497,7 +657,7 @@ void ProjectList::trashUnusedClips()
     }
 
     emit deleteProjectClips(ids, QMap <QString, QString>());
-    for (int i = 0; i < urls.count(); i++)
+    for (int i = 0; i < urls.count(); ++i)
         KIO::NetAccess::del(KUrl(urls.at(i)), this);
 }
 
@@ -511,39 +671,40 @@ void ProjectList::slotReloadClip(const QString &id)
         if (itemToReLoad) selected.append(itemToReLoad);
     }
     ProjectItem *item;
-    for (int i = 0; i < selected.count(); i++) {
-        if (selected.at(i)->type() != PROJECTCLIPTYPE) {
-            if (selected.at(i)->type() == PROJECTFOLDERTYPE) {
+    for (int i = 0; i < selected.count(); ++i) {
+        if (selected.at(i)->type() != ProjectClipType) {
+            if (selected.at(i)->type() == ProjectFoldeType) {
                 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 && !item->isProxyRunning()) {
+        if (item && !hasPendingJob(item, PROXYJOB)) {
             DocClipBase *clip = item->referencedClip();
             if (!clip || !clip->isClean() || m_render->isProcessing(item->clipId())) {
                 kDebug()<<"//// TRYING TO RELOAD: "<<item->clipId()<<", but it is busy";
                 continue;
             }
-            CLIPTYPE t = item->clipType();
-            if (t == TEXT) {
+            ClipType t = item->clipType();
+            if (t == Text) {
                 if (clip && !clip->getProperty("xmltemplate").isEmpty())
                     regenerateTemplate(item);
-            } else if (t != COLOR && t != SLIDESHOW && clip && clip->checkHash() == false) {
+            } else if (t != Color && t != SlideShow && clip && clip->checkHash() == false) {
                 item->referencedClip()->setPlaceHolder(true);
                 item->setProperty("file_hash", QString());
-            } else if (t == IMAGE) {
-                clip->getProducer()->set("force_reload", 1);
+            } else if (t == Image) {
+                //clip->getProducer() clip->getProducer()->set("force_reload", 1);
             }
 
             QDomElement e = item->toXml();
             // Make sure we get the correct producer length if it was adjusted in timeline
-            if (t == COLOR || t == IMAGE || t == SLIDESHOW || t == TEXT) {
+            if (t == Color || t == Image || t == SlideShow || t == Text) {
                 int length = QString(clip->producerProperty("length")).toInt();
                 if (length > 0 && !e.hasAttribute("length")) {
                     e.setAttribute("length", length);
                 }
+                e.setAttribute("duration", clip->getProperty("duration"));
             }
             resetThumbsProducer(clip);
             m_render->getFileProperties(e, item->clipId(), m_listView->iconSize().height(), true);
@@ -564,7 +725,7 @@ void ProjectList::slotModifiedClip(const QString &id)
         } else {
             pixmap = KIcon("view-refresh").pixmap(m_listView->iconSize());
         }
-        item->setData(0, Qt::DecorationRole, pixmap);
+        item->setPixmap(pixmap);
     }
 }
 
@@ -574,6 +735,10 @@ void ProjectList::slotMissingClip(const QString &id)
     if (item) {
         item->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled | Qt::ItemIsDropEnabled);
         int height = m_listView->iconSize().height();
+        if (m_render == NULL) {
+            kDebug() << "*********  ERROR, NULL RENDR";
+            return;
+        }
         int width = (int)(height  * m_render->dar());
         QPixmap pixmap = qVariantValue<QPixmap>(item->data(0, Qt::DecorationRole));
         if (pixmap.isNull()) {
@@ -584,13 +749,9 @@ void ProjectList::slotMissingClip(const QString &id)
         QPainter p(&pixmap);
         p.drawPixmap(3, 3, icon.pixmap(width - 6, height - 6));
         p.end();
-        item->setData(0, Qt::DecorationRole, pixmap);
+        item->setPixmap(pixmap);
         if (item->referencedClip()) {
             item->referencedClip()->setPlaceHolder(true);
-            if (m_render == NULL) {
-                kDebug() << "*********  ERROR, NULL RENDR";
-                return;
-            }
             Mlt::Producer *newProd = m_render->invalidProducer(id);
             if (item->referencedClip()->getProducer()) {
                 Mlt::Properties props(newProd->get_properties());
@@ -603,7 +764,7 @@ void ProjectList::slotMissingClip(const QString &id)
         }
     }
     update();
-    emit displayMessage(i18n("Check missing clips"), -2);
+    emit displayMessage(i18n("Check missing clips"), -2, ErrorMessage);
     emit updateRenderStatus();
 }
 
@@ -630,7 +791,7 @@ bool ProjectList::hasMissingClips()
     bool missing = false;
     QTreeWidgetItemIterator it(m_listView);
     while (*it) {
-        if ((*it)->type() == PROJECTCLIPTYPE && !((*it)->flags() & Qt::ItemIsDragEnabled)) {
+        if ((*it)->type() == ProjectClipType && !((*it)->flags() & Qt::ItemIsDragEnabled)) {
             missing = true;
             break;
         }
@@ -643,6 +804,7 @@ void ProjectList::setRenderer(Render *projectRender)
 {
     m_render = projectRender;
     m_listView->setIconSize(QSize((ProjectItem::itemDefaultHeight() - 2) * m_render->dar(), ProjectItem::itemDefaultHeight() - 2));
+    connect(m_render, SIGNAL(requestProxy(QString)), this, SLOT(slotCreateProxy(QString)));
 }
 
 void ProjectList::slotClipSelected()
@@ -650,24 +812,30 @@ void ProjectList::slotClipSelected()
     QTreeWidgetItem *item = m_listView->currentItem();
     ProjectItem *clip = NULL;
     if (item) {
-        if (item->type() == PROJECTFOLDERTYPE) {
+        if (item->type() == ProjectFoldeType) {
             emit clipSelected(NULL);
             m_editButton->defaultAction()->setEnabled(item->childCount() > 0);
             m_deleteButton->defaultAction()->setEnabled(true);
             m_openAction->setEnabled(false);
             m_reloadAction->setEnabled(false);
+            m_extractAudioAction->setEnabled(false);
             m_transcodeAction->setEnabled(false);
-            m_stabilizeAction->setEnabled(false);
+            m_clipsActionsMenu->setEnabled(false);
         } else {
-            if (item->type() == PROJECTSUBCLIPTYPE) {
+            if (item->type() == ProjectSubclipType) {
                 // this is a sub item, use base clip
                 m_deleteButton->defaultAction()->setEnabled(true);
                 clip = static_cast <ProjectItem*>(item->parent());
-                if (clip == NULL) kDebug() << "-----------ERROR";
+                if (clip == NULL) {
+                    kDebug() << "-----------ERROR";
+                    return;
+                }
                 SubProjectItem *sub = static_cast <SubProjectItem*>(item);
+                if (clip->referencedClip()->getProducer() == NULL) m_render->getFileProperties(clip->referencedClip()->toXML(), clip->clipId(), m_listView->iconSize().height(), true);
                 emit clipSelected(clip->referencedClip(), sub->zone());
+                m_extractAudioAction->setEnabled(false);
                 m_transcodeAction->setEnabled(false);
-                m_stabilizeAction->setEnabled(false);
+                m_clipsActionsMenu->setEnabled(false);
                 m_reloadAction->setEnabled(false);
                 adjustProxyActions(clip);
                 return;
@@ -675,15 +843,17 @@ void ProjectList::slotClipSelected()
             clip = static_cast <ProjectItem*>(item);
             if (clip && clip->referencedClip())
                 emit clipSelected(clip->referencedClip());
+            if (clip->referencedClip()->getProducer() == NULL) m_render->getFileProperties(clip->referencedClip()->toXML(), clip->clipId(), m_listView->iconSize().height(), true);
             m_editButton->defaultAction()->setEnabled(true);
             m_deleteButton->defaultAction()->setEnabled(true);
             m_reloadAction->setEnabled(true);
+            m_extractAudioAction->setEnabled(true);
             m_transcodeAction->setEnabled(true);
-            m_stabilizeAction->setEnabled(true);
-            if (clip && clip->clipType() == IMAGE && !KdenliveSettings::defaultimageapp().isEmpty()) {
+            m_clipsActionsMenu->setEnabled(true);
+            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()) {
+            } else if (clip && clip->clipType() == Audio && !KdenliveSettings::defaultaudioapp().isEmpty()) {
                 m_openAction->setIcon(KIcon(KdenliveSettings::defaultaudioapp()));
                 m_openAction->setEnabled(true);
             } else {
@@ -701,19 +871,23 @@ void ProjectList::slotClipSelected()
         m_deleteButton->defaultAction()->setEnabled(false);
         m_openAction->setEnabled(false);
         m_reloadAction->setEnabled(false);
+        m_extractAudioAction->setEnabled(true);
         m_transcodeAction->setEnabled(false);
-        m_stabilizeAction->setEnabled(false);
+        m_clipsActionsMenu->setEnabled(false);
     }
     adjustProxyActions(clip);
 }
 
 void ProjectList::adjustProxyActions(ProjectItem *clip) const
 {
-    if (clip == NULL || clip->type() != PROJECTCLIPTYPE || clip->clipType() == COLOR || clip->clipType() == TEXT || clip->clipType() == SLIDESHOW || clip->clipType() == AUDIO) {
+    if (!m_proxyAction) return;
+    if (clip == NULL || clip->type() != ProjectClipType || clip->clipType() == Color || clip->clipType() == Text || clip->clipType() == SlideShow || clip->clipType() == Audio) {
         m_proxyAction->setEnabled(false);
         return;
     }
-    m_proxyAction->setEnabled(useProxy());
+    bool enabled = useProxy();
+    if (clip->referencedClip() && !clip->referencedClip()->getProperty("_missingsource").isEmpty()) enabled = false;
+    m_proxyAction->setEnabled(enabled);
     m_proxyAction->blockSignals(true);
     m_proxyAction->setChecked(clip->hasProxy());
     m_proxyAction->blockSignals(false);
@@ -722,25 +896,27 @@ void ProjectList::adjustProxyActions(ProjectItem *clip) const
 void ProjectList::adjustStabilizeActions(ProjectItem *clip) const
 {
 
-    if (clip == NULL || clip->type() != PROJECTCLIPTYPE || clip->clipType() == COLOR || clip->clipType() == TEXT || clip->clipType() == PLAYLIST || clip->clipType() == SLIDESHOW) {
-        m_stabilizeAction->setEnabled(false);
+    if (clip == NULL || clip->type() != ProjectClipType || clip->clipType() == Color || clip->clipType() == Text || clip->clipType() == SlideShow) {
+        m_clipsActionsMenu->setEnabled(false);
         return;
     }
-	m_stabilizeAction->setEnabled(true);
+    m_clipsActionsMenu->setEnabled(true);
 
 }
 
 void ProjectList::adjustTranscodeActions(ProjectItem *clip) const
 {
-    if (clip == NULL || clip->type() != PROJECTCLIPTYPE || clip->clipType() == COLOR || clip->clipType() == TEXT || clip->clipType() == PLAYLIST || clip->clipType() == SLIDESHOW) {
+    if (clip == NULL || clip->type() != ProjectClipType || clip->clipType() == Color || clip->clipType() == Text || clip->clipType() == Playlist || clip->clipType() == SlideShow) {
         m_transcodeAction->setEnabled(false);
+        m_extractAudioAction->setEnabled(false);
         return;
     }
     m_transcodeAction->setEnabled(true);
+    m_extractAudioAction->setEnabled(true);
     QList<QAction *> transcodeActions = m_transcodeAction->actions();
     QStringList data;
     QString condition;
-    for (int i = 0; i < transcodeActions.count(); i++) {
+    for (int i = 0; i < transcodeActions.count(); ++i) {
         data = transcodeActions.at(i)->data().toStringList();
         if (data.count() > 2) {
             condition = data.at(2);
@@ -764,7 +940,7 @@ void ProjectList::slotUpdateClipProperties(const QString &id, QMap <QString, QSt
     ProjectItem *item = getItemById(id);
     if (item) {
         slotUpdateClipProperties(item, properties);
-        if (properties.contains("out") || properties.contains("force_fps") || properties.contains("resource")) {
+        if (properties.contains("out") || properties.contains("force_fps") || properties.contains("resource") || properties.contains("video_index") || properties.contains("audio_index") || properties.contains("full_luma") || properties.contains("force_progressive") || properties.contains("force_tff") || properties.contains("force_colorspace")) {
             slotReloadClip(id);
         } else if (properties.contains("colour") ||
                    properties.contains("xmldata") ||
@@ -773,7 +949,7 @@ void ProjectList::slotUpdateClipProperties(const QString &id, QMap <QString, QSt
                    properties.contains("templatetext")) {
             slotRefreshClipThumbnail(item);
             emit refreshClip(id, true);
-        } else if (properties.contains("full_luma") || properties.contains("force_colorspace") || properties.contains("loop")) {
+        } else if (properties.contains("loop")) {
             emit refreshClip(id, false);
         }
     }
@@ -784,6 +960,11 @@ void ProjectList::slotUpdateClipProperties(ProjectItem *clip, QMap <QString, QSt
     if (!clip)
         return;
     clip->setProperties(properties);
+    if (properties.contains("proxy")) {
+        if (properties.value("proxy") == "-" || properties.value("proxy").isEmpty())
+            // this should only apply to proxy jobs
+            clip->setConditionalJobStatus(NoJob, PROXYJOB);
+    }
     if (properties.contains("name")) {
         monitorItemEditing(false);
         clip->setText(0, properties.value("name"));
@@ -791,12 +972,18 @@ void ProjectList::slotUpdateClipProperties(ProjectItem *clip, QMap <QString, QSt
         emit clipNameChanged(clip->clipId(), properties.value("name"));
     }
     if (properties.contains("description")) {
-        CLIPTYPE type = clip->clipType();
+#ifdef USE_NEPOMUK
+        ClipType type = clip->clipType();
+#endif
         monitorItemEditing(false);
         clip->setText(1, properties.value("description"));
         monitorItemEditing(true);
-#ifdef NEPOMUK
-        if (KdenliveSettings::activate_nepomuk() && (type == AUDIO || type == VIDEO || type == AV || type == IMAGE || type == PLAYLIST)) {
+
+#ifdef USE_NEPOMUK
+        bool hasType = (type == Audio || type == Video || type == AV ||
+                        type == Image || type == Playlist);
+
+        if (KdenliveSettings::activate_nepomuk() && hasType) {
             // Use Nepomuk system to store clip description
             Nepomuk::Resource f(clip->clipUrl().path());
             f.setDescription(properties.value("description"));
@@ -808,7 +995,7 @@ void ProjectList::slotUpdateClipProperties(ProjectItem *clip, QMap <QString, QSt
 
 void ProjectList::slotItemEdited(QTreeWidgetItem *item, int column)
 {
-    if (item->type() == PROJECTSUBCLIPTYPE) {
+    if (item->type() == ProjectSubclipType) {
         // this is a sub-item
         if (column == 1) {
             // user edited description
@@ -820,14 +1007,15 @@ void ProjectList::slotItemEdited(QTreeWidgetItem *item, int column)
         }
         return;
     }
-    if (item->type() == PROJECTFOLDERTYPE) {
+    if (item->type() == ProjectFoldeType) {
         if (column == 0) {
             FolderProjectItem *folder = static_cast <FolderProjectItem*>(item);
+            if (item->text(0) == folder->groupName()) return;
             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++) {
+            for (int i = 0; i < children; ++i) {
                 ProjectItem *child = static_cast <ProjectItem *>(item->child(i));
                 child->setProperty("groupname", item->text(0));
             }
@@ -843,7 +1031,7 @@ void ProjectList::slotItemEdited(QTreeWidgetItem *item, int column)
             oldprops["description"] = clip->referencedClip()->getProperty("description");
             newprops["description"] = item->text(1);
 
-            if (clip->clipType() == TEXT) {
+            if (clip->clipType() == Text) {
                 // This is a text template clip, update the image
                 /*oldprops.insert("xmldata", clip->referencedClip()->getProperty("xmldata"));
                 newprops.insert("xmldata", generateTemplateXml(clip->referencedClip()->getProperty("xmltemplate"), item->text(2)).toString());*/
@@ -865,27 +1053,39 @@ void ProjectList::slotItemEdited(QTreeWidgetItem *item, int column)
                 emit projectModified();
                 EditClipCommand *command = new EditClipCommand(this, clip->clipId(), oldprops, newprops, false);
                 m_commandStack->push(command);
+                QTimer::singleShot(100, this, SLOT(slotCheckScrolling()));
             }
         }
     }
 }
 
+void ProjectList::slotCheckScrolling()
+{
+    m_listView->scrollToItem(m_listView->currentItem());
+}
+
 void ProjectList::slotContextMenu(const QPoint &pos, QTreeWidgetItem *item)
 {
+    if (!m_menu) {
+        kDebug()<<"Warning, menu was not created, something is wrong";
+        return;
+    }
     bool enable = item ? true : false;
     m_editButton->defaultAction()->setEnabled(enable);
     m_deleteButton->defaultAction()->setEnabled(enable);
     m_reloadAction->setEnabled(enable);
+    m_extractAudioAction->setEnabled(enable);
     m_transcodeAction->setEnabled(enable);
-    m_stabilizeAction->setEnabled(enable);
+    m_clipsActionsMenu->setEnabled(enable);
     if (enable) {
         ProjectItem *clip = NULL;
-        if (m_listView->currentItem()->type() == PROJECTSUBCLIPTYPE) {
+        if (m_listView->currentItem()->type() == ProjectSubclipType) {
             clip = static_cast <ProjectItem*>(item->parent());
+            m_extractAudioAction->setEnabled(false);
             m_transcodeAction->setEnabled(false);
-            m_stabilizeAction->setEnabled(false);
+            m_clipsActionsMenu->setEnabled(false);
             adjustProxyActions(clip);
-        } else if (m_listView->currentItem()->type() == PROJECTCLIPTYPE) {
+        } else if (m_listView->currentItem()->type() == ProjectClipType) {
             clip = static_cast <ProjectItem*>(item);
             // Display relevant transcoding actions only
             adjustTranscodeActions(clip);
@@ -894,13 +1094,14 @@ void ProjectList::slotContextMenu(const QPoint &pos, QTreeWidgetItem *item)
             // Display uses in timeline
             emit findInTimeline(clip->clipId());
         } else {
+            m_extractAudioAction->setEnabled(false);
             m_transcodeAction->setEnabled(false);
-            m_stabilizeAction->setEnabled(false);
+            m_clipsActionsMenu->setEnabled(false);
         }
-        if (clip && clip->clipType() == IMAGE && !KdenliveSettings::defaultimageapp().isEmpty()) {
+        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()) {
+        } else if (clip && clip->clipType() == Audio && !KdenliveSettings::defaultaudioapp().isEmpty()) {
             m_openAction->setIcon(KIcon(KdenliveSettings::defaultaudioapp()));
             m_openAction->setEnabled(true);
         } else {
@@ -923,13 +1124,13 @@ void ProjectList::slotRemoveClip()
 
     QUndoCommand *delCommand = new QUndoCommand();
     delCommand->setText(i18n("Delete Clip Zone"));
-    for (int i = 0; i < selected.count(); i++) {
-        if (selected.at(i)->type() == PROJECTSUBCLIPTYPE) {
+    for (int i = 0; i < selected.count(); ++i) {
+        if (selected.at(i)->type() == ProjectSubclipType) {
             // subitem
             SubProjectItem *sub = static_cast <SubProjectItem *>(selected.at(i));
             ProjectItem *item = static_cast <ProjectItem *>(sub->parent());
             new AddClipCutCommand(this, item->clipId(), sub->zone().x(), sub->zone().y(), sub->description(), false, true, delCommand);
-        } else if (selected.at(i)->type() == PROJECTFOLDERTYPE) {
+        } else if (selected.at(i)->type() == ProjectFoldeType) {
             // folder
             FolderProjectItem *folder = static_cast <FolderProjectItem *>(selected.at(i));
             folderids[folder->groupName()] = folder->clipId();
@@ -944,7 +1145,7 @@ void ProjectList::slotRemoveClip()
         } else {
             ProjectItem *item = static_cast <ProjectItem *>(selected.at(i));
             ids << item->clipId();
-            if (item->numReferences() > 0 && KMessageBox::questionYesNo(kapp->activeWindow(), 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"), KStandardGuiItem::yes(), KStandardGuiItem::no(), "DeleteAll") == KMessageBox::No) {
+            if (item->numReferences() > 0 && KMessageBox::questionYesNo(kapp->activeWindow(), 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->text(1)), i18n("Delete Clip"), KStandardGuiItem::yes(), KStandardGuiItem::no(), "DeleteAll") == KMessageBox::No) {
                 KMessageBox::enableMessage("DeleteAll");
                 return;
             }
@@ -968,24 +1169,24 @@ void ProjectList::updateButtons() const
         if (!m_listView->currentItem())
             m_listView->setCurrentItem(m_listView->topLevelItem(0));
         QTreeWidgetItem *item = m_listView->currentItem();
-        if (item && item->type() == PROJECTCLIPTYPE) {
+        if (item && item->type() == ProjectClipType) {
             m_editButton->defaultAction()->setEnabled(true);
             m_openAction->setEnabled(true);
             m_reloadAction->setEnabled(true);
             m_transcodeAction->setEnabled(true);
-            m_stabilizeAction->setEnabled(true);
+            m_clipsActionsMenu->setEnabled(true);
             return;
         }
-        else if (item && item->type() == PROJECTFOLDERTYPE && item->childCount() > 0) {
+        else if (item && item->type() == ProjectFoldeType && item->childCount() > 0) {
             m_editButton->defaultAction()->setEnabled(true);
         }
         else m_editButton->defaultAction()->setEnabled(false);
     }
     m_openAction->setEnabled(false);
-    m_reloadAction->setEnabled(false);
+    if (m_reloadAction) m_reloadAction->setEnabled(false);
     m_transcodeAction->setEnabled(false);
-    m_stabilizeAction->setEnabled(false);
-    m_proxyAction->setEnabled(false);
+    m_clipsActionsMenu->setEnabled(false);
+    if (m_proxyAction) m_proxyAction->setEnabled(false);
 }
 
 void ProjectList::selectItemById(const QString &clipId)
@@ -1003,7 +1204,7 @@ void ProjectList::slotDeleteClip(const QString &clipId)
         kDebug() << "/// Cannot find clip to delete";
         return;
     }
-    if (item->isProxyRunning()) m_abortProxy.append(item->referencedClip()->getProperty("proxy"));
+    deleteJobsForClip(clipId);
     m_listView->blockSignals(true);
     QTreeWidgetItem *newSelectedItem = m_listView->itemAbove(item);
     if (!newSelectedItem)
@@ -1029,13 +1230,13 @@ void ProjectList::editFolder(const QString folderName, const QString oldfolderNa
     m_doc->setModified(true);
 }
 
-void ProjectList::slotAddFolder()
+void ProjectList::slotAddFolder(const QString &name)
 {
-    AddFolderCommand *command = new AddFolderCommand(this, i18n("Folder"), QString::number(m_doc->clipManager()->getFreeFolderId()), true);
+    AddFolderCommand *command = new AddFolderCommand(this, name.isEmpty() ? i18n("Folder") : name, QString::number(m_doc->clipManager()->getFreeFolderId()), true);
     m_commandStack->push(command);
 }
 
-void ProjectList::slotAddFolder(const QString foldername, const QString &clipId, bool remove, bool edit)
+void ProjectList::slotAddFolder(const QString &foldername, const QString &clipId, bool remove, bool edit)
 {
     if (remove) {
         FolderProjectItem *item = getFolderItemById(clipId);
@@ -1059,7 +1260,7 @@ void ProjectList::slotAddFolder(const QString foldername, const QString &clipId,
                 m_listView->blockSignals(false);
                 m_doc->clipManager()->addFolder(clipId, foldername);
                 const int children = item->childCount();
-                for (int i = 0; i < children; i++) {
+                for (int i = 0; i < children; ++i) {
                     ProjectItem *child = static_cast <ProjectItem *>(item->child(i));
                     child->setProperty("groupname", foldername);
                 }
@@ -1095,13 +1296,14 @@ void ProjectList::slotAddClip(DocClipBase *clip, bool getProperties)
 {
     //m_listView->setEnabled(false);
     const QString parent = clip->getProperty("groupid");
+    QString groupName = clip->getProperty("groupname");
+    QSize pixelSize((int)(m_listView->iconSize().height()  * m_render->dar()), m_listView->iconSize().height());
     ProjectItem *item = NULL;
     monitorItemEditing(false);
     if (!parent.isEmpty()) {
         FolderProjectItem *parentitem = getFolderItemById(parent);
         if (!parentitem) {
             QStringList text;
-            QString groupName = clip->getProperty("groupname");
             //kDebug() << "Adding clip to new group: " << groupName;
             if (groupName.isEmpty()) groupName = i18n("Folder");
             text << groupName;
@@ -1109,38 +1311,42 @@ void ProjectList::slotAddClip(DocClipBase *clip, bool getProperties)
         }
 
         if (parentitem)
-            item = new ProjectItem(parentitem, clip);
+            item = new ProjectItem(parentitem, clip, pixelSize);
     }
     if (item == NULL) {
-        item = new ProjectItem(m_listView, clip);
+        item = new ProjectItem(m_listView, clip, pixelSize);
     }
-    if (item->data(0, DurationRole).isNull()) item->setData(0, DurationRole, i18n("Loading"));
-    connect(clip, SIGNAL(createProxy(const QString &)), this, SLOT(slotCreateProxy(const QString &)));
-    connect(clip, SIGNAL(abortProxy(const QString &, const QString &)), this, SLOT(slotAbortProxy(const QString, const QString)));
+    if (item->data(0, ItemDelegate::DurationRole).isNull()) item->setData(0, ItemDelegate::DurationRole, i18n("Loading"));
+    connect(clip, SIGNAL(createProxy(QString)), this, SLOT(slotCreateProxy(QString)));
+    connect(clip, SIGNAL(abortProxy(QString,QString)), this, SLOT(slotAbortProxy(QString,QString)));
+
     if (getProperties) {
-        int height = m_listView->iconSize().height();
-        int width = (int)(height  * m_render->dar());
-        QPixmap pix =  KIcon("video-x-generic").pixmap(QSize(width, height));
-        item->setData(0, Qt::DecorationRole, pix);
         //item->setFlags(Qt::ItemIsSelectable);
         m_listView->processLayout();
         QDomElement e = clip->toXML().cloneNode().toElement();
+        if (!groupName.isEmpty()) {
+            e.setAttribute("groupId", parent);
+            e.setAttribute("group", groupName);
+        }
         e.removeAttribute("file_hash");
         resetThumbsProducer(clip);
         m_render->getFileProperties(e, clip->getId(), m_listView->iconSize().height(), true);
     }
     // WARNING: code below triggers unnecessary reload of all proxy clips on document loading... is it useful in some cases?
-    /*else if (item->hasProxy() && !item->isProxyRunning()) {
+    /*else if (item->hasProxy() && !item->isJobRunning()) {
         slotCreateProxy(clip->getId());
     }*/
     
     KUrl url = clip->fileURL();
-#ifdef NEPOMUK
-    if (!url.isEmpty() && KdenliveSettings::activate_nepomuk()) {
+#ifdef USE_NEPOMUK
+    if (!url.isEmpty() && KdenliveSettings::activate_nepomuk() && clip->getProperty("description").isEmpty()) {
         // if file has Nepomuk comment, use it
         Nepomuk::Resource f(url.path());
         QString annotation = f.description();
-        if (!annotation.isEmpty()) item->setText(1, annotation);
+        if (!annotation.isEmpty()) {
+            item->setText(1, annotation);
+            clip->setProperty("description", annotation);
+        }
         item->setText(2, QString::number(f.rating()));
     }
 #endif
@@ -1148,14 +1354,14 @@ void ProjectList::slotAddClip(DocClipBase *clip, bool getProperties)
     // Add info to date column
     QFileInfo fileInfo(url.path());
     if (fileInfo.exists()) {
-    	item->setText(3, fileInfo.lastModified().toString(QString("yyyy/MM/dd hh:mm:ss")));
+        item->setText(3, fileInfo.lastModified().toString(QString("yyyy/MM/dd hh:mm:ss")));
     }
 
     // Add cut zones
     QList <CutZoneInfo> cuts = clip->cutZones();
     if (!cuts.isEmpty()) {
-        for (int i = 0; i < cuts.count(); i++) {
-            SubProjectItem *sub = new SubProjectItem(item, cuts.at(i).zone.x(), cuts.at(i).zone.y(), cuts.at(i).description);
+        for (int i = 0; i < cuts.count(); ++i) {
+            SubProjectItem *sub = new SubProjectItem(m_render->dar(), item, cuts.at(i).zone.x(), cuts.at(i).zone.y(), cuts.at(i).description);
             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)) {
@@ -1173,12 +1379,12 @@ void ProjectList::slotAddClip(DocClipBase *clip, bool getProperties)
 
 void ProjectList::slotGotProxy(const QString &proxyPath)
 {
-    if (proxyPath.isEmpty() || m_abortAllProxies) return;
+    if (proxyPath.isEmpty() || m_abortAllJobs) return;
     QTreeWidgetItemIterator it(m_listView);
     ProjectItem *item;
 
-    while (*it && !m_abortAllProxies) {
-        if ((*it)->type() == PROJECTCLIPTYPE) {
+    while (*it && !m_closing) {
+        if ((*it)->type() == ProjectClipType) {
             item = static_cast <ProjectItem *>(*it);
             if (item->referencedClip()->getProperty("proxy") == proxyPath)
                 slotGotProxy(item);
@@ -1187,6 +1393,13 @@ void ProjectList::slotGotProxy(const QString &proxyPath)
     }
 }
 
+void ProjectList::slotGotProxyForId(const QString id)
+{
+    if (m_closing) return;
+    ProjectItem *item = getItemById(id);
+    slotGotProxy(item);
+}
+
 void ProjectList::slotGotProxy(ProjectItem *item)
 {
     if (item == NULL) return;
@@ -1201,8 +1414,8 @@ void ProjectList::slotGotProxy(ProjectItem *item)
     QDomElement e = clip->toXML().cloneNode().toElement();
 
     // Make sure we get the correct producer length if it was adjusted in timeline
-    CLIPTYPE t = item->clipType();
-    if (t == COLOR || t == IMAGE || t == SLIDESHOW || t == TEXT) {
+    ClipType t = item->clipType();
+    if (t == Color || t == Image || t == SlideShow || t == Text) {
         int length = QString(clip->producerProperty("length")).toInt();
         if (length > 0 && !e.hasAttribute("length")) {
             e.setAttribute("length", length);
@@ -1215,16 +1428,23 @@ void ProjectList::slotGotProxy(ProjectItem *item)
 void ProjectList::slotResetProjectList()
 {
     m_listView->blockSignals(true);
-    m_abortAllProxies = true;
-    m_proxyThreads.waitForFinished();
-    m_proxyThreads.clearFutures();
+    m_abortAllJobs = true;
+    for (int i = 0; i < m_jobList.count(); ++i) {
+        m_jobList.at(i)->setStatus(JobAborted);
+    }
+    m_closing = true;
+    m_jobThreads.waitForFinished();
+    m_jobThreads.clearFutures();
     m_thumbnailQueue.clear();
+    if (!m_jobList.isEmpty()) qDeleteAll(m_jobList);
+    m_jobList.clear();
     m_listView->clear();
     m_listView->setEnabled(true);
     emit clipSelected(NULL);
     m_refreshed = false;
     m_allClipsProcessed = false;
-    m_abortAllProxies = false;
+    m_abortAllJobs = false;
+    m_closing = false;
     m_listView->blockSignals(false);
 }
 
@@ -1232,7 +1452,9 @@ void ProjectList::slotUpdateClip(const QString &id)
 {
     ProjectItem *item = getItemById(id);
     monitorItemEditing(false);
-    if (item) item->setData(0, UsageRole, QString::number(item->numReferences()));
+    if (item){
+        item->setData(0, ItemDelegate::UsageRole, QString::number(item->numReferences()));
+    }
     monitorItemEditing(true);
 }
 
@@ -1240,7 +1462,9 @@ void ProjectList::getCachedThumbnail(ProjectItem *item)
 {
     if (!item) return;
     DocClipBase *clip = item->referencedClip();
-    if (!clip) return;
+    if (!clip) {
+        return;
+    }
     QString cachedPixmap = m_doc->projectFolder().path(KUrl::AddTrailingSlash) + "thumbs/" + clip->getClipHash() + ".png";
     if (QFile::exists(cachedPixmap)) {
         QPixmap pix(cachedPixmap);
@@ -1249,8 +1473,9 @@ void ProjectList::getCachedThumbnail(ProjectItem *item)
             requestClipThumbnail(item->clipId());
         }
         else {
-            processThumbOverlays(item, pix);
-            item->setData(0, Qt::DecorationRole, pix);
+            QPixmap result = roundedPixmap(pix);
+            processThumbOverlays(item, result);
+            item->setPixmap(result);
         }
     }
     else {
@@ -1258,6 +1483,34 @@ void ProjectList::getCachedThumbnail(ProjectItem *item)
     }
 }
 
+QPixmap ProjectList::roundedPixmap(const QImage &img)
+{
+    QPixmap pix(img.width(), img.height());
+    pix.fill(Qt::transparent);
+    QPainter p(&pix);
+    p.setRenderHint(QPainter::Antialiasing, true);
+    QPainterPath path;
+    path.addRoundedRect(0.5, 0.5, pix.width() - 1, pix.height() - 1, 2, 2);
+    p.setClipPath(path);
+    p.drawImage(0, 0, img);
+    p.end();
+    return pix;
+}
+
+QPixmap ProjectList::roundedPixmap(const QPixmap &source)
+{
+    QPixmap pix(source.width(), source.height());
+    pix.fill(Qt::transparent);
+    QPainter p(&pix);
+    p.setRenderHint(QPainter::Antialiasing, true);
+    QPainterPath path;
+    path.addRoundedRect(0.5, 0.5, pix.width() - 1, pix.height() - 1, 2, 2);
+    p.setClipPath(path);
+    p.drawPixmap(0, 0, source);
+    p.end();
+    return pix;
+}
+
 void ProjectList::getCachedThumbnail(SubProjectItem *item)
 {
     if (!item) return;
@@ -1266,7 +1519,7 @@ void ProjectList::getCachedThumbnail(SubProjectItem *item)
     DocClipBase *clip = parentItem->referencedClip();
     if (!clip) return;
     int pos = item->zone().x();
-    QString cachedPixmap = m_doc->projectFolder().path(KUrl::AddTrailingSlash) + "thumbs/" + clip->getClipHash() + "#" + QString::number(pos) + ".png";
+    QString cachedPixmap = m_doc->projectFolder().path(KUrl::AddTrailingSlash) + "thumbs/" + clip->getClipHash() + '#' + QString::number(pos) + ".png";
     if (QFile::exists(cachedPixmap)) {
         QPixmap pix(cachedPixmap);
         if (pix.isNull()) {
@@ -1278,8 +1531,12 @@ void ProjectList::getCachedThumbnail(SubProjectItem *item)
     else requestClipThumbnail(parentItem->clipId() + '#' + QString::number(pos));
 }
 
-void ProjectList::updateAllClips(bool displayRatioChanged, bool fpsChanged, QStringList brokenClips)
+void ProjectList::updateAllClips(bool displayRatioChanged, bool fpsChanged, const QStringList &brokenClips)
 {
+    // We are in a new thread, so we need a new OpenGL context for the remainder of the function.
+    QGLWidget ctx(0, m_mainGLContext);
+    ctx.makeCurrent();
+
     if (!m_allClipsProcessed) m_listView->setEnabled(false);
     m_listView->setSortingEnabled(false);
     QTreeWidgetItemIterator it(m_listView);
@@ -1301,7 +1558,7 @@ void ProjectList::updateAllClips(bool displayRatioChanged, bool fpsChanged, QStr
 
     while (*it) {
         emit displayMessage(i18n("Loading thumbnails"), (int)(100 *(max - ct++) / max));
-        if ((*it)->type() == PROJECTSUBCLIPTYPE) {
+        if ((*it)->type() == ProjectSubclipType) {
             // subitem
             SubProjectItem *sub = static_cast <SubProjectItem *>(*it);
             if (displayRatioChanged) {
@@ -1313,56 +1570,63 @@ void ProjectList::updateAllClips(bool displayRatioChanged, bool fpsChanged, QStr
             }
             ++it;
             continue;
-        } else if ((*it)->type() == PROJECTFOLDERTYPE) {
+        } else if ((*it)->type() == ProjectFoldeType) {
             // folder
             ++it;
             continue;
         } else {
             item = static_cast <ProjectItem *>(*it);
             clip = item->referencedClip();
-            if (item->referencedClip()->getProducer() == NULL) {
+            if (clip->getProducer() == NULL) {
                 bool replace = false;
                 if (brokenClips.contains(item->clipId())) {
                     // if this is a proxy clip, disable proxy
-                    item->setProxyStatus(NOPROXY);
+                    item->setConditionalJobStatus(NoJob, PROXYJOB);
+                    discardJobs(item->clipId(), PROXYJOB);
                     clip->setProperty("proxy", "-");
                     replace = true;
                 }
-                if (clip->isPlaceHolder() == false && !item->isProxyRunning()) {
+                if (clip->isPlaceHolder() == false && !hasPendingJob(item, PROXYJOB)) {
                     QDomElement xml = clip->toXML();
+                    getCachedThumbnail(item);
                     if (fpsChanged) {
                         xml.removeAttribute("out");
                         xml.removeAttribute("file_hash");
                         xml.removeAttribute("proxy_out");
                     }
-                    if (!replace) replace = xml.attribute("replace") == "1";
+                    if (!replace) replace = xml.attribute("_replaceproxy") == "1";
+                    xml.removeAttribute("_replaceproxy");
                     if (replace) {
                         resetThumbsProducer(clip);
+                        m_render->getFileProperties(xml, clip->getId(), m_listView->iconSize().height(), replace);
+                    }
+                    else if (item->numReferences() > 0) {
+                        // In some cases, like slowmotion clips, the producer is not loaded automatically be MLT
+                        m_render->getFileProperties(xml, clip->getId(), m_listView->iconSize().height(), replace);
                     }
-                    m_render->getFileProperties(xml, clip->getId(), m_listView->iconSize().height(), replace);
                 }
                 else if (clip->isPlaceHolder()) {
                     item->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled | Qt::ItemIsDropEnabled);
-                    if (item->data(0, Qt::DecorationRole).isNull()) {
-                        item->setData(0, Qt::DecorationRole, missingPixmap);
+                    if (!item->hasPixmap()) {
+                        item->setPixmap(missingPixmap);
                     }
                     else {
                         QPixmap pixmap = qVariantValue<QPixmap>(item->data(0, Qt::DecorationRole));
                         QPainter p(&pixmap);
                         p.drawPixmap(3, 3, KIcon("dialog-close").pixmap(pixmap.width() - 6, pixmap.height() - 6));
                         p.end();
-                        item->setData(0, Qt::DecorationRole, pixmap);
+                        item->setPixmap(pixmap);
                     }
                 }
-            } else {              
+            } else {
                 if (displayRatioChanged) {
                     requestClipThumbnail(clip->getId());
                 }
-                else if (item->data(0, Qt::DecorationRole).isNull()) {
+                else if (!item->hasPixmap()) {
                     getCachedThumbnail(item);
                 }
-                if (item->data(0, DurationRole).toString().isEmpty()) {
-                    item->changeDuration(item->referencedClip()->getProducer()->get_playtime());
+                if (item->data(0, ItemDelegate::DurationRole).toString().isEmpty()) {
+                    item->changeDuration(clip->getProducer()->get_playtime());
                 }
                 if (clip->isPlaceHolder()) {
                     QPixmap pixmap = qVariantValue<QPixmap>(item->data(0, Qt::DecorationRole));
@@ -1373,10 +1637,14 @@ void ProjectList::updateAllClips(bool displayRatioChanged, bool fpsChanged, QStr
                     QPainter p(&pixmap);
                     p.drawPixmap(3, 3, KIcon("dialog-close").pixmap(pixmap.width() - 6, pixmap.height() - 6));
                     p.end();
-                    item->setData(0, Qt::DecorationRole, pixmap);
+                    item->setPixmap(pixmap);
+                }
+                else if (clip->getProperty("_replaceproxy") == "1") {
+                    clip->setProperty("_replaceproxy", QString());
+                    slotCreateProxy(clip->getId());
                 }
             }
-            item->setData(0, UsageRole, QString::number(item->numReferences()));
+            item->setData(0, ItemDelegate::UsageRole, QString::number(item->numReferences()));
         }
         ++it;
     }
@@ -1384,8 +1652,8 @@ void ProjectList::updateAllClips(bool displayRatioChanged, bool fpsChanged, QStr
     m_listView->setSortingEnabled(true);
     m_allClipsProcessed = true;
     if (m_render->processingItems() == 0) {
-       monitorItemEditing(true);
-       slotProcessNextThumbnail();
+        monitorItemEditing(true);
+        slotProcessNextThumbnail();
     }
 }
 
@@ -1393,10 +1661,16 @@ void ProjectList::updateAllClips(bool displayRatioChanged, bool fpsChanged, QStr
 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" << "video/webm"
-                            << "audio/x-flac" << "audio/x-matroska" << "audio/mp4" << "audio/mpeg" << "audio/x-mp3" << "audio/ogg" << "audio/x-wav" << "audio/x-aiff" << "audio/aiff" << "application/ogg" << "application/mxf" << "application/x-shockwave-flash"
-                            << "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";
+    QStringList mimeTypes = QStringList() << "application/x-kdenlive" << "application/x-kdenlivetitle" << "video/mlt-playlist" << "text/plain";
+
+    // Video mimes
+    mimeTypes <<  "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" << "video/webm" << "video/3gpp" << "video/mp2t";
+
+    // Audio mimes
+    mimeTypes << "audio/x-flac" << "audio/x-matroska" << "audio/mp4" << "audio/mpeg" << "audio/x-mp3" << "audio/ogg" << "audio/x-wav" << "audio/x-aiff" << "audio/aiff" << "application/ogg" << "application/mxf" << "application/x-shockwave-flash" << "audio/ac3";
+
+    // Image mimes
+    mimeTypes << "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) {
@@ -1409,7 +1683,15 @@ QString ProjectList::getExtensions()
     return allExtensions.simplified();
 }
 
-void ProjectList::slotAddClip(const QList <QUrl> givenList, const QString &groupName, const QString &groupId)
+void ProjectList::slotAddClip(const QString &url, const QString &groupName, const QString &groupId)
+{
+    kDebug()<<"// Adding clip: "<<url;
+    QList <QUrl> list;
+    list.append(url);
+    slotAddClip(list, groupName, groupId);
+}
+
+void ProjectList::slotAddClip(const QList <QUrl> &givenList, const QString &groupName, const QString &groupId)
 {
     if (!m_commandStack)
         kDebug() << "!!!!!!!!!!!!!!!! NO CMD STK";
@@ -1429,72 +1711,117 @@ void ProjectList::slotAddClip(const QList <QUrl> givenList, const QString &group
         l->addWidget(c);
         l->addStretch(5);
         f->setLayout(l);
-        KFileDialog *d = new KFileDialog(KUrl("kfiledialog:///clipfolder"), dialogFilter, kapp->activeWindow(), f);
+
+        QPointer<KFileDialog> d = new KFileDialog(KUrl("kfiledialog:///clipfolder"), dialogFilter, kapp->activeWindow(), f);
         d->setOperationMode(KFileDialog::Opening);
         d->setMode(KFile::Files);
         if (d->exec() == QDialog::Accepted) {
             KdenliveSettings::setAutoimagetransparency(c->isChecked());
-        }
-        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")) {
-                    // import as sequence if we found more than one image in the sequence
-                    QStringList list;
-                    QString pattern = SlideshowClip::selectedPath(url.path(), false, QString(), &list);
-                    int count = list.count();
-                    if (count > 1) {
-                        delete d;
-                        QStringList groupInfo = getGroup();
-
-                        // get image sequence base name
-                        while (fileName.at(fileName.size() - 1).isDigit()) {
-                            fileName.chop(1);
+            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")) {
+                        // import as sequence if we found more than one image in the sequence
+                        QStringList list;
+                        QString pattern = SlideshowClip::selectedPath(url.path(), false, QString(), &list);
+                        int count = list.count();
+                        if (count > 1) {
+                            delete d;
+                            QStringList groupInfo = getGroup();
+
+                            // get image sequence base name
+                            while (fileName.at(fileName.size() - 1).isDigit()) {
+                                fileName.chop(1);
+                            }
+                            QMap <QString, QString> properties;
+                            properties.insert("name", fileName);
+                            properties.insert("resource", pattern);
+                            properties.insert("in", "0");
+                            QString duration = m_timecode.reformatSeparators(KdenliveSettings::sequence_duration());
+                            properties.insert("out", QString::number(m_doc->getFramePos(duration) * count));
+                            properties.insert("ttl", QString::number(m_doc->getFramePos(duration)));
+                            properties.insert("loop", QString::number(false));
+                            properties.insert("crop", QString::number(false));
+                            properties.insert("fade", QString::number(false));
+                            properties.insert("luma_duration", QString::number(m_doc->getFramePos(m_timecode.getTimecodeFromFrames(int(ceil(m_timecode.fps()))))));
+                            m_doc->slotCreateSlideshowClipFile(properties, groupInfo.at(0), groupInfo.at(1));
+                            return;
                         }
-
-                        m_doc->slotCreateSlideshowClipFile(fileName, pattern, count, m_timecode.reformatSeparators(KdenliveSettings::sequence_duration()),
-                                                           false, false, false,
-                                                           m_timecode.getTimecodeFromFrames(int(ceil(m_timecode.fps()))), QString(), 0,
-                                                           QString(), groupInfo.at(0), groupInfo.at(1));
-                        return;
                     }
                 }
             }
         }
         delete d;
     } else {
-        for (int i = 0; i < givenList.count(); i++)
+        for (int i = 0; i < givenList.count(); ++i)
             list << givenList.at(i);
     }
+    QList <KUrl::List> foldersList;
 
     foreach(const KUrl & file, list) {
         // Check there is no folder here
         KMimeType::Ptr type = KMimeType::findByUrl(file);
         if (type->is("inode/directory")) {
-            // user dropped a folder
+            // user dropped a folder, import its files
             list.removeAll(file);
+            QDir dir(file.path());
+            QStringList result = dir.entryList(QDir::Files);
+            KUrl::List folderFiles;
+            folderFiles << file;
+            foreach(const QString & path, result) {
+                KUrl newFile = file;
+                newFile.addPath(path);
+                folderFiles.append(newFile);
+            }
+            if (folderFiles.count() > 1) foldersList.append(folderFiles);
         }
     }
 
-    if (list.isEmpty())
-        return;
-
-    if (givenList.isEmpty()) {
+    if (givenList.isEmpty() && !list.isEmpty()) {
         QStringList groupInfo = getGroup();
-        m_doc->slotAddClipList(list, groupInfo.at(0), groupInfo.at(1));
-    } else {
-        m_doc->slotAddClipList(list, groupName, groupId);
+        QMap <QString, QString> data;
+        data.insert("group", groupInfo.at(0));
+        data.insert("groupId", groupInfo.at(1));
+        m_doc->slotAddClipList(list, data);
+    } else if (!list.isEmpty()) {
+        QMap <QString, QString> data;
+        data.insert("group", groupName);
+        data.insert("groupId", groupId);
+        m_doc->slotAddClipList(list, data);
+    }
+    
+    if (!foldersList.isEmpty()) {
+        // create folders
+        for (int i = 0; i < foldersList.count(); ++i) {
+            KUrl::List urls = foldersList.at(i);
+            KUrl folderUrl = urls.takeFirst();
+            QString folderName = folderUrl.fileName();
+            FolderProjectItem *folder = NULL;
+            if (!folderName.isEmpty()) {
+                folder = getFolderItemByName(folderName);
+                if (folder == NULL) {
+                    slotAddFolder(folderName);
+                    folder = getFolderItemByName(folderName);
+                }
+            }
+            if (folder) {
+                QMap <QString, QString> data;
+                data.insert("group", folder->groupName());
+                data.insert("groupId", folder->clipId());
+                m_doc->slotAddClipList(urls, data);
+            }
+            else m_doc->slotAddClipList(urls);
+        }
     }
 }
 
 void ProjectList::slotRemoveInvalidClip(const QString &id, bool replace)
 {
     ProjectItem *item = getItemById(id);
-    m_processingClips.removeAll(id);
     m_thumbnailQueue.removeAll(id);
     if (item) {
         item->setFlags(Qt::ItemIsSelectable | Qt::ItemIsDragEnabled | Qt::ItemIsEnabled | Qt::ItemIsEditable | Qt::ItemIsDropEnabled);
@@ -1507,9 +1834,9 @@ void ProjectList::slotRemoveInvalidClip(const QString &id, bool replace)
             }
             else {
                 if (replace)
-                    m_invalidClipDialog = new InvalidDialog(i18n("Invalid clip"),  i18n("Clip <b>%1</b><br />is invalid, will be removed from project.", QString()), replace, kapp->activeWindow());
+                    m_invalidClipDialog = new InvalidDialog(i18n("Invalid clip"),  i18n("Clip is invalid, will be removed from project."), replace, kapp->activeWindow());
                 else {
-                    m_invalidClipDialog = new InvalidDialog(i18n("Invalid clip"),  i18n("Clip <b>%1</b><br />is missing or invalid. Remove it from project?", QString()), replace, kapp->activeWindow());
+                    m_invalidClipDialog = new InvalidDialog(i18n("Invalid clip"),  i18n("Clip is missing or invalid. Remove it from project?"), replace, kapp->activeWindow());
                 }
                 m_invalidClipDialog->addClip(id, path);
                 int result = m_invalidClipDialog->exec();
@@ -1534,9 +1861,9 @@ void ProjectList::slotRemoveInvalidProxy(const QString &id, bool durationError)
         item->setFlags(Qt::ItemIsSelectable | Qt::ItemIsDragEnabled | Qt::ItemIsEnabled | Qt::ItemIsEditable | Qt::ItemIsDropEnabled);
         if (durationError) {
             kDebug() << "Proxy duration is wrong, try changing transcoding parameters.";
-            emit displayMessage(i18n("Proxy clip unusable (duration is different from original)."), -2);
+            emit displayMessage(i18n("Proxy clip unusable (duration is different from original)."), -2, ErrorMessage);
         }
-        item->setProxyStatus(PROXYCRASHED);
+        slotUpdateJobStatus(item, PROXYJOB, JobCrashed, i18n("Failed to create proxy for %1. check parameters", item->text(0)), "project_settings");
         QString path = item->referencedClip()->getProperty("proxy");
         KUrl proxyFolder(m_doc->projectFolder().path( KUrl::AddTrailingSlash) + "proxy/");
 
@@ -1553,7 +1880,6 @@ void ProjectList::slotRemoveInvalidProxy(const QString &id, bool durationError)
             item->referencedClip()->reloadThumbProducer();
         }
     }
-    m_processingClips.removeAll(id);
     m_thumbnailQueue.removeAll(id);
 }
 
@@ -1562,7 +1888,7 @@ void ProjectList::slotAddColorClip()
     if (!m_commandStack)
         kDebug() << "!!!!!!!!!!!!!!!! NO CMD STK";
 
-    QDialog *dia = new QDialog(this);
+    QPointer<QDialog> dia = new QDialog(this);
     Ui::ColorClip_UI dia_ui;
     dia_ui.setupUi(dia);
     dia->setWindowTitle(i18n("Color Clip"));
@@ -1594,10 +1920,22 @@ void ProjectList::slotAddSlideshowClip()
 
     if (dia->exec() == QDialog::Accepted) {
         QStringList groupInfo = getGroup();
-        m_doc->slotCreateSlideshowClipFile(dia->clipName(), dia->selectedPath(), dia->imageCount(), dia->clipDuration(),
-                                           dia->loop(), dia->crop(), dia->fade(),
-                                           dia->lumaDuration(), dia->lumaFile(), dia->softness(),
-                                           dia->animation(), groupInfo.at(0), groupInfo.at(1));
+        
+        QMap <QString, QString> properties;
+        properties.insert("name", dia->clipName());
+        properties.insert("resource", dia->selectedPath());
+        properties.insert("in", "0");
+        properties.insert("out", QString::number(m_doc->getFramePos(dia->clipDuration()) * dia->imageCount()));
+        properties.insert("ttl", QString::number(m_doc->getFramePos(dia->clipDuration())));
+        properties.insert("loop", QString::number(dia->loop()));
+        properties.insert("crop", QString::number(dia->crop()));
+        properties.insert("fade", QString::number(dia->fade()));
+        properties.insert("luma_duration", dia->lumaDuration());
+        properties.insert("luma_file", dia->lumaFile());
+        properties.insert("softness", QString::number(dia->softness()));
+        properties.insert("animation", dia->animation());
+        
+        m_doc->slotCreateSlideshowClipFile(properties, groupInfo.at(0), groupInfo.at(1));
     }
     delete dia;
 }
@@ -1621,7 +1959,7 @@ void ProjectList::slotAddTitleTemplateClip()
     const QString path = m_doc->projectFolder().path(KUrl::AddTrailingSlash) + "titles/";
     QStringList templateFiles = QDir(path).entryList(filter, QDir::Files);
 
-    QDialog *dia = new QDialog(this);
+    QPointer<QDialog> dia = new QDialog(this);
     Ui::TemplateClip_UI dia_ui;
     dia_ui.setupUi(dia);
     for (int i = 0; i < templateFiles.size(); ++i)
@@ -1647,7 +1985,7 @@ QStringList ProjectList::getGroup() const
 {
     QStringList result;
     QTreeWidgetItem *item = m_listView->currentItem();
-    while (item && item->type() != PROJECTFOLDERTYPE)
+    while (item && item->type() != ProjectFoldeType)
         item = item->parent();
 
     if (item) {
@@ -1662,12 +2000,15 @@ QStringList ProjectList::getGroup() const
 void ProjectList::setDocument(KdenliveDoc *doc)
 {
     m_listView->blockSignals(true);
-    m_abortAllProxies = true;
-    m_proxyThreads.waitForFinished();
-    m_proxyThreads.clearFutures();
+    m_abortAllJobs = true;
+    for (int i = 0; i < m_jobList.count(); ++i) {
+        m_jobList.at(i)->setStatus(JobAborted);
+    }
+    m_closing = true;
+    m_jobThreads.waitForFinished();
+    m_jobThreads.clearFutures();
     m_thumbnailQueue.clear();
     m_listView->clear();
-    m_processingClips.clear();
     
     m_listView->setSortingEnabled(false);
     emit clipSelected(NULL);
@@ -1677,7 +2018,8 @@ void ProjectList::setDocument(KdenliveDoc *doc)
     m_timecode = doc->timecode();
     m_commandStack = doc->commandStack();
     m_doc = doc;
-    m_abortAllProxies = false;
+    m_abortAllJobs = false;
+    m_closing = false;
 
     QMap <QString, QString> flist = doc->clipManager()->documentFolderList();
     QStringList openedFolders = doc->getExpandedFolders();
@@ -1694,15 +2036,35 @@ void ProjectList::setDocument(KdenliveDoc *doc)
         m_refreshed = true;
         m_allClipsProcessed = true;
     }
-    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);
-    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(bool, bool, QStringList)), this, SLOT(updateAllClips(bool, bool, QStringList)));
+    connect(m_doc->clipManager(), SIGNAL(reloadClip(QString)), this, SLOT(slotReloadClip(QString)));
+    connect(m_doc->clipManager(), SIGNAL(modifiedClip(QString)), this, SLOT(slotModifiedClip(QString)));
+    connect(m_doc->clipManager(), SIGNAL(missingClip(QString)), this, SLOT(slotMissingClip(QString)));
+    connect(m_doc->clipManager(), SIGNAL(availableClip(QString)), this, SLOT(slotAvailableClip(QString)));
+    connect(m_doc->clipManager(), SIGNAL(checkAllClips(bool,bool,QStringList)), this, SLOT(updateAllClips(bool,bool,QStringList)));
+    connect(m_doc->clipManager(), SIGNAL(thumbReady(QString,int,QImage)), this, SLOT(slotSetThumbnail(QString,int,QImage)));
+}
+
+void ProjectList::slotSetThumbnail(const QString &id, int framePos, QImage img)
+{
+    QString fullid = id + '#' + QString::number(framePos);
+    ProjectItem *pItem = NULL;
+    QTreeWidgetItem *item = getAnyItemById(fullid);
+    if (item && item->parent()) pItem = static_cast <ProjectItem *>(item->parent());
+    if (!item && framePos == 0) pItem = getItemById(id);
+    if (!item && !pItem) return;
+    if (item) {
+        if (item->type() == ProjectClipType) static_cast<ProjectItem*>(item)->setPixmap(QPixmap::fromImage(img));
+        else item->setData(0, Qt::DecorationRole, QPixmap::fromImage(img));
+    }
+    else if (pItem) pItem->setPixmap(QPixmap::fromImage(img));
+    if (pItem) {
+        QString hash = pItem->getClipHash();
+        if (!hash.isEmpty()) m_doc->cacheImage(hash + '#' + QString::number(framePos), img);
+    }
 }
 
 QList <DocClipBase*> ProjectList::documentClipList() const
@@ -1720,7 +2082,7 @@ QDomElement ProjectList::producersList()
     doc.appendChild(prods);
     QTreeWidgetItemIterator it(m_listView);
     while (*it) {
-        if ((*it)->type() != PROJECTCLIPTYPE) {
+        if ((*it)->type() != ProjectClipType) {
             // subitem
             ++it;
             continue;
@@ -1748,7 +2110,7 @@ void ProjectList::slotCheckForEmptyQueue()
 }
 
 
-void ProjectList::requestClipThumbnail(const QString id)
+void ProjectList::requestClipThumbnail(const QString &id)
 {
     if (!m_thumbnailQueue.contains(id)) m_thumbnailQueue.append(id);
     slotProcessNextThumbnail();
@@ -1792,8 +2154,8 @@ void ProjectList::slotRefreshClipThumbnail(QTreeWidgetItem *it, bool update)
     ProjectItem *item = NULL;
     bool isSubItem = false;
     int frame;
-    if (it->type() == PROJECTFOLDERTYPE) return;
-    if (it->type() == PROJECTSUBCLIPTYPE) {
+    if (it->type() == ProjectFoldeType) return;
+    if (it->type() == ProjectSubclipType) {
         item = static_cast <ProjectItem *>(it->parent());
         frame = static_cast <SubProjectItem *>(it)->zone().x();
         isSubItem = true;
@@ -1808,26 +2170,22 @@ void ProjectList::slotRefreshClipThumbnail(QTreeWidgetItem *it, bool update)
             slotProcessNextThumbnail();
             return;
         }
-        QPixmap pix;
         QImage img;
         int height = m_listView->iconSize().height();
         int swidth = (int)(height  * m_render->frameRenderWidth() / m_render->renderHeight()+ 0.5);
         int dwidth = (int)(height  * m_render->dar() + 0.5);
-        if (clip->clipType() == AUDIO)
-            pix = KIcon("audio-x-generic").pixmap(QSize(dwidth, height));
-        else if (clip->clipType() == IMAGE)
+        if (clip->clipType() == Image) {
             img = KThumb::getFrame(item->referencedClip()->getProducer(), 0, swidth, dwidth, height);
-        else {
+        }
+        else if (clip->clipType() != Audio) {
             img = item->referencedClip()->extractImage(frame, dwidth, height);
         }
-
-        if (!pix.isNull() || !img.isNull()) {
+        if (!img.isNull()) {
             monitorItemEditing(false);
-            if (!img.isNull()) {
-                pix = QPixmap::fromImage(img);
-                processThumbOverlays(item, pix);
-            }
-            it->setData(0, Qt::DecorationRole, pix);
+            QPixmap pix = roundedPixmap(img);
+            processThumbOverlays(item, pix);
+            if (isSubItem) it->setData(0, Qt::DecorationRole, pix);
+            else item->setPixmap(pix);
             monitorItemEditing(true);
             
             QString hash = item->getClipHash();
@@ -1844,13 +2202,87 @@ void ProjectList::slotRefreshClipThumbnail(QTreeWidgetItem *it, bool update)
     }
 }
 
+void ProjectList::extractMetadata(DocClipBase *clip)
+{
+    ClipType t = clip->clipType();
+    if (t != AV && t != Video) {
+        // Currently, we only use exiftool on video files
+        return;
+    }
+    QMap <QString, QString> props = clip->properties();
+    if (KdenliveSettings::use_exiftool() && !props.contains("exiftool")) {
+        QMap <QString, QString> meta;
+        QString url = clip->fileURL().path();
+        //Check for Canon THM file
+        url = url.section('.', 0, -2) + ".THM";
+        if (QFile::exists(url)) {
+            // Read the exif metadata embeded in the THM file
+            QProcess p;
+            QStringList args;
+            args << "-g" << "-args" << url;
+            p.start("exiftool", args);
+            p.waitForFinished();
+            QString res = p.readAllStandardOutput();
+            QStringList list = res.split("\n");
+            foreach(QString tagline, list) {
+                if (tagline.startsWith("-File") || tagline.startsWith("-ExifTool")) continue;
+                QString tag = tagline.section(':', 1).simplified();
+                if (tag.startsWith("ImageWidth") || tag.startsWith("ImageHeight")) continue;
+                if (!tag.section('=', 0, 0).isEmpty() && !tag.section('=', 1).simplified().isEmpty())
+                    meta.insert(tag.section('=', 0, 0), tag.section('=', 1).simplified());
+            }
+        } else {
+            QString codecid = props.value("videocodecid").simplified();
+            if (codecid == "h264") {
+                QProcess p;
+                QStringList args;
+                args << "-g" << "-args" << clip->fileURL().encodedPathAndQuery();
+                p.start("exiftool", args);
+                p.waitForFinished();
+                QString res = p.readAllStandardOutput();
+                QStringList list = res.split("\n");
+                foreach(QString tagline, list) {
+                    if (!tagline.startsWith("-H264")) continue;
+                    QString tag = tagline.section(':', 1);
+                    if (tag.startsWith("ImageWidth") || tag.startsWith("ImageHeight")) continue;
+                    meta.insert(tag.section('=', 0, 0), tag.section('=', 1));
+                }
+            }
+        }
+        clip->setProperty("exiftool", "1");
+        if (!meta.isEmpty()) {
+            clip->setMetadata(meta, "ExifTool");
+            //checkCamcorderFilters(clip, meta);
+        }
+    }
+    if (KdenliveSettings::use_magicLantern() && !props.contains("magiclantern")) {
+        QMap <QString, QString> meta;
+        QString url = clip->fileURL().path();
+        url = url.section('.', 0, -2) + ".LOG";
+        if (QFile::exists(url)) {
+            QFile file(url);
+            if (file.open(QIODevice::ReadOnly | QIODevice::Text)) {
+                while (!file.atEnd()) {
+                    QString line = file.readLine().simplified();
+                    if (line.startsWith('#') || line.isEmpty() || !line.contains(':')) continue;
+                    if (line.startsWith("CSV data")) break;
+                    meta.insert(line.section(':', 0, 0).simplified(), line.section(':', 1).simplified());
+                }
+            }
+        }
+
+        if (!meta.isEmpty())
+            clip->setMetadata(meta, "Magic Lantern");
+        clip->setProperty("magiclantern", "1");
+    }
+}
+
 
 void ProjectList::slotReplyGetFileProperties(const QString &clipId, Mlt::Producer *producer, const stringMap &properties, const stringMap &metadata, bool replace)
 {
+    QMutexLocker lock(&m_processMutex);
     QString toReload;
     ProjectItem *item = getItemById(clipId);
-
-    int queue = m_render->processingItems();
     if (item && producer) {
         monitorItemEditing(false);
         DocClipBase *clip = item->referencedClip();
@@ -1863,25 +2295,33 @@ void ProjectList::slotReplyGetFileProperties(const QString &clipId, Mlt::Produce
         }
         item->setProperties(properties, metadata);
         clip->setProducer(producer, replace);
+        extractMetadata(clip);
+        m_render->processingDone(clipId);
 
         // Proxy stuff
         QString size = properties.value("frame_size");
-        if (!useProxy() && clip->getProperty("proxy").isEmpty()) setProxyStatus(item, NOPROXY);
-        if (useProxy() && generateProxy() && clip->getProperty("proxy") == "-") setProxyStatus(item, NOPROXY);
-        else if (useProxy() && !item->hasProxy() && !item->isProxyRunning()) {
+        if (!useProxy() && clip->getProperty("proxy").isEmpty()) {
+            item->setConditionalJobStatus(NoJob, PROXYJOB);
+            discardJobs(clipId, PROXYJOB);
+        }
+        if (useProxy() && generateProxy() && clip->getProperty("proxy") == "-") {
+            item->setConditionalJobStatus(NoJob, PROXYJOB);
+            discardJobs(clipId, PROXYJOB);
+        }
+        else if (useProxy() && !item->hasProxy() && !hasPendingJob(item, PROXYJOB)) {
             // proxy video and image clips
             int maxSize;
-            CLIPTYPE t = item->clipType();
-            if (t == IMAGE) maxSize = m_doc->getDocumentProperty("proxyimageminsize").toInt();
+            ClipType t = item->clipType();
+            if (t == Image) maxSize = m_doc->getDocumentProperty("proxyimageminsize").toInt();
             else maxSize = m_doc->getDocumentProperty("proxyminsize").toInt();
-            if ((((t == AV || t == VIDEO || t == PLAYLIST) && generateProxy()) || (t == IMAGE && generateImageProxy())) && (size.section('x', 0, 0).toInt() > maxSize || size.section('x', 1, 1).toInt() > maxSize)) {
+            if ((((t == AV || t == Video || t == Playlist) && generateProxy()) || (t == Image && generateImageProxy())) && (size.section('x', 0, 0).toInt() > maxSize || size.section('x', 1, 1).toInt() > maxSize)) {
                 if (clip->getProperty("proxy").isEmpty()) {
                     KUrl proxyPath = m_doc->projectFolder();
                     proxyPath.addPath("proxy/");
-                    proxyPath.addPath(clip->getClipHash() + "." + (t == IMAGE ? "png" : m_doc->getDocumentProperty("proxyextension")));
+                    proxyPath.addPath(clip->getClipHash() + '.' + (t == Image ? "png" : m_doc->getDocumentProperty("proxyextension")));
                     QMap <QString, QString> newProps;
                     // insert required duration for proxy
-                    if (t != IMAGE) newProps.insert("proxy_out", clip->producerProperty("out"));
+                    if (t != Image) newProps.insert("proxy_out", clip->producerProperty("out"));
                     newProps.insert("proxy", proxyPath.path());
                     QMap <QString, QString> oldProps = clip->properties();
                     oldProps.insert("proxy", QString());
@@ -1891,12 +2331,16 @@ void ProjectList::slotReplyGetFileProperties(const QString &clipId, Mlt::Produce
             }
         }
 
-        if (!replace && m_allClipsProcessed && item->data(0, Qt::DecorationRole).isNull()) {
+        if (!replace && m_allClipsProcessed && !item->hasPixmap()) {
             getCachedThumbnail(item);
         }
         if (!toReload.isEmpty())
             item->slotSetToolTip();
-    } else kDebug() << "////////  COULD NOT FIND CLIP TO UPDATE PRPS...";
+    } else {
+        kDebug() << "////////  COULD NOT FIND CLIP TO UPDATE PRPS...";
+        m_render->processingDone(clipId);
+    }
+    int queue = m_render->processingItems();
     if (queue == 0) {
         monitorItemEditing(true);
         if (item && m_thumbnailQueue.isEmpty()) {
@@ -1904,11 +2348,14 @@ void ProjectList::slotReplyGetFileProperties(const QString &clipId, Mlt::Produce
                 m_listView->setCurrentItem(item);
             bool updatedProfile = false;
             if (item->parent()) {
-                if (item->parent()->type() == PROJECTFOLDERTYPE)
+                if (item->parent()->type() == ProjectFoldeType)
                     static_cast <FolderProjectItem *>(item->parent())->switchIcon();
             } else if (KdenliveSettings::checkfirstprojectclip() &&  m_listView->topLevelItemCount() == 1 && m_refreshed && m_allClipsProcessed) {
                 // this is the first clip loaded in project, check if we want to adjust project settings to the clip
                 updatedProfile = adjustProjectProfileToItem(item);
+                if (updatedProfile == false) {
+                    emit clipSelected(item->referencedClip());
+                }
             }
             if (updatedProfile == false) {
                 //emit clipSelected(item->referencedClip());
@@ -1925,14 +2372,15 @@ void ProjectList::slotReplyGetFileProperties(const QString &clipId, Mlt::Produce
         return;
     }
     if (replace) toReload = clipId;
-    if (!toReload.isEmpty())
+    if (!toReload.isEmpty()) {
         emit clipNeedsReload(toReload);
+    }
 }
 
 bool ProjectList::adjustProjectProfileToItem(ProjectItem *item)
 {
     if (item == NULL) {
-        if (m_listView->currentItem() && m_listView->currentItem()->type() != PROJECTFOLDERTYPE)
+        if (m_listView->currentItem() && m_listView->currentItem()->type() != ProjectFoldeType)
             item = static_cast <ProjectItem*>(m_listView->currentItem());
     }
     if (item == NULL || item->referencedClip() == NULL) {
@@ -1943,12 +2391,14 @@ bool ProjectList::adjustProjectProfileToItem(ProjectItem *item)
     QString size = item->referencedClip()->getProperty("frame_size");
     int width = size.section('x', 0, 0).toInt();
     int height = size.section('x', -1).toInt();
+    // Fix some avchd clips tht report a wrong size (1920x1088)
+    if (height == 1088) height = 1080;
     double fps = item->referencedClip()->getProperty("fps").toDouble();
     double par = item->referencedClip()->getProperty("aspect_ratio").toDouble();
-    if (item->clipType() == IMAGE || item->clipType() == AV || item->clipType() == VIDEO) {
-        if (ProfilesDialog::matchProfile(width, height, fps, par, item->clipType() == IMAGE, m_doc->mltProfile()) == false) {
+    if (item->clipType() == Image || item->clipType() == AV || item->clipType() == Video) {
+        if (ProfilesDialog::matchProfile(width, height, fps, par, item->clipType() == Image, m_doc->mltProfile()) == false) {
             // get a list of compatible profiles
-            QMap <QString, QString> suggestedProfiles = ProfilesDialog::getProfilesFromProperties(width, height, fps, par, item->clipType() == IMAGE);
+            QMap <QString, QString> suggestedProfiles = ProfilesDialog::getProfilesFromProperties(width, height, fps, par, item->clipType() == Image);
             if (!suggestedProfiles.isEmpty()) {
                 KDialog *dialog = new KDialog(this);
                 dialog->setCaption(i18n("Change project profile"));
@@ -2012,10 +2462,10 @@ void ProjectList::slotReplyGetImage(const QString &clipId, const QImage &img)
 {
     ProjectItem *item = getItemById(clipId);
     if (item && !img.isNull()) {
-        QPixmap pix = QPixmap::fromImage(img);
+        QPixmap pix = roundedPixmap(img);
         processThumbOverlays(item, pix);
         monitorItemEditing(false);
-        item->setData(0, Qt::DecorationRole, pix);
+        item->setPixmap(pix);
         monitorItemEditing(true);
         QString hash = item->getClipHash();
         if (!hash.isEmpty()) m_doc->cacheImage(hash, img);
@@ -2043,7 +2493,7 @@ QTreeWidgetItem *ProjectList::getAnyItemById(const QString &id)
 
     ProjectItem *result = NULL;
     while (*it) {
-        if ((*it)->type() != PROJECTCLIPTYPE) {
+        if ((*it)->type() != ProjectClipType) {
             // subitem
             ++it;
             continue;
@@ -2058,7 +2508,7 @@ QTreeWidgetItem *ProjectList::getAnyItemById(const QString &id)
     if (result == NULL || !id.contains('#')) {
         return result;
     } else {
-        for (int i = 0; i < result->childCount(); i++) {
+        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())
                 return sub;
@@ -2074,7 +2524,7 @@ ProjectItem *ProjectList::getItemById(const QString &id)
     ProjectItem *item;
     QTreeWidgetItemIterator it(m_listView);
     while (*it) {
-        if ((*it)->type() != PROJECTCLIPTYPE) {
+        if ((*it)->type() != ProjectClipType) {
             // subitem or folder
             ++it;
             continue;
@@ -2087,12 +2537,25 @@ ProjectItem *ProjectList::getItemById(const QString &id)
     return NULL;
 }
 
+FolderProjectItem *ProjectList::getFolderItemByName(const QString &name)
+{
+    FolderProjectItem *item = NULL;
+    QList <QTreeWidgetItem *> hits = m_listView->findItems(name, Qt::MatchExactly, 0);
+    for (int i = 0; i < hits.count(); ++i) {
+        if (hits.at(i)->type() == ProjectFoldeType) {
+            item = static_cast<FolderProjectItem *>(hits.at(i));
+            break;
+        }
+    }
+    return item;
+}
+
 FolderProjectItem *ProjectList::getFolderItemById(const QString &id)
 {
     FolderProjectItem *item;
     QTreeWidgetItemIterator it(m_listView);
     while (*it) {
-        if ((*it)->type() == PROJECTFOLDERTYPE) {
+        if ((*it)->type() == ProjectFoldeType) {
             item = static_cast<FolderProjectItem *>(*it);
             if (item->clipId() == id)
                 return item;
@@ -2111,12 +2574,13 @@ void ProjectList::slotSelectClip(const QString &ix)
         m_editButton->defaultAction()->setEnabled(true);
         m_deleteButton->defaultAction()->setEnabled(true);
         m_reloadAction->setEnabled(true);
+        m_extractAudioAction->setEnabled(true);
         m_transcodeAction->setEnabled(true);
-        m_stabilizeAction->setEnabled(true);
-        if (clip->clipType() == IMAGE && !KdenliveSettings::defaultimageapp().isEmpty()) {
+        m_clipsActionsMenu->setEnabled(true);
+        if (clip->clipType() == Image && !KdenliveSettings::defaultimageapp().isEmpty()) {
             m_openAction->setIcon(KIcon(KdenliveSettings::defaultimageapp()));
             m_openAction->setEnabled(true);
-        } else if (clip->clipType() == AUDIO && !KdenliveSettings::defaultaudioapp().isEmpty()) {
+        } else if (clip->clipType() == Audio && !KdenliveSettings::defaultaudioapp().isEmpty()) {
             m_openAction->setIcon(KIcon(KdenliveSettings::defaultaudioapp()));
             m_openAction->setEnabled(true);
         } else {
@@ -2128,8 +2592,8 @@ void ProjectList::slotSelectClip(const QString &ix)
 QString ProjectList::currentClipUrl() const
 {
     ProjectItem *item;
-    if (!m_listView->currentItem() || m_listView->currentItem()->type() == PROJECTFOLDERTYPE) return QString();
-    if (m_listView->currentItem()->type() == PROJECTSUBCLIPTYPE) {
+    if (!m_listView->currentItem() || m_listView->currentItem()->type() == ProjectFoldeType) return QString();
+    if (m_listView->currentItem()->type() == ProjectSubclipType) {
         // subitem
         item = static_cast <ProjectItem*>(m_listView->currentItem()->parent());
     } else {
@@ -2145,16 +2609,16 @@ KUrl::List ProjectList::getConditionalUrls(const QString &condition) const
     KUrl::List result;
     ProjectItem *item;
     QList<QTreeWidgetItem *> list = m_listView->selectedItems();
-    for (int i = 0; i < list.count(); i++) {
-        if (list.at(i)->type() == PROJECTFOLDERTYPE)
+    for (int i = 0; i < list.count(); ++i) {
+        if (list.at(i)->type() == ProjectFoldeType)
             continue;
-        if (list.at(i)->type() == PROJECTSUBCLIPTYPE) {
+        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 || item->type() == COLOR || item->type() == SLIDESHOW || item->type() == TEXT)
+        if (item == NULL || item->type() == Color || item->type() == SlideShow || item->type() == Text)
             continue;
         DocClipBase *clip = item->referencedClip();
         if (!condition.isEmpty()) {
@@ -2168,6 +2632,34 @@ KUrl::List ProjectList::getConditionalUrls(const QString &condition) const
     return result;
 }
 
+QMap <QString, QString> ProjectList::getConditionalIds(const QString &condition) const
+{
+    QMap <QString, QString> result;
+    ProjectItem *item;
+    QList<QTreeWidgetItem *> list = m_listView->selectedItems();
+    for (int i = 0; i < list.count(); ++i) {
+        if (list.at(i)->type() == ProjectFoldeType)
+            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 || 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;
+        }
+        result.insert(item->clipId(), item->clipUrl().path());
+    }
+    return result;
+}
+
 void ProjectList::regenerateTemplate(const QString &id)
 {
     ProjectItem *clip = getItemById(id);
@@ -2196,7 +2688,7 @@ QDomDocument ProjectList::generateTemplateXml(QString path, const QString &repla
     }
     file.close();
     QDomNodeList texts = doc.elementsByTagName("content");
-    for (int i = 0; i < texts.count(); i++) {
+    for (int i = 0; i < texts.count(); ++i) {
         QString data = texts.item(i).firstChild().nodeValue();
         data.replace("%s", replaceString);
         texts.item(i).firstChild().setNodeValue(data);
@@ -2221,17 +2713,14 @@ void ProjectList::addClipCut(const QString &id, int in, int out, const QString d
         DocClipBase *base = clip->referencedClip();
         base->addCutZone(in, out);
         monitorItemEditing(false);
-        SubProjectItem *sub = new SubProjectItem(clip, in, out, desc);
+        SubProjectItem *sub = new SubProjectItem(m_render->dar(), clip, in, out, desc);
         if (newItem && desc.isEmpty() && !m_listView->isColumnHidden(1)) {
             if (!clip->isExpanded())
                 clip->setExpanded(true);
             m_listView->scrollToItem(sub);
             m_listView->editItem(sub, 1);
         }
-        QImage img = clip->referencedClip()->extractImage(in, (int)(sub->sizeHint(0).height()  * m_render->dar()), sub->sizeHint(0).height() - 2);
-        sub->setData(0, Qt::DecorationRole, QPixmap::fromImage(img));
-        QString hash = clip->getClipHash();
-        if (!hash.isEmpty()) m_doc->cacheImage(hash + '#' + QString::number(in), img);
+        m_doc->clipManager()->slotRequestThumbs(QString('#' + id), QList <int>() << in);
         monitorItemEditing(true);
     }
     emit projectModified();
@@ -2253,13 +2742,13 @@ void ProjectList::removeClipCut(const QString &id, int in, int out)
     emit projectModified();
 }
 
-SubProjectItem *ProjectList::getSubItem(ProjectItem *clip, QPoint zone)
+SubProjectItem *ProjectList::getSubItem(ProjectItem *clip, const QPoint &zone)
 {
     SubProjectItem *sub = NULL;
     if (clip) {
-        for (int i = 0; i < clip->childCount(); i++) {
+        for (int i = 0; i < clip->childCount(); ++i) {
             QTreeWidgetItem *it = clip->child(i);
-            if (it->type() == PROJECTSUBCLIPTYPE) {
+            if (it->type() == ProjectSubclipType) {
                 sub = static_cast <SubProjectItem*>(it);
                 if (sub->zone() == zone)
                     break;
@@ -2273,7 +2762,7 @@ SubProjectItem *ProjectList::getSubItem(ProjectItem *clip, QPoint zone)
 
 void ProjectList::slotUpdateClipCut(QPoint p)
 {
-    if (!m_listView->currentItem() || m_listView->currentItem()->type() != PROJECTSUBCLIPTYPE)
+    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());
@@ -2281,7 +2770,7 @@ void ProjectList::slotUpdateClipCut(QPoint p)
     m_commandStack->push(command);
 }
 
-void ProjectList::doUpdateClipCut(const QString &id, const QPoint oldzone, const QPoint zone, const QString &comment)
+void ProjectList::doUpdateClipCut(const QString &id, const QPoint &oldzone, const QPoint &zone, const QString &comment)
 {
     ProjectItem *clip = getItemById(id);
     SubProjectItem *sub = getSubItem(clip, oldzone);
@@ -2301,7 +2790,7 @@ void ProjectList::slotForceProcessing(const QString &id)
     m_render->forceProcessing(id);
 }
 
-void ProjectList::slotAddOrUpdateSequence(const QString frameName)
+void ProjectList::slotAddOrUpdateSequence(const QString &frameName)
 {
     QString fileName = KUrl(frameName).fileName().section('_', 0, -2);
     QStringList list;
@@ -2324,12 +2813,21 @@ void ProjectList::slotAddOrUpdateSequence(const QString frameName)
         } else {
             // Create sequence
             QStringList groupInfo = getGroup();
-            m_doc->slotCreateSlideshowClipFile(fileName, pattern, count, m_timecode.reformatSeparators(KdenliveSettings::sequence_duration()),
-                                               false, false, false,
-                                               m_timecode.getTimecodeFromFrames(int(ceil(m_timecode.fps()))), QString(), 0,
-                                               QString(), groupInfo.at(0), groupInfo.at(1));
+            QMap <QString, QString> properties;
+            properties.insert("name", fileName);
+            properties.insert("resource", pattern);
+            properties.insert("in", "0");
+            QString duration = m_timecode.reformatSeparators(KdenliveSettings::sequence_duration());
+            properties.insert("out", QString::number(m_doc->getFramePos(duration) * count));
+            properties.insert("ttl", QString::number(m_doc->getFramePos(duration)));
+            properties.insert("loop", QString::number(false));
+            properties.insert("crop", QString::number(false));
+            properties.insert("fade", QString::number(false));
+            properties.insert("luma_duration", m_timecode.getTimecodeFromFrames(int(ceil(m_timecode.fps()))));
+
+            m_doc->slotCreateSlideshowClipFile(properties, groupInfo.at(0), groupInfo.at(1));
         }
-    } else emit displayMessage(i18n("Sequence not found"), -2);
+    } else emit displayMessage(i18n("Sequence not found"), -2, ErrorMessage);
 }
 
 QMap <QString, QString> ProjectList::getProxies()
@@ -2338,7 +2836,7 @@ QMap <QString, QString> ProjectList::getProxies()
     ProjectItem *item;
     QTreeWidgetItemIterator it(m_listView);
     while (*it) {
-        if ((*it)->type() != PROJECTCLIPTYPE) {
+        if ((*it)->type() != ProjectClipType) {
             ++it;
             continue;
         }
@@ -2354,306 +2852,305 @@ QMap <QString, QString> ProjectList::getProxies()
     return list;
 }
 
-void ProjectList::slotCreateProxy(const QString id)
+void ProjectList::slotCreateProxy(const QString &id)
 {
     ProjectItem *item = getItemById(id);
-    if (!item || item->isProxyRunning() || item->referencedClip()->isPlaceHolder()) return;
+    if (!item || hasPendingJob(item, PROXYJOB) || item->referencedClip()->isPlaceHolder()) return;
     QString path = item->referencedClip()->getProperty("proxy");
     if (path.isEmpty()) {
-        setProxyStatus(item, PROXYCRASHED);
-        return;
-    }
-    setProxyStatus(item, PROXYWAITING);
-    if (m_abortProxy.contains(path)) m_abortProxy.removeAll(path);
-    if (m_processingProxy.contains(path)) {
-        // Proxy is already being generated
+        slotUpdateJobStatus(item, PROXYJOB, JobCrashed, i18n("Failed to create proxy, empty path."));
         return;
     }
+    
     if (QFileInfo(path).size() > 0) {
         // Proxy already created
-        setProxyStatus(item, PROXYDONE);
+        setJobStatus(item, PROXYJOB, JobDone);
         slotGotProxy(path);
         return;
     }
-    m_processingProxy.append(path);
+    QString sourcePath = item->clipUrl().path();
+    if (item->clipType() == Playlist) {
+        // Special case: playlists use the special 'consumer' producer to support resizing
+        sourcePath.prepend("consumer:");
+    }
+    ProxyJob *job = new ProxyJob(item->clipType(), id, QStringList() << path << sourcePath << item->referencedClip()->producerProperty("_exif_orientation") << m_doc->getDocumentProperty("proxyparams").simplified() << QString::number(m_render->frameRenderWidth()) << QString::number(m_render->renderHeight()));
+    if (job->isExclusive() && hasPendingJob(item, job->jobType)) {
+        delete job;
+        return;
+    }
+
+    m_jobList.append(job);
+    setJobStatus(item, job->jobType, JobWaiting, 0, job->statusMessage());
+    slotCheckJobProcess();
+}
+
+void ProjectList::slotCutClipJob(const QString &id, QPoint zone)
+{
+    ProjectItem *item = getItemById(id);
+    if (!item|| item->referencedClip()->isPlaceHolder()) return;
+    QString source = item->clipUrl().path();
+    QString ext = source.section('.', -1);
+    QString dest = source.section('.', 0, -2) + '_' + QString::number(zone.x()) + '.' + ext;
+    
+    double clipFps = item->referencedClip()->getProperty("fps").toDouble();
+    if (clipFps == 0) clipFps = m_fps;
+    // if clip and project have different frame rate, adjust in and out
+    int in = zone.x();
+    int out = zone.y();
+    in = GenTime(in, m_timecode.fps()).frames(clipFps);
+    out = GenTime(out, m_timecode.fps()).frames(clipFps);
+    int max = GenTime(item->clipMaxDuration(), m_timecode.fps()).frames(clipFps);
+    int duration = out - in + 1;
+    QString timeIn = Timecode::getStringTimecode(in, clipFps, true);
+    QString timeOut = Timecode::getStringTimecode(duration, clipFps, true);
+    
+    QPointer<QDialog> d = new QDialog(this);
+    Ui::CutJobDialog_UI ui;
+    ui.setupUi(d);
+    ui.extra_params->setVisible(false);
+    ui.add_clip->setChecked(KdenliveSettings::add_new_clip());
+    ui.file_url->fileDialog()->setOperationMode(KFileDialog::Saving);
+    ui.extra_params->setMaximumHeight(QFontMetrics(font()).lineSpacing() * 5);
+    ui.file_url->setUrl(KUrl(dest));
+    ui.button_more->setIcon(KIcon("configure"));
+    ui.extra_params->setPlainText("-acodec copy -vcodec copy");
+    QString mess = i18n("Extracting %1 out of %2", timeOut, Timecode::getStringTimecode(max, clipFps, true));
+    ui.info_label->setText(mess);
+    if (d->exec() != QDialog::Accepted) {
+        delete d;
+        return;
+    }
+    dest = ui.file_url->url().path();
+    bool acceptPath = dest != source;
+    if (acceptPath && QFileInfo(dest).size() > 0) {
+        // destination file olready exists, overwrite?
+        acceptPath = false;
+    }
+    while (!acceptPath) {
+        // Do not allow to save over original clip
+        if (dest == source) ui.info_label->setText("<b>" + i18n("You cannot overwrite original clip.") + "</b><br>" + mess);
+        else if (KMessageBox::questionYesNo(this, i18n("Overwrite file %1", dest)) == KMessageBox::Yes) break;
+        if (d->exec() != QDialog::Accepted) {
+            delete d;
+            return;
+        }
+        dest = ui.file_url->url().path();
+        acceptPath = dest != source;
+        if (acceptPath && QFileInfo(dest).size() > 0) {
+            acceptPath = false;
+        }
+    }
+    QString extraParams = ui.extra_params->toPlainText().simplified();
+    KdenliveSettings::setAdd_new_clip(ui.add_clip->isChecked());
+    delete d;
+
+    QStringList jobParams;
+    jobParams << dest << item->clipUrl().path() << timeIn << timeOut << QString::number(duration) << QString::number(KdenliveSettings::add_new_clip());
+    if (!extraParams.isEmpty()) jobParams << extraParams;
+    CutClipJob *job = new CutClipJob(item->clipType(), id, jobParams);
+    if (job->isExclusive() && hasPendingJob(item, job->jobType)) {
+        delete job;
+        return;
+    }
+    m_jobList.append(job);
+    setJobStatus(item, job->jobType, JobWaiting, 0, job->statusMessage());
 
-    PROXYINFO info;
-    info.dest = path;
-    info.src = item->clipUrl().path();
-    info.type = item->clipType();
-    info.exif = QString(item->referencedClip()->producerProperty("_exif_orientation")).toInt();
-    m_proxyList.append(info);
-    if (!m_proxyThreads.futures().isEmpty()) {
+    slotCheckJobProcess();
+}
+
+void ProjectList::slotTranscodeClipJob(const QString &condition, QString params, QString desc)
+{
+    QStringList existingFiles;
+    QMap <QString, QString> ids = getConditionalIds(condition);
+    QMap<QString, QString>::const_iterator i = ids.constBegin();
+    QStringList destinations;
+    while (i != ids.constEnd()) {
+        QString newFile = params.section(' ', -1).replace("%1", i.value());
+        destinations << newFile;
+        if (QFile::exists(newFile)) existingFiles << newFile;
+        ++i;
+    }
+    if (!existingFiles.isEmpty()) {
+        if (KMessageBox::warningContinueCancelList(this, i18n("The transcoding job will overwrite the following files:"), existingFiles) ==  KMessageBox::Cancel) return;
+    }
+    
+    QDialog *d = new QDialog(this);
+    Ui::CutJobDialog_UI ui;
+    ui.setupUi(d);
+    d->setWindowTitle(i18n("Transcoding"));
+    ui.extra_params->setMaximumHeight(QFontMetrics(font()).lineSpacing() * 5);
+    if (ids.count() == 1) {
+        ui.file_url->setUrl(KUrl(destinations.first()));
+    }
+    else {
+        ui.destination_label->setVisible(false);
+        ui.file_url->setVisible(false);
+    }
+    ui.extra_params->setVisible(false);
+    d->adjustSize();
+    ui.button_more->setIcon(KIcon("configure"));
+    ui.add_clip->setChecked(KdenliveSettings::add_new_clip());
+    ui.extra_params->setPlainText(params.simplified().section(' ', 0, -2));
+    QString mess = desc;
+    mess.append(' ' + i18np("(%1 clip)", "(%1 clips)", ids.count()));
+    ui.info_label->setText(mess);
+    if (d->exec() != QDialog::Accepted) {
+        delete d;
+        return;
+    }
+    params = ui.extra_params->toPlainText().simplified();
+    KdenliveSettings::setAdd_new_clip(ui.add_clip->isChecked());
+    int index = 0;
+    i = ids.constBegin();
+    while (i != ids.constEnd()) {
+        ProjectItem *item = getItemById(i.key());
+        if (!item || !item->referencedClip()) continue;
+        QString src = i.value();
+        QString dest;
+        if (ids.count() > 1) {
+            dest = destinations.at(index);
+            index++;
+        }
+        else dest = ui.file_url->url().path();
+        QStringList jobParams;
+        jobParams << dest << src << QString() << QString();
+        double clipFps = item->referencedClip()->getProperty("fps").toDouble();
+        if (clipFps == 0) clipFps = m_fps;
+        int max = item->clipMaxDuration();
+        QString duration = QString::number(max);
+        jobParams << duration;
+        jobParams << QString::number(KdenliveSettings::add_new_clip());
+        jobParams << params;
+        CutClipJob *job = new CutClipJob(item->clipType(), i.key(), jobParams);
+        if (job->isExclusive() && hasPendingJob(item, job->jobType)) {
+            delete job;
+            continue;
+        }
+        m_jobList.append(job);
+        setJobStatus(item, job->jobType, JobWaiting, 0, job->statusMessage());
+        ++i;
+    }
+    delete d;
+    slotCheckJobProcess();
+    
+}
+
+void ProjectList::slotCheckJobProcess()
+{        
+    if (!m_jobThreads.futures().isEmpty()) {
         // Remove inactive threads
-        QList <QFuture<void> > futures = m_proxyThreads.futures();
-        m_proxyThreads.clearFutures();
-        for (int i = 0; i < futures.count(); i++)
+        QList <QFuture<void> > futures = m_jobThreads.futures();
+        m_jobThreads.clearFutures();
+        for (int i = 0; i < futures.count(); ++i)
             if (!futures.at(i).isFinished()) {
-                m_proxyThreads.addFuture(futures.at(i));
+                m_jobThreads.addFuture(futures.at(i));
             }
     }
-    if (m_proxyThreads.futures().isEmpty() || m_proxyThreads.futures().count() < KdenliveSettings::proxythreads()) m_proxyThreads.addFuture(QtConcurrent::run(this, &ProjectList::slotGenerateProxy));
+    if (m_jobList.isEmpty()) return;
+
+    m_jobMutex.lock();
+    int count = 0;
+    for (int i = 0; i < m_jobList.count(); ++i) {
+        if (m_jobList.at(i)->status() == JobWorking || m_jobList.at(i)->status() == JobWaiting)
+            count ++;
+        else {
+            // remove finished jobs
+            AbstractClipJob *job = m_jobList.takeAt(i);
+            job->deleteLater();
+            --i;
+        }
+    }
+    emit jobCount(count);
+    m_jobMutex.unlock();
+    if (m_jobThreads.futures().isEmpty() || m_jobThreads.futures().count() < KdenliveSettings::proxythreads()) m_jobThreads.addFuture(QtConcurrent::run(this, &ProjectList::slotProcessJobs));
 }
 
-void ProjectList::slotAbortProxy(const QString id, const QString path)
+void ProjectList::slotAbortProxy(const QString &id, const QString &path)
 {
-    QTreeWidgetItemIterator it(m_listView);
+    Q_UNUSED(path)
+
     ProjectItem *item = getItemById(id);
-    if (!path.isEmpty() && m_processingProxy.contains(path)) {
-        m_abortProxy << path;
-        setProxyStatus(item, NOPROXY);
-    }
-    else {
-        setProxyStatus(item, NOPROXY);
-        slotGotProxy(item);
-    }
+    if (!item) return;
+    if (!item->isProxyRunning()) slotGotProxy(item);
+    item->setConditionalJobStatus(NoJob, PROXYJOB);
+    discardJobs(id, PROXYJOB);
 }
 
-void ProjectList::slotGenerateProxy()
+void ProjectList::slotProcessJobs()
 {
-    while (!m_proxyList.isEmpty() && !m_abortAllProxies) {
+    while (!m_jobList.isEmpty() && !m_abortAllJobs) {
         emit projectModified();
-        PROXYINFO info = m_proxyList.takeFirst();
-        if (m_abortProxy.contains(info.dest)) {
-            m_abortProxy.removeAll(info.dest);
-            continue;
-        }
-        // Get the list of clips that will need to get progress info
-        QTreeWidgetItemIterator it(m_listView);
-        QList <ProjectItem *> processingItems;
-        while (*it && !m_abortAllProxies) {
-            if ((*it)->type() == PROJECTCLIPTYPE) {
-                ProjectItem *item = static_cast <ProjectItem *>(*it);
-                if (item->referencedClip()->getProperty("proxy") == info.dest) {
-                    processingItems.append(item);
+        AbstractClipJob *job = NULL;
+        int count = 0;
+        m_jobMutex.lock();
+        for (int i = 0; i < m_jobList.count(); ++i) {
+            if (m_jobList.at(i)->status() == JobWaiting) {
+                if (job == NULL) {
+                    m_jobList.at(i)->setStatus(JobWorking);
+                    job = m_jobList.at(i);
                 }
+                count++;
             }
-            ++it;
+            else if (m_jobList.at(i)->status() == JobWorking)
+                count ++;
         }
+        // Set jobs count
+        emit jobCount(count);
+        m_jobMutex.unlock();
 
-        // Make sure proxy path is writable
-        QFile file(info.dest);
-        if (!file.open(QIODevice::WriteOnly)) {
-            for (int i = 0; i < processingItems.count(); i++)
-                setProxyStatus(processingItems.at(i), PROXYCRASHED);
-            m_processingProxy.removeAll(info.dest);
-            continue;
+        if (job == NULL) {
+            break;
         }
-        file.close();
-        QFile::remove(info.dest);
-    
-        for (int i = 0; i < processingItems.count(); i++)
-            setProxyStatus(processingItems.at(i), CREATINGPROXY);
-
-        // Special case: playlist clips (.mlt or .kdenlive project files)
-        if (info.type == PLAYLIST) {
-            // change FFmpeg params to MLT format
-            QStringList parameters;
-            parameters << info.src;
-            parameters << "-consumer" << "avformat:" + info.dest;
-            QStringList params = m_doc->getDocumentProperty("proxyparams").simplified().split('-', QString::SkipEmptyParts);
-        
-            foreach(QString s, params) {
-                s = s.simplified();
-                if (s.count(' ') == 0) {
-                    s.append("=1");
-                }
-                else s.replace(' ', '=');
-                parameters << s;
-            }
-        
-            parameters.append(QString("real_time=-%1").arg(KdenliveSettings::mltthreads()));
-
-            //TODO: currently, when rendering an xml file through melt, the display ration is lost, so we enforce it manualy
-            double display_ratio = KdenliveDoc::getDisplayRatio(info.src);
-            parameters << "aspect=" + QString::number(display_ratio);
-
-            //kDebug()<<"TRANSCOD: "<<parameters;
-            QProcess myProcess;
-            myProcess.setProcessChannelMode(QProcess::MergedChannels);
-            myProcess.start(KdenliveSettings::rendererpath(), parameters);
-            myProcess.waitForStarted();
-            int result = -1;
-            int duration = 0;
-            while (myProcess.state() != QProcess::NotRunning) {
-                // building proxy file
-                if (m_abortProxy.contains(info.dest) || m_abortAllProxies) {
-                    myProcess.close();
-                    myProcess.waitForFinished();
-                    QFile::remove(info.dest);
-                    m_abortProxy.removeAll(info.dest);
-                    m_processingProxy.removeAll(info.dest);
-                    for (int i = 0; i < processingItems.count(); i++)
-                        setProxyStatus(processingItems.at(i), NOPROXY);
-                    result = -2;
-                }
-                else {
-                    QString log = QString(myProcess.readAll());
-                    processLogInfo(processingItems, &duration, log);
-                }
-                myProcess.waitForFinished(500);
-            }
-            myProcess.waitForFinished();
-            m_processingProxy.removeAll(info.dest);
-            if (result == -1) result = myProcess.exitStatus();
-            if (result == 0) {
-                // proxy successfully created
-                for (int i = 0; i < processingItems.count(); i++)
-                    setProxyStatus(processingItems.at(i), PROXYDONE);
-                slotGotProxy(info.dest);
-            }
-            else if (result == 1) {
-                // Proxy process crashed
-                QFile::remove(info.dest);
-                for (int i = 0; i < processingItems.count(); i++)
-                    setProxyStatus(processingItems.at(i), PROXYCRASHED);
-            }
+        QString destination = job->destination();
+        // Check if the clip is still here
+        DocClipBase *currentClip = m_doc->clipManager()->getClipById(job->clipId());
+        //ProjectItem *processingItem = getItemById(job->clipId());
+        if (currentClip == NULL) {
+            job->setStatus(JobDone);
             continue;
         }
-    
-        if (info.type == IMAGE) {
-            // Image proxy
-            QImage i(info.src);
-            if (i.isNull()) {
-                // Cannot load image
-                for (int i = 0; i < processingItems.count(); i++)
-                    setProxyStatus(processingItems.at(i), PROXYCRASHED);
+        // Set clip status to started
+        emit processLog(job->clipId(), 0, job->jobType, job->statusMessage());
+
+        // Make sure destination path is writable
+        if (!destination.isEmpty()) {
+            QFile file(destination);
+            if (!file.open(QIODevice::WriteOnly)) {
+                emit updateJobStatus(job->clipId(), job->jobType, JobCrashed, i18n("Cannot write to path: %1", destination));
+                job->setStatus(JobCrashed);
                 continue;
             }
-            QImage proxy;
-            // Images are scaled to profile size. 
-            //TODO: Make it be configurable?
-            if (i.width() > i.height()) proxy = i.scaledToWidth(m_render->frameRenderWidth());
-            else proxy = i.scaledToHeight(m_render->renderHeight());
-            if (info.exif > 1) {
-                // Rotate image according to exif data
-                QImage processed;
-                QMatrix matrix;
-
-                switch ( info.exif ) {
-                    case 2:
-                        matrix.scale( -1, 1 );
-                        break;
-                    case 3:
-                        matrix.rotate( 180 );
-                        break;
-                    case 4:
-                        matrix.scale( 1, -1 );
-                        break;
-                    case 5:
-                        matrix.rotate( 270 );
-                        matrix.scale( -1, 1 );
-                        break;
-                    case 6:
-                        matrix.rotate( 90 );
-                        break;
-                    case 7:
-                        matrix.rotate( 90 );
-                        matrix.scale( -1, 1 );
-                        break;
-                    case 8:
-                        matrix.rotate( 270 );
-                        break;
-                }
-                processed = proxy.transformed( matrix );
-                processed.save(info.dest);
-            }
-            else proxy.save(info.dest);
-            for (int i = 0; i < processingItems.count(); i++)
-                setProxyStatus(processingItems.at(i), PROXYDONE);
-            slotGotProxy(info.dest);
-            m_abortProxy.removeAll(info.dest);
-            m_processingProxy.removeAll(info.dest);
-            continue;
+            file.close();
+            QFile::remove(destination);
         }
+        connect(job, SIGNAL(jobProgress(QString,int,int)), this, SIGNAL(processLog(QString,int,int)));
+        connect(job, SIGNAL(cancelRunningJob(QString,stringMap)), this, SIGNAL(cancelRunningJob(QString,stringMap)));
 
-        QStringList parameters;
-        parameters << "-i" << info.src;
-        QString params = m_doc->getDocumentProperty("proxyparams").simplified();
-        foreach(QString s, params.split(' '))
-        parameters << s;
-
-        // Make sure we don't block when proxy file already exists
-        parameters << "-y";
-        parameters << info.dest;
-        QProcess myProcess;
-        myProcess.setProcessChannelMode(QProcess::MergedChannels);
-        myProcess.start("ffmpeg", parameters);
-        myProcess.waitForStarted();
-        int result = -1;
-        int duration = 0;
-   
-        while (myProcess.state() != QProcess::NotRunning) {
-            // building proxy file
-            if (m_abortProxy.contains(info.dest) || m_abortAllProxies) {
-                myProcess.close();
-                myProcess.waitForFinished();
-                m_abortProxy.removeAll(info.dest);
-                m_processingProxy.removeAll(info.dest);
-                QFile::remove(info.dest);
-                if (!m_abortAllProxies) {
-                    for (int i = 0; i < processingItems.count(); i++)
-                        setProxyStatus(processingItems.at(i), NOPROXY);
-                }
-                else continue;
-                result = -2;
-            }
-            else {
-                QString log = QString(myProcess.readAll());
-                processLogInfo(processingItems, &duration, log);
+        if (job->jobType == MLTJOB) {
+            MeltJob *jb = static_cast<MeltJob *> (job);
+            jb->setProducer(currentClip->getProducer(), currentClip->fileURL());
+            if (jb->isProjectFilter())
+                connect(job, SIGNAL(gotFilterJobResults(QString,int,int,stringMap,stringMap)), this, SLOT(slotGotFilterJobResults(QString,int,int,stringMap,stringMap)));
+            else
+                connect(job, SIGNAL(gotFilterJobResults(QString,int,int,stringMap,stringMap)), this, SIGNAL(gotFilterJobResults(QString,int,int,stringMap,stringMap)));
+        }
+        job->startJob();
+        if (job->status() == JobDone) {
+            emit updateJobStatus(job->clipId(), job->jobType, JobDone);
+            //TODO: replace with more generic clip replacement framework
+            if (job->jobType == PROXYJOB) emit gotProxy(job->clipId());
+            if (job->addClipToProject()) {
+                emit addClip(destination, QString(), QString());
             }
-            myProcess.waitForFinished(500);
-        }
-        myProcess.waitForFinished();
-        m_abortProxy.removeAll(info.dest);
-        m_processingProxy.removeAll(info.dest);
-        if (result == -1) {
-            result = myProcess.exitStatus();
-        }
-        
-        // FFmpeg process terminated normally, but make sure proxy clip exists
-        if (result != -2 && QFileInfo(info.dest).size() == 0) {
-            result = QProcess::CrashExit;
-        }
-
-        if (result == QProcess::NormalExit) {
-            // proxy successfully created
-            for (int i = 0; i < processingItems.count(); i++)
-                setProxyStatus(processingItems.at(i), PROXYDONE);
-            slotGotProxy(info.dest);
-        }
-        else if (result == QProcess::CrashExit) {
-            // Proxy process crashed
-            QFile::remove(info.dest);
-            for (int i = 0; i < processingItems.count(); i++)
-                setProxyStatus(processingItems.at(i), PROXYCRASHED);
+        } else if (job->status() == JobCrashed || job->status() == JobAborted) {
+            emit updateJobStatus(job->clipId(), job->jobType, job->status(), job->errorMessage(), QString(), job->logDetails());
         }
     }
+    // Thread finished, cleanup & update count
+    QTimer::singleShot(200, this, SIGNAL(checkJobProcess()));
 }
 
 
-void ProjectList::processLogInfo(QList <ProjectItem *>items, int *duration, const QString &log)
-{
-    int progress;
-    if (*duration == 0) {
-        if (log.contains("Duration:")) {
-            QString data = log.section("Duration:", 1, 1).section(',', 0, 0).simplified();
-            QStringList numbers = data.split(':');
-            *duration = (int) (numbers.at(0).toInt() * 3600 + numbers.at(1).toInt() * 60 + numbers.at(2).toDouble());
-        }
-    }
-    else if (log.contains("time=")) {
-        QString time = log.section("time=", 1, 1).simplified().section(' ', 0, 0);
-        if (time.contains(':')) {
-            QStringList numbers = time.split(':');
-            progress = numbers.at(0).toInt() * 3600 + numbers.at(1).toInt() * 60 + numbers.at(2).toDouble();
-        }
-        else progress = (int) time.toDouble();
-        for (int i = 0; i < items.count(); i++)
-            setProxyStatus(items.at(i), CREATINGPROXY, (int) (100.0 * progress / (*duration)));
-    }
-}
-
 void ProjectList::updateProxyConfig()
 {
     ProjectItem *item;
@@ -2662,7 +3159,7 @@ void ProjectList::updateProxyConfig()
     command->setText(i18n("Update proxy settings"));
     QString proxydir = m_doc->projectFolder().path( KUrl::AddTrailingSlash) + "proxy/";
     while (*it) {
-        if ((*it)->type() != PROJECTCLIPTYPE) {
+        if ((*it)->type() != ProjectClipType) {
             ++it;
             continue;
         }
@@ -2671,9 +3168,9 @@ void ProjectList::updateProxyConfig()
             ++it;
             continue;
         }
-        CLIPTYPE t = item->clipType();
-        if ((t == VIDEO || t == AV || t == UNKNOWN) && item->referencedClip() != NULL) {
-            if  (generateProxy() && useProxy() && !item->isProxyRunning()) {
+        ClipType t = item->clipType();
+        if ((t == Video || t == AV || t == Unknown) && item->referencedClip() != NULL) {
+            if  (generateProxy() && useProxy() && !hasPendingJob(item, PROXYJOB)) {
                 DocClipBase *clip = item->referencedClip();
                 if (clip->getProperty("frame_size").section('x', 0, 0).toInt() > m_doc->getDocumentProperty("proxyminsize").toInt()) {
                     if (clip->getProperty("proxy").isEmpty()) {
@@ -2681,7 +3178,7 @@ void ProjectList::updateProxyConfig()
                         QMap <QString, QString> oldProps;// = clip->properties();
                         oldProps.insert("proxy", QString());
                         QMap <QString, QString> newProps;
-                        newProps.insert("proxy", proxydir + item->referencedClip()->getClipHash() + "." + m_doc->getDocumentProperty("proxyextension"));
+                        newProps.insert("proxy", proxydir + item->referencedClip()->getClipHash() + '.' + m_doc->getDocumentProperty("proxyextension"));
                         new EditClipCommand(this, clip->getId(), oldProps, newProps, true, command);
                     }
                 }
@@ -2690,13 +3187,12 @@ void ProjectList::updateProxyConfig()
                 // remove proxy
                 QMap <QString, QString> newProps;
                 newProps.insert("proxy", QString());
-                newProps.insert("replace", "1");
                 // insert required duration for proxy
                 newProps.insert("proxy_out", item->referencedClip()->producerProperty("out"));
                 new EditClipCommand(this, item->clipId(), item->referencedClip()->currentProperties(newProps), newProps, true, command);
             }
         }
-        else if (t == IMAGE && item->referencedClip() != NULL) {
+        else if (t == Image && item->referencedClip() != NULL) {
             if  (generateImageProxy() && useProxy()) {
                 DocClipBase *clip = item->referencedClip();
                 int maxImageSize = m_doc->getDocumentProperty("proxyimageminsize").toInt();
@@ -2715,7 +3211,6 @@ void ProjectList::updateProxyConfig()
                 // remove proxy
                 QMap <QString, QString> newProps;
                 newProps.insert("proxy", QString());
-                newProps.insert("replace", "1");
                 new EditClipCommand(this, item->clipId(), item->referencedClip()->properties(), newProps, true, command);
             }
         }
@@ -2725,6 +3220,12 @@ void ProjectList::updateProxyConfig()
     else delete command;
 }
 
+void ProjectList::slotProcessLog(const QString &id, int progress, int type, const QString &message)
+{
+    ProjectItem *item = getItemById(id);
+    setJobStatus(item, (JOBTYPE) type, JobWorking, progress, message);
+}
+
 void ProjectList::slotProxyCurrentItem(bool doProxy, ProjectItem *itemToProxy)
 {
     QList<QTreeWidgetItem *> list;
@@ -2734,23 +3235,23 @@ void ProjectList::slotProxyCurrentItem(bool doProxy, ProjectItem *itemToProxy)
     // expand list (folders, subclips) to get real clips
     QTreeWidgetItem *listItem;
     QList<ProjectItem *> clipList;
-    for (int i = 0; i < list.count(); i++) {
+    for (int i = 0; i < list.count(); ++i) {
         listItem = list.at(i);
-        if (listItem->type() == PROJECTFOLDERTYPE) {
+        if (listItem->type() == ProjectFoldeType) {
             for (int j = 0; j < listItem->childCount(); j++) {
                 QTreeWidgetItem *sub = listItem->child(j);
-                if (sub->type() == PROJECTCLIPTYPE) {
+                if (sub->type() == ProjectClipType) {
                     ProjectItem *item = static_cast <ProjectItem*>(sub);
                     if (!clipList.contains(item)) clipList.append(item);
                 }
             }
         }
-        else if (listItem->type() == PROJECTSUBCLIPTYPE) {
+        else if (listItem->type() == ProjectSubclipType) {
             QTreeWidgetItem *sub = listItem->parent();
             ProjectItem *item = static_cast <ProjectItem*>(sub);
             if (!clipList.contains(item)) clipList.append(item);
         }
-        else if (listItem->type() == PROJECTCLIPTYPE) {
+        else if (listItem->type() == ProjectClipType) {
             ProjectItem *item = static_cast <ProjectItem*>(listItem);
             if (!clipList.contains(item)) clipList.append(item);
         }
@@ -2763,36 +3264,39 @@ void ProjectList::slotProxyCurrentItem(bool doProxy, ProjectItem *itemToProxy)
     // Make sure the proxy folder exists
     QString proxydir = m_doc->projectFolder().path( KUrl::AddTrailingSlash) + "proxy/";
     KStandardDirs::makeDir(proxydir);
-                
+
     QMap <QString, QString> newProps;
     QMap <QString, QString> oldProps;
     if (!doProxy) newProps.insert("proxy", "-");
-    for (int i = 0; i < clipList.count(); i++) {
+    for (int i = 0; i < clipList.count(); ++i) {
         ProjectItem *item = clipList.at(i);
-        CLIPTYPE t = item->clipType();
-        if ((t == VIDEO || t == AV || t == UNKNOWN || t == IMAGE || t == PLAYLIST) && item->referencedClip()) {
+        ClipType t = item->clipType();
+        if ((t == Video || t == AV || t == Unknown || t == Image || t == Playlist) && item->referencedClip()) {
             if ((doProxy && item->hasProxy()) || (!doProxy && !item->hasProxy() && item->referencedClip()->getProducer() != NULL)) continue;
             DocClipBase *clip = item->referencedClip();
             if (!clip || !clip->isClean() || m_render->isProcessing(item->clipId())) {
                 kDebug()<<"//// TRYING TO PROXY: "<<item->clipId()<<", but it is busy";
                 continue;
             }
-                
-            oldProps = clip->properties();
+
+            //oldProps = clip->properties();
             if (doProxy) {
                 newProps.clear();
-                QString path = proxydir + clip->getClipHash() + "." + (t == IMAGE ? "png" : m_doc->getDocumentProperty("proxyextension"));
+                QString path = proxydir + clip->getClipHash() + '.' + (t == Image ? "png" : m_doc->getDocumentProperty("proxyextension"));
                 // insert required duration for proxy
                 newProps.insert("proxy_out", clip->producerProperty("out"));
                 newProps.insert("proxy", path);
                 // We need to insert empty proxy so that undo will work
-                oldProps.insert("proxy", QString());
+                //oldProps.insert("proxy", QString());
             }
             else if (item->referencedClip()->getProducer() == NULL) {
                 // Force clip reload
                 kDebug()<<"// CLIP HAD NULL PROD------------";
                 newProps.insert("resource", item->referencedClip()->getProperty("resource"));
             }
+            // We need to insert empty proxy so that undo will work
+            oldProps = clip->currentProperties(newProps);
+            if (doProxy) oldProps.insert("proxy", "-");
             new EditClipCommand(this, item->clipId(), oldProps, newProps, true, command);
         }
     }
@@ -2811,13 +3315,13 @@ void ProjectList::slotDeleteProxy(const QString proxyPath)
     QTreeWidgetItemIterator it(m_listView);
     ProjectItem *item;
     while (*it) {
-        if ((*it)->type() == PROJECTCLIPTYPE) {
+        if ((*it)->type() == ProjectClipType) {
             item = static_cast <ProjectItem *>(*it);
             if (item->referencedClip()->getProperty("proxy") == proxyPath) {
                 QMap <QString, QString> props;
                 props.insert("proxy", QString());
                 new EditClipCommand(this, item->clipId(), item->referencedClip()->currentProperties(props), props, true, proxyCommand);
-            
+
             }
         }
         ++it;
@@ -2829,12 +3333,12 @@ void ProjectList::slotDeleteProxy(const QString proxyPath)
     QFile::remove(proxyPath);
 }
 
-void ProjectList::setProxyStatus(ProjectItem *item, PROXYSTATUS status, int progress)
+void ProjectList::setJobStatus(ProjectItem *item, JOBTYPE jobType, ClipJobStatus status, int progress, const QString &statusMessage)
 {
-    if (item == NULL || m_abortAllProxies) return;
+    if (item == NULL || (m_abortAllJobs && m_closing)) return;
     monitorItemEditing(false);
-    item->setProxyStatus(status, progress);
-    if (status == PROXYCRASHED) {
+    item->setJobStatus(jobType, status, progress, statusMessage);
+    if (status == JobCrashed) {
         DocClipBase *clip = item->referencedClip();
         if (!clip) {
             kDebug()<<"// PROXY CRASHED";
@@ -2855,8 +3359,8 @@ void ProjectList::setProxyStatus(ProjectItem *item, PROXYSTATUS status, int prog
 
 void ProjectList::monitorItemEditing(bool enable)
 {
-    if (enable) connect(m_listView, SIGNAL(itemChanged(QTreeWidgetItem *, int)), this, SLOT(slotItemEdited(QTreeWidgetItem *, int)));     
-    else disconnect(m_listView, SIGNAL(itemChanged(QTreeWidgetItem *, int)), this, SLOT(slotItemEdited(QTreeWidgetItem *, int)));     
+    if (enable) connect(m_listView, SIGNAL(itemChanged(QTreeWidgetItem*,int)), this, SLOT(slotItemEdited(QTreeWidgetItem*,int)));
+    else disconnect(m_listView, SIGNAL(itemChanged(QTreeWidgetItem*,int)), this, SLOT(slotItemEdited(QTreeWidgetItem*,int)));
 }
 
 QStringList ProjectList::expandedFolders() const
@@ -2865,7 +3369,7 @@ QStringList ProjectList::expandedFolders() const
     FolderProjectItem *item;
     QTreeWidgetItemIterator it(m_listView);
     while (*it) {
-        if ((*it)->type() != PROJECTFOLDERTYPE) {
+        if ((*it)->type() != ProjectFoldeType) {
             ++it;
             continue;
         }
@@ -2882,16 +3386,501 @@ void ProjectList::processThumbOverlays(ProjectItem *item, QPixmap &pix)
 {
     if (item->hasProxy()) {
         QPainter p(&pix);
-        QColor c = QPalette().base().color();
-        c.setAlpha(160);
-        QBrush br(c);
-        p.setBrush(br);
-        p.setPen(Qt::NoPen);
-        QRect r(1, 1, 10, 10);
-        p.drawRect(r);
-        p.setPen(QPalette().text().color());
+        QColor c(220, 220, 10, 200);
+        QRect r(0, 0, 12, 12);
+        p.fillRect(r, c);
+        QFont font = p.font();
+        font.setBold(true);
+        p.setFont(font);
+        p.setPen(Qt::black);
         p.drawText(r, Qt::AlignCenter, i18nc("The first letter of Proxy, used as abbreviation", "P"));
     }
 }
 
+void ProjectList::slotCancelJobs()
+{
+    m_abortAllJobs = true;
+    for (int i = 0; i < m_jobList.count(); ++i) {
+        m_jobList.at(i)->setStatus(JobAborted);
+    }
+    m_jobThreads.waitForFinished();
+    m_jobThreads.clearFutures();
+    QUndoCommand *command = new QUndoCommand();
+    command->setText(i18np("Cancel job", "Cancel jobs", m_jobList.count()));
+    m_jobMutex.lock();
+    for (int i = 0; i < m_jobList.count(); ++i) {
+        DocClipBase *currentClip = m_doc->clipManager()->getClipById(m_jobList.at(i)->clipId());
+        if (!currentClip) continue;
+        QMap <QString, QString> newProps = m_jobList.at(i)->cancelProperties();
+        if (newProps.isEmpty()) continue;
+        QMap <QString, QString> oldProps = currentClip->currentProperties(newProps);
+        new EditClipCommand(this, m_jobList.at(i)->clipId(), oldProps, newProps, true, command);
+    }
+    m_jobMutex.unlock();
+    if (command->childCount() > 0) {
+        m_doc->commandStack()->push(command);
+    }
+    else delete command;
+    if (!m_jobList.isEmpty()) qDeleteAll(m_jobList);
+    m_jobList.clear();
+    m_abortAllJobs = false;
+    m_infoLabel->slotSetJobCount(0);
+}
+
+void ProjectList::slotCancelRunningJob(const QString id, stringMap newProps)
+{
+    if (newProps.isEmpty() || m_closing) return;
+    DocClipBase *currentClip = m_doc->clipManager()->getClipById(id);
+    if (!currentClip) return;
+    QMap <QString, QString> oldProps = currentClip->currentProperties(newProps);
+    if (newProps == oldProps) return;
+    QMapIterator<QString, QString> i(oldProps);
+    EditClipCommand *command = new EditClipCommand(this, id, oldProps, newProps, true);
+    m_commandStack->push(command);
+}
+
+bool ProjectList::hasPendingJob(ProjectItem *item, JOBTYPE type)
+{
+    if (!item || !item->referencedClip() || m_abortAllJobs) return false;
+    AbstractClipJob *job;
+    QMutexLocker lock(&m_jobMutex);
+    for (int i = 0; i < m_jobList.count(); ++i) {
+        if (m_abortAllJobs) break;
+        job = m_jobList.at(i);
+        if (job->clipId() == item->clipId() && job->jobType == type && (job->status() == JobWaiting || job->status() == JobWorking)) return true;
+    }
+    
+    return false;
+}
+
+void ProjectList::deleteJobsForClip(const QString &clipId)
+{
+    QMutexLocker lock(&m_jobMutex);
+    for (int i = 0; i < m_jobList.count(); ++i) {
+        if (m_jobList.at(i)->clipId() == clipId) {
+            m_jobList.at(i)->setStatus(JobAborted);
+        }
+    }
+}
+
+void ProjectList::slotUpdateJobStatus(const QString id, int type, int status, const QString label, const QString actionName, const QString details)
+{
+    ProjectItem *item = getItemById(id);
+    if (!item) return;
+    slotUpdateJobStatus(item, type, status, label, actionName, details);
+    
+}
+
+void ProjectList::slotUpdateJobStatus(ProjectItem *item, int type, int status, const QString &label, const QString &actionName, const QString details)
+{
+    item->setJobStatus((JOBTYPE) type, (ClipJobStatus) status);
+    if (status != JobCrashed) return;
+#if KDE_IS_VERSION(4,7,0)
+    QList<QAction *> actions = m_infoMessage->actions();
+    if (m_infoMessage->isHidden()) {
+        m_infoMessage->setText(label);
+        m_infoMessage->setWordWrap(m_infoMessage->text().length() > 35);
+        m_infoMessage->setMessageType(KMessageWidget::Warning);
+    }
+    
+    if (!actionName.isEmpty()) {
+        QAction *action = NULL;
+        QList< KActionCollection * > collections = KActionCollection::allCollections();
+        for (int i = 0; i < collections.count(); ++i) {
+            KActionCollection *coll = collections.at(i);
+            action = coll->action(actionName);
+            if (action) break;
+        }
+        if (action && !actions.contains(action)) m_infoMessage->addAction(action);
+    }
+    if (!details.isEmpty()) {
+        m_errorLog.append(details);
+        if (!actions.contains(m_logAction)) m_infoMessage->addAction(m_logAction);
+    }
+    m_infoMessage->animatedShow();
+#else
+    // warning for KDE < 4.7
+    KPassivePopup *passivePop = new KPassivePopup( this );
+    passivePop->setAutoDelete(true);
+    connect(passivePop, SIGNAL(clicked()), this, SLOT(slotClosePopup()));
+    m_errorLog.append(details);
+    KVBox *vb = new KVBox( passivePop );
+    KHBox *vh1 = new KHBox( vb );
+    KIcon icon("dialog-warning");
+    QLabel *iconLabel = new QLabel(vh1);
+    iconLabel->setPixmap(icon.pixmap(m_listView->iconSize()));
+    (void) new QLabel( label, vh1);
+    KHBox *box = new KHBox( vb );
+    QPushButton *but = new QPushButton( "Show log", box );
+    connect(but, SIGNAL(clicked(bool)), this, SLOT(slotShowJobLog()));
+
+    passivePop->setView( vb );
+    passivePop->show();
+    
+#endif
+}
+
+void ProjectList::slotShowJobLog()
+{
+    KDialog d(this);
+    d.setButtons(KDialog::Close);
+    QTextEdit t(&d);
+    for (int i = 0; i < m_errorLog.count(); ++i) {
+        if (i > 0) t.insertHtml("<br><hr /><br>");
+        t.insertPlainText(m_errorLog.at(i));
+    }
+    t.setReadOnly(true);
+    d.setMainWidget(&t);
+    d.exec();
+}
+
+QStringList ProjectList::getPendingJobs(const QString &id)
+{
+    QStringList result;
+    QMutexLocker lock(&m_jobMutex);
+    for (int i = 0; i < m_jobList.count(); ++i) {
+        if (m_jobList.at(i)->clipId() == id && (m_jobList.at(i)->status() == JobWaiting || m_jobList.at(i)->status() == JobWorking)) {
+            // discard this job
+            result << m_jobList.at(i)->description;
+        }
+    }
+    return result;
+}
+
+void ProjectList::discardJobs(const QString &id, JOBTYPE type) {
+    QMutexLocker lock(&m_jobMutex);
+    for (int i = 0; i < m_jobList.count(); ++i) {
+        if (m_jobList.at(i)->clipId() == id && (m_jobList.at(i)->jobType == type || type == NOJOBTYPE)) {
+            // discard this job
+            m_jobList.at(i)->setStatus(JobAborted);
+        }
+    }
+}
+
+void ProjectList::slotStartFilterJob(ItemInfo info, const QString&id, const QString&filterName, const QString&filterParams, const QString&consumer, const QString&consumerParams, const QMap <QString, QString> &extraParams)
+{
+    ProjectItem *item = getItemById(id);
+    if (!item) return;
+    QStringList jobParams;
+    jobParams << QString::number((int) info.cropStart.frames(m_fps)) << QString::number((int) (info.cropStart + info.cropDuration).frames(m_fps));
+    jobParams << QString() << filterName << filterParams << consumer << consumerParams << QString::number((int) info.startPos.frames(m_fps)) << QString::number(info.track);
+    MeltJob *job = new MeltJob(item->clipType(), id, jobParams, extraParams);
+    if (job->isExclusive() && hasPendingJob(item, job->jobType)) {
+        delete job;
+        return;
+    }
+    job->description = i18n("Filter %1", extraParams.value("finalfilter"));
+    m_jobList.append(job);
+    setJobStatus(item, job->jobType, JobWaiting, 0, job->statusMessage());
+    slotCheckJobProcess();
+}
+
+void ProjectList::startClipFilterJob(const QString &filterName, const QString &condition)
+{
+    QMap <QString, QString> ids = getConditionalIds(condition);
+    QStringList destination;
+    QMap<QString, QString>::const_iterator first = ids.constBegin();
+    if (first == ids.constEnd()) {
+        emit displayMessage(i18n("Cannot find clip to process filter %1", filterName), -2, ErrorMessage);
+        return;
+    }
+    ProjectItem *item = getItemById(first.key());
+    if (!item) {
+        emit displayMessage(i18n("Cannot find clip to process filter %1", filterName), -2, ErrorMessage);
+        return;
+    }
+    if (ids.count() == 1) {
+        destination << item->clipUrl().path();
+    }
+    else {
+        destination = ids.values();
+    }
+    if (filterName == "framebuffer") {
+        Mlt::Profile profile;
+        QStringList keys = ids.keys();
+        int ix = 0;
+        foreach(const QString &url, destination) {
+            QString prodstring = QString("framebuffer:" + url + "?-1");
+            Mlt::Producer *reversed = new Mlt::Producer(profile, prodstring.toUtf8().constData());
+            if (!reversed || !reversed->is_valid()) {
+                emit displayMessage(i18n("Cannot reverse clip"), -2, ErrorMessage);
+                continue;
+            }
+            QString dest = url + ".mlt";
+            if (QFile::exists(dest)) {
+                if (KMessageBox::questionYesNo(this, i18n("File %1 already exists.\nDo you want to overwrite it?", dest)) == KMessageBox::No) continue;
+            }
+            Mlt::Consumer *cons = new Mlt::Consumer(profile, "xml", dest.toUtf8().constData());
+            if (cons == NULL || !cons->is_valid()) {
+                emit displayMessage(i18n("Cannot render reversed clip"), -2, ErrorMessage);
+                continue;
+            }
+            Mlt::Playlist list;
+            list.insert_at(0, reversed, 0);
+            delete reversed;
+            cons->connect(list);
+            cons->run();
+            delete cons;
+            QString groupId;
+            QString groupName;
+            DocClipBase *base = m_doc->clipManager()->getClipById(keys.at(ix));
+            if (base) {
+                groupId = base->getProperty("groupid");
+                groupName = base->getProperty("groupname");
+            }
+            emit addClip(dest, groupId, groupName);
+            ix++;
+        }
+        return;
+    }
+    
+    if (filterName == "motion_est") {
+        // Show config dialog
+        QPointer<QDialog> d = new QDialog(this);
+        Ui::SceneCutDialog_UI ui;
+        ui.setupUi(d);
+        // Set  up categories
+        for (int i = 0; i < 5; ++i) {
+            ui.marker_type->insertItem(i, i18n("Category %1", i));
+            ui.marker_type->setItemData(i, CommentedTime::markerColor(i), Qt::DecorationRole);
+        }
+        ui.marker_type->setCurrentIndex(KdenliveSettings::default_marker_type());
+        if (d->exec() != QDialog::Accepted) {
+            delete d;
+            return;
+        }
+        // Autosplit filter
+        QStringList jobParams;
+        // Producer params
+        jobParams << QString();
+        // Filter params, use a smaller region of the image to speed up operation
+        // In fact, it's faster to rescale whole image than using part of it (bounding=\"25%x25%:15%x15\")
+        jobParams << filterName << "shot_change_list=0 denoise=0";
+        // Consumer
+        jobParams << "null" << "all=1 terminate_on_pause=1 real_time=-1 rescale=nearest deinterlace_method=onefield top_field_first=-1";
+        QMap <QString, QString> extraParams;
+        extraParams.insert("key", "shot_change_list");
+        extraParams.insert("projecttreefilter", "1");
+        QString keyword("%count");
+        extraParams.insert("resultmessage", i18n("Found %1 scenes.", keyword));
+        extraParams.insert("resize_profile", "160");
+        if (ui.store_data->isChecked()) {
+            // We want to save result as clip metadata
+            extraParams.insert("storedata", "1");
+        }
+        if (ui.zone_only->isChecked()) {
+            // We want to analyze only clip zone
+            extraParams.insert("zoneonly", "1");
+        }
+        if (ui.add_markers->isChecked()) {
+            // We want to create markers
+            extraParams.insert("addmarkers", QString::number(ui.marker_type->currentIndex()));
+        }
+        if (ui.cut_scenes->isChecked()) {
+            // We want to cut scenes
+            extraParams.insert("cutscenes", "1");
+        }
+        delete d;
+        processClipJob(ids.keys(), QString(), false, jobParams, i18n("Auto split"), extraParams);
+    }
+    else {
+        QPointer<ClipStabilize> d = new ClipStabilize(destination, filterName);
+        if (d->exec() == QDialog::Accepted) {
+            QMap <QString, QString> extraParams;
+            extraParams.insert("producer_profile", "1");
+            processClipJob(ids.keys(), d->destination(), d->autoAddClip(), d->params(), d->desc(), extraParams);
+        }
+        delete d;
+    }
+}
+
+void ProjectList::processClipJob(QStringList ids, const QString&destination, bool autoAdd, QStringList jobParams, const QString &description, QMap <QString, QString> extraParams)
+{
+    QStringList preParams;
+    // in and out
+    preParams << QString::number(0) << QString::number(-1);
+    // producer params
+    preParams << jobParams.takeFirst();
+    // filter name
+    preParams << jobParams.takeFirst();
+    // filter params
+    preParams << jobParams.takeFirst();
+    // consumer
+    QString consumer = jobParams.takeFirst();
+    
+    foreach(const QString&id, ids) {
+        ProjectItem *item = getItemById(id);
+        if (!item) continue;
+        QStringList jobArgs;
+        if (extraParams.contains("zoneonly")) {
+            // Analyse clip zone only, remove in / out and replace with zone
+            preParams.takeFirst();
+            preParams.takeFirst();
+            QPoint zone = item->referencedClip()->zone();
+            jobArgs << QString::number(zone.x()) << QString::number(zone.y());
+        }
+        jobArgs << preParams;
+        if (ids.count() == 1) {
+            jobArgs << consumer + ':' + destination;
+        }
+        else {
+            jobArgs << consumer + ':' + destination + item->clipUrl().fileName() + ".mlt";
+        }
+        jobArgs << jobParams;
+        
+        MeltJob *job = new MeltJob(item->clipType(), id, jobArgs, extraParams);
+        if (autoAdd) {
+            job->setAddClipToProject(true);
+            kDebug()<<"// ADDING TRUE";
+        }
+        else kDebug()<<"// ADDING FALSE!!!";
+
+        if (job->isExclusive() && hasPendingJob(item, job->jobType)) {
+            delete job;
+            return;
+        }
+        job->description = description;
+        m_jobList.append(job);
+        setJobStatus(item, job->jobType, JobWaiting, 0, job->statusMessage());
+        slotCheckJobProcess();
+    }
+}
+
+
+void ProjectList::slotPrepareJobsMenu()
+{
+    ProjectItem *item;
+    if (!m_listView->currentItem() || m_listView->currentItem()->type() == ProjectFoldeType)
+        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 && (item->flags() & Qt::ItemIsDragEnabled)) {
+        QString id = item->clipId();
+        m_discardCurrentClipJobs->setData(id);
+        QStringList jobs = getPendingJobs(id);
+        m_discardCurrentClipJobs->setEnabled(!jobs.isEmpty());
+    } else {
+        m_discardCurrentClipJobs->setData(QString());
+        m_discardCurrentClipJobs->setEnabled(false);
+    }
+}
+
+void ProjectList::slotDiscardClipJobs()
+{
+    QString id = m_discardCurrentClipJobs->data().toString();
+    if (id.isEmpty()) return;
+    discardJobs(id);
+}
+
+void ProjectList::updatePalette()
+{
+    m_infoLabel->setStyleSheet(SmallInfoLabel::getStyleSheet(QApplication::palette()));
+    m_listView->updateStyleSheet();
+}
+
+void ProjectList::slotResetInfoMessage()
+{
+#if KDE_IS_VERSION(4,7,0)
+    m_errorLog.clear();
+    QList<QAction *> actions = m_infoMessage->actions();
+    for (int i = 0; i < actions.count(); ++i) {
+        m_infoMessage->removeAction(actions.at(i));
+    }
+#endif
+}
+
+void ProjectList::slotClosePopup()
+{
+    m_errorLog.clear();
+}
+
+void ProjectList::slotGotFilterJobResults(QString id, int , int , stringMap results, stringMap filterInfo)
+{
+    // Currently, only the first value of results is used
+    //kDebug()<<"// FILTER RES:\n"<<filterInfo<<"\n--------------\n"<<results;
+    ProjectItem *clip = getItemById(id);
+    if (!clip) return;
+
+    // Check for return value
+    int markersType = -1;
+    if (filterInfo.contains("addmarkers")) markersType = filterInfo.value("addmarkers").toInt();
+    if (results.isEmpty()) {
+        emit displayMessage(i18n("No data returned from clip analysis"), 0, ErrorMessage);
+        return;
+    }
+    bool dataProcessed = false;
+    QString key = filterInfo.value("key");
+    int offset = filterInfo.value("offset").toInt();
+    QStringList value = results.value(key).split(';', QString::SkipEmptyParts);
+    kDebug()<<"// RESULT; "<<key<<" = "<<value;
+    if (filterInfo.contains("resultmessage")) {
+        QString mess = filterInfo.value("resultmessage");
+        mess.replace("%count", QString::number(value.count()));
+        emit displayMessage(mess, 0, InformationMessage);
+    }
+    else emit displayMessage(i18n("Processing data analysis"), 0, InformationMessage);
+    if (filterInfo.contains("cutscenes")) {
+        // Check if we want to cut scenes from returned data
+        dataProcessed = true;
+        int cutPos = 0;
+        QUndoCommand *command = new QUndoCommand();
+        command->setText(i18n("Auto Split Clip"));
+        foreach (QString pos, value) {
+            if (!pos.contains("=")) continue;
+            int newPos = pos.section("=", 0, 0).toInt();
+            // Don't use scenes shorter than 1 second
+            if (newPos - cutPos < 24) continue;
+            (void) new AddClipCutCommand(this, id, cutPos + offset, newPos + offset, QString(), true, false, command);
+            cutPos = newPos;
+        }
+        if (command->childCount() == 0)
+            delete command;
+        else m_commandStack->push(command);
+    }
+    if (markersType >= 0) {
+        // Add markers from returned data
+        dataProcessed = true;
+        int cutPos = 0;
+        QUndoCommand *command = new QUndoCommand();
+        command->setText(i18n("Add Markers"));
+        QList <CommentedTime> markersList;
+        int index = 1;
+        foreach (QString pos, value) {
+            if (!pos.contains("=")) continue;
+            int newPos = pos.section("=", 0, 0).toInt();
+            // Don't use scenes shorter than 1 second
+            if (newPos - cutPos < 24) continue;
+            CommentedTime m(GenTime(newPos + offset, m_fps), QString::number(index), markersType);
+            markersList << m;
+            index++;
+            cutPos = newPos;
+        }
+        emit addMarkers(id, markersList);
+    }
+    if (!dataProcessed || filterInfo.contains("storedata")) {
+        // Store returned data as clip extra data
+        clip->referencedClip()->setAnalysisData(filterInfo.contains("displaydataname") ? filterInfo.value("displaydataname") : key, results.value(key), filterInfo.value("offset").toInt());
+        emit updateAnalysisData(clip->referencedClip());
+    }
+}
+
+
+/*
+// Work in progress: apply filter based on clip's camcorder
+void ProjectList::checkCamcorderFilters(DocClipBase *clip, QMap <QString, QString> meta)
+{
+    KConfig conf("camcorderfilters.rc", KConfig::CascadeConfig, "appdata");
+    QStringList groups = conf.groupList();
+    foreach(QString grp, groups) {
+    if (!meta.contains(grp)) continue;
+    KConfigGroup group(&conf, grp);
+    QString value = group.readEntry(meta.value(grp));
+    if (value.isEmpty()) continue;
+    clip->setProperty(value.section(' ', 0, 0), value.section(' ', 1));
+    break;
+    }
+}*/
+
 #include "projectlist.moc"