#include "ui_boolval_ui.h"
#include "ui_colorval_ui.h"
#include "ui_wipeval_ui.h"
-#include "ui_keyframeeditor_ui.h"
#include "complexparameter.h"
#include "geometryval.h"
-#include "keyframeedit.h"
#include "positionedit.h"
#include "effectslist.h"
#include "kdenlivesettings.h"
QScrollArea(parent),
m_in(0),
m_out(0),
- m_frameSize(QPoint())
+ m_frameSize(QPoint()),
+ m_keyframeEditor(NULL)
{
m_baseWidget = new QWidget(this);
setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
void EffectStackEdit::transferParamDesc(const QDomElement d, int in, int out)
{
clearAllItems();
+ m_keyframeEditor = NULL;
m_params = d;
m_in = in;
m_out = out;
QWidget * toFillin = new QWidget(m_baseWidget);
QString value = pa.attribute("value").isNull() ?
pa.attribute("default") : pa.attribute("value");
-
- /** Currently supported parameter types are:
- * constant (=double): a slider with an integer value (use the "factor" attribute to divide the value so that you can get a double
- * list: a combobox containing a list of values to choose
- * bool: a checkbox
- * complex: designed for keyframe parameters, but old and not finished, do not use
- * geometry: a rectangle that can be moved & resized, with possible keyframes, used in composite transition
- * keyframe: a list widget with a list of entries (position and value)
- * color: a color chooser button
- * position: a slider representing the position of a frame in the current clip
- * wipe: a widget designed for the wipe transition, allowing to choose a position (left, right, top,...)
- */
+
+ /** Currently supported parameter types are:
+ * constant (=double): a slider with an integer value (use the "factor" attribute to divide the value so that you can get a double
+ * list: a combobox containing a list of values to choose
+ * bool: a checkbox
+ * complex: designed for keyframe parameters, but old and not finished, do not use
+ * geometry: a rectangle that can be moved & resized, with possible keyframes, used in composite transition
+ * keyframe: a list widget with a list of entries (position and value)
+ * color: a color chooser button
+ * position: a slider representing the position of a frame in the current clip
+ * wipe: a widget designed for the wipe transition, allowing to choose a position (left, right, top,...)
+ */
if (type == "double" || type == "constant") {
int min;
m_valueItems[paramName+"geometry"] = geo;
connect(geo, SIGNAL(parameterChanged()), this, SLOT(collectAllParameters()));
connect(geo, SIGNAL(seekToPos(int)), this, SLOT(slotSeekToPos(int)));
- } else if (type == "keyframe") {
+ } else if (type == "keyframe" || type == "simplekeyframe") {
// keyframe editor widget
kDebug() << "min: " << m_in << ", MAX: " << m_out;
- KeyframeEdit *geo = new KeyframeEdit(pa, m_out - m_in - 1, pa.attribute("min").toInt(), pa.attribute("max").toInt(), m_timecode);
- //geo->setupParam(100, pa.attribute("min").toInt(), pa.attribute("max").toInt(), pa.attribute("keyframes"));
- //connect(geo, SIGNAL(seekToPos(int)), this, SLOT(slotSeekToPos(int)));
- //geo->setupParam(pa, minFrame, maxFrame);
- m_vbox->addWidget(geo);
- m_valueItems[paramName+"keyframe"] = geo;
- connect(geo, SIGNAL(parameterChanged()), this, SLOT(collectAllParameters()));
+ if (m_keyframeEditor == NULL) {
+ KeyframeEdit *geo = new KeyframeEdit(pa, m_in, m_in + m_out, pa.attribute("min").toInt(), pa.attribute("max").toInt(), m_timecode, paramName);
+ m_vbox->addWidget(geo);
+ m_valueItems[paramName+"keyframe"] = geo;
+ m_keyframeEditor = geo;
+ connect(geo, SIGNAL(parameterChanged()), this, SLOT(collectAllParameters()));
+ } else {
+ // we already have a keyframe editor, so just add another column for the new param
+ m_keyframeEditor->addParameter(pa);
+ }
} else if (type == "color") {
Colorval *cval = new Colorval;
cval->setupUi(toFillin);