From: Jean-Baptiste Mardelle Date: Sun, 22 Jan 2012 16:11:54 +0000 (+0100) Subject: Show job info in clip tooltip X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=d49606b131a356afe6b3c778e86958d723241f97;p=kdenlive Show job info in clip tooltip --- diff --git a/src/projectitem.cpp b/src/projectitem.cpp index 4caecf73..c4225237 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 f5258235..bc84df9a 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:"<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 01fe9972..25879754 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: "<