[Kdenlive-svn] [kdenlive] src: Show job info in clip tooltip

[Jean-Baptiste M. <jb...@kd...>]

Git commit d49606b131a356afe6b3c778e86958d723241f97 by Jean-Baptiste Mardelle.
Committed on 22/01/2012 at 17:11.
Pushed by mardelle into branch 'master'.

Show job info in clip tooltip

M  +2    -1    src/projectitem.cpp
M  +2    -1    src/projectlist.cpp
M  +2    -3    src/projecttree/meltjob.cpp

http://commits.kde.org/kdenlive/d49606b131a356afe6b3c778e86958d723241f97

diff --git a/src/projectitem.cpp b/src/projectitem.cpp
index 4caecf7..c422523 100644
--- a/src/projectitem.cpp
+++ b/src/projectitem.cpp
@@ -259,7 +259,8 @@ void ProjectItem::setJobStatus(JOBTYPE jobType, CLIPJOBSTATUS status, int progre
     if (progress > 0) setData(0, JobProgressRole, progress);
     else {
         setData(0, JobProgressRole, status);
-        setData(0, JobStatusMessage, statusMessage);
+        if ((status == JOBABORTED || status == JOBCRASHED  || status == JOBDONE) || !statusMessage.isEmpty())
+            setData(0, JobStatusMessage, statusMessage);
         slotSetToolTip();
     }
 }
diff --git a/src/projectlist.cpp b/src/projectlist.cpp
index f525823..bc84df9 100644
--- a/src/projectlist.cpp
+++ b/src/projectlist.cpp
@@ -3313,12 +3313,12 @@ void ProjectList::slotStartFilterJob(ItemInfo info, const QString&id, const QStr
     QStringList jobParams;
     jobParams << QString::number(info.cropStart.frames(m_fps)) << QString::number((info.cropStart + info.cropDuration).frames(m_fps));
     jobParams << QString() << filterName << filterParams << consumer << consumerParams << properties << QString::number(info.startPos.frames(m_fps)) << QString::number(info.track) << finalFilterName;
-    kDebug()<<"// JPB PARAMS:"<<jobParams;
     MeltJob *job = new MeltJob(item->clipType(), id, jobParams);
     if (job->isExclusive() && hasPendingJob(item, job->jobType)) {
         delete job;
         return;
     }
+    job->description = i18n("Filter %1", finalFilterName);
     m_jobList.append(job);
     setJobStatus(item, job->jobType, JOBWAITING, 0, job->statusMessage());
     slotCheckJobProcess();
@@ -3381,6 +3381,7 @@ void ProjectList::processClipJob(QStringList ids, const QString&destination, boo
             delete job;
             return;
         }
+        job->description = description;
         m_jobList.append(job);
         setJobStatus(item, job->jobType, JOBWAITING, 0, job->statusMessage());
     }
diff --git a/src/projecttree/meltjob.cpp b/src/projecttree/meltjob.cpp
index 01fe997..2587975 100644
--- a/src/projecttree/meltjob.cpp
+++ b/src/projecttree/meltjob.cpp
@@ -153,7 +153,6 @@ void MeltJob::startJob()
     foreach(const QString key, wanted) {
         QString value = mltFilter.get(key.toUtf8().constData());
         jobResults.insert(key, value);
-        kDebug()<<"RESULT: "<<key<<" = "<< value;
     }
     if (!jobResults.isEmpty()) emit gotFilterJobResults(m_clipId, startPos, track, finalFilter, jobResults);
     setStatus(JOBDONE);
@@ -183,10 +182,10 @@ const QString MeltJob::statusMessage()
     QString statusInfo;
     switch (jobStatus) {
         case JOBWORKING:
-            statusInfo = i18n("Processing clip");
+            statusInfo = description;
             break;
         case JOBWAITING:
-            statusInfo = i18n("Waiting - process clip");
+            statusInfo = i18n("Waiting to process clip");
             break;
         default:
             break;