X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fkeyframeedit.h;h=a0ba5dc9ea139df9cf974c48d3557269fb9b9857;hb=1404e8f1d631c81399e0e92ffce7dfac0195fabb;hp=4d3e5747da17af75d83d0ee109a4783e2c0563f2;hpb=f475537f4b0be796d0990db610a361095c1e7ee5;p=kdenlive

diff --git a/src/keyframeedit.h b/src/keyframeedit.h
index 4d3e5747..a0ba5dc9 100644
--- a/src/keyframeedit.h
+++ b/src/keyframeedit.h
@@ -25,6 +25,7 @@
 #include <QAbstractItemView>
 #include <QSpinBox>
 
+class PositionEdit;
 
 #include "ui_keyframeeditor_ui.h"
 #include "definitions.h"
@@ -34,7 +35,8 @@ class KeyItemDelegate: public QItemDelegate
 {
     Q_OBJECT
 public:
-    KeyItemDelegate(int min, int max, QAbstractItemView* parent = 0): QItemDelegate(parent), m_min(min), m_max(max) {
+    KeyItemDelegate(int min, int max, QAbstractItemView* parent = 0)
+        : QItemDelegate(parent), m_min(min), m_max(max) {
     }
 
     QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const {
@@ -79,52 +81,68 @@ class KeyframeEdit : public QWidget, public Ui::KeyframeEditor_UI
 {
     Q_OBJECT
 public:
-    explicit KeyframeEdit(QDomElement e, int minFrame, int maxFrame, int minVal, int maxVal, Timecode tc, int active_keyframe, QWidget* parent = 0);
+    explicit KeyframeEdit(const QDomElement &e, int minFrame, int maxFrame, const Timecode &tc, int activeKeyframe, QWidget* parent = 0);
     virtual ~KeyframeEdit();
-    void setupParam();
-    void addParameter(QDomElement e);
+    virtual void addParameter(const QDomElement &e, int activeKeyframe = -1);
     const QString getValue(const QString &name);
     /** @brief Updates the timecode display according to settings (frame number or hh:mm:ss:ff) */
     void updateTimecodeFormat();
 
-private:
-    QList <QDomElement> m_params;
-    int m_min;
-    int m_max;
-    int m_minVal;
-    int m_maxVal;
-    Timecode m_timecode;
-    int m_previousPos;
-    //KeyItemDelegate *m_delegate;
-    void generateAllParams();
-    QGridLayout *m_slidersLayout;
-    int m_active_keyframe;
+    /** @brief Returns true if the parameter @param name should be shown on the clip in timeline. */
+    bool isVisibleParam(const QString &name);
 
+    /** @brief Makes the first parameter visible in timeline if no parameter is selected. */
+    void checkVisibleParam();
+
+public slots:
+
+    void slotUpdateRange(int inPoint, int outPoint);
+
+protected:
     /** @brief Gets the position of a keyframe from the table.
-    * @param row Row of the keyframe in the table */
+     * @param row Row of the keyframe in the table */
     int getPos(int row);
     /** @brief Converts a frame value to timecode considering the frames vs. HH:MM:SS:FF setting.
-    * @return timecode */
+     * @return timecode */
     QString getPosString(int pos);
 
+    void generateAllParams();
+
+    int m_min;
+    int m_max;
+
+protected slots:
+    void slotAdjustKeyframeInfo(bool seek = true);
+
+private:
+    QList <QDomElement> m_params;
+    Timecode m_timecode;
+    QGridLayout *m_slidersLayout;
+    PositionEdit *m_position;
+
 private slots:
     void slotDeleteKeyframe();
     void slotAddKeyframe();
     void slotGenerateParams(int row, int column);
-    void slotAdjustKeyframeInfo(bool seek = true);
     void slotAdjustKeyframePos(int value);
-    void slotAdjustKeyframeValue(int value);
+    void slotAdjustKeyframeValue(double value);
     /** @brief Turns the seek to keyframe position setting on/off.
-    * @param state State of the associated checkbox */
-    void slotSetSeeking(int state);
+    * @param seek true = seeking on */
+    void slotSetSeeking(bool seek);
 
     /** @brief Shows the keyframe table and adds a second keyframe. */
     void slotKeyframeMode();
-    //void slotSaveCurrentParam(QTreeWidgetItem *item, int column);
+
+    /** @brief Resets all parameters of the selected keyframe to their default values. */
+    void slotResetKeyframe();
+
+    /** @brief Makes the parameter at column @param id the visible (in timeline) one. */
+    void slotUpdateVisibleParameter(int id, bool update = true);
 
 signals:
     void parameterChanged();
     void seekToPos(int);
+    void showComments(bool show);
 };
 
 #endif