]> git.sesse.net Git - kdenlive/commitdiff
New effectstack with collapsible effects, preparing for effect masks and groups
authorJean-Baptiste Mardelle <jb@kdenlive.org>
Sun, 20 Nov 2011 13:45:52 +0000 (14:45 +0100)
committerJean-Baptiste Mardelle <jb@kdenlive.org>
Sun, 20 Nov 2011 13:45:52 +0000 (14:45 +0100)
src/CMakeLists.txt
src/effectstack/CMakeLists.txt [new file with mode: 0644]
src/effectstack/collapsibleeffect.cpp [new file with mode: 0644]
src/effectstack/collapsibleeffect.h [new file with mode: 0644]
src/effectstack/effectstackview2.cpp [new file with mode: 0644]
src/effectstack/effectstackview2.h [new file with mode: 0644]
src/mainwindow.cpp
src/mainwindow.h
src/widgets/effectstack2_ui.ui [new file with mode: 0644]

index 8fdcd8cc8fb452854947e710ccd05d900195086f..843beac7461dcb0117bddceb73bf389f86e2506e 100644 (file)
@@ -79,6 +79,7 @@ add_subdirectory(colorcorrection)
 add_subdirectory(colorscopes)
 add_subdirectory(commands)
 add_subdirectory(databackup)
+add_subdirectory(effectstack)
 add_subdirectory(kiss_fft)
 add_subdirectory(mimetypes)
 add_subdirectory(onmonitoritems)
