]> git.sesse.net Git - kdenlive/blobdiff - src/effectstackedit.cpp
Fix small display issue in render widget
[kdenlive] / src / effectstackedit.cpp
index a165a52b49da91581cde4e83decf270592b9a417..f3184f298b20248bbd4e38b54a909b9ccdde7f4d 100644 (file)
@@ -1,5 +1,5 @@
 /***************************************************************************
-                          effecstackview.cpp  -  description
+                          effecstackedit.cpp  -  description
                              -------------------
     begin                : Feb 15 2008
     copyright            : (C) 2008 by Marco Gittler
  ***************************************************************************/
 
 #include "effectstackedit.h"
-#include "ui_constval_ui.h"
 #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 "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 "choosecolorwidget.h"
+#include "geometrywidget.h"
+#include "colortools.h"
+#include "doubleparameterwidget.h"
+#include "cornerswidget.h"
 
 #include <KDebug>
 #include <KLocale>
+#include <KFileDialog>
 
 #include <QVBoxLayout>
-#include <QSlider>
 #include <QLabel>
 #include <QPushButton>
 #include <QCheckBox>
 #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 Listval: public QWidget, public Ui::Listval_UI
 {
 };
 
-class Constval: public EffectStackEdit::UiItem, public Ui::Constval_UI
+class Wipeval: public QWidget, public Ui::Wipeval_UI
 {
 };
 
-class Listval: public EffectStackEdit::UiItem, public Ui::Listval_UI
+class Urlval: public QWidget, public Ui::Urlval_UI
 {
 };
 
-class Positionval: public EffectStackEdit::UiItem, public Ui::Positionval_UI
-{
-};
-
-class Wipeval: public EffectStackEdit::UiItem, public Ui::Wipeval_UI
-{
-};
-
-
 QMap<QString, QImage> EffectStackEdit::iconCache;
 
