X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fclipproperties.h;h=19b5bc7d57d475768ea11d5906890780c5b91604;hb=3d9ff40b713934e307b6ac7808bd8d56d0bd66f7;hp=93cf57eb8a2aa919c15f905246e6dca6ea3be664;hpb=05f4fad9a19434399f43ff76e06d1e1a5f74c0f6;p=kdenlive

diff --git a/src/clipproperties.h b/src/clipproperties.h
index 93cf57eb..19b5bc7d 100644
--- a/src/clipproperties.h
+++ b/src/clipproperties.h
@@ -33,10 +33,10 @@ class PropertiesViewDelegate : public QStyledItemDelegate
     Q_OBJECT
 public:
     PropertiesViewDelegate(QWidget *parent) : QStyledItemDelegate(parent) {
-        m_height = parent->fontMetrics().height() * 1.5;
+        m_height = parent->fontMetrics().height() * 1.2;
     }
-    virtual QSize sizeHint(const QStyleOptionViewItem &, const QModelIndex &) const {
-        return QSize(10, m_height);
+    virtual QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const {
+        return QSize(QStyledItemDelegate::sizeHint(option, index).width(), m_height);
     }
 private:
     int m_height;
@@ -47,7 +47,7 @@ class ClipProperties : public QDialog
     Q_OBJECT
 
 public:
-    ClipProperties(DocClipBase *clip, Timecode tc, double fps, QWidget * parent = 0);
+    ClipProperties(DocClipBase *clip, const Timecode &tc, double fps, QWidget * parent = 0);
     ClipProperties(QList <DocClipBase *>cliplist, Timecode tc, QMap <QString, QString> commonproperties, QWidget * parent);
     virtual ~ClipProperties();
     QMap <QString, QString> properties();
@@ -55,13 +55,16 @@ public:
     bool needsTimelineRefresh() const;
     bool needsTimelineReload() const;
     void disableClipId(const QString &id);
+
+public slots:
+    void slotFillMarkersList(DocClipBase *clip);
+    void slotUpdateAnalysisData(DocClipBase *clip);
     
 private slots:
-    void parseFolder();
+    void parseFolder(bool reloadThumb = true);
     void slotAddMarker();
     void slotEditMarker();
     void slotDeleteMarker();
-    void slotFillMarkersList();
     void slotCheckMaxLength();
     void slotEnableLuma(int state);
     void slotEnableLumaFile(int state);
@@ -70,6 +73,14 @@ private slots:
     void slotModified();
     void slotDeleteProxy();
     void slotOpenUrl(const QString &url);
+    void slotSaveMarkers();
+    void slotLoadMarkers();
+    void slotDeleteAnalysis();
+    void slotGotThumbnail(const QString &id, QImage img);
+    void slotSaveAnalysis();
+    void slotLoadAnalysis();
+    void slotReloadVideoProperties();
+    void slotReloadVideoThumb();
 
 private:
     Ui::ClipProperties_UI m_view;
@@ -85,11 +96,16 @@ private:
     bool m_clipNeedsReLoad;
     /** Frame with proxy info / delete button */
     QFrame* m_proxyContainer;
+    void loadVideoProperties(QMap <QString, QString> props);
 
 signals:
-    void addMarker(const QString &, GenTime, QString);
+    void addMarkers(const QString &, QList <CommentedTime>);
     void deleteProxy(const QString);
     void applyNewClipProperties(const QString, QMap <QString, QString> , QMap <QString, QString> , bool, bool);
+    void saveMarkers(const QString &id);
+    void loadMarkers(const QString &id);
+    void editAnalysis(const QString &id, const QString &name, const QString &value);
+    void requestThumb(const QString id, QList <int> frames);
 };