X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fprojectlist.h;h=8236cfdd99a1e479adeabe0301146a99e6dfdf3e;hb=16e28d660e6c5754dbc5eb8a04d607285e749cd8;hp=f4a16f49d1188282d95a79e96a96b47eb42468e3;hpb=e3e515a29c84ff477a5ccb5ce3826227441dfbb3;p=kdenlive diff --git a/src/projectlist.h b/src/projectlist.h index f4a16f49..8236cfdd 100644 --- a/src/projectlist.h +++ b/src/projectlist.h @@ -22,6 +22,7 @@ #define PROJECTLIST_H #include +#include #include #include #include @@ -90,7 +91,7 @@ class ItemDelegate: public QStyledItemDelegate public: ItemDelegate(QAbstractItemView* parent = 0): QStyledItemDelegate(parent) { } - + /*void drawFocus(QPainter *, const QStyleOptionViewItem &, const QRect &) const { }*/ @@ -107,7 +108,8 @@ public: } const int textMargin = style->pixelMetric(QStyle::PM_FocusFrameHMargin) + 1; QPixmap pixmap = qVariantValue(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(); @@ -117,7 +119,7 @@ public: 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(); @@ -128,22 +130,21 @@ public: 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 != PROXYDONE) { 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); + // 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()); + progress.adjust(1, 1, 0, -1); + progress.setWidth((pixmap.width() - 4) * proxy / 100); + painter->drawRect(progress); } else { switch (proxy) { @@ -157,16 +158,13 @@ public: default: proxyText = i18n("Proxy crashed"); } - brush = option.palette.highlight(); - color = option.palette.color(QPalette::HighlightedText); + 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); } - - 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); } painter->restore(); @@ -203,7 +201,7 @@ public: void setHeaderInfo(const QByteArray &state); void updateProjectFormat(Timecode t); void setupMenu(QMenu *addMenu, QAction *defaultAction); - void setupGeneratorMenu(QMenu *addMenu, QMenu *transcodeMenu, QMenu *inTimelineMenu); + void setupGeneratorMenu(const QHash& menus); QString currentClipUrl() const; KUrl::List getConditionalUrls(const QString &condition) const; QDomDocument generateTemplateXml(QString data, const QString &replaceString); @@ -238,11 +236,12 @@ public: 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 slotClipSelected(); void setDocument(KdenliveDoc *doc); - void updateAllClips(bool displayRatioChanged, bool fpsChanged); + 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 slotReplyGetFileProperties(const QString &clipId, Mlt::Producer *producer, const stringMap &properties, const stringMap &metadata, bool replace); @@ -291,10 +290,13 @@ private: QAction *m_openAction; QAction *m_reloadAction; QMenu *m_transcodeAction; + QMenu *m_stabilizeAction; KdenliveDoc *m_doc; ItemDelegate *m_listViewDelegate; /** @brief False if we have not yet finished opening the document. */ bool m_refreshed; + /** @brief False if we have not yet finished checking all project tree thumbs. */ + bool m_allClipsProcessed; QToolButton *m_addButton; QToolButton *m_deleteButton; QToolButton *m_editButton; @@ -325,6 +327,8 @@ private: /** @brief Enables and disables transcode actions based on the selected clip's type. */ void adjustTranscodeActions(ProjectItem *clip) const; + /** @brief Enables and disables stabilize actions based on the selected clip's type. */ + void adjustStabilizeActions(ProjectItem *clip) const; /** @brief Enables and disables proxy action based on the selected clip. */ void adjustProxyActions(ProjectItem *clip) const; @@ -334,19 +338,18 @@ private: /** @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(const QString proxyPath, PROXYSTATUS status, int progress = 0); void setProxyStatus(ProjectItem *item, PROXYSTATUS status, int progress = 0); /** @brief Process ffmpeg output to find out process progress. */ - void processLogInfo(const QString &path, int *duration, const QString &log); + void processLogInfo(QList items, int *duration, const QString &log); 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); private slots: + void slotClipSelected(); void slotAddSlideshowClip(); void slotAddTitleClip(); void slotAddTitleTemplateClip(); @@ -377,7 +380,7 @@ private slots: void slotGotProxy(const QString &proxyPath); void slotGotProxy(ProjectItem *item); /** @brief Enable / disable proxy for current clip. */ - void slotProxyCurrentItem(bool doProxy); + void slotProxyCurrentItem(bool doProxy, ProjectItem *itemToProxy = NULL); /** @brief Put clip in the proxy waiting list. */ void slotCreateProxy(const QString id); /** @brief Stop creation of this clip's proxy. */ @@ -386,7 +389,7 @@ private slots: void slotGenerateProxy(); 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 , QMap commonproperties);