-EffectStackEdit::EffectStackEdit(QWidget *parent) :
-        QWidget(parent),
-        m_in(0),
-        m_out(0),
-        m_frameSize(QPoint())
+EffectStackEdit::EffectStackEdit(Monitor *monitor, QWidget *parent) :
+    QScrollArea(parent),
+    m_in(0),
+    m_out(0),
+    m_frameSize(QPoint()),
+    m_keyframeEditor(NULL),
+    m_monitor(monitor)
 {
-    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()
 {
     iconCache.clear();
+    delete m_baseWidget;
 }
 
 void EffectStackEdit::setFrameSize(QPoint p)
@@ -112,13 +102,53 @@ void EffectStackEdit::setFrameSize(QPoint p)
         QString type = pa.attributes().namedItem("type").nodeValue();
         QString paramName = i18n(na.toElement().text().toUtf8().data());
 
-        if (type == "geometry") {
+        if (type == "geometry" && !KdenliveSettings::on_monitor_effects()) {
             Geometryval *geom = ((Geometryval*)m_valueItems[paramName+"geometry"]);
             geom->setFrameSize(m_frameSize);
             break;
         }
     }
+}
+
+void EffectStackEdit::updateTimecodeFormat()
+{
+    if (m_keyframeEditor)
+        m_keyframeEditor->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") {
+            if (KdenliveSettings::on_monitor_effects()) {
+                GeometryWidget *geom = (GeometryWidget*)m_valueItems[paramName+"geometry"];
+                geom->updateTimecodeFormat();
+            } else {
+                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::meetDependency(const QString& name, QString type, QString value)
+{
+    if (type == "curve") {
+        KisCurveWidget *curve = (KisCurveWidget*)m_valueItems[name];
+        if (curve) {
+            int color = value.toInt();
+            curve->setPixmap(QPixmap::fromImage(ColorTools::rgbCurvePlane(curve->size(), (ColorTools::ColorsRGB)color, 0.8)));
+        }
+    }
 }
 
 void EffectStackEdit::updateProjectFormat(MltVideoProfile profile, Timecode t)
@@ -130,67 +160,101 @@ void EffectStackEdit::updateProjectFormat(MltVideoProfile profile, Timecode t)
 void EffectStackEdit::updateParameter(const QString &name, const QString &value)
 {
     m_params.setAttribute(name, value);
+
+    if (name == "disable") {
+        // if effect is disabled, disable parameters widget
+        setEnabled(value.toInt() == 0 || !KdenliveSettings::disable_effect_parameters());
+        if (KdenliveSettings::on_monitor_effects()) {
+            // effect disabled, hide monitor scene if any
+            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();
+                if (type == "geometry") {
+                    QString paramName = i18n(na.toElement().text().toUtf8().data());
+                    paramName.append("geometry");
+                    GeometryWidget *geometry = ((GeometryWidget*)m_valueItems.value(paramName));
+                    geometry->slotShowScene(value.toInt() == 0 || !KdenliveSettings::disable_effect_parameters());
+                }
+            }
+        }
+    }
 }
 
-void EffectStackEdit::transferParamDesc(const QDomElement& d, int in, int out)
+void EffectStackEdit::transferParamDesc(const QDomElement d, int pos, int in, int out, bool isEffect)
 {
-    kDebug() << "in";
+    clearAllItems();
+    if (m_keyframeEditor) delete m_keyframeEditor;
+    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;
-    doc.appendChild(doc.importNode(m_params, true));
-    //kDebug() << "IMPORTED TRANS: " << doc.toString();
     QDomNodeList namenode = m_params.elementsByTagName("parameter");
     QDomElement e = m_params.toElement();
     const int minFrame = e.attribute("start").toInt();
     const int maxFrame = e.attribute("end").toInt();
 
+    bool disable = d.attribute("disable") == "1" && KdenliveSettings::disable_effect_parameters();
+    setEnabled(!disable);
+
 
     for (int i = 0; i < namenode.count() ; i++) {
-        kDebug() << "in form";
         QDomElement pa = namenode.item(i).toElement();
-        QDomNode na = pa.firstChildElement("name");
+        QDomElement na = pa.firstChildElement("name");
+        QDomElement commentElem = pa.firstChildElement("comment");
         QString type = pa.attribute("type");
-        QString paramName = i18n(na.toElement().text().toUtf8().data());
-        QWidget * toFillin = new QWidget;
+        QString paramName = i18n(na.text().toUtf8().data());
+        QString comment;
+        if (!commentElem.isNull())
+            comment = i18n(commentElem.text().toUtf8().data());
+        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
+            * 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;
-            if (pa.attribute("min").startsWith('%')) {
+            if (pa.attribute("min").startsWith('%'))
                 min = (int) ProfilesDialog::getStringEval(m_profile, pa.attribute("min"));
-            } else min = pa.attribute("min").toInt();
-            if (pa.attribute("max").startsWith('%')) {
+            else
+                min = pa.attribute("min").toInt();
+            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);
-            delete toFillin;
-            toFillin = NULL;
+            else
+                max = pa.attribute("max").toInt();
+
+            DoubleParameterWidget *doubleparam = new DoubleParameterWidget(paramName, (int)(value.toDouble() + 0.5), min, max,
+                    pa.attribute("default").toInt(), comment, pa.attribute("suffix"), this);
+            m_vbox->addWidget(doubleparam);
+            m_valueItems[paramName] = doubleparam;
+            connect(doubleparam, SIGNAL(valueChanged(int)), this, SLOT(collectAllParameters()));
+            connect(this, SIGNAL(showComments()), doubleparam, SLOT(slotShowComment()));
         } else if (type == "list") {
             Listval *lsval = new Listval;
             lsval->setupUi(toFillin);
             QStringList listitems = pa.attribute("paramlist").split(',');
             QStringList listitemsdisplay = pa.attribute("paramlistdisplay").split(',');
-            if (listitemsdisplay.count() != listitems.count()) listitemsdisplay = listitems;
-            //lsval->list->addItems(listitems);
+            if (listitemsdisplay.count() != listitems.count())
+                listitemsdisplay = listitems;
             lsval->list->setIconSize(QSize(30, 30));
             for (int i = 0; i < listitems.count(); i++) {
                 lsval->list->addItem(listitemsdisplay.at(i), listitems.at(i));
@@ -204,86 +268,139 @@ void EffectStackEdit::transferParamDesc(const QDomElement& d, int in, int out)
                 }
             }
             if (!value.isEmpty()) lsval->list->setCurrentIndex(listitems.indexOf(value));
-
-            connect(lsval->list, SIGNAL(currentIndexChanged(int)) , this, SLOT(collectAllParameters()));
-            lsval->title->setTitle(paramName);
+            lsval->name->setText(paramName);
             m_valueItems[paramName] = lsval;
+            connect(lsval->list, SIGNAL(currentIndexChanged(int)) , this, SLOT(collectAllParameters()));
             m_uiItems.append(lsval);
         } else if (type == "bool") {
             Boolval *bval = new Boolval;
             bval->setupUi(toFillin);
             bval->checkBox->setCheckState(value == "0" ? Qt::Unchecked : Qt::Checked);
-
-            connect(bval->checkBox, SIGNAL(stateChanged(int)) , this, SLOT(collectAllParameters()));
-            bval->checkBox->setText(paramName);
+            bval->name->setText(paramName);
             m_valueItems[paramName] = bval;
+            connect(bval->checkBox, SIGNAL(stateChanged(int)) , this, SLOT(collectAllParameters()));
             m_uiItems.append(bval);
         } else if (type == "complex") {
-            /*QStringList names=nodeAtts.namedItem("name").nodeValue().split(';');
-            QStringList max=nodeAtts.namedItem("max").nodeValue().split(';');
-            QStringList min=nodeAtts.namedItem("min").nodeValue().split(';');
-            QStringList val=value.split(';');
-            kDebug() << "in complex"<<names.size() << " " << max.size() << " " << min.size() << " " << val.size()  ;
-            if ( (names.size() == max.size() ) &&
-                 (names.size()== min.size()) &&
-                 (names.size()== val.size()) )
-            {
-             for (int i=0;i< names.size();i++){
-              createSliderItem(names[i],val[i].toInt(),min[i].toInt(),max[i].toInt());
-             };
-            }*/
             ComplexParameter *pl = new ComplexParameter;
-            connect(pl, SIGNAL(parameterChanged()), this, SLOT(collectAllParameters()));
             pl->setupParam(d, pa.attribute("name"), 0, 100);
             m_vbox->addWidget(pl);
             m_valueItems[paramName+"complex"] = pl;
-            m_items.append(pl);
+            connect(pl, SIGNAL(parameterChanged()), this, SLOT(collectAllParameters()));
         } else if (type == "geometry") {
-            Geometryval *geo = new Geometryval(m_profile, m_frameSize);
-            connect(geo, SIGNAL(parameterChanged()), this, SLOT(collectAllParameters()));
-            connect(geo, SIGNAL(seekToPos(int)), this, SLOT(slotSeekToPos(int)));
-            geo->setupParam(pa, minFrame, maxFrame);
-            m_vbox->addWidget(geo);
-            m_valueItems[paramName+"geometry"] = geo;
-            m_items.append(geo);
-        } else if (type == "keyframe") {
-            // keyframe editor widget
-            kDebug() << "min: " << m_in << ", MAX: " << m_out;
-            KeyframeEdit *geo = new KeyframeEdit(pa, m_out - m_in, m_timecode);
-            connect(geo, SIGNAL(parameterChanged()), this, SLOT(collectAllParameters()));
-            //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;
-            m_items.append(geo);
+            if (KdenliveSettings::on_monitor_effects()) {
+                GeometryWidget *geometry = new GeometryWidget(m_monitor, m_timecode, pos, isEffect, disable, this);
+                // connect this before setupParam to make sure the monitor scene shows up at startup
+                connect(geometry, SIGNAL(checkMonitorPosition(int)), this, SIGNAL(checkMonitorPosition(int)));
+                connect(geometry, SIGNAL(parameterChanged()), this, SLOT(collectAllParameters()));
+                if (minFrame == maxFrame)
+                    geometry->setupParam(pa, m_in, m_out);
+                else
+                    geometry->setupParam(pa, minFrame, maxFrame);
+                m_vbox->addWidget(geometry);
+                m_valueItems[paramName+"geometry"] = geometry;
+                connect(geometry, SIGNAL(seekToPos(int)), this, SIGNAL(seekTimeline(int)));
+                connect(this, SIGNAL(syncEffectsPos(int)), geometry, SLOT(slotSyncPosition(int)));
+            } else {
+                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, SIGNAL(seekTimeline(int)));
+                connect(this, SIGNAL(syncEffectsPos(int)), geo, SLOT(slotSyncPosition(int)));
+            }
+        } else if (type == "keyframe" || type == "simplekeyframe") {
+            // keyframe editor widget
+            if (m_keyframeEditor == NULL) {
+                KeyframeEdit *geo = new KeyframeEdit(pa, m_in, m_in + m_out, 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)));
+                connect(this, SIGNAL(showComments()), geo, SIGNAL(showComments()));
+            } 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);
+            if (value.startsWith('#'))
+                value = value.replace('#', "0x");
             bool ok;
