QRectF bounding;
painter->drawText(r2, Qt::AlignLeft | Qt::AlignVCenter , subText, &bounding);
- int proxy = index.data(Qt::UserRole + 5).toInt();
- if (proxy != 0 && proxy != JOBDONE) {
- QString proxyText;
- QColor color;
- if (proxy != JOBCRASHED) {
- // Draw proxy progress bar
- color = option.palette.alternateBase().color();
+ int jobProgress = index.data(Qt::UserRole + 5).toInt();
+ if (jobProgress != 0 && jobProgress != JOBDONE && jobProgress != JOBABORTED) {
+ if (jobProgress != JOBCRASHED) {
+ // Draw job progress bar
+ QColor color = option.palette.alternateBase().color();
painter->setPen(Qt::NoPen);
color.setAlpha(180);
painter->setBrush(QBrush(color));
- QRect progress(pixmapPoint.x() + 1, pixmapPoint.y() + pixmap.height() - 5, pixmap.width() - 2, 4);
+ QRect progress(pixmapPoint.x() + 1, pixmapPoint.y() + pixmap.height() - 9, pixmap.width() - 2, 8);
painter->drawRect(progress);
painter->setBrush(option.palette.text());
- if (proxy > 0) {
+ if (jobProgress > 0) {
progress.adjust(1, 1, 0, -1);
- progress.setWidth((pixmap.width() - 4) * proxy / 100);
+ progress.setWidth((pixmap.width() - 4) * jobProgress / 100);
painter->drawRect(progress);
- }
- else if (proxy == JOBWAITING) {
+ } else if (jobProgress == JOBWAITING) {
// Draw kind of a pause icon
progress.adjust(1, 1, 0, -1);
progress.setWidth(2);
progress.moveLeft(progress.right() + 2);
painter->drawRect(progress);
}
- }
- else if (proxy == JOBCRASHED) {
- proxyText = index.data(Qt::UserRole + 7).toString();
- if (!proxyText.isEmpty()) {
- QRectF txtBounding = painter->boundingRect(r2, Qt::AlignRight | Qt::AlignVCenter, " " + proxyText + " ");
+ } else if (jobProgress == JOBCRASHED) {
+ QString jobText = index.data(Qt::UserRole + 7).toString();
+ if (!jobText.isEmpty()) {
+ QRectF txtBounding = painter->boundingRect(r2, Qt::AlignRight | Qt::AlignVCenter, " " + jobText + " ");
painter->setPen(Qt::NoPen);
painter->setBrush(option.palette.highlight());
painter->drawRoundedRect(txtBounding, 2, 2);
painter->setPen(option.palette.highlightedText().color());
- painter->drawText(txtBounding, Qt::AlignHCenter | Qt::AlignVCenter , proxyText);
+ painter->drawText(txtBounding, Qt::AlignCenter, jobText);
}
}
}
void setupGeneratorMenu(const QHash<QString,QMenu*>& menus);
QString currentClipUrl() const;
KUrl::List getConditionalUrls(const QString &condition) const;
+ /** @brief Get a list of selected clip Id's that match a condition. */
+ QStringList getConditionalIds(const QString &condition) const;
QDomDocument generateTemplateXml(QString data, const QString &replaceString);
void cleanup();
void trashUnusedClips();
void clearSelection();
/** @brief Print required overlays over clip thumb (proxy, stabilized,...). */
void processThumbOverlays(ProjectItem *item, QPixmap &pix);
+ /** @brief Start an MLT process job. */
+ void startClipFilterJob(const QString &filterName, const QString &condition);
+ /** @brief Set current document for the project tree. */
+ void setDocument(KdenliveDoc *doc);
public slots:
- void setDocument(KdenliveDoc *doc);
void updateAllClips(bool displayRatioChanged, bool fpsChanged, QStringList brokenClips);
void slotReplyGetImage(const QString &clipId, const QImage &img);
void slotReplyGetImage(const QString &clipId, const QString &name, int width, int height);
void slotDeleteProxy(const QString proxyPath);
/** @brief Start a hard cut clip job. */
void slotCutClipJob(const QString &id, QPoint zone);
+ /** @brief Start transcoding selected clips. */
+ void slotTranscodeClipJob(const QString &condition, QString params, QString desc);
+ /** @brief Start an MLT process job. */
+ void slotStartFilterJob(ItemInfo, const QString&,const QString&,const QString&,const QString&,const QString&,const QString&,const QString&);
+
private:
ProjectListView *m_listView;
ProjectItem *getItemById(const QString &id);
QTreeWidgetItem *getAnyItemById(const QString &id);
FolderProjectItem *getFolderItemById(const QString &id);
+ FolderProjectItem *getFolderItemByName(const QString &name);
QAction *m_openAction;
QAction *m_reloadAction;
+ QAction *m_discardCurrentClipJobs;
+ QMenu *m_extractAudioAction;
QMenu *m_transcodeAction;
QMenu *m_stabilizeAction;
KdenliveDoc *m_doc;
QMap <QString, QDomElement> m_producerQueue;
QList <QString> m_thumbnailQueue;
QAction *m_proxyAction;
- QStringList m_processingClips;
- /** @brief Holds a list of proxy urls that are currently being created. */
- QStringList m_processingProxy;
QMutex m_jobMutex;
bool m_abortAllJobs;
/** @brief We are cleaning up the project list, so stop processing signals. */
void getCachedThumbnail(SubProjectItem *item);
/** @brief The clip is about to be reloaded, cancel thumbnail requests. */
void resetThumbsProducer(DocClipBase *clip);
- /** @brief Check if it is necessary to start a job thread. */
- void slotCheckJobProcess();
- /** @brief Check if a clip has a running or pending proxy process. */
- bool hasPendingProxy(ProjectItem *item);
+ /** @brief Check if a clip has a running or pending job process. */
+ bool hasPendingJob(ProjectItem *item, JOBTYPE type);
/** @brief Delete pending jobs for a clip. */
void deleteJobsForClip(const QString &clipId);
/** @brief Discard specific job type for a clip. */
- void discardJobs(const QString &id, JOBTYPE type);
+ void discardJobs(const QString &id, JOBTYPE type = NOJOBTYPE);
+ /** @brief Get the list of job names for current clip. */
+ QStringList getPendingJobs(const QString &id);
+ /** @brief Start an MLT process job. */
+ void processClipJob(QStringList ids, const QString&destination, bool autoAdd, QStringList jobParams, const QString &description);
private slots:
void slotClipSelected();
void slotContextMenu(const QPoint &pos, QTreeWidgetItem *item);
/** @brief Creates an AddFolderCommand. */
- void slotAddFolder();
+ void slotAddFolder(const QString &name = QString());
/** @brief This is triggered when a clip description has been modified. */
void slotItemEdited(QTreeWidgetItem *item, int column);
/** @brief Discard a running clip jobs. */
void slotCancelRunningJob(const QString id, stringMap);
/** @brief Update a clip's job status. */
- void slotProcessLog(const QString, int progress, int);
+ void slotProcessLog(const QString, int progress, int, const QString = QString());
/** @brief A clip job crashed, inform user. */
- void slotUpdateJobStatus(const QString &id, int type, int status, const QString &label, const QString &actionName, const QString details);
+ void slotUpdateJobStatus(const QString id, int type, int status, const QString label, const QString actionName, const QString details);
void slotUpdateJobStatus(ProjectItem *item, int type, int status, const QString &label, const QString &actionName = QString(), const QString details = QString());
/** @brief Display error log for last failed job. */
void slotShowJobLog();
/** @brief A proxy clip is ready. */
void slotGotProxyForId(const QString);
+ /** @brief Check if it is necessary to start a job thread. */
+ void slotCheckJobProcess();
+ /** @brief Fill the jobs menu with current clip's jobs. */
+ void slotPrepareJobsMenu();
+ /** @brief Discard all jobs for current clip. */
+ void slotDiscardClipJobs();
signals:
void clipSelected(DocClipBase *, QPoint zone = QPoint(), bool forceUpdate = false);
/** @brief Set number of running jobs. */
void jobCount(int);
void cancelRunningJob(const QString, stringMap);
- void processLog(const QString, int , int);
+ void processLog(const QString, int , int, const QString = QString());
void addClip(const QString, const QString &, const QString &);
- void updateJobStatus(const QString, int, int, const QString &label = QString(), const QString &actionName = QString(), const QString details = QString());
- void checkJobProcess();
+ void updateJobStatus(const QString, int, int, const QString label = QString(), const QString actionName = QString(), const QString details = QString());
void gotProxy(const QString);
+ void checkJobProcess();
+ /** @brief A Filter Job produced results, send them back to the clip. */
+ void gotFilterJobResults(const QString &id, int startPos, int track, const QString &filterName, stringMap params);
};
#endif
projects / kdenlive / blobdiff