@@ -195,6 +196,7 @@ kde4_add_ui_files(kdenlive_UIS
   widgets/clipdurationdialog_ui.ui
   widgets/clipproperties_ui.ui
   widgets/cliptranscode_ui.ui
+  widgets/collapsiblewidget_ui.ui
   widgets/colorclip_ui.ui
   widgets/colorplaneexport_ui.ui
   widgets/configcapture_ui.ui
@@ -211,6 +213,7 @@ kde4_add_ui_files(kdenlive_UIS
   widgets/dvdwizardvob_ui.ui
   widgets/effectlist_ui.ui
   widgets/effectstack_ui.ui
+  widgets/effectstack2_ui.ui
   widgets/geometryval_ui.ui
   widgets/geometrywidget_ui.ui
   widgets/histogram_ui.ui
diff --git a/src/effectstack/CMakeLists.txt b/src/effectstack/CMakeLists.txt
new file mode 100644 (file)
index 0000000..de21722
--- /dev/null
@@ -0,0 +1,7 @@
+set(kdenlive_SRCS
+  ${kdenlive_SRCS}
+  effectstack/collapsibleeffect.cpp
+  effectstack/effectstackview2.cpp
+  PARENT_SCOPE
+)
+
diff --git a/src/effectstack/collapsibleeffect.cpp b/src/effectstack/collapsibleeffect.cpp
new file mode 100644 (file)
index 0000000..4165e3b
--- /dev/null
@@ -0,0 +1,918 @@
+/***************************************************************************
+ *   Copyright (C) 2008 by Jean-Baptiste Mardelle (jb@kdenlive.org)        *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA          *
+ ***************************************************************************/
+
+
+#include "collapsibleeffect.h"
+
+#include "ui_listval_ui.h"
+#include "ui_boolval_ui.h"
+#include "ui_wipeval_ui.h"
+#include "ui_urlval_ui.h"
+#include "complexparameter.h"
+#include "geometryval.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 "beziercurve/beziersplinewidget.h"
+#ifdef USE_QJSON
+#include "rotoscoping/rotowidget.h"
+#endif
+
+
+#include <QDialog>
+#include <QVBoxLayout>
+#include <KDebug>
+#include <KGlobalSettings>
+#include <KLocale>
+#include <KFileDialog>
+#include <KUrlRequester>
+
+class Boolval: public QWidget, public Ui::Boolval_UI
+{
+};
+
+class Listval: public QWidget, public Ui::Listval_UI
+{
+};
+
+class Wipeval: public QWidget, public Ui::Wipeval_UI
+{
+};
+
+class Urlval: public QWidget, public Ui::Urlval_UI
+{
+};
+
+QMap<QString, QImage> CollapsibleEffect::iconCache;
+
+
+
+CollapsibleEffect::CollapsibleEffect(QDomElement effect, ItemInfo info, int ix, EffectMetaInfo *metaInfo, bool lastEffect, QWidget * parent) :
+        QWidget(parent),
+        m_paramWidget(NULL),
+        m_effect(effect),
+        m_lastEffect(lastEffect),
+        m_active(false)
+{
+    setFont(KGlobalSettings::toolBarFont());
+    setMouseTracking(true);
+    setupUi(this);
+    QDomElement namenode = m_effect.firstChildElement("name");
+    if (namenode.isNull()) return;
+    QString type = m_effect.attribute("type", QString());
+    KIcon icon;
+    if (type == "audio") icon = KIcon("kdenlive-show-audio");
+    else if (m_effect.attribute("tag") == "region") icon = KIcon("kdenlive-mask-effect");
+    else if (type == "custom") icon = KIcon("kdenlive-custom-effect");
+    else icon = KIcon("kdenlive-show-video");
+   
+    buttonUp->setIcon(KIcon("go-up"));
+    buttonUp->setToolTip(i18n("Move effect up"));
+    if (!lastEffect) {
+        buttonDown->setIcon(KIcon("go-down"));
+        buttonDown->setToolTip(i18n("Move effect down"));
+    }
+    buttonDel->setIcon(KIcon("edit-delete"));
+    buttonDel->setToolTip(i18n("Delete effect"));
+    buttonSave->setIcon(KIcon("document-save"));
+    buttonSave->setToolTip(i18n("Save effect"));
+
+    buttonUp->setVisible(false);
+    buttonDown->setVisible(false);
+    buttonSave->setVisible(false);
+    buttonDel->setVisible(false);
+    
+    /*buttonReset->setIcon(KIcon("view-refresh"));
+    buttonReset->setToolTip(i18n("Reset effect"));*/
+    //checkAll->setToolTip(i18n("Enable/Disable all effects"));
+    //buttonShowComments->setIcon(KIcon("help-about"));
+    //buttonShowComments->setToolTip(i18n("Show additional information for the parameters"));
+            
+    title->setText(i18n(namenode.text().toUtf8().data()));
+    effectIcon->setPixmap(icon.pixmap(QSize(16,16)));
+    
+    //QLabel *lab = new QLabel("HEllo", widgetFrame);
+    //vbox->addWidget(lab);
+    if (m_effect.attribute("disable") == "1") {
+        enabledBox->setCheckState(Qt::Unchecked);
+        title->setEnabled(false);
+    }
+    else {
+        enabledBox->setCheckState(Qt::Checked);
+    }
+
+    connect(collapseButton, SIGNAL(clicked()), this, SLOT(slotSwitch()));
+    connect(enabledBox, SIGNAL(toggled(bool)), this, SLOT(slotEnable(bool)));
+    connect(buttonUp, SIGNAL(clicked()), this, SLOT(slotEffectUp()));
+    connect(buttonDown, SIGNAL(clicked()), this, SLOT(slotEffectDown()));
+    connect(buttonDel, SIGNAL(clicked()), this, SLOT(slotDeleteEffect()));
+    setupWidget(info, ix, metaInfo);
+}
+
+CollapsibleEffect::~CollapsibleEffect()
+{
+}
+
+void CollapsibleEffect::setActive(bool activate)
+{
+    m_active = activate;
+    title->setBackgroundRole(m_active ? QPalette::AlternateBase : QPalette::Window);
+    title->setAutoFillBackground(m_active);    
+}
+
+void CollapsibleEffect::mouseDoubleClickEvent ( QMouseEvent * event )
+{
+    if (title->underMouse() && collapseButton->isEnabled()) slotSwitch();
+    QWidget::mouseDoubleClickEvent(event);
+}
+
+void CollapsibleEffect::mousePressEvent ( QMouseEvent * event )
+{
+    if (!m_active) emit activateEffect(m_paramWidget->index());
+}
+
+void CollapsibleEffect::enterEvent ( QEvent * event )
+{
+    if (m_paramWidget->index() > 0) buttonUp->setVisible(true);
+    if (!m_lastEffect) buttonDown->setVisible(true);
+    buttonSave->setVisible(true);
+    buttonDel->setVisible(true);
+    QWidget::enterEvent(event);
+}
+
+void CollapsibleEffect::leaveEvent ( QEvent * event )
+{
+    buttonUp->setVisible(false);
+    buttonDown->setVisible(false);
+    buttonSave->setVisible(false);
+    buttonDel->setVisible(false);
+    QWidget::leaveEvent(event);
+}
+
+void CollapsibleEffect::slotEnable(bool enable)
+{
+    title->setEnabled(enable);
+    m_effect.setAttribute("disable", enable ? 0 : 1);
+    if (enable || KdenliveSettings::disable_effect_parameters()) {
+        widgetFrame->setEnabled(enable);
+    }
+    emit effectStateChanged(!enable, m_paramWidget->index());
+}
+
+void CollapsibleEffect::slotDeleteEffect()
+{
+    emit deleteEffect(m_effect, m_paramWidget->index());
+}
+
+void CollapsibleEffect::slotEffectUp()
+{
+    emit changeEffectPosition(m_paramWidget->index(), true);
+}
+
+void CollapsibleEffect::slotEffectDown()
+{
+    emit changeEffectPosition(m_paramWidget->index(), false);
+}
+
+void CollapsibleEffect::slotSwitch()
+{
+    bool enable = !widgetFrame->isVisible();
+    slotShow(enable);
+}
+
+void CollapsibleEffect::slotShow(bool show)
+{
+    widgetFrame->setVisible(show);
+    if (show) {
+        collapseButton->setArrowType(Qt::DownArrow);
+    }
+    else {
+        collapseButton->setArrowType(Qt::RightArrow);
+    }
+
+}
+
+
+void CollapsibleEffect::setupWidget(ItemInfo info, int index, EffectMetaInfo *metaInfo)
+{
+    if (m_effect.isNull()) {
+//         kDebug() << "// EMPTY EFFECT STACK";
+        return;
+    }
+    if (m_effect.attribute("tag") == "region") {
+        QVBoxLayout *vbox = new QVBoxLayout(widgetFrame);
+        vbox->setContentsMargins(0, 0, 0, 0);
+        QDomNodeList effects =  m_effect.elementsByTagName("effect");
+        QWidget *container = new QWidget(widgetFrame);
+        vbox->addWidget(container);
+        m_paramWidget = new ParameterContainer(m_effect.toElement(), info, metaInfo, index, container);
+        for (int i = 0; i < effects.count(); i++) {
+            CollapsibleEffect *coll = new CollapsibleEffect(effects.at(i).toElement(), info, i, metaInfo, container);
+            m_subParamWidgets.append(coll);
+            //container = new QWidget(widgetFrame);
+            vbox->addWidget(coll);
+            //p = new ParameterContainer(effects.at(i).toElement(), info, isEffect, container);
+        }
+        
+    }
+    else {
+        m_paramWidget = new ParameterContainer(m_effect, info, metaInfo, index, widgetFrame);
+        if (m_effect.firstChildElement("parameter").isNull()) {
+            // Effect has no parameter, don't allow expand
+            collapseButton->setEnabled(false);
+            widgetFrame->setVisible(false);            
+        }
+    }
+    if (collapseButton->isEnabled()) slotShow(true);
+    connect (m_paramWidget, SIGNAL(parameterChanged(const QDomElement, const QDomElement, int)), this, SIGNAL(parameterChanged(const QDomElement, const QDomElement, int)));
+    connect (this, SIGNAL(syncEffectsPos(int)), m_paramWidget, SIGNAL(syncEffectsPos(int)));
+    connect (this, SIGNAL(effectStateChanged(bool)), m_paramWidget, SIGNAL(effectStateChanged(bool)));
+    connect (m_paramWidget, SIGNAL(checkMonitorPosition(int)), this, SIGNAL(checkMonitorPosition(int)));
+    connect (m_paramWidget, SIGNAL(seekTimeline(int)), this, SIGNAL(seekTimeline(int)));
+    
+    
+}
+
+void CollapsibleEffect::updateTimecodeFormat()
+{
+    m_paramWidget->updateTimecodeFormat();
+    if (!m_subParamWidgets.isEmpty()) {
+        // we have a group
+        for (int i = 0; i < m_subParamWidgets.count(); i++)
+            m_subParamWidgets.at(i)->updateTimecodeFormat();
+    }
+}
+
+void CollapsibleEffect::slotSyncEffectsPos(int pos)
+{
+    emit syncEffectsPos(pos);
+}
+
+
+
+ParameterContainer::ParameterContainer(QDomElement effect, ItemInfo info, EffectMetaInfo *metaInfo, int index, QWidget * parent) :
+        m_keyframeEditor(NULL),
+        m_geometryWidget(NULL),
+        m_effect(effect),
+        m_metaInfo(metaInfo),
+        m_index(index)
+{
+    m_in = info.cropStart.frames(KdenliveSettings::project_fps());
+    m_out = (info.cropStart + info.cropDuration).frames(KdenliveSettings::project_fps()) - 1;
+
+    QDomNodeList namenode = effect.childNodes(); //elementsByTagName("parameter");
+    
+    QDomElement e = effect.toElement();
+    int minFrame = e.attribute("start").toInt();
+    int maxFrame = e.attribute("end").toInt();
+    // In transitions, maxFrame is in fact one frame after the end of transition
+    if (maxFrame > 0) maxFrame --;
+
+    bool disable = effect.attribute("disable") == "1" && KdenliveSettings::disable_effect_parameters();
+    parent->setEnabled(!disable);
+
+    bool stretch = true;
+    QVBoxLayout *vbox = new QVBoxLayout(parent);
+    vbox->setContentsMargins(0, 0, 0, 0);
+
+    for (int i = 0; i < namenode.count() ; i++) {
+        QDomElement pa = namenode.item(i).toElement();
+        if (pa.tagName() != "parameter") continue;
+        QDomElement na = pa.firstChildElement("name");
+        QDomElement commentElem = pa.firstChildElement("comment");
+        QString type = pa.attribute("type");
+        QString paramName = na.isNull() ? pa.attribute("name") : i18n(na.text().toUtf8().data());
+        QString comment;
+        if (!commentElem.isNull())
+            comment = i18n(commentElem.text().toUtf8().data());
+        QWidget * toFillin = new QWidget(parent);
+        QString value = pa.attribute("value").isNull() ?
+                        pa.attribute("default") : pa.attribute("value");
+
+
+        /** See effects/README for info on the different types */
+
+        if (type == "double" || type == "constant") {
+            double min;
+            double max;
+            if (pa.attribute("min").contains('%'))
+                min = ProfilesDialog::getStringEval(m_metaInfo->profile, pa.attribute("min"), m_metaInfo->frameSize);
+            else
+                min = pa.attribute("min").toDouble();
+            if (pa.attribute("max").contains('%'))
+                max = ProfilesDialog::getStringEval(m_metaInfo->profile, pa.attribute("max"), m_metaInfo->frameSize);
+            else
+                max = pa.attribute("max").toDouble();
+
+            DoubleParameterWidget *doubleparam = new DoubleParameterWidget(paramName, value.toDouble(), min, max,
+                    pa.attribute("default").toDouble(), comment, -1, pa.attribute("suffix"), pa.attribute("decimals").toInt(), parent);
+            vbox->addWidget(doubleparam);
+            m_valueItems[paramName] = doubleparam;
+            connect(doubleparam, SIGNAL(valueChanged(double)), this, SLOT(slotCollectAllParameters()));
+            connect(this, SIGNAL(showComments(bool)), doubleparam, SLOT(slotShowComment(bool)));
+        } else if (type == "list") {
+            Listval *lsval = new Listval;
+            lsval->setupUi(toFillin);
+            QStringList listitems = pa.attribute("paramlist").split(';');
+            if (listitems.count() == 1) {
+                // probably custom effect created before change to ';' as separator
+                listitems = pa.attribute("paramlist").split(",");
+            }
+            QDomElement list = pa.firstChildElement("paramlistdisplay");
+            QStringList listitemsdisplay;
+            if (!list.isNull()) {
+                listitemsdisplay = i18n(list.text().toUtf8().data()).split(',');
+            } else {
+                listitemsdisplay = i18n(pa.attribute("paramlistdisplay").toUtf8().data()).split(',');
+            }
+            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));
+                QString entry = listitems.at(i);
+                if (!entry.isEmpty() && (entry.endsWith(".png") || entry.endsWith(".pgm"))) {
+                    if (!CollapsibleEffect::iconCache.contains(entry)) {
+                        QImage pix(entry);
+                        CollapsibleEffect::iconCache[entry] = pix.scaled(30, 30);
+                    }
+                    lsval->list->setItemIcon(i, QPixmap::fromImage(CollapsibleEffect::iconCache[entry]));
+                }
+            }
+            if (!value.isEmpty()) lsval->list->setCurrentIndex(listitems.indexOf(value));
+            lsval->name->setText(paramName);
+            lsval->labelComment->setText(comment);
+            lsval->widgetComment->setHidden(true);
+            m_valueItems[paramName] = lsval;
+            connect(lsval->list, SIGNAL(currentIndexChanged(int)) , this, SLOT(slotCollectAllParameters()));
+            if (!comment.isEmpty())
+                connect(this, SIGNAL(showComments(bool)), lsval->widgetComment, SLOT(setVisible(bool)));
+            m_uiItems.append(lsval);
+        } else if (type == "bool") {
+            Boolval *bval = new Boolval;
+            bval->setupUi(toFillin);
+            bval->checkBox->setCheckState(value == "0" ? Qt::Unchecked : Qt::Checked);
+            bval->name->setText(paramName);
+            bval->labelComment->setText(comment);
+            bval->widgetComment->setHidden(true);
+            m_valueItems[paramName] = bval;
+            connect(bval->checkBox, SIGNAL(stateChanged(int)) , this, SLOT(slotCollectAllParameters()));
+            if (!comment.isEmpty())
+                connect(this, SIGNAL(showComments(bool)), bval->widgetComment, SLOT(setVisible(bool)));
+            m_uiItems.append(bval);
+        } else if (type == "complex") {
+            ComplexParameter *pl = new ComplexParameter;
+            pl->setupParam(effect, pa.attribute("name"), 0, 100);
+            vbox->addWidget(pl);
+            m_valueItems[paramName+"complex"] = pl;
+            connect(pl, SIGNAL(parameterChanged()), this, SLOT(slotCollectAllParameters()));
+        } else if (type == "geometry") {
+            if (KdenliveSettings::on_monitor_effects()) {
+                m_geometryWidget = new GeometryWidget(m_metaInfo->monitor, m_metaInfo->timecode, 0, true, effect.hasAttribute("showrotation"), parent);
+                m_geometryWidget->setFrameSize(m_metaInfo->frameSize);
+                m_geometryWidget->slotShowScene(!disable);
+                // connect this before setupParam to make sure the monitor scene shows up at startup
+                connect(m_geometryWidget, SIGNAL(checkMonitorPosition(int)), this, SIGNAL(checkMonitorPosition(int)));
+                connect(m_geometryWidget, SIGNAL(parameterChanged()), this, SLOT(slotCollectAllParameters()));
+                if (minFrame == maxFrame)
+                    m_geometryWidget->setupParam(pa, m_in, m_out);
+                else
+                    m_geometryWidget->setupParam(pa, minFrame, maxFrame);
+                vbox->addWidget(m_geometryWidget);
+                m_valueItems[paramName+"geometry"] = m_geometryWidget;
+                connect(m_geometryWidget, SIGNAL(seekToPos(int)), this, SIGNAL(seekTimeline(int)));
+                connect(this, SIGNAL(syncEffectsPos(int)), m_geometryWidget, SLOT(slotSyncPosition(int)));
+                connect(this, SIGNAL(effectStateChanged(bool)), m_geometryWidget, SLOT(slotShowScene(bool)));
+            } else {
+                Geometryval *geo = new Geometryval(m_metaInfo->profile, m_metaInfo->timecode, m_metaInfo->frameSize, 0);
+                if (minFrame == maxFrame)
+                    geo->setupParam(pa, m_in, m_out);
+                else
+                    geo->setupParam(pa, minFrame, maxFrame);
+                vbox->addWidget(geo);
+                m_valueItems[paramName+"geometry"] = geo;
+                connect(geo, SIGNAL(parameterChanged()), this, SLOT(slotCollectAllParameters()));
+                connect(geo, SIGNAL(seekToPos(int)), this, SIGNAL(seekTimeline(int)));
+                connect(this, SIGNAL(syncEffectsPos(int)), geo, SLOT(slotSyncPosition(int)));
+            }
+        } else if (type == "addedgeometry") {
+            // this is a parameter that should be linked to the geometry widget, for example rotation, shear, ...
+            if (m_geometryWidget) m_geometryWidget->addParameter(pa);
+        } else if (type == "keyframe" || type == "simplekeyframe") {
+            // keyframe editor widget
+            if (m_keyframeEditor == NULL) {
+                KeyframeEdit *geo;
+                if (pa.attribute("widget") == "corners") {
+                    // we want a corners-keyframe-widget
+                    CornersWidget *corners = new CornersWidget(m_metaInfo->monitor, pa, m_in, m_out, m_metaInfo->timecode, e.attribute("active_keyframe", "-1").toInt(), parent);
+                    corners->slotShowScene(!disable);
+                    connect(corners, SIGNAL(checkMonitorPosition(int)), this, SIGNAL(checkMonitorPosition(int)));
+                    connect(this, SIGNAL(effectStateChanged(bool)), corners, SLOT(slotShowScene(bool)));
+                    connect(this, SIGNAL(syncEffectsPos(int)), corners, SLOT(slotSyncPosition(int)));
+                    geo = static_cast<KeyframeEdit *>(corners);
+                } else {
+                    geo = new KeyframeEdit(pa, m_in, m_out, m_metaInfo->timecode, e.attribute("active_keyframe", "-1").toInt());
+                }
+                vbox->addWidget(geo);
+                m_valueItems[paramName+"keyframe"] = geo;
+                m_keyframeEditor = geo;
+                connect(geo, SIGNAL(parameterChanged()), this, SLOT(slotCollectAllParameters()));
+                connect(geo, SIGNAL(seekToPos(int)), this, SIGNAL(seekTimeline(int)));
+                connect(this, SIGNAL(showComments(bool)), geo, SIGNAL(showComments(bool)));
+            } else {
+                // we already have a keyframe editor, so just add another column for the new param
+                m_keyframeEditor->addParameter(pa);
+            }
+        } else if (type == "color") {
+            if (value.startsWith('#'))
+                value = value.replace('#', "0x");
+            bool ok;
+            ChooseColorWidget *choosecolor = new ChooseColorWidget(paramName, QColor(value.toUInt(&ok, 16)), parent);
+            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(slotCollectAllParameters()));
+        } else if (type == "position") {
+            int pos = value.toInt();
+            if (effect.attribute("id") == "fadein" || effect.attribute("id") == "fade_from_black") {
+                pos = pos - m_in;
+            } else if (effect.attribute("id") == "fadeout" || effect.attribute("id") == "fade_to_black") {
+                // fadeout position starts from clip end
+                pos = m_out - pos;
+            }
+            PositionEdit *posedit = new PositionEdit(paramName, pos, 0, m_out - m_in, m_metaInfo->timecode);
+            vbox->addWidget(posedit);
+            m_valueItems[paramName+"position"] = posedit;
+            connect(posedit, SIGNAL(parameterChanged()), this, SLOT(slotCollectAllParameters()));
+        } else if (type == "curve") {
+            KisCurveWidget *curve = new KisCurveWidget(parent);
+            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);
+            vbox->addWidget(curve);
+            vbox->addWidget(spinin);
+            vbox->addWidget(spinout);
+
+            connect(curve, SIGNAL(modified()), this, SLOT(slotCollectAllParameters()));
+            m_valueItems[paramName] = curve;
+
+            QString depends = pa.attribute("depends");
+            if (!depends.isEmpty())
+                meetDependency(paramName, type, EffectsList::parameter(e, depends));
+        } else if (type == "bezier_spline") {
+            BezierSplineWidget *widget = new BezierSplineWidget(value, parent);
+            stretch = false;
+            vbox->addWidget(widget);
+            m_valueItems[paramName] = widget;
+            connect(widget, SIGNAL(modified()), this, SLOT(slotCollectAllParameters()));
+            QString depends = pa.attribute("depends");
+            if (!depends.isEmpty())
+                meetDependency(paramName, type, EffectsList::parameter(e, depends));
+#ifdef USE_QJSON
+        } else if (type == "roto-spline") {
+            RotoWidget *roto = new RotoWidget(value, m_metaInfo->monitor, info, m_metaInfo->timecode, parent);
+            roto->slotShowScene(!disable);
+            connect(roto, SIGNAL(valueChanged()), this, SLOT(slotCollectAllParameters()));
+            connect(roto, SIGNAL(checkMonitorPosition(int)), this, SIGNAL(checkMonitorPosition(int)));
+            connect(roto, SIGNAL(seekToPos(int)), this, SIGNAL(seekTimeline(int)));
+            connect(this, SIGNAL(syncEffectsPos(int)), roto, SLOT(slotSyncPosition(int)));
+            connect(this, SIGNAL(effectStateChanged(bool)), roto, SLOT(slotShowScene(bool)));
+            vbox->addWidget(roto);
+            m_valueItems[paramName] = roto;
+#endif
+        } else if (type == "wipe") {
+            Wipeval *wpval = new Wipeval;
+            wpval->setupUi(toFillin);
+            wipeInfo w = getWipeInfo(value);
+            switch (w.start) {
+            case UP:
+                wpval->start_up->setChecked(true);
+                break;
+            case DOWN:
+                wpval->start_down->setChecked(true);
+                break;
+            case RIGHT:
+                wpval->start_right->setChecked(true);
+                break;
+            case LEFT:
+                wpval->start_left->setChecked(true);
+                break;
+            default:
+                wpval->start_center->setChecked(true);
+                break;
+            }
+            switch (w.end) {
+            case UP:
+                wpval->end_up->setChecked(true);
+                break;
+            case DOWN:
+                wpval->end_down->setChecked(true);
+                break;
+            case RIGHT:
+                wpval->end_right->setChecked(true);
+                break;
+            case LEFT:
+                wpval->end_left->setChecked(true);
+                break;
+            default:
+                wpval->end_center->setChecked(true);
+                break;
+            }
+            wpval->start_transp->setValue(w.startTransparency);
+            wpval->end_transp->setValue(w.endTransparency);
+            m_valueItems[paramName] = wpval;
+            connect(wpval->end_up, SIGNAL(clicked()), this, SLOT(slotCollectAllParameters()));
+            connect(wpval->end_down, SIGNAL(clicked()), this, SLOT(slotCollectAllParameters()));
+            connect(wpval->end_left, SIGNAL(clicked()), this, SLOT(slotCollectAllParameters()));
+            connect(wpval->end_right, SIGNAL(clicked()), this, SLOT(slotCollectAllParameters()));
+            connect(wpval->end_center, SIGNAL(clicked()), this, SLOT(slotCollectAllParameters()));
+            connect(wpval->start_up, SIGNAL(clicked()), this, SLOT(slotCollectAllParameters()));
+            connect(wpval->start_down, SIGNAL(clicked()), this, SLOT(slotCollectAllParameters()));
+            connect(wpval->start_left, SIGNAL(clicked()), this, SLOT(slotCollectAllParameters()));
+            connect(wpval->start_right, SIGNAL(clicked()), this, SLOT(slotCollectAllParameters()));
+            connect(wpval->start_center, SIGNAL(clicked()), this, SLOT(slotCollectAllParameters()));
+            connect(wpval->start_transp, SIGNAL(valueChanged(int)), this, SLOT(slotCollectAllParameters()));
+            connect(wpval->end_transp, SIGNAL(valueChanged(int)), this, SLOT(slotCollectAllParameters()));
+            //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->setUrl(KUrl(value));
+            connect(cval->urlwidget, SIGNAL(returnPressed()) , this, SLOT(slotCollectAllParameters()));
+            connect(cval->urlwidget, SIGNAL(urlSelected(const KUrl&)) , this, SLOT(slotCollectAllParameters()));
+            m_uiItems.append(cval);
+        } else {
+            delete toFillin;
+            toFillin = NULL;
+        }
+
+        if (toFillin)
+            vbox->addWidget(toFillin);
+    }
+
+    if (stretch)
+        vbox->addStretch();
+
+    if (m_keyframeEditor)
+        m_keyframeEditor->checkVisibleParam();
+
+    // Make sure all doubleparam spinboxes have the same width, looks much better
+    QList<DoubleParameterWidget *> allWidgets = findChildren<DoubleParameterWidget *>();
+    int minSize = 0;
+    for (int i = 0; i < allWidgets.count(); i++) {
+        if (minSize < allWidgets.at(i)->spinSize()) minSize = allWidgets.at(i)->spinSize();
+    }
+    for (int i = 0; i < allWidgets.count(); i++) {
+        allWidgets.at(i)->setSpinSize(minSize);
+    }
+}
+
+
+void ParameterContainer::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 == 3 ? 4 : color), 0.8)));
+        }
+    } else if (type == "bezier_spline") {
+        BezierSplineWidget *widget = (BezierSplineWidget*)m_valueItems[name];
+        if (widget) {
+            widget->setMode((BezierSplineWidget::CurveModes)((int)(value.toDouble() * 10)));
+        }
+    }
+}
+
+wipeInfo ParameterContainer::getWipeInfo(QString value)
+{
+    wipeInfo info;
+    // Convert old geometry values that used a comma as separator
+    if (value.contains(',')) value.replace(',','/');
+    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;
+
+    return info;
+}
+
+void ParameterContainer::updateTimecodeFormat()
+{
+    if (m_keyframeEditor)
+        m_keyframeEditor->updateTimecodeFormat();
+
+    QDomNodeList namenode = m_effect.elementsByTagName("parameter");
+    for (int i = 0; i < namenode.count() ; i++) {
+        QDomNode pa = namenode.item(i);
+        QDomElement na = pa.firstChildElement("name");
+        QString type = pa.attributes().namedItem("type").nodeValue();
+        QString paramName = na.isNull() ? pa.attributes().namedItem("name").nodeValue() : i18n(na.text().toUtf8().data());
+
+        if (type == "geometry") {
+            if (KdenliveSettings::on_monitor_effects()) {
+                if (m_geometryWidget) m_geometryWidget->updateTimecodeFormat();
+            } else {
+                Geometryval *geom = ((Geometryval*)m_valueItems[paramName+"geometry"]);
+                geom->updateTimecodeFormat();
+            }
+            break;
+        } else if (type == "position") {
+            PositionEdit *posi = ((PositionEdit*)m_valueItems[paramName+"position"]);
+            posi->updateTimecodeFormat();
+            break;
+#ifdef USE_QJSON
+        } else if (type == "roto-spline") {
+            RotoWidget *widget = static_cast<RotoWidget *>(m_valueItems[paramName]);
+            widget->updateTimecodeFormat();
+#endif
+        }
+    }
+}
+
+void ParameterContainer::slotCollectAllParameters()
+{
+    if (m_valueItems.isEmpty() || m_effect.isNull()) return;
+    QLocale locale;
+    locale.setNumberOptions(QLocale::OmitGroupSeparator);
+    const QDomElement oldparam = m_effect.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);
+        QDomElement na = pa.firstChildElement("name");
+        QString type = pa.attributes().namedItem("type").nodeValue();
+        QString paramName = na.isNull() ? pa.attributes().namedItem("name").nodeValue() : i18n(na.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" && type != "fixed" && type != "addedgeometry" && !m_valueItems.contains(paramName)) {
+            kDebug() << "// Param: " << paramName << " NOT FOUND";
+            continue;
+        }
+
+        QString setValue;
+        if (type == "double" || type == "constant") {
+            DoubleParameterWidget *doubleparam = (DoubleParameterWidget*)m_valueItems.value(paramName);
+            setValue = locale.toString(doubleparam->getValue());
+        } else if (type == "list") {
+            KComboBox *box = ((Listval*)m_valueItems.value(paramName))->list;
+            setValue = box->itemData(box->currentIndex()).toString();
+        } else if (type == "bool") {
+            QCheckBox *box = ((Boolval*)m_valueItems.value(paramName))->checkBox;
+            setValue = box->checkState() == Qt::Checked ? "1" : "0" ;
+        } else if (type == "color") {
+            ChooseColorWidget *choosecolor = ((ChooseColorWidget*)m_valueItems.value(paramName));
+            setValue = choosecolor->getColor().name();
+        } else if (type == "complex") {
+            ComplexParameter *complex = ((ComplexParameter*)m_valueItems.value(paramName));
+            namenode.item(i) = complex->getParamDesc();
+        } else if (type == "geometry") {
+            if (KdenliveSettings::on_monitor_effects()) {
+                if (m_geometryWidget) namenode.item(i).toElement().setAttribute("value", m_geometryWidget->getValue());
+            } else {
+                Geometryval *geom = ((Geometryval*)m_valueItems.value(paramName));
+                namenode.item(i).toElement().setAttribute("value", geom->getValue());
+            }
+        } else if (type == "addedgeometry") {
+            namenode.item(i).toElement().setAttribute("value", m_geometryWidget->getExtraValue(namenode.item(i).toElement().attribute("name")));
+        } else if (type == "position") {
+            PositionEdit *pedit = ((PositionEdit*)m_valueItems.value(paramName));
+            int pos = pedit->getPosition();
+            setValue = QString::number(pos);
+            if (newparam.attribute("id") == "fadein" || newparam.attribute("id") == "fade_from_black") {
+                // Make sure duration is not longer than clip
+                /*if (pos > m_out) {
+                    pos = m_out;
+                    pedit->setPosition(pos);
+                }*/
+                EffectsList::setParameter(newparam, "in", QString::number(m_in));
+                EffectsList::setParameter(newparam, "out", QString::number(m_in + pos));
+                setValue.clear();
+            } else if (newparam.attribute("id") == "fadeout" || newparam.attribute("id") == "fade_to_black") {
+                // Make sure duration is not longer than clip
+                /*if (pos > m_out) {
+                    pos = m_out;
+                    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, locale.toString(points.at(j).x()));
+                EffectsList::setParameter(newparam, out, locale.toString(points.at(j).y()));
+            }
+            QString depends = pa.attributes().namedItem("depends").nodeValue();
+            if (!depends.isEmpty())
+                meetDependency(paramName, type, EffectsList::parameter(newparam, depends));
+        } else if (type == "bezier_spline") {
+            BezierSplineWidget *widget = (BezierSplineWidget*)m_valueItems.value(paramName);
+            setValue = widget->spline();
+            QString depends = pa.attributes().namedItem("depends").nodeValue();
+            if (!depends.isEmpty())
+                meetDependency(paramName, type, EffectsList::parameter(newparam, depends));
+#ifdef USE_QJSON
+        } else if (type == "roto-spline") {
+            RotoWidget *widget = static_cast<RotoWidget *>(m_valueItems.value(paramName));
+            setValue = widget->getSpline();
+#endif
+        } else if (type == "wipe") {
+            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;
+            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;
+            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())
+            pa.attributes().namedItem("value").setNodeValue(setValue);
+
+    }
+    emit parameterChanged(oldparam, newparam, m_index);
+}
+
+QString ParameterContainer::getWipeString(wipeInfo info)
+{
+
+    QString start;
+    QString end;
+    switch (info.start) {
+    case LEFT:
+        start = "-100%/0%:100%x100%";
+        break;
+    case RIGHT:
+        start = "100%/0%:100%x100%";
+        break;
+    case DOWN:
+        start = "0%/100%:100%x100%";
+        break;
+    case UP:
+        start = "0%/-100%:100%x100%";
+        break;
+    default:
+        start = "0%/0%:100%x100%";
+        break;
+    }
+    start.append(':' + QString::number(info.startTransparency));
+
+    switch (info.end) {
+    case LEFT:
+        end = "-100%/0%:100%x100%";
+        break;
+    case RIGHT:
+        end = "100%/0%:100%x100%";
+        break;
+    case DOWN:
+        end = "0%/100%:100%x100%";
+        break;
+    case UP:
+        end = "0%/-100%:100%x100%";
+        break;
+    default:
+        end = "0%/0%:100%x100%";
+        break;
+    }
+    end.append(':' + QString::number(info.endTransparency));
+    return QString(start + ";-1=" + end);
+}
+
+int ParameterContainer::index()
+{
+    return m_index;
+}
+
+
diff --git a/src/effectstack/collapsibleeffect.h b/src/effectstack/collapsibleeffect.h
new file mode 100644 (file)
index 0000000..fb40e83
--- /dev/null
@@ -0,0 +1,145 @@
+/***************************************************************************
+ *   Copyright (C) 2008 by Jean-Baptiste Mardelle (jb@kdenlive.org)        *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA          *
+ ***************************************************************************/
+
+
+#ifndef COLLAPSIBLEEFFECT_H
+#define COLLAPSIBLEEFFECT_H
+
+
+#include "ui_collapsiblewidget_ui.h"
+
+#include "timecode.h"
+#include "keyframeedit.h"
+#include "effectstackedit.h"
+
+#include <QDomElement>
+
+class QFrame;
+class Monitor;
+class GeometryWidget;
+
+struct EffectMetaInfo {
+    MltVideoProfile profile;
+    Timecode timecode;
+    Monitor *monitor;
+    QPoint frameSize;
+    bool trackMode;
+};
+
+class ParameterContainer : public QObject
+{
+    Q_OBJECT
+
+public:
+    ParameterContainer(QDomElement effect, ItemInfo info, EffectMetaInfo *metaInfo, int index, QWidget * parent = 0);
+    void updateTimecodeFormat();
+    void updateProjectFormat(MltVideoProfile profile, Timecode t);
+    int index();
+
+private slots:
+    void slotCollectAllParameters();
+
+private:
+        /** @brief Updates parameter @param name according to new value of dependency.
+    * @param name Name of the parameter which will be updated
+    * @param type Type of the parameter which will be updated
+    * @param value Value of the dependency parameter */
+    void meetDependency(const QString& name, QString type, QString value);
+    wipeInfo getWipeInfo(QString value);
+    QString getWipeString(wipeInfo info);
+    
+    int m_in;
+    int m_out;
+    int m_index;
+    QList<QWidget*> m_uiItems;
+    QMap<QString, QWidget*> m_valueItems;
+    Timecode m_timecode;
+    KeyframeEdit *m_keyframeEditor;
+    GeometryWidget *m_geometryWidget;
+    EffectMetaInfo *m_metaInfo;
+    QDomElement m_effect;
+
+signals:
+    void parameterChanged(const QDomElement, const QDomElement, int);
+    void syncEffectsPos(int);
+    void effectStateChanged(bool);
+    void checkMonitorPosition(int);
+    void seekTimeline(int);
+    
+};
+
+/**
+ * @class CollapsibleEffect
+ * @brief A dialog for editing markers and guides.
+ * @author Jean-Baptiste Mardelle
+ */
+
+class CollapsibleEffect : public QWidget, public Ui::CollapsibleWidget_UI
+{
+    Q_OBJECT
+
+public:
+    CollapsibleEffect(QDomElement effect, ItemInfo info, int ix, EffectMetaInfo *metaInfo, bool lastEffect, QWidget * parent = 0);
+    ~CollapsibleEffect();
+    static QMap<QString, QImage> iconCache;
+    void setupWidget(ItemInfo info, int index, EffectMetaInfo *metaInfo);
+    void updateTimecodeFormat();
+    void setActive(bool activate);
+
+public slots:
+    void slotSyncEffectsPos(int pos);
+
+private slots:
+    void slotSwitch();
+    void slotEnable(bool enable);
+    void slotShow(bool show);
+    void slotDeleteEffect();
+    void slotEffectUp();
+    void slotEffectDown();
+
+private:
+    ParameterContainer *m_paramWidget;
+    QList <CollapsibleEffect *> m_subParamWidgets;
+    QDomElement m_effect;
+    QList <QDomElement> m_subEffects;
+    bool m_lastEffect;
+    int m_in;
+    int m_out;
+    bool m_active;
+    
+protected:
+    virtual void mouseDoubleClickEvent ( QMouseEvent * event );
+    virtual void mousePressEvent ( QMouseEvent * event );
+    virtual void enterEvent( QEvent * event );
+    virtual void leaveEvent( QEvent * event );
+    
+signals:
+    void parameterChanged(const QDomElement, const QDomElement, int);
+    void syncEffectsPos(int);
+    void effectStateChanged(bool, int ix = -1);
+    void deleteEffect(const QDomElement, int);
+    void changeEffectPosition(int, bool);
+    void activateEffect(int);
+    void checkMonitorPosition(int);
+    void seekTimeline(int);
+};
+
+
+#endif
+
diff --git a/src/effectstack/effectstackview2.cpp b/src/effectstack/effectstackview2.cpp
new file mode 100644 (file)
index 0000000..348cdff
--- /dev/null
@@ -0,0 +1,323 @@
+/***************************************************************************
+                          effecstackview.cpp2  -  description
+                             -------------------
+    begin                : Feb 15 2008
+    copyright            : (C) 2008 by Marco Gittler
+    email                : g.marco@freenet.de
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+
+#include "effectstackview2.h"
+#include "effectslist.h"
+#include "clipitem.h"
+#include "mainwindow.h"
+#include "docclipbase.h"
+#include "projectlist.h"
+#include "kthumb.h"
+#include "monitoreditwidget.h"
+#include "monitorscene.h"
+#include "kdenlivesettings.h"
+
+#include <KDebug>
+#include <KLocale>
+#include <KMessageBox>
+#include <KStandardDirs>
+#include <KFileDialog>
+#include <KColorScheme>
+
+#include <QMenu>
+#include <QTextStream>
+#include <QFile>
+#include <QInputDialog>
+
+
+EffectStackView2::EffectStackView2(Monitor *monitor, QWidget *parent) :
+        QWidget(parent),
+        m_clipref(NULL),
+        m_view(NULL),
+        m_trackindex(-1)
+{
+    m_effectMetaInfo.trackMode = false;
+    m_effectMetaInfo.monitor = monitor;
+
+    m_ui.setupUi(this);
+    m_ui.checkAll->setToolTip(i18n("Enable/Disable all effects"));
+    m_ui.buttonShowComments->setIcon(KIcon("help-about"));
+    m_ui.buttonShowComments->setToolTip(i18n("Show additional information for the parameters"));
+
+
+    setEnabled(false);
+
+    QPalette p = palette();
+    KColorScheme scheme(p.currentColorGroup(), KColorScheme::View, KSharedConfig::openConfig(KdenliveSettings::colortheme()));
+    QColor dark_bg = scheme.shade(KColorScheme::DarkShade);
+    QColor selected_bg = scheme.decoration(KColorScheme::FocusColor).color();
+    QColor hover_bg = scheme.decoration(KColorScheme::HoverColor).color();
+    QColor light_bg = scheme.shade(KColorScheme::LightShade);
+    
+    QString stylesheet(QString("QProgressBar:horizontal {border: 1px solid %1;border-radius:0px;border-top-left-radius: 4px;border-bottom-left-radius: 4px;border-right: 0px;background:%4;padding: 0px;text-align:left center}\
+                                QProgressBar:horizontal#dragOnly {background: %1} QProgressBar:horizontal:hover#dragOnly {background: %3} QProgressBar:horizontal:hover {border: 1px solid %3;border-right: 0px;}\
+                                QProgressBar::chunk:horizontal {background: %1;} QProgressBar::chunk:horizontal:hover {background: %3;}\
+                                QProgressBar:horizontal[inTimeline=\"true\"] { border: 1px solid %2;border-right: 0px;background: %4;padding: 0px;text-align:left center } QProgressBar::chunk:horizontal[inTimeline=\"true\"] {background: %2;}\
+                                QAbstractSpinBox#dragBox {border: 1px solid %1;border-top-right-radius: 4px;border-bottom-right-radius: 4px;padding-right:0px;} QAbstractSpinBox::down-button#dragBox {width:0px;padding:0px;}\
+                                QAbstractSpinBox::up-button#dragBox {width:0px;padding:0px;} QAbstractSpinBox[inTimeline=\"true\"]#dragBox { border: 1px solid %2;} QAbstractSpinBox:hover#dragBox {border: 1px solid %3;} ")
+                                .arg(dark_bg.name()).arg(selected_bg.name()).arg(hover_bg.name()).arg(light_bg.name()));
+    setStyleSheet(stylesheet);
+}
+
+EffectStackView2::~EffectStackView2()
+{
+}
+
+
+void EffectStackView2::slotRenderPos(int pos)
+{
+    if (m_effects.isEmpty()) return;
+    if (!m_effectMetaInfo.trackMode && m_clipref) pos = pos - m_clipref->startPos().frames(KdenliveSettings::project_fps());
+
+    for (int i = 0; i< m_effects.count(); i++)
+        m_effects.at(i)->slotSyncEffectsPos(pos);
+}
+
+void EffectStackView2::setMenu(QMenu *menu)
+{
+    //m_ui.buttonNew->setMenu(menu);
+}
+
+void EffectStackView2::slotClipItemSelected(ClipItem* c, int ix)
+{
+    if (c && !c->isEnabled()) return;
+    if (c && c == m_clipref) {
+        
+    } else {
+        m_clipref = c;
+        if (c) {
+            QString cname = m_clipref->clipName();
+            if (cname.length() > 30) {
+                m_ui.checkAll->setToolTip(i18n("Effects for %1").arg(cname));
+                cname.truncate(27);
+                m_ui.checkAll->setText(i18n("Effects for %1").arg(cname) + "...");
+            } else {
+                m_ui.checkAll->setToolTip(QString());
+                m_ui.checkAll->setText(i18n("Effects for %1").arg(cname));
+            }
+            ix = c->selectedEffectIndex();
+            QString size = c->baseClip()->getProperty("frame_size");
+            double factor = c->baseClip()->getProperty("aspect_ratio").toDouble();
+            m_effectMetaInfo.frameSize = QPoint((int)(size.section('x', 0, 0).toInt() * factor + 0.5), size.section('x', 1, 1).toInt());
+        } else {
+            ix = 0;
+        }
+    }
+    if (m_clipref == NULL) {
+        //TODO: clear list, reset paramdesc and info
+        //ItemInfo info;
+        //m_effectedit->transferParamDesc(QDomElement(), info);
+        kDebug()<<" - - -DELETE LAYOUT";
+        m_effects.clear();
+        delete m_view;
+        m_view = NULL;
+        m_ui.checkAll->setToolTip(QString());
+        m_ui.checkAll->setText(QString());
+        setEnabled(false);
+        return;
+    }
+    setEnabled(true);
+    m_effectMetaInfo.trackMode = false;
+    m_currentEffectList = m_clipref->effectList();
+    setupListView(ix);
+}
+
+void EffectStackView2::slotTrackItemSelected(int ix, const TrackInfo info)
+{
+    m_clipref = NULL;
+    m_effectMetaInfo.trackMode = true;
+    m_currentEffectList = info.effectsList;
+    m_trackInfo = info;
+    setEnabled(true);
+    m_ui.checkAll->setToolTip(QString());
+    m_ui.checkAll->setText(i18n("Effects for track %1").arg(info.trackName.isEmpty() ? QString::number(ix) : info.trackName));
+    m_trackindex = ix;
+    setupListView(0);
+}
+
+void EffectStackView2::setupListView(int ix)
+{
+    //TODO: clear list
+
+    kDebug()<<"++++++++++++++++++++++++++++++++   setup +++++++++++"<<ix;
+
+    blockSignals(true);
+    disconnect(m_effectMetaInfo.monitor, SIGNAL(renderPosition(int)), this, SLOT(slotRenderPos(int)));
+    m_effects.clear();
+    QLayoutItem *child;
+    QLayout *vbox = NULL;
+    if (m_view) vbox = m_view->layout();
+    if (vbox) {
+        while ((child = vbox->takeAt(0)) != 0) {
+            QWidget *wid = child->widget();
+            delete child;
+            if (wid) delete wid;
+        }
+    }
+    if (m_view) delete m_view;
+    blockSignals(false);
+    m_view = new QWidget(m_ui.container);
+    m_ui.container->setWidget(m_view);
+
+    QVBoxLayout *vbox1 = new QVBoxLayout(m_view);
+    vbox1->setContentsMargins(0, 0, 0, 0);
+    vbox1->setSpacing(0);
+
+    for (int i = 0; i < m_currentEffectList.count(); i++) {
+        QDomElement d = m_currentEffectList.at(i).cloneNode().toElement();
+        if (d.isNull()) {
+            kDebug() << " . . . . WARNING, NULL EFFECT IN STACK!!!!!!!!!";
+            continue;
+        }
+
+        /*QDomDocument doc;
+        doc.appendChild(doc.importNode(d, true));
+        kDebug() << "IMPORTED STK: " << doc.toString();*/
+
+        CollapsibleEffect *currentEffect = new CollapsibleEffect(d, m_clipref->info(), i, &m_effectMetaInfo, i == m_currentEffectList.count() - 1, m_view);
+        m_effects.append(currentEffect);
+        vbox1->addWidget(currentEffect);
+        connect(currentEffect, SIGNAL(parameterChanged(const QDomElement, const QDomElement, int)), this , SLOT(slotUpdateEffectParams(const QDomElement, const QDomElement, int)));
+        connect(currentEffect, SIGNAL(deleteEffect(const QDomElement, int)), this , SLOT(slotDeleteEffect(const QDomElement, int)));
+        connect(currentEffect, SIGNAL(changeEffectPosition(int,bool)), this , SLOT(slotMoveEffect(int , bool)));
+        connect(currentEffect, SIGNAL(effectStateChanged(bool, int)), this, SLOT(slotUpdateEffectState(bool, int)));
+        connect(currentEffect, SIGNAL(activateEffect(int)), this, SLOT(slotSetCurrentEffect(int)));
+        connect(currentEffect, SIGNAL(checkMonitorPosition(int)), this, SLOT(slotCheckMonitorPosition(int)));
+        connect(currentEffect, SIGNAL(seekTimeline(int)), this , SLOT(slotSeekTimeline(int)));
+            //ui.title->setPixmap(icon.pixmap(QSize(12, 12)));
+    }
+    vbox1->addStretch(10);
+    connect(m_effectMetaInfo.monitor, SIGNAL(renderPosition(int)), this, SLOT(slotRenderPos(int)));
+}
+
+void EffectStackView2::slotUpdateEffectState(bool disable, int index)
+{
+    if (m_effectMetaInfo.trackMode)
+        emit changeEffectState(NULL, m_trackindex, index, disable);
+    else
+        emit changeEffectState(m_clipref, -1, index, disable);
+}
+
+
+void EffectStackView2::raiseWindow(QWidget* dock)
+{
+    if ((m_clipref || m_effectMetaInfo.trackMode) && dock)
+        dock->raise();
+}
+
+
+void EffectStackView2::slotSeekTimeline(int pos)
+{
+    if (m_effectMetaInfo.trackMode) {
+        emit seekTimeline(pos);
+    } else if (m_clipref) {
+        emit seekTimeline(m_clipref->startPos().frames(KdenliveSettings::project_fps()) + pos);
+    }
+}
+
+
+/*void EffectStackView2::slotRegionChanged()
+{
+    if (!m_trackMode) emit updateClipRegion(m_clipref, m_ui.effectlist->currentRow(), m_ui.region_url->text());
+}*/
+
+void EffectStackView2::slotCheckMonitorPosition(int renderPos)
+{
+    if (m_effectMetaInfo.trackMode || (m_clipref && renderPos >= m_clipref->startPos().frames(KdenliveSettings::project_fps()) && renderPos <= m_clipref->endPos().frames(KdenliveSettings::project_fps()))) {
+        if (!m_effectMetaInfo.monitor->getEffectEdit()->getScene()->views().at(0)->isVisible())
+            m_effectMetaInfo.monitor->slotEffectScene(true);
+    } else {
+        m_effectMetaInfo.monitor->slotEffectScene(false);
+    }
+}
+
+int EffectStackView2::isTrackMode(bool *ok) const
+{
+    *ok = m_effectMetaInfo.trackMode;
+    return m_trackindex;
+}
+
+void EffectStackView2::clear()
+{
+}
+
+void EffectStackView2::updateProjectFormat(MltVideoProfile profile, Timecode t)
+{
+    m_effectMetaInfo.profile = profile;
+    m_effectMetaInfo.timecode = t;
+}
+
+void EffectStackView2::slotItemDel()
+{
+
+}
+
+void EffectStackView2::updateTimecodeFormat()
+{
+    for (int i = 0; i< m_effects.count(); i++)
+        m_effects.at(i)->updateTimecodeFormat();
+}
+
+void EffectStackView2::slotUpdateEffectParams(const QDomElement old, const QDomElement e, int ix)
+{
+    if (m_effectMetaInfo.trackMode)
+        emit updateEffect(NULL, m_trackindex, old, e, ix);
+    else if (m_clipref) {
+        emit updateEffect(m_clipref, -1, old, e, ix);
+        // Make sure the changed effect is currently displayed
+        slotSetCurrentEffect(ix);
+    }
+}
+
+void EffectStackView2::slotSetCurrentEffect(int ix)
+{
+    if (ix != m_clipref->selectedEffectIndex())
+        m_clipref->setSelectedEffect(ix);
+    for (int i = 0; i < m_effects.count(); i++) {
+        m_effects.at(i)->setActive(i == ix);
+    }
+}
+
+void EffectStackView2::slotDeleteEffect(const QDomElement effect, int index)
+{
+    
+    if (m_effectMetaInfo.trackMode)
+        emit removeEffect(NULL, m_trackindex, effect);
+    else
+        emit removeEffect(m_clipref, -1, effect);
+}
+
+void EffectStackView2::slotMoveEffect(int index, bool up)
+{
+    if (up && index <= 0) return;
+    if (!up && index >= m_currentEffectList.count() - 1) return;
+    int startPos;
+    int endPos;
+    if (up) {
+        startPos =  index + 1;
+        endPos = index;
+    }
+    else {
+        startPos =  index + 1;
+        endPos =  index + 2;
+    }
+    if (m_effectMetaInfo.trackMode) emit changeEffectPosition(NULL, m_trackindex, startPos, endPos);
+    else emit changeEffectPosition(m_clipref, -1, startPos, endPos);
+}
+
+#include "effectstackview2.moc"
diff --git a/src/effectstack/effectstackview2.h b/src/effectstack/effectstackview2.h
new file mode 100644 (file)
index 0000000..7d41c0e
--- /dev/null
@@ -0,0 +1,146 @@
+/***************************************************************************
+                          effecstackview2.h  -  description
+                             -------------------
+    begin                : Feb 15 2008
+    copyright            : (C) 2008 by Marco Gittler
+    email                : g.marco@freenet.de
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+/**
+ * @class EffectStackView2
+ * @brief View part of the EffectStack
+ * @author Marco Gittler
+ */
+
+#ifndef EFFECTSTACKVIEW2_H
+#define EFFECTSTACKVIEW2_H
+
+#include "ui_effectstack2_ui.h"
+#include "effectstackedit.h"
+#include "collapsibleeffect.h"
+
+class EffectsList;
+class ClipItem;
+class MltVideoProfile;
+class Monitor;
+
+
+class EffectStackView2 : public QWidget
+{
+    Q_OBJECT
+
+public:
+    EffectStackView2(Monitor *monitor, QWidget *parent = 0);
+    virtual ~EffectStackView2();
+
+    /** @brief Raises @param dock if a clip is loaded. */
+    void raiseWindow(QWidget* dock);
+
+    /** @brief Sets the add effect button's menu to @param menu. */
+    void setMenu(QMenu *menu);
+
+
+    /** @brief return the index of the track displayed in effect stack
+     ** @param ok set to true if we are looking at a track's effects, otherwise false. */
+    int isTrackMode(bool *ok) const;
+
+    /** @brief Clears the list of effects and updates the buttons accordingly. */
+    void clear();
+
+    /** @brief Passes updates on @param profile and @param t on to the effect editor. */
+    void updateProjectFormat(MltVideoProfile profile, Timecode t);
+
+    /** @brief Tells the effect editor to update its timecode format. */
+    void updateTimecodeFormat();
+
+private:
+    Ui::EffectStack2_UI m_ui;
+    ClipItem* m_clipref;
+    QList <CollapsibleEffect*> m_effects;
+    EffectsList m_currentEffectList;
+    EffectMetaInfo m_effectMetaInfo;
+    QWidget *m_view;
+
+    /** @brief The track index of currently edited track. */
+    int m_trackindex;
+
+    /** If in track mode: Info of the edited track to be able to access its duration. */
+    TrackInfo m_trackInfo;
+
+    /** @brief Sets the list of effects according to the clip's effect list.
+    * @param ix Number of the effect to preselect */
+    void setupListView(int ix);
+
+public slots:
+    /** @brief Sets the clip whose effect list should be managed.
+    * @param c Clip whose effect list should be managed
+    * @param ix Effect to preselect */
+    void slotClipItemSelected(ClipItem* c, int ix);
+
+    void slotTrackItemSelected(int ix, const TrackInfo info);
+
+    /** @brief Removes the selected effect. */
+    void slotItemDel();
+
+private slots:
+
+    /** @brief Emits seekTimeline with position = clipstart + @param pos. */
+    void slotSeekTimeline(int pos);
+
+
+    /* @brief Define the region filter for current effect.
+    void slotRegionChanged();*/
+
+    /** @brief Checks whether the monitor scene has to be displayed. */
+    void slotCheckMonitorPosition(int renderPos);
+
+    void slotUpdateEffectParams(const QDomElement old, const QDomElement e, int ix);
+
+    /** @brief Move an effect in the stack.
+     * @param index The effect index in the stack
+     * @param up true if we want to move effect up, false for down */
+    void slotMoveEffect(int index, bool up);
+
+    /** @brief Delete an effect in the stack. */
+    void slotDeleteEffect(const QDomElement effect, int index);
+
+    /** @brief Pass position changes of the timeline cursor to the effects to keep their local timelines in sync. */
+    void slotRenderPos(int pos);
+
+    /** @brief Called whenever an effect is enabled / disabled by user. */
+    void slotUpdateEffectState(bool disable, int index);
+
+    void slotSetCurrentEffect(int ix);
+
+
+signals:
+    void removeEffect(ClipItem*, int, QDomElement);
+    /**  Parameters for an effect changed, update the filter in playlist */
+    void updateEffect(ClipItem*, int, QDomElement, QDomElement, int);
+    /** An effect in stack was moved, we need to regenerate
+        all effects for this clip in the playlist */
+    void refreshEffectStack(ClipItem *);
+    /** Enable or disable an effect */
+    void changeEffectState(ClipItem*, int, int, bool);
+    /** An effect in stack was moved */
+    void changeEffectPosition(ClipItem*, int, int, int);
+    /** an effect was saved, reload list */
+    void reloadEffects();
+    /** An effect with position parameter was changed, seek */
+    void seekTimeline(int);
+    /** The region effect for current effect was changed */
+    void updateClipRegion(ClipItem*, int, QString);
+    void displayMessage(const QString&, int);
+    void showComments(bool show);
+};
+
+#endif
index 53fb77bb249deba922601e416e587b1fb36de53f..53c880a1e95fa72f6e909d2e0dc9e3de0fd4c371 100644 (file)
@@ -36,6 +36,7 @@
 #include "customtrackview.h"
 #include "effectslistview.h"
 #include "effectstackview.h"