-            if (value.startsWith('#')) value = value.replace('#', "0x");
-            cval->kcolorbutton->setColor(value.toUInt(&ok, 16));
-            //kDebug() << "color: " << value << ", " << value.toUInt(&ok, 16);
-
-            connect(cval->kcolorbutton, SIGNAL(clicked()) , this, SLOT(collectAllParameters()));
-            cval->label->setText(paramName);
-            m_valueItems[paramName] = cval;
-            m_uiItems.append(cval);
+            ChooseColorWidget *choosecolor = new ChooseColorWidget(paramName, QColor(value.toUInt(&ok, 16)), this);
+            m_vbox->addWidget(choosecolor);
+            m_valueItems[paramName] = choosecolor;
+            connect(choosecolor, SIGNAL(displayMessage(const QString&, int)), this, SIGNAL(displayMessage(const QString&, int)));
+            connect(choosecolor, SIGNAL(modified()) , this, SLOT(collectAllParameters()));
         } 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;
             } else if (d.attribute("id") == "fadeout" || d.attribute("id") == "fade_to_black") {
                 // fadeout position starts from clip end
-                pos = m_out - (pos - m_in);
+                pos = m_out - pos;
             }
-            pval->krestrictedline->setText(m_timecode.getTimecodeFromFrames(pos));
-            connect(pval->krestrictedline, SIGNAL(editingFinished()), this, SLOT(collectAllParameters()));
-            pval->label->setText(paramName);
-            m_valueItems[paramName + "position"] = pval;
-            m_uiItems.append(pval);
+            PositionEdit *posedit = new PositionEdit(paramName, pos, 0, m_out - m_in, m_timecode);
+            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;
+
+            QString depends = pa.attribute("depends");
+            if (!depends.isEmpty())
+                meetDependency(paramName, type, EffectsList::parameter(e, depends));
+        } else if (type == "corners") {
+            CornersWidget *corners = new CornersWidget(m_monitor, pos, isEffect, pa.attribute("factor").toInt(), this);
+            connect(corners, SIGNAL(checkMonitorPosition(int)), this, SIGNAL(checkMonitorPosition(int)));
+            if (minFrame == maxFrame)
+                corners->setRange(m_in, m_out);
+            else
+                corners->setRange(minFrame, maxFrame);
+
+            QString xName = pa.attribute("xpoints");
+            QString yName = pa.attribute("ypoints");
+            QPolygon points;
+            int x, y;
+            for (int j = 1; j <= 4; ++j) {
+                x = EffectsList::parameter(e, QString(xName).replace("%i", QString::number(j))).toInt();
+                y = EffectsList::parameter(e, QString(yName).replace("%i", QString::number(j))).toInt();
+                points << QPoint(x, y);
+            }
+            corners->setValue(points);
+
+            m_vbox->addWidget(corners);
+            connect(corners, SIGNAL(parameterChanged()), this, SLOT(collectAllParameters()));
+            m_valueItems[paramName] = corners;
         } else if (type == "wipe") {
             Wipeval *wpval = new Wipeval;
             wpval->setupUi(toFillin);
@@ -324,7 +441,7 @@ void EffectStackEdit::transferParamDesc(const QDomElement& d, int in, int out)
             }
             wpval->start_transp->setValue(w.startTransparency);
             wpval->end_transp->setValue(w.endTransparency);
