#include "ui_listval_ui.h"
#include "ui_boolval_ui.h"
#include "ui_colorval_ui.h"
-#include "ui_positionval_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"
#include "profilesdialog.h"
#include <QScrollArea>
-class Boolval: public EffectStackEdit::UiItem, public Ui::Boolval_UI
+class Boolval: public QWidget, public Ui::Boolval_UI
{
};
-class Colorval: public EffectStackEdit::UiItem, public Ui::Colorval_UI
+class Colorval: public QWidget, public Ui::Colorval_UI
{
};
-class Constval: public EffectStackEdit::UiItem, public Ui::Constval_UI
+class Constval: public QWidget, public Ui::Constval_UI
{
};
-class Listval: public EffectStackEdit::UiItem, public Ui::Listval_UI
+class Listval: public QWidget, public Ui::Listval_UI
{
};
-class Positionval: public EffectStackEdit::UiItem, public Ui::Positionval_UI
-{
-};
-
-class Wipeval: public EffectStackEdit::UiItem, public Ui::Wipeval_UI
+class Wipeval: public QWidget, public Ui::Wipeval_UI
{
};
QMap<QString, QImage> EffectStackEdit::iconCache;
EffectStackEdit::EffectStackEdit(QWidget *parent) :
- QWidget(parent),
+ QScrollArea(parent),
m_in(0),
m_out(0),
- m_frameSize(QPoint())
+ m_frameSize(QPoint()),
+ m_keyframeEditor(NULL)
{
- setSizePolicy(QSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding));
- QVBoxLayout *vbox1 = new QVBoxLayout(parent);
- vbox1->setContentsMargins(0, 0, 0, 0);
- vbox1->setSpacing(0);
-
- QScrollArea *area = new QScrollArea;
- QWidget *wid = new QWidget(parent);
- area->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
- area->setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded);
- area->setFrameStyle(QFrame::NoFrame);
- wid->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum));
- area->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::MinimumExpanding));
-
- vbox1->addWidget(area);
- area->setWidget(wid);
- area->setWidgetResizable(true);
- m_vbox = new QVBoxLayout(wid);
+ m_baseWidget = new QWidget(this);
+ setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+ setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded);
+ setFrameStyle(QFrame::NoFrame);
+ setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::MinimumExpanding));
+
+ setWidget(m_baseWidget);
+ setWidgetResizable(true);
+ m_vbox = new QVBoxLayout(m_baseWidget);
m_vbox->setContentsMargins(0, 0, 0, 0);
m_vbox->setSpacing(0);
- wid->show();
-
+ //wid->show();
}
EffectStackEdit::~EffectStackEdit()
m_params.setAttribute(name, value);
}
-void EffectStackEdit::transferParamDesc(const QDomElement& d, int in, int out)
+void EffectStackEdit::transferParamDesc(const QDomElement d, int in, int out)
{
- kDebug() << "in";
+ clearAllItems();
+ m_keyframeEditor = NULL;
m_params = d;
m_in = in;
m_out = out;
- clearAllItems();
- if (m_params.isNull()) return;
+ if (m_params.isNull()) {
+ kDebug() << "// EMPTY EFFECT STACK";
+ return;
+ }
- QDomDocument doc;
+ /*QDomDocument doc;
doc.appendChild(doc.importNode(m_params, true));
- //kDebug() << "IMPORTED TRANS: " << doc.toString();
+ kDebug() << "IMPORTED TRANS: " << doc.toString();*/
+
QDomNodeList namenode = m_params.elementsByTagName("parameter");
QDomElement e = m_params.toElement();
const int minFrame = e.attribute("start").toInt();
for (int i = 0; i < namenode.count() ; i++) {
- kDebug() << "in form";
QDomElement pa = namenode.item(i).toElement();
QDomNode na = pa.firstChildElement("name");
QString type = pa.attribute("type");
QString paramName = i18n(na.toElement().text().toUtf8().data());
- QWidget * toFillin = new QWidget;
+ QWidget * toFillin = new QWidget(m_baseWidget);
QString value = pa.attribute("value").isNull() ?
pa.attribute("default") : pa.attribute("value");
- if (type == "geometry") {
- /*pa.setAttribute("namedesc", "X;Y;Width;Height;Transparency");
- pa.setAttribute("format", "%d%,%d%:%d%x%d%:%d");
- pa.setAttribute("min", "-500;-500;0;0;0");
- pa.setAttribute("max", "500;500;200;200;100");*/
- } else if (type == "complex") {
- //pa.setAttribute("namedesc",pa.attribute("name"));
-
- }
-
+ /** 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,...)
+ */
- //TODO constant, list, bool, complex , color, geometry, position
if (type == "double" || type == "constant") {
int min;
int max;
if (pa.attribute("max").startsWith('%')) {
max = (int) ProfilesDialog::getStringEval(m_profile, pa.attribute("max"));
} else max = pa.attribute("max").toInt();
- createSliderItem(paramName, (int)(value.toDouble() + 0.5) , min, max);
+ createSliderItem(paramName, (int)(value.toDouble() + 0.5) , min, max, pa.attribute("suffix", QString()));
delete toFillin;
toFillin = NULL;
} else if (type == "list") {
m_vbox->addWidget(pl);
m_valueItems[paramName+"complex"] = pl;
connect(pl, SIGNAL(parameterChanged()), this, SLOT(collectAllParameters()));
- m_items.append(pl);
} else if (type == "geometry") {
Geometryval *geo = new Geometryval(m_profile, m_frameSize);
geo->setupParam(pa, minFrame, maxFrame);
m_valueItems[paramName+"geometry"] = geo;
connect(geo, SIGNAL(parameterChanged()), this, SLOT(collectAllParameters()));
connect(geo, SIGNAL(seekToPos(int)), this, SLOT(slotSeekToPos(int)));
- m_items.append(geo);
- } 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, 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()));
- m_items.append(geo);
+ 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);
connect(cval->kcolorbutton, SIGNAL(clicked()) , this, SLOT(collectAllParameters()));
m_uiItems.append(cval);
} else if (type == "position") {
- Positionval *pval = new Positionval;
- pval->setupUi(toFillin);
int pos = value.toInt();
if (d.attribute("id") == "fadein" || d.attribute("id") == "fade_from_black") {
pos = pos - m_in;
// fadeout position starts from clip end
pos = m_out - (pos - m_in);
}
- pval->krestrictedline->setText(m_timecode.getTimecodeFromFrames(pos));
- pval->label->setText(paramName);
- m_valueItems[paramName + "position"] = pval;
- connect(pval->krestrictedline, SIGNAL(editingFinished()), this, SLOT(collectAllParameters()));
- m_uiItems.append(pval);
+ PositionEdit *posedit = new PositionEdit(paramName, pos, 1, m_out, m_timecode);
+ m_vbox->addWidget(posedit);
+ m_valueItems[paramName+"position"] = posedit;
+ connect(posedit, SIGNAL(parameterChanged()), this, SLOT(collectAllParameters()));
} else if (type == "wipe") {
Wipeval *wpval = new Wipeval;
wpval->setupUi(toFillin);
}
if (toFillin) {
- m_items.append(toFillin);
m_vbox->addWidget(toFillin);
}
}
void EffectStackEdit::collectAllParameters()
{
- if (m_valueItems.isEmpty()) return;
- QDomElement oldparam = m_params.cloneNode().toElement();
- QDomNodeList namenode = m_params.elementsByTagName("parameter");
+ if (m_valueItems.isEmpty() || m_params.isNull()) return;
+ const QDomElement oldparam = m_params.cloneNode().toElement();
+ QDomElement newparam = oldparam.cloneNode().toElement();
+ QDomNodeList namenode = newparam.elementsByTagName("parameter");
for (int i = 0; i < namenode.count() ; i++) {
QDomNode pa = namenode.item(i);
else if (type == "geometry") paramName.append("geometry");
else if (type == "keyframe") paramName.append("keyframe");
if (!m_valueItems.contains(paramName)) {
- kDebug() << "// Param: " << paramName << " NOT FOUND";
- return;
+ // kDebug() << "// Param: " << paramName << " NOT FOUND";
+ continue;
}
QString setValue;
namenode.item(i) = complex->getParamDesc();
} else if (type == "geometry") {
Geometryval *geom = ((Geometryval*)m_valueItems.value(paramName));
- namenode.item(i) = geom->getParamDesc();
+ namenode.item(i).toElement().setAttribute("value", geom->getValue());
} else if (type == "position") {
- KRestrictedLine *line = ((Positionval*)m_valueItems.value(paramName))->krestrictedline;
- int pos = m_timecode.getFrameCount(line->text(), KdenliveSettings::project_fps());
+ PositionEdit *pedit = ((PositionEdit*)m_valueItems.value(paramName));
+ int pos = pedit->getPosition();
setValue = QString::number(pos);
- if (m_params.attribute("id") == "fadein" || m_params.attribute("id") == "fade_from_black") {
+ if (newparam.attribute("id") == "fadein" || newparam.attribute("id") == "fade_from_black") {
// Make sure duration is not longer than clip
- if (pos > m_out) {
+ /*if (pos > m_out) {
pos = m_out;
- line->setText(m_timecode.getTimecodeFromFrames(pos));
- }
- EffectsList::setParameter(m_params, "in", QString::number(m_in));
- EffectsList::setParameter(m_params, "out", QString::number(m_in + pos));
+ pedit->setPosition(pos);
+ }*/
+ EffectsList::setParameter(newparam, "in", QString::number(m_in));
+ EffectsList::setParameter(newparam, "out", QString::number(m_in + pos));
setValue.clear();
- } else if (m_params.attribute("id") == "fadeout" || m_params.attribute("id") == "fade_to_black") {
+ } else if (newparam.attribute("id") == "fadeout" || newparam.attribute("id") == "fade_to_black") {
// Make sure duration is not longer than clip
- if (pos > m_out) {
+ /*if (pos > m_out) {
pos = m_out;
- line->setText(m_timecode.getTimecodeFromFrames(pos));
- }
- EffectsList::setParameter(m_params, "in", QString::number(m_out + m_in - pos));
- EffectsList::setParameter(m_params, "out", QString::number(m_out + m_in));
+ pedit->setPosition(pos);
+ }*/
+ EffectsList::setParameter(newparam, "in", QString::number(m_out + m_in - pos));
+ EffectsList::setParameter(newparam, "out", QString::number(m_out + m_in));
setValue.clear();
}
} else if (type == "wipe") {
pa.attributes().namedItem("value").setNodeValue(setValue);
}
}
- emit parameterChanged(oldparam, m_params);
+ emit parameterChanged(oldparam, newparam);
}
-void EffectStackEdit::createSliderItem(const QString& name, int val , int min, int max)
+void EffectStackEdit::createSliderItem(const QString& name, int val , int min, int max, const QString suffix)
{
- QWidget* toFillin = new QWidget;
+ QWidget* toFillin = new QWidget(m_baseWidget);
Constval *ctval = new Constval;
ctval->setupUi(toFillin);
ctval->horizontalSlider->setMinimum(min);
ctval->horizontalSlider->setMaximum(max);
+ if (!suffix.isEmpty()) ctval->spinBox->setSuffix(suffix);
ctval->spinBox->setMinimum(min);
ctval->spinBox->setMaximum(max);
ctval->horizontalSlider->setPageStep((int)(max - min) / 10);
m_valueItems[name] = ctval;
m_uiItems.append(ctval);
connect(ctval->horizontalSlider, SIGNAL(valueChanged(int)) , this, SLOT(collectAllParameters()));
- m_items.append(toFillin);
m_vbox->addWidget(toFillin);
}
{
blockSignals(true);
m_valueItems.clear();
-
- while (!m_items.isEmpty()) {
- QWidget * die = m_items.takeFirst();
+ m_uiItems.clear();
+ /*while (!m_items.isEmpty()) {
+ QWidget *die = m_items.takeFirst();
die->disconnect();
delete die;
- }
-
- qDeleteAll(m_uiItems);
- m_uiItems.clear();
- m_items.clear();
- QLayoutItem *item = m_vbox->itemAt(0);
- while (item) {
- m_vbox->removeItem(item);
- delete item;
- item = m_vbox->itemAt(0);
+ }*/
+ //qDeleteAll(m_uiItems);
+ QLayoutItem *child;
+ while ((child = m_vbox->takeAt(0)) != 0) {
+ QWidget *wid = child->widget();
+ delete child;
+ if (wid) delete wid;
}
blockSignals(false);
}
projects / kdenlive / blobdiff