Merge branch 'master' into stabilize

[kdenlive] / src / clipproperties.h

diff --git a/src/clipproperties.h b/src/clipproperties.h
index 8cac7e0c67267320ecc4bf0641126131e2c02097..5dad49494b04b67eb975a57bfb427c0b062cdf23 100644 (file)
--- a/src/clipproperties.h
+++ b/src/clipproperties.h
@@ -35,7 +35,7 @@ public:
     PropertiesViewDelegate(QWidget *parent) : QStyledItemDelegate(parent) {
         m_height = parent->fontMetrics().height() * 1.5;
     }
-    virtual QSize sizeHint(const QStyleOptionViewItem & option, const QModelIndex & index) const {
+    virtual QSize sizeHint(const QStyleOptionViewItem &, const QModelIndex &) const {
         return QSize(10, m_height);
     }
 private:
@@ -68,6 +68,7 @@ private slots:
     void slotUpdateDurationFormat(int ix);
     void slotApplyProperties();
     void slotModified();
+    void slotDeleteProxy();
 
 private:
     Ui::ClipProperties_UI m_view;
@@ -81,11 +82,12 @@ private:
     bool m_clipNeedsRefresh;
     /** clip resource changed, reload it */
     bool m_clipNeedsReLoad;
-    /** Used to draw video / audio properties */
-    PropertiesViewDelegate *m_propsDelegate;
+    /** Frame with proxy info / delete button */
+    QFrame* m_proxyContainer;
 
 signals:
     void addMarker(const QString &, GenTime, QString);
+    void deleteProxy(const QString);
     void applyNewClipProperties(const QString, QMap <QString, QString> , QMap <QString, QString> , bool, bool);
 };