-
+            m_valueItems[paramName] = wpval;
             connect(wpval->end_up, SIGNAL(clicked()), this, SLOT(collectAllParameters()));
             connect(wpval->end_down, SIGNAL(clicked()), this, SLOT(collectAllParameters()));
             connect(wpval->end_left, SIGNAL(clicked()), this, SLOT(collectAllParameters()));
@@ -338,24 +455,29 @@ void EffectStackEdit::transferParamDesc(const QDomElement& d, int in, int out)
             connect(wpval->start_transp, SIGNAL(valueChanged(int)), this, SLOT(collectAllParameters()));
             connect(wpval->end_transp, SIGNAL(valueChanged(int)), this, SLOT(collectAllParameters()));
             //wpval->title->setTitle(na.toElement().text());
-            m_valueItems[paramName] = wpval;
             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->setUrl(KUrl(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;
         }
 
-        if (toFillin) {
-            m_items.append(toFillin);
+        if (toFillin)
             m_vbox->addWidget(toFillin);
-        }
     }
     m_vbox->addStretch();
-}
 
-void EffectStackEdit::slotSeekToPos(int pos)
-{
-    emit seekTimeline(m_in + pos);
+    if (m_keyframeEditor)
+        m_keyframeEditor->checkVisibleParam();
 }
 
 wipeInfo EffectStackEdit::getWipeInfo(QString value)
