Make it easier to see the job related thumbnail overlays

[kdenlive] / src / projectlist.cpp

diff --git a/src/projectlist.cpp b/src/projectlist.cpp
index fb481bd7366856523a4daa7cac6decc10d64baad..eca508b16bbd4fb1d176bd7f82a8be092784846d 100644 (file)
--- a/src/projectlist.cpp
+++ b/src/projectlist.cpp
@@ -58,9 +58,10 @@
 #include <KActionCollection>
 #include <KUrlRequester>
 
-#ifdef NEPOMUK
+#ifdef USE_NEPOMUK
 #include <nepomuk/global.h>
 #include <nepomuk/resourcemanager.h>
+#include <Nepomuk/Resource>
 //#include <nepomuk/tag.h>
 #endif
 
@@ -306,7 +307,7 @@ ProjectList::ProjectList(QWidget *parent) :
     
     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()) {
@@ -954,7 +955,7 @@ void ProjectList::slotUpdateClipProperties(ProjectItem *clip, QMap <QString, QSt
         monitorItemEditing(false);
         clip->setText(1, properties.value("description"));
         monitorItemEditing(true);
-#ifdef NEPOMUK
+#ifdef USE_NEPOMUK
         if (KdenliveSettings::activate_nepomuk() && (type == AUDIO || type == VIDEO || type == AV || type == IMAGE || type == PLAYLIST)) {
             // Use Nepomuk system to store clip description
             Nepomuk::Resource f(clip->clipUrl().path());
@@ -1297,12 +1298,15 @@ void ProjectList::slotAddClip(DocClipBase *clip, bool getProperties)
     }*/
     
     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
@@ -2832,6 +2836,7 @@ void ProjectList::slotProcessJobs()
         }
         connect(job, SIGNAL(jobProgress(QString, int, int)), this, SIGNAL(processLog(QString, int, int)));
         connect(job, SIGNAL(cancelRunningJob(const QString, stringMap)), this, SIGNAL(cancelRunningJob(const QString, stringMap)));
+        connect(job, SIGNAL(gotFilterJobResults(QString,int, int, QString,stringMap)), this, SIGNAL(gotFilterJobResults(QString,int, int, QString,stringMap)));
 
         if (job->jobType == MLTJOB) {
             MeltJob *jb = static_cast<MeltJob *> (job);
@@ -2845,9 +2850,8 @@ void ProjectList::slotProcessJobs()
             if (job->addClipToProject) {
                 emit addClip(destination, QString(), QString());
             }
-        }
-        else if (job->jobStatus == JOBCRASHED) {
-            emit updateJobStatus(job->clipId(), job->jobType, JOBCRASHED, job->errorMessage());
+        } else if (job->jobStatus == JOBCRASHED || job->jobStatus == JOBABORTED) {
+            emit updateJobStatus(job->clipId(), job->jobType, job->jobStatus, job->errorMessage());
         }
     }
     // Thread finished, cleanup & update count
@@ -3093,13 +3097,16 @@ void ProjectList::processThumbOverlays(ProjectItem *item, QPixmap &pix)
     if (item->hasProxy()) {
         QPainter p(&pix);
         QColor c = QPalette().base().color();
-        c.setAlpha(160);
+        c.setAlpha(200);
         QBrush br(c);
         p.setBrush(br);
         p.setPen(Qt::NoPen);
-        QRect r(1, 1, 10, 10);
-        p.drawRect(r);
+        QRect r(1, 1, 15, 15);
+        p.drawRoundedRect(r, 2, 2);
         p.setPen(QPalette().text().color());
+        QFont font = p.font();
+        font.setBold(true);
+        p.setFont(font);
         p.drawText(r, Qt::AlignCenter, i18nc("The first letter of Proxy, used as abbreviation", "P"));
     }
 }
@@ -3247,13 +3254,13 @@ void ProjectList::discardJobs(const QString &id, JOBTYPE type) {
     }
 }
 
-void ProjectList::slotStartFilterJob(const QString&id, const QString&filterName, const QString&filterParams, const QString&consumer, const QString&consumerParams, const QString&properties)
+void ProjectList::slotStartFilterJob(ItemInfo info, const QString&id, const QString&filterName, const QString&filterParams, const QString&finalFilterName, const QString&consumer, const QString&consumerParams, const QString&properties)
 {
     ProjectItem *item = getItemById(id);
     if (!item) return;
     QStringList jobParams;
-    jobParams << filterName << filterParams << consumer << consumerParams << properties;
-    kDebug()<<"// STARTING JOB: "<<jobParams;
+    jobParams << QString::number(info.cropStart.frames(m_fps)) << QString::number((info.cropStart + info.cropDuration).frames(m_fps));
+    jobParams << filterName << filterParams << consumer << consumerParams << properties << QString::number(info.startPos.frames(m_fps)) << QString::number(info.track) << finalFilterName;
     MeltJob *job = new MeltJob(item->clipType(), id, jobParams);
     if (job->isExclusive() && hasPendingJob(item, job->jobType)) {
         delete job;