+#include "effectstack/effectstackview2.h"
 #include "transitionsettings.h"
 #include "renderwidget.h"
 #include "renderer.h"
@@ -253,7 +254,7 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, const QString &
 
     m_effectStackDock = new QDockWidget(i18n("Effect Stack"), this);
     m_effectStackDock->setObjectName("effect_stack");
-    m_effectStack = new EffectStackView(m_projectMonitor);
+    m_effectStack = new EffectStackView2(m_projectMonitor);
     m_effectStackDock->setWidget(m_effectStack);
     addDockWidget(Qt::TopDockWidgetArea, m_effectStackDock);
 
index 2f9484e6b7be98867479bfe54250f8ce416db5c2..717efb06645ef0fe2aa6cf8b1cb1d312ea258843 100644 (file)
@@ -54,6 +54,7 @@ class MonitorManager;
 class ProjectList;
 class EffectsListView;
 class EffectStackView;
+class EffectStackView2;
 class TransitionSettings;
 class Monitor;
 class RecMonitor;
@@ -154,7 +155,7 @@ private:
     NotesWidget *m_notesWidget;
 
     QDockWidget *m_effectStackDock;
-    EffectStackView *m_effectStack;
+    EffectStackView2 *m_effectStack;
 
     QDockWidget *m_transitionConfigDock;
     TransitionSettings *m_transitionConfig;