@@ -363,21 +485,39 @@ wipeInfo EffectStackEdit::getWipeInfo(QString value)
     wipeInfo info;
     QString start = value.section(';', 0, 0);
     QString end = value.section(';', 1, 1).section('=', 1, 1);
-    if (start.startsWith("-100%,0")) info.start = LEFT;
-    else if (start.startsWith("100%,0")) info.start = RIGHT;
-    else if (start.startsWith("0%,100%")) info.start = DOWN;
-    else if (start.startsWith("0%,-100%")) info.start = UP;
-    else info.start = CENTER;
-    if (start.count(':') == 2) info.startTransparency = start.section(':', -1).toInt();
-    else info.startTransparency = 100;
-
-    if (end.startsWith("-100%,0")) info.end = LEFT;
-    else if (end.startsWith("100%,0")) info.end = RIGHT;
-    else if (end.startsWith("0%,100%")) info.end = DOWN;
-    else if (end.startsWith("0%,-100%")) info.end = UP;
-    else info.end = CENTER;
-    if (end.count(':') == 2) info.endTransparency = end.section(':', -1).toInt();
-    else info.endTransparency = 100;
+
+    if (start.startsWith("-100%,0"))
+        info.start = LEFT;
+    else if (start.startsWith("100%,0"))
+        info.start = RIGHT;
+    else if (start.startsWith("0%,100%"))
+        info.start = DOWN;
+    else if (start.startsWith("0%,-100%"))
+        info.start = UP;
+    else
+        info.start = CENTER;
+
+    if (start.count(':') == 2)
+        info.startTransparency = start.section(':', -1).toInt();
+    else
+        info.startTransparency = 100;
+
+    if (end.startsWith("-100%,0"))
+        info.end = LEFT;
+    else if (end.startsWith("100%,0"))
+        info.end = RIGHT;
+    else if (end.startsWith("0%,100%"))
+        info.end = DOWN;
+    else if (end.startsWith("0%,-100%"))
+        info.end = UP;
+    else
+        info.end = CENTER;
+
+    if (end.count(':') == 2)
+        info.endTransparency = end.section(':', -1).toInt();
+    else
+        info.endTransparency = 100;
+
     return info;
 }
 
@@ -428,119 +568,183 @@ QString EffectStackEdit::getWipeString(wipeInfo info)
 
 void EffectStackEdit::collectAllParameters()
 {
-    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);
         QDomNode na = pa.firstChildElement("name");
         QString type = pa.attributes().namedItem("type").nodeValue();
         QString paramName = i18n(na.toElement().text().toUtf8().data());
