Fix render profiles containing a 'profile' parameter after recent MLT commit renaming...

[kdenlive] / src / projectlist.h

diff --git a/src/projectlist.h b/src/projectlist.h
index 266775f7c606b18fac29c93a837fb643b8c9d641..5c6ec30bb364830168cb96e04ff0fb84f68ecea8 100644 (file)
--- a/src/projectlist.h
+++ b/src/projectlist.h
@@ -84,13 +84,6 @@ public:
             }
             const int textMargin = style->pixelMetric(QStyle::PM_FocusFrameHMargin) + 1;
             QPixmap pixmap = qVariantValue<QPixmap>(index.data(Qt::DecorationRole));
-            if ((index.flags() & (Qt::ItemIsDragEnabled)) == false) {
-                KIcon icon("dialog-close");
-                QPainter p(&pixmap);
-                p.drawPixmap(1, 1, icon.pixmap(16, 16));
-                p.end();
-            }
-
             painter->drawPixmap(r1.left() + textMargin, r1.top() + (r1.height() - pixmap.height()) / 2, pixmap);
             int decoWidth = pixmap.width() + 2 * textMargin;
 
@@ -123,9 +116,17 @@ public:
                     color = option.palette.color(QPalette::WindowText);
                 }
                 else {
-                    if (proxy == CREATINGPROXY) proxyText = i18n("Generating proxy...");
-                    else if (proxy == PROXYWAITING) proxyText = i18n("Waiting proxy...");
-                    else if (proxy == PROXYCRASHED) proxyText = i18n("proxy crashed");
+                    switch (proxy)  {
+                        case CREATINGPROXY:
+                            proxyText = i18n("Generating proxy ...");
+                            break;
+                        case PROXYWAITING:
+                            proxyText = i18n("Waiting proxy ...");
+                            break;
+                        case PROXYCRASHED:
+                        default:
+                            proxyText = i18n("Proxy crashed");
+                    }
                     brush = option.palette.highlight();
                     color = option.palette.color(QPalette::HighlightedText);
                 }
@@ -175,7 +176,6 @@ public:
     void setupGeneratorMenu(QMenu *addMenu, QMenu *transcodeMenu, QMenu *inTimelineMenu);
     QString currentClipUrl() const;
     KUrl::List getConditionalUrls(const QString &condition) const;
-    void reloadClipThumbnails();
     QDomDocument generateTemplateXml(QString data, const QString &replaceString);
     void cleanup();
     void trashUnusedClips();
@@ -195,18 +195,21 @@ public:
     QMap <QString, QString> getProxies();
     /** @brief Enable / disable proxies. */
     void updateProxyConfig();
-    /** @brief Does this project automatically use proxies. */
+    /** @brief Get a property from the document. */
+    QString getDocumentProperty(const QString &key) const;
+    
+    /** @brief Does this project allow proxies. */
     bool useProxy() const;
-    /** @brief proxy parameters for this project. */
-    QString proxyParams() const;
     /** @brief Should we automatically create proxy clips for newly added clips. */
     bool generateProxy() const;
-    /** @brief Minimum clip width to create proxy. */
-    int proxyMinSize() const;
+    /** @brief Should we automatically create proxy clips for newly added clips. */
+    bool generateImageProxy() const;
+    /** @brief Returns a list of the expanded folder ids. */
+    QStringList expandedFolders() const;
 
 public slots:
     void setDocument(KdenliveDoc *doc);
-    void updateAllClips();
+    void updateAllClips(bool displayRatioChanged, bool fpsChanged);
     void slotReplyGetImage(const QString &clipId, const QPixmap &pix);
     void slotReplyGetFileProperties(const QString &clipId, Mlt::Producer *producer, const QMap < QString, QString > &properties, const QMap < QString, QString > &metadata, bool replace, bool selectClip);
     void slotAddClip(DocClipBase *clip, bool getProperties);
@@ -215,7 +218,7 @@ public slots:
     void slotRefreshClipThumbnail(const QString &clipId, bool update = true);
     void slotRefreshClipThumbnail(QTreeWidgetItem *item, bool update = true);
     void slotRemoveInvalidClip(const QString &id, bool replace);
-    void slotRemoveInvalidProxy(const QString &id);
+    void slotRemoveInvalidProxy(const QString &id, bool durationError);
     void slotSelectClip(const QString &ix);
 
     /** @brief Prepares removing the selected items. */
@@ -254,6 +257,7 @@ private:
     QMenu *m_transcodeAction;
     KdenliveDoc *m_doc;
     ItemDelegate *m_listViewDelegate;
+    /** @brief True if we have not yet finished opening the document. */
     bool m_refreshed;
     QToolButton *m_addButton;
     QToolButton *m_deleteButton;
@@ -329,7 +333,7 @@ private slots:
     /** @brief Enable / disable proxy for current clip. */
     void slotProxyCurrentItem(bool doProxy);
     /** @brief Put clip in the proxy waiting list. */
-    void slotCreateProxy(const QString id);
+    void slotCreateProxy(const QString id, bool createProducer = true);
     /** @brief Stop creation of this clip's proxy. */
     void slotAbortProxy(const QString id);
     /** @brief Start creation of proxy clip. */