diff --git a/src/widgets/effectstack2_ui.ui b/src/widgets/effectstack2_ui.ui
new file mode 100644 (file)
index 0000000..81e75f8
--- /dev/null
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>EffectStack2_UI</class>
+ <widget class="QWidget" name="EffectStack2_UI">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>226</width>
+    <height>145</height>
+   </rect>
+  </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <layout class="QGridLayout" name="gridLayout">
+   <property name="margin">
+    <number>0</number>
+   </property>
+   <property name="spacing">
+    <number>0</number>
+   </property>
+   <item row="0" column="0">
+    <layout class="QHBoxLayout" name="horizontalLayout_2">
+     <item>
+      <widget class="QCheckBox" name="checkAll">
+       <property name="enabled">
+        <bool>false</bool>
+       </property>
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="MinimumExpanding" vsizetype="Minimum">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="text">
+        <string notr="true"/>
+       </property>
+       <property name="checkable">
+        <bool>true</bool>
+       </property>
+       <property name="tristate">
+        <bool>false</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QToolButton" name="buttonShowComments">
+       <property name="text">
+        <string/>
+       </property>
+       <property name="checkable">
+        <bool>true</bool>
+       </property>
+       <property name="autoRaise">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item row="1" column="0">
+    <layout class="QVBoxLayout" name="verticalLayout">
+     <item>
+      <widget class="QScrollArea" name="container">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Expanding" vsizetype="MinimumExpanding">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="frameShape">
+        <enum>QFrame::NoFrame</enum>
+       </property>
+       <property name="frameShadow">
+        <enum>QFrame::Sunken</enum>
+       </property>
+       <property name="widgetResizable">
+        <bool>true</bool>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+       </property>
+       <widget class="QWidget" name="scrollAreaWidgetContents">
+        <property name="geometry">
+         <rect>
+          <x>0</x>
+          <y>0</y>
+          <width>224</width>
+          <height>117</height>
+         </rect>
+        </property>
+       </widget>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>