+        if (type == "complex")
+            paramName.append("complex");
+        else if (type == "position")
+            paramName.append("position");
+        else if (type == "geometry")
+            paramName.append("geometry");
+        else if (type == "keyframe")
+            paramName.append("keyframe");
+        if (type != "simplekeyframe" && !m_valueItems.contains(paramName)) {
+            kDebug() << "// Param: " << paramName << " NOT FOUND";
+            continue;
+        }
 
         QString setValue;
         if (type == "double" || type == "constant") {
-            QSlider* slider = ((Constval*)m_valueItems[paramName])->horizontalSlider;
-            setValue = QString::number(slider->value());
+            DoubleParameterWidget *doubleparam = (DoubleParameterWidget*)m_valueItems.value(paramName);
+            setValue = QString::number(doubleparam->getValue());
         } else if (type == "list") {
-            KComboBox *box = ((Listval*)m_valueItems[paramName])->list;
+            KComboBox *box = ((Listval*)m_valueItems.value(paramName))->list;
             setValue = box->itemData(box->currentIndex()).toString();
         } else if (type == "bool") {
-            QCheckBox *box = ((Boolval*)m_valueItems[paramName])->checkBox;
+            QCheckBox *box = ((Boolval*)m_valueItems.value(paramName))->checkBox;
             setValue = box->checkState() == Qt::Checked ? "1" : "0" ;
         } else if (type == "color") {
-            KColorButton *color = ((Colorval*)m_valueItems[paramName])->kcolorbutton;
-            setValue = color->color().name();
+            ChooseColorWidget *choosecolor = ((ChooseColorWidget*)m_valueItems.value(paramName));
+            setValue = choosecolor->getColor().name();
         } else if (type == "complex") {
-            ComplexParameter *complex = ((ComplexParameter*)m_valueItems[paramName+"complex"]);
+            ComplexParameter *complex = ((ComplexParameter*)m_valueItems.value(paramName));
             namenode.item(i) = complex->getParamDesc();
         } else if (type == "geometry") {
-            Geometryval *geom = ((Geometryval*)m_valueItems[paramName+"geometry"]);
-            namenode.item(i) = geom->getParamDesc();
+            if (KdenliveSettings::on_monitor_effects()) {
+                GeometryWidget *geometry = ((GeometryWidget*)m_valueItems.value(paramName));
+                namenode.item(i).toElement().setAttribute("value", geometry->getValue());
+            } else {
+                Geometryval *geom = ((Geometryval*)m_valueItems.value(paramName));
+                namenode.item(i).toElement().setAttribute("value", geom->getValue());
+            }
         } else if (type == "position") {
-            KRestrictedLine *line = ((Positionval*)m_valueItems[paramName+"position"])->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 - pos));
+                EffectsList::setParameter(newparam, "out", QString::number(m_out));
                 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()));
+            }
+            QString depends = pa.attributes().namedItem("depends").nodeValue();
+            if (!depends.isEmpty())
+                meetDependency(paramName, type, EffectsList::parameter(newparam, depends));
+        } else if (type == "corners") {
+            CornersWidget *corners = ((CornersWidget*)m_valueItems.value(paramName));
+            QString xName = pa.attributes().namedItem("xpoints").nodeValue();
+            QString yName = pa.attributes().namedItem("ypoints").nodeValue();
+            QPolygon points = corners->getValue();
+            QPoint p;
+            for (int j = 1; j <= 4; ++j) {
+                p = points.at(j - 1);
+                EffectsList::setParameter(newparam, QString(xName).replace("%i", QString::number(j)), QString::number(p.x()));
+                EffectsList::setParameter(newparam, QString(yName).replace("%i", QString::number(j)), QString::number(p.y()));
+            }
         } else if (type == "wipe") {
-            Wipeval *wp = (Wipeval*)m_valueItems[paramName];
+            Wipeval *wp = (Wipeval*)m_valueItems.value(paramName);
             wipeInfo info;
-            if (wp->start_left->isChecked()) info.start = LEFT;
-            else if (wp->start_right->isChecked()) info.start = RIGHT;
-            else if (wp->start_up->isChecked()) info.start = UP;
-            else if (wp->start_down->isChecked()) info.start = DOWN;
-            else if (wp->start_center->isChecked()) info.start = CENTER;
-            else info.start = LEFT;
+            if (wp->start_left->isChecked())
+                info.start = LEFT;
+            else if (wp->start_right->isChecked())
+                info.start = RIGHT;
+            else if (wp->start_up->isChecked())
+                info.start = UP;
+            else if (wp->start_down->isChecked())
+                info.start = DOWN;
+            else if (wp->start_center->isChecked())
+                info.start = CENTER;
+            else
+                info.start = LEFT;
             info.startTransparency = wp->start_transp->value();
-            if (wp->end_left->isChecked()) info.end = LEFT;
-            else if (wp->end_right->isChecked()) info.end = RIGHT;
-            else if (wp->end_up->isChecked()) info.end = UP;
-            else if (wp->end_down->isChecked()) info.end = DOWN;
-            else if (wp->end_center->isChecked()) info.end = CENTER;
-            else info.end = RIGHT;
+
+            if (wp->end_left->isChecked())
+                info.end = LEFT;
+            else if (wp->end_right->isChecked())
+                info.end = RIGHT;
+            else if (wp->end_up->isChecked())
+                info.end = UP;
+            else if (wp->end_down->isChecked())
+                info.end = DOWN;
+            else if (wp->end_center->isChecked())
+                info.end = CENTER;
+            else
+                info.end = RIGHT;
             info.endTransparency = wp->end_transp->value();
+
             setValue = getWipeString(info);
+        } else if ((type == "simplekeyframe" || type == "keyframe") && m_keyframeEditor) {
+            QDomElement elem = pa.toElement();
+            QString realName = i18n(na.toElement().text().toUtf8().data());
+            QString val = m_keyframeEditor->getValue(realName);
+            elem.setAttribute("keyframes", val);
+
+            if (m_keyframeEditor->isVisibleParam(realName))
+                elem.setAttribute("intimeline", "1");
+            else if (elem.hasAttribute("intimeline"))
+                elem.removeAttribute("intimeline");
+        } else if (type == "url") {
+            KUrlRequester *req = ((Urlval*)m_valueItems.value(paramName))->urlwidget;
+            setValue = req->url().path();
         }
 
-        if (!setValue.isNull()) {
+        if (!setValue.isNull())
             pa.attributes().namedItem("value").setNodeValue(setValue);
-        }
-    }
-    emit parameterChanged(oldparam, m_params);
-}
-
-void EffectStackEdit::createSliderItem(const QString& name, int val , int min, int max)
-{
-    QWidget* toFillin = new QWidget;
-    Constval *ctval = new Constval;
-    ctval->setupUi(toFillin);
-    ctval->horizontalSlider->setMinimum(min);
-    ctval->horizontalSlider->setMaximum(max);
-    ctval->spinBox->setMinimum(min);
-    ctval->spinBox->setMaximum(max);
-    ctval->horizontalSlider->setPageStep((int)(max - min) / 10);
-    ctval->horizontalSlider->setValue(val);
-    ctval->label->setText(name);
-    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);
-}
 
-void EffectStackEdit::slotSliderMoved(int)
-{
-    collectAllParameters();
+    }
+    emit parameterChanged(oldparam, newparam);
 }
 
 void EffectStackEdit::clearAllItems()
 {
-    qDeleteAll(m_items);
-    qDeleteAll(m_uiItems);
-    m_uiItems.clear();
-    m_items.clear();
+    blockSignals(true);
     m_valueItems.clear();
-    QLayoutItem *item = m_vbox->itemAt(0);
-    while (item) {
-        m_vbox->removeItem(item);
-        delete item;
-        item = m_vbox->itemAt(0);
+    m_uiItems.clear();
+    /*while (!m_items.isEmpty()) {
+        QWidget *die = m_items.takeFirst();
+        die->disconnect();
+        delete die;
+    }*/
+    //qDeleteAll(m_uiItems);
+    QLayoutItem *child;
+    while ((child = m_vbox->takeAt(0)) != 0) {
+        QWidget *wid = child->widget();
+        delete child;
+        if (wid) delete wid;
     }
+    m_keyframeEditor = NULL;
+    blockSignals(false);
+}
+
+void EffectStackEdit::slotSyncEffectsPos(int pos)
+{
+    emit syncEffectsPos(pos);
 }