#include "ui_boolval_ui.h"
#include "ui_colorval_ui.h"
#include "ui_wipeval_ui.h"
-#include "ui_keyframeeditor_ui.h"
+#include "ui_urlval_ui.h"
#include "complexparameter.h"
#include "geometryval.h"
-#include "keyframeedit.h"
#include "positionedit.h"
+#include "projectlist.h"
#include "effectslist.h"
#include "kdenlivesettings.h"
#include "profilesdialog.h"
+#include "kis_curve_widget.h"
+#include "kis_cubic_curve.h"
#include <KDebug>
#include <KLocale>
+#include <KFileDialog>
#include <QVBoxLayout>
#include <QSlider>
{
};
+class Urlval: public QWidget, public Ui::Urlval_UI
+{
+};
QMap<QString, QImage> EffectStackEdit::iconCache;
EffectStackEdit::EffectStackEdit(QWidget *parent) :
- QObject(parent),
+ QScrollArea(parent),
m_in(0),
m_out(0),
- m_frameSize(QPoint())
+ m_frameSize(QPoint()),
+ m_keyframeEditor(NULL)
{
- QVBoxLayout *vbox1 = new QVBoxLayout(parent);
- vbox1->setContentsMargins(0, 0, 0, 0);
- vbox1->setSpacing(0);
-
- QScrollArea *area = new QScrollArea;
- m_baseWidget = new QWidget(parent);
- area->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
- area->setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded);
- area->setFrameStyle(QFrame::NoFrame);
- parent->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum));
- area->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::MinimumExpanding));
-
- vbox1->addWidget(area);
- area->setWidget(m_baseWidget);
- area->setWidgetResizable(true);
+ 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);
EffectStackEdit::~EffectStackEdit()
{
iconCache.clear();
+ delete m_baseWidget;
}
void EffectStackEdit::setFrameSize(QPoint p)
break;
}
}
+}
+
+void EffectStackEdit::updateTimecodeFormat()
+{
+ QDomNodeList namenode = m_params.elementsByTagName("parameter");
+ for (int i = 0; i < namenode.count() ; i++) {
+ QDomNode pa = namenode.item(i);
+ QDomNode na = pa.firstChildElement("name");
+ QString type = pa.attributes().namedItem("type").nodeValue();
+ QString paramName = i18n(na.toElement().text().toUtf8().data());
+ if (type == "geometry") {
+ Geometryval *geom = ((Geometryval*)m_valueItems[paramName+"geometry"]);
+ geom->updateTimecodeFormat();
+ break;
+ }
+ if (type == "position") {
+ PositionEdit *posi = ((PositionEdit*)m_valueItems[paramName+"position"]);
+ posi->updateTimecodeFormat();
+ break;
+ }
+ }
}
void EffectStackEdit::updateProjectFormat(MltVideoProfile profile, Timecode t)
m_params.setAttribute(name, value);
}
-void EffectStackEdit::transferParamDesc(const QDomElement d, int in, int out)
+void EffectStackEdit::transferParamDesc(const QDomElement d, int pos, int in, int out)
{
clearAllItems();
+ if (m_keyframeEditor) delete m_keyframeEditor;
+ m_keyframeEditor = NULL;
m_params = d;
m_in = in;
m_out = out;
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
+ * curve: a single curve representing multiple points
+ * 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;
m_valueItems[paramName+"complex"] = pl;
connect(pl, SIGNAL(parameterChanged()), this, SLOT(collectAllParameters()));
} else if (type == "geometry") {
- Geometryval *geo = new Geometryval(m_profile, m_frameSize);
- geo->setupParam(pa, minFrame, maxFrame);
+ Geometryval *geo = new Geometryval(m_profile, m_timecode, m_frameSize, pos);
+ if (minFrame == maxFrame) geo->setupParam(pa, m_in, m_out);
+ else geo->setupParam(pa, minFrame, maxFrame);
m_vbox->addWidget(geo);
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") {
+ connect(geo, SIGNAL(seekToPos(int)), this, SIGNAL(seekTimeline(int)));
+ } 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, 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, e.attribute("active_keyframe", "-1").toInt());
+ m_vbox->addWidget(geo);
+ m_valueItems[paramName+"keyframe"] = geo;
+ m_keyframeEditor = geo;
+ connect(geo, SIGNAL(parameterChanged()), this, SLOT(collectAllParameters()));
+ connect(geo, SIGNAL(seekToPos(int)), this, SIGNAL(seekTimeline(int)));
+ } 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);
m_vbox->addWidget(posedit);
m_valueItems[paramName+"position"] = posedit;
connect(posedit, SIGNAL(parameterChanged()), this, SLOT(collectAllParameters()));
+ } else if (type == "curve") {
+ KisCurveWidget *curve = new KisCurveWidget(this);
+ curve->setMaxPoints(pa.attribute("max").toInt());
+ QList<QPointF> points;
+ int number = EffectsList::parameter(e, pa.attribute("number")).toInt();
+ QString inName = pa.attribute("inpoints");
+ QString outName = pa.attribute("outpoints");
+ int start = pa.attribute("min").toInt();
+ for (int j = start; j <= number; j++) {
+ QString in = inName;
+ in.replace("%i", QString::number(j));
+ QString out = outName;
+ out.replace("%i", QString::number(j));
+ points << QPointF(EffectsList::parameter(e, in).toDouble(), EffectsList::parameter(e, out).toDouble());
+ }
+ if (!points.isEmpty()) curve->setCurve(KisCubicCurve(points));
+ QSpinBox *spinin = new QSpinBox();
+ spinin->setRange(0, 1000);
+ QSpinBox *spinout = new QSpinBox();
+ spinout->setRange(0, 1000);
+ curve->setupInOutControls(spinin, spinout, 0, 1000);
+ m_vbox->addWidget(curve);
+ m_vbox->addWidget(spinin);
+ m_vbox->addWidget(spinout);
+ connect(curve, SIGNAL(modified()), this, SLOT(collectAllParameters()));
+ m_valueItems[paramName] = curve;
} else if (type == "wipe") {
Wipeval *wpval = new Wipeval;
wpval->setupUi(toFillin);
connect(wpval->end_transp, SIGNAL(valueChanged(int)), this, SLOT(collectAllParameters()));
//wpval->title->setTitle(na.toElement().text());
m_uiItems.append(wpval);
+ } else if (type == "url") {
+ Urlval *cval = new Urlval;
+ cval->setupUi(toFillin);
+ cval->label->setText(paramName);
+ cval->urlwidget->fileDialog()->setFilter(ProjectList::getExtensions());
+ m_valueItems[paramName] = cval;
+ cval->urlwidget->setText(value);
+ connect(cval->urlwidget, SIGNAL(returnPressed()) , this, SLOT(collectAllParameters()));
+ connect(cval->urlwidget, SIGNAL(urlSelected(const KUrl&)) , this, SLOT(collectAllParameters()));
+ m_uiItems.append(cval);
} else {
delete toFillin;
toFillin = NULL;
m_vbox->addStretch();
}
-void EffectStackEdit::slotSeekToPos(int pos)
-{
- emit seekTimeline(m_in + pos);
-}
-
wipeInfo EffectStackEdit::getWipeInfo(QString value)
{
wipeInfo info;
else if (type == "position") paramName.append("position");
else if (type == "geometry") paramName.append("geometry");
else if (type == "keyframe") paramName.append("keyframe");
- if (!m_valueItems.contains(paramName)) {
- // kDebug() << "// Param: " << paramName << " NOT FOUND";
+ if (type != "simplekeyframe" && !m_valueItems.contains(paramName)) {
+ kDebug() << "// Param: " << paramName << " NOT FOUND";
continue;
}
EffectsList::setParameter(newparam, "out", QString::number(m_out + m_in));
setValue.clear();
}
+ } else if (type == "curve") {
+ KisCurveWidget *curve = ((KisCurveWidget*)m_valueItems.value(paramName));
+ QList<QPointF> points = curve->curve().points();
+ QString number = pa.attributes().namedItem("number").nodeValue();
+ QString inName = pa.attributes().namedItem("inpoints").nodeValue();
+ QString outName = pa.attributes().namedItem("outpoints").nodeValue();
+ int off = pa.attributes().namedItem("min").nodeValue().toInt();
+ int end = pa.attributes().namedItem("max").nodeValue().toInt();
+ EffectsList::setParameter(newparam, number, QString::number(points.count()));
+ for (int j = 0; (j < points.count() && j + off <= end); j++) {
+ QString in = inName;
+ in.replace("%i", QString::number(j + off));
+ QString out = outName;
+ out.replace("%i", QString::number(j + off));
+ EffectsList::setParameter(newparam, in, QString::number(points.at(j).x()));
+ EffectsList::setParameter(newparam, out, QString::number(points.at(j).y()));
+ }
} else if (type == "wipe") {
Wipeval *wp = (Wipeval*)m_valueItems.value(paramName);
wipeInfo info;
else info.end = RIGHT;
info.endTransparency = wp->end_transp->value();
setValue = getWipeString(info);
+ } else if ((type == "simplekeyframe" || type == "keyframe") && m_keyframeEditor) {
+ QString realName = i18n(na.toElement().text().toUtf8().data());
+ QString val = m_keyframeEditor->getValue(realName);
+ kDebug() << "SET VALUE: " << val;
+ namenode.item(i).toElement().setAttribute("keyframes", val);
+ } else if (type == "url") {
+ KUrlRequester *req = ((Urlval*)m_valueItems.value(paramName))->urlwidget;
+ setValue = req->url().path();
}
-
if (!setValue.isNull()) {
pa.attributes().namedItem("value").setNodeValue(setValue);
}
//qDeleteAll(m_uiItems);
QLayoutItem *child;
while ((child = m_vbox->takeAt(0)) != 0) {
- if (child->widget()) delete child->widget();
+ QWidget *wid = child->widget();
delete child;
+ if (wid) delete wid;
}
+ m_keyframeEditor = NULL;
blockSignals(false);
}
projects / kdenlive / blobdiff