#include <QFuture>
#include <QFutureSynchronizer>
#include <QListWidget>
+#include <QTimeLine>
+#include <QPushButton>
#include <KTreeWidgetSearchLine>
#include <KUrl>
#include "kdenlivesettings.h"
#include "folderprojectitem.h"
#include "subprojectitem.h"
+#include "projecttree/abstractclipjob.h"
#include <kdialog.h>
namespace Mlt
class Producer;
};
-struct PROXYINFO {
- QString dest;
- QString src;
- CLIPTYPE type;
- int exif;
-};
-
class ProjectItem;
class ProjectListView;
class Render;
class KdenliveDoc;
class DocClipBase;
+class AbstractClipJob;
const int NameRole = Qt::UserRole;
const int DurationRole = NameRole + 1;
const int UsageRole = NameRole + 2;
+class SmallInfoLabel: public QPushButton
+{
+ Q_OBJECT
+public:
+ SmallInfoLabel(QWidget *parent = 0);
+
+private:
+ QTimeLine* m_timeLine;
+
+public slots:
+ void slotSetJobCount(int jobCount);
+
+private slots:
+ void slotTimeLineChanged(qreal value);
+ void slotTimeLineFinished();
+};
+
class InvalidDialog: public KDialog
{
Q_OBJECT
public:
ItemDelegate(QAbstractItemView* parent = 0): QStyledItemDelegate(parent) {
}
-
+
/*void drawFocus(QPainter *, const QStyleOptionViewItem &, const QRect &) const {
}*/
}
const int textMargin = style->pixelMetric(QStyle::PM_FocusFrameHMargin) + 1;
QPixmap pixmap = qVariantValue<QPixmap>(index.data(Qt::DecorationRole));
- painter->drawPixmap(r1.left() + textMargin, r1.top() + (r1.height() - pixmap.height()) / 2, pixmap);
+ QPoint pixmapPoint(r1.left() + textMargin, r1.top() + (r1.height() - pixmap.height()) / 2);
+ painter->drawPixmap(pixmapPoint, pixmap);
int decoWidth = pixmap.width() + 2 * textMargin;
QFont font = painter->font();
r1.adjust(decoWidth, 0, 0, -mid);
QRect r2 = option.rect;
r2.adjust(decoWidth, mid, 0, 0);
- painter->drawText(r1, Qt::AlignLeft | Qt::AlignBottom , index.data().toString());
+ painter->drawText(r1, Qt::AlignLeft | Qt::AlignBottom, index.data().toString());
font.setBold(false);
painter->setFont(font);
QString subText = index.data(DurationRole).toString();
painter->drawText(r2, Qt::AlignLeft | Qt::AlignVCenter , subText, &bounding);
int proxy = index.data(Qt::UserRole + 5).toInt();
- if (proxy != 0) {
- QRectF txtBounding;
+ if (proxy != 0 && proxy != JOBDONE) {
QString proxyText;
- QBrush brush;
QColor color;
- if (proxy > 0) {
- proxyText = QString::number(proxy) + "% ";
- proxyText.append(i18n("Generating proxy ..."));
- brush = option.palette.highlight();
- color = option.palette.color(QPalette::HighlightedText);
-
- }
- else if (proxy == PROXYDONE) {
- proxyText = i18n("Proxy");
- brush = option.palette.mid();
- color = option.palette.color(QPalette::WindowText);
- }
- else {
- switch (proxy) {
- case CREATINGPROXY:
- proxyText = i18n("Generating proxy ...");
- break;
- case PROXYWAITING:
- proxyText = i18n("Waiting proxy ...");
- break;
- case PROXYCRASHED:
- default:
- proxyText = i18n("Proxy crashed");
+ if (proxy != JOBCRASHED) {
+ // Draw proxy progress bar
+ 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);
+ painter->drawRect(progress);
+ painter->setBrush(option.palette.text());
+ if (proxy > 0) {
+ progress.adjust(1, 1, 0, -1);
+ progress.setWidth((pixmap.width() - 4) * proxy / 100);
+ painter->drawRect(progress);
+ }
+ else if (proxy == JOBWAITING) {
+ // Draw kind of a pause icon
+ progress.adjust(1, 1, 0, -1);
+ progress.setWidth(2);
+ painter->drawRect(progress);
+ progress.moveLeft(progress.right() + 2);
+ painter->drawRect(progress);
}
- brush = option.palette.highlight();
- color = option.palette.color(QPalette::HighlightedText);
}
-
- txtBounding = painter->boundingRect(r2, Qt::AlignRight | Qt::AlignVCenter, " " + proxyText + " ");
- painter->setPen(Qt::NoPen);
- painter->setBrush(brush);
- painter->drawRoundedRect(txtBounding, 2, 2);
- painter->setPen(option.palette.highlightedText().color());
- painter->drawText(txtBounding, Qt::AlignHCenter | Qt::AlignVCenter , proxyText);
+ else if (proxy == JOBCRASHED) {
+ proxyText = index.data(Qt::UserRole + 7).toString();
+ QRectF txtBounding = painter->boundingRect(r2, Qt::AlignRight | Qt::AlignVCenter, " " + proxyText + " ");
+ 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->restore();
QStringList expandedFolders() const;
/** @brief Deselect all clips in project tree. */
void clearSelection();
+ /** @brief Print required overlays over clip thumb (proxy, stabilized,...). */
+ void processThumbOverlays(ProjectItem *item, QPixmap &pix);
public slots:
void setDocument(KdenliveDoc *doc);
/** @brief Prepares removing the selected items. */
void slotRemoveClip();
+ void slotAddClip(const QString url, const QString &groupName, const QString &groupId);
void slotAddClip(const QList <QUrl> givenList = QList <QUrl> (), const QString &groupName = QString(), const QString &groupId = QString());
/** @brief Adds, edits or deletes a folder item.
void slotForceProcessing(const QString &id);
/** @brief Remove all instances of a proxy and delete the file. */
void slotDeleteProxy(const QString proxyPath);
+ /** @brief Start a hard cut clip job. */
+ void slotCutClipJob(const QString &id, QPoint zone);
private:
ProjectListView *m_listView;
/** @brief Holds a list of proxy urls that are currently being created. */
QStringList m_processingProxy;
QMutex m_mutex;
- bool m_abortAllProxies;
- QList <PROXYINFO> m_proxyList;
+ bool m_abortAllJobs;
+ /** @brief We are cleaning up the project list, so stop processing signals. */
+ bool m_closing;
+ QList <AbstractClipJob *> m_jobList;
QFutureSynchronizer<void> m_proxyThreads;
InvalidDialog *m_invalidClipDialog;
+ QMenu *m_jobsMenu;
+ SmallInfoLabel *m_infoLabel;
void requestClipThumbnail(const QString id);
/** @brief Set the Proxy status on a clip.
* @param item The clip item to set status
- * @param status The proxy status (see definitions.h) */
- void setProxyStatus(ProjectItem *item, PROXYSTATUS status, int progress = 0);
+ * @param status The job status (see definitions.h) */
+ void setJobStatus(ProjectItem *item, CLIPJOBSTATUS status, int progress = 0, JOBTYPE jobType = NOJOBTYPE);
/** @brief Process ffmpeg output to find out process progress. */
- void processLogInfo(QList <ProjectItem *>items, int *duration, const QString &log);
+ void processLogInfo(QList <ProjectItem *>items, int progress, JOBTYPE jobType);
void monitorItemEditing(bool enable);
- /** @brief Set thumbnail for a project's clip. */
- void setThumbnail(const QString &clipId, const QPixmap &pix);
/** @brief Get cached thumbnail for a project's clip or create it if no cache. */
void getCachedThumbnail(ProjectItem *item);
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 startJobProcess();
+ /** @brief Check if a clip has a running or pending proxy process. */
+ bool hasPendingProxy(ProjectItem *item);
+ /** @brief Delete pending jobs for a clip. */
+ void deleteJobsForClip(const QString &clipId);
private slots:
void slotClipSelected();
void slotCreateProxy(const QString id);
/** @brief Stop creation of this clip's proxy. */
void slotAbortProxy(const QString id, const QString path);
- /** @brief Start creation of proxy clip. */
- void slotGenerateProxy();
+ /** @brief Start creation of clip jobs. */
+ void slotProcessJobs();
+ /** @brief Discard running and pending clip jobs. */
+ void slotCancelJobs();
+ /** @brief Discard a running clip jobs. */
+ void slotCancelRunningJob(const QString id, stringMap);
signals:
- void clipSelected(DocClipBase *, QPoint zone = QPoint());
+ void clipSelected(DocClipBase *, QPoint zone = QPoint(), bool forceUpdate = false);
void receivedClipDuration(const QString &);
void showClipProperties(DocClipBase *);
void showClipProperties(QList <DocClipBase *>, QMap<QString, QString> commonproperties);
void processNextThumbnail();
/** @brief Activate the clip monitor. */
void raiseClipMonitor();
+ /** @brief Set number of running jobs. */
+ void jobCount(int);
+ void cancelRunningJob(const QString, stringMap);
+ void addClip(const QString, const QString &, const QString &);
};
#endif
projects / kdenlive / blobdiff