]> git.sesse.net Git - kdenlive/commitdiff
Cleanup effect stack (part 1)
authorJean-Baptiste Mardelle <jb@kdenlive.org>
Tue, 17 Apr 2012 14:59:19 +0000 (16:59 +0200)
committerJean-Baptiste Mardelle <jb@kdenlive.org>
Tue, 17 Apr 2012 14:59:19 +0000 (16:59 +0200)
21 files changed:
effects/region.xml
src/cornerswidget.cpp
src/effectstack/CMakeLists.txt
src/effectstack/collapsibleeffect.cpp
src/effectstack/collapsibleeffect.h
src/effectstack/effectstackview2.cpp
src/effectstack/effectstackview2.h
src/effectstack/parametercontainer.cpp [new file with mode: 0644]
src/effectstack/parametercontainer.h [new file with mode: 0644]
src/effectstackedit.cpp
src/effectstackedit.h
src/effectstackview.cpp
src/geometrywidget.cpp
src/initeffects.cpp
src/mainwindow.cpp
src/mainwindow.h
src/monitor.cpp
src/monitor.h
src/rotoscoping/rotowidget.cpp
src/transitionsettings.cpp
src/widgets/geometrywidget_ui.ui

index 9f76c0903837031f4c95047a463c9d54ec6e65fb..af1db0bce53c49f56d7930c187d08c1ff110cae7 100644 (file)
@@ -6,5 +6,8 @@
        <parameter type="url" name="resource" default="">
                <name>Url</name>
        </parameter>
+       <parameter type="geometry" name="composite.geometry" default="0%,0%:100%x100%" fixed="1" opacity="false">
+               <name>Pan and Zoom</name>
+       </parameter>
        <parameter type="fixed" name="filter_only" min="1" max="1" default="1" />
 </effect>
index 6905de5b5782ca7e8346de5dba5dd83013cce958..1b9fd5dd2fa8318b0dadc46880a1fcf9e10b4645 100644 (file)
@@ -74,7 +74,7 @@ CornersWidget::~CornersWidget()
         MonitorEditWidget *edit = m_monitor->getEffectEdit();
         edit->showVisibilityButton(false);
         edit->removeCustomControls();
-        m_monitor->slotEffectScene(false);
+        m_monitor->slotShowEffectScene(false);
     }
 }
 
@@ -178,7 +178,7 @@ void CornersWidget::slotShowScene(bool show)
 {
     m_showScene = show;
     if (!m_showScene)
-        m_monitor->slotEffectScene(false);
+        m_monitor->slotShowEffectScene(false);
     else
         slotCheckMonitorPosition(m_monitor->render->seekFramePosition());
 }
index 613236cc2a94955406df4eb53d6b0c2e380d4255..dd6d10f406faea0c12f6d00ac0cc76dfe7d0e306 100644 (file)
@@ -1,5 +1,6 @@
 set(kdenlive_SRCS
   ${kdenlive_SRCS}
+  effectstack/parametercontainer.cpp
   effectstack/abstractcollapsiblewidget.cpp
   effectstack/collapsibleeffect.cpp
   effectstack/collapsiblegroup.cpp
index dc5ff8c506c70ac3f649d5418960a749b4025e99..8495d546c7c2a40119611a303f18265094646331 100644 (file)
 
 
 #include "collapsibleeffect.h"
-
-#include "ui_listval_ui.h"
-#include "ui_boolval_ui.h"
-#include "ui_wipeval_ui.h"
-#include "ui_urlval_ui.h"
-#include "ui_keywordval_ui.h"
-#include "ui_fontval_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 "dragvalue.h"
-#include "beziercurve/beziersplinewidget.h"
-#ifdef USE_QJSON
-#include "rotoscoping/rotowidget.h"
-#endif
+#include "projectlist.h"
 
 #include <QInputDialog>
 #include <QDialog>
 #include <QMenu>
 #include <QVBoxLayout>
+#include <QLabel>
+#include <QProgressBar>
+#include <QWheelEvent>
 
 #include <KDebug>
+#include <KComboBox>
 #include <KGlobalSettings>
 #include <KLocale>
 #include <KMessageBox>
 #include <KStandardDirs>
 #include <KFileDialog>
-#include <KUrlRequester>
-#include <KColorScheme>
-#include <KColorUtils>
 #include <KApplication>
 
-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
-{
-};
-
-class Keywordval: public QWidget, public Ui::Keywordval_UI
-{
-};
-
-class Fontval: public QWidget, public Ui::Fontval_UI
-{
-};
-
-QMap<QString, QImage> CollapsibleEffect::iconCache;
-
-void clearLayout(QLayout *layout)
-{
-    QLayoutItem *item;
-    while((item = layout->takeAt(0))) {
-        if (item->layout()) {
-            clearLayout(item->layout());
-            delete item->layout();
-        }
-        if (item->widget()) {
-            delete item->widget();
-        }
-        delete item;
-    }
-}
-
-MySpinBox::MySpinBox(QWidget * parent):
-    QSpinBox(parent)
-{
-    setFocusPolicy(Qt::StrongFocus);
-}
-
-void MySpinBox::focusInEvent(QFocusEvent *e)
-{
-     setFocusPolicy(Qt::WheelFocus);
-     e->accept();
-}
-
-void MySpinBox::focusOutEvent(QFocusEvent *e)
-{
-     setFocusPolicy(Qt::StrongFocus);
-     e->accept();
-}
-
 
 CollapsibleEffect::CollapsibleEffect(QDomElement effect, QDomElement original_effect, ItemInfo info, EffectMetaInfo *metaInfo, bool lastEffect, QWidget * parent) :
         AbstractCollapsibleWidget(parent),
@@ -226,48 +145,6 @@ CollapsibleEffect::~CollapsibleEffect()
     delete m_menu;
 }
 
-//static
-const QString CollapsibleEffect::getStyleSheet()
-{
-    KColorScheme scheme(QApplication::palette().currentColorGroup(), KColorScheme::View, KSharedConfig::openConfig(KdenliveSettings::colortheme()));
-    QColor selected_bg = scheme.decoration(KColorScheme::FocusColor).color();
-    QColor hgh = KColorUtils::mix(QApplication::palette().window().color(), selected_bg, 0.2);
-    QColor hover_bg = scheme.decoration(KColorScheme::HoverColor).color();
-    QColor light_bg = scheme.shade(KColorScheme::LightShade);
-    QColor alt_bg = scheme.background(KColorScheme::NormalBackground).color();
-    
-    QString stylesheet;
-    
-    // effect background
-    stylesheet.append(QString("QFrame#decoframe {border-top-left-radius:5px;border-top-right-radius:5px;border-bottom:2px solid palette(mid);border-top:1px solid palette(light);} QFrame#decoframe[active=\"true\"] {background: %1;}").arg(hgh.name()));
-    
-    // effect in group background
-    stylesheet.append(QString("QFrame#decoframesub {border-top:1px solid palette(light);}  QFrame#decoframesub[active=\"true\"] {background: %1;}").arg(hgh.name()));
-    
-    // group background
-    stylesheet.append(QString("QFrame#decoframegroup {border-top-left-radius:5px;border-top-right-radius:5px;border:2px solid palette(dark);margin:0px;margin-top:2px;} "));
-    
-    // effect title bar
-    stylesheet.append(QString("QFrame#frame {margin-bottom:2px;border-top-left-radius:5px;border-top-right-radius:5px;}  QFrame#frame[target=\"true\"] {background: palette(highlight);}"));
-
-    // group effect title bar
-    stylesheet.append(QString("QFrame#framegroup {border-top-left-radius:2px;border-top-right-radius:2px;background: palette(dark);}  QFrame#framegroup[target=\"true\"] {background: palette(highlight);} "));
-    
-    // draggable effect bar content
-    stylesheet.append(QString("QProgressBar::chunk:horizontal {background: palette(button);border-top-left-radius: 4px;border-bottom-left-radius: 4px;} QProgressBar::chunk:horizontal#dragOnly {background: %1;border-top-left-radius: 4px;border-bottom-left-radius: 4px;} QProgressBar::chunk:horizontal:hover {background: %2;}").arg(alt_bg.name()).arg(selected_bg.name()));
-    
-    // draggable effect bar
-    stylesheet.append(QString("QProgressBar:horizontal {border: 1px solid palette(dark);border-top-left-radius: 4px;border-bottom-left-radius: 4px;border-right:0px;background:%3;padding: 0px;text-align:left center} QProgressBar:horizontal:disabled {border: 1px solid palette(button)} QProgressBar:horizontal#dragOnly {background: %3} QProgressBar:horizontal[inTimeline=\"true\"] { border: 1px solid %1;border-right: 0px;background: %2;padding: 0px;text-align:left center } QProgressBar::chunk:horizontal[inTimeline=\"true\"] {background: %1;}").arg(hover_bg.name()).arg(light_bg.name()).arg(alt_bg.name()));
-    
-    // spin box for draggable widget
-    stylesheet.append(QString("QAbstractSpinBox#dragBox {border: 1px solid palette(dark);border-top-right-radius: 4px;border-bottom-right-radius: 4px;padding-right:0px;} QAbstractSpinBox::down-button#dragBox {width:0px;padding:0px;} QAbstractSpinBox:disabled#dragBox {border: 1px solid palette(button);} QAbstractSpinBox::up-button#dragBox {width:0px;padding:0px;} QAbstractSpinBox[inTimeline=\"true\"]#dragBox { border: 1px solid %1;} QAbstractSpinBox:hover#dragBox {border: 1px solid %2;} ").arg(hover_bg.name()).arg(selected_bg.name()));
-    
-    // group editable labels
-    stylesheet.append(QString("MyEditableLabel { background-color: transparent; color: palette(bright-text); border-radius: 2px;border: 1px solid transparent;} MyEditableLabel:hover {border: 1px solid palette(highlight);} "));
-    
-    return stylesheet;
-}
-
 void CollapsibleEffect::slotCreateGroup()
 {
     emit createGroup(effectIndex());
@@ -544,12 +421,11 @@ void CollapsibleEffect::setupWidget(ItemInfo info, EffectMetaInfo *metaInfo)
 
     if (m_effect.attribute("tag") == "region") {
        m_regionEffect = true;
-        QVBoxLayout *vbox = new QVBoxLayout(widgetFrame);
-        vbox->setContentsMargins(0, 0, 0, 0);
-        vbox->setSpacing(2);
         QDomNodeList effects =  m_effect.elementsByTagName("effect");
         QDomNodeList origin_effects =  m_original_effect.elementsByTagName("effect");
+       m_paramWidget = new ParameterContainer(m_effect, info, metaInfo, widgetFrame);
         QWidget *container = new QWidget(widgetFrame);
+       QVBoxLayout *vbox = static_cast<QVBoxLayout *> (widgetFrame->layout());
         vbox->addWidget(container);
        // m_paramWidget = new ParameterContainer(m_effect.toElement(), info, metaInfo, container);
         for (int i = 0; i < effects.count(); i++) {
@@ -700,731 +576,9 @@ void CollapsibleEffect::adjustButtons(int ix, int max)
     buttonDown->setVisible(ix < max - 1);
 }
 
-ParameterContainer::ParameterContainer(QDomElement effect, ItemInfo info, EffectMetaInfo *metaInfo, QWidget * parent) :
-        m_keyframeEditor(NULL),
-        m_geometryWidget(NULL),
-        m_metaInfo(metaInfo),
-        m_effect(effect)
-{
-    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;
-    m_vbox = new QVBoxLayout(parent);
-    m_vbox->setContentsMargins(4, 0, 4, 0);
-    m_vbox->setSpacing(2);
-
-    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);
-           doubleparam->setFocusPolicy(Qt::StrongFocus);
-            m_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);
-           lsval->list->setFocusPolicy(Qt::StrongFocus);
-            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);
-            m_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);
-                m_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);
-                m_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());
-                }
-                m_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 (pa.hasAttribute("paramprefix")) value.remove(0, pa.attribute("paramprefix").size());
-            if (value.startsWith('#'))
-                value = value.replace('#', "0x");
-            ChooseColorWidget *choosecolor = new ChooseColorWidget(paramName, value, parent);
-           choosecolor->setAlphaChannelEnabled(true);
-            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(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);
-            m_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;
-           if (e.attribute("version").toDouble() > 0.2) {
-               // Rounding gives really weird results. (int) (10 * 0.3) gives 2! So for now, add 0.5 to get correct result
-                number = EffectsList::parameter(e, pa.attribute("number")).toDouble() * 10 + 0.5;
-            } else {
-                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));
-            MySpinBox *spinin = new MySpinBox();
-            spinin->setRange(0, 1000);
-            MySpinBox *spinout = new MySpinBox();
-            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(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;
-            m_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)));
-            m_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 if (type == "keywords") {
-            Keywordval* kval = new Keywordval;
-            kval->setupUi(toFillin);
-            kval->label->setText(paramName);
-            kval->lineeditwidget->setText(value);
-            QDomElement klistelem = pa.firstChildElement("keywords");
-            QDomElement kdisplaylistelem = pa.firstChildElement("keywordsdisplay");
-            QStringList keywordlist;
-            QStringList keyworddisplaylist;
-            if (!klistelem.isNull()) {
-                keywordlist = klistelem.text().split(';');
-                keyworddisplaylist = i18n(kdisplaylistelem.text().toUtf8().data()).split(';');
-            }
-            if (keyworddisplaylist.count() != keywordlist.count()) {
-                keyworddisplaylist = keywordlist;
-            }
-            for (int i = 0; i < keywordlist.count(); i++) {
-                kval->comboboxwidget->addItem(keyworddisplaylist.at(i), keywordlist.at(i));
-            }
-            // Add disabled user prompt at index 0
-            kval->comboboxwidget->insertItem(0, i18n("<select a keyword>"), "");
-            kval->comboboxwidget->model()->setData( kval->comboboxwidget->model()->index(0,0), QVariant(Qt::NoItemFlags), Qt::UserRole -1);
-            kval->comboboxwidget->setCurrentIndex(0);
-            m_valueItems[paramName] = kval;
-            connect(kval->lineeditwidget, SIGNAL(editingFinished()) , this, SLOT(collectAllParameters()));
-            connect(kval->comboboxwidget, SIGNAL(activated (const QString&)), this, SLOT(collectAllParameters()));
-            m_uiItems.append(kval);
-        } else if (type == "fontfamily") {
-            Fontval* fval = new Fontval;
-            fval->setupUi(toFillin);
-            fval->name->setText(paramName);
-            fval->fontfamilywidget->setCurrentFont(QFont(value));
-            m_valueItems[paramName] = fval;
-            connect(fval->fontfamilywidget, SIGNAL(currentFontChanged(const QFont &)), this, SLOT(collectAllParameters())) ;
-            m_uiItems.append(fval);
-        } else if (type == "filterjob") {
-           QVBoxLayout *l= new QVBoxLayout(toFillin);
-           QPushButton *button = new QPushButton(paramName, toFillin);
-           l->addWidget(button);
-            m_valueItems[paramName] = button;
-            connect(button, SIGNAL(pressed()), this, SLOT(slotStartFilterJobAction()));   
-        } else {
-            delete toFillin;
-            toFillin = NULL;
-        }
-
-        if (toFillin)
-            m_vbox->addWidget(toFillin);
-    }
-
-    if (stretch)
-        m_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);
-    }
-}
-
-ParameterContainer::~ParameterContainer()
-{
-    clearLayout(m_vbox);
-    delete m_vbox;
-}
-
-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 + 0.5)));
-        }
-    }
-}
-
-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()
+bool CollapsibleEffect::needsMonitorEffectScene()
 {
-    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 = m_effect.elementsByTagName("parameter");
-
-    for (int i = 0; i < namenode.count() ; i++) {
-        QDomElement pa = namenode.item(i).toElement();
-        QDomElement na = pa.firstChildElement("name");
-        QString type = pa.attribute("type");
-        QString paramName = na.isNull() ? pa.attribute("name") : 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();
-           if (pa.hasAttribute("paramprefix")) setValue.prepend(pa.attribute("paramprefix"));
-        } 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 (m_effect.attribute("id") == "fadein" || m_effect.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(m_effect, "in", QString::number(m_in));
-                EffectsList::setParameter(m_effect, "out", QString::number(m_in + pos));
-                setValue.clear();
-            } else if (m_effect.attribute("id") == "fadeout" || m_effect.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(m_effect, "in", QString::number(m_out - pos));
-                EffectsList::setParameter(m_effect, "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.attribute("number");
-            QString inName = pa.attribute("inpoints");
-            QString outName = pa.attribute("outpoints");
-            int off = pa.attribute("min").toInt();
-            int end = pa.attribute("max").toInt();
-            if (oldparam.attribute("version").toDouble() > 0.2) {
-                EffectsList::setParameter(m_effect, number, locale.toString(points.count() / 10.));
-            } else {
-                EffectsList::setParameter(m_effect, 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(m_effect, in, locale.toString(points.at(j).x()));
-                EffectsList::setParameter(m_effect, out, locale.toString(points.at(j).y()));
-            }
-            QString depends = pa.attribute("depends");
-            if (!depends.isEmpty())
-                meetDependency(paramName, type, EffectsList::parameter(m_effect, depends));
-        } else if (type == "bezier_spline") {
-            BezierSplineWidget *widget = (BezierSplineWidget*)m_valueItems.value(paramName);
-            setValue = widget->spline();
-            QString depends = pa.attribute("depends");
-            if (!depends.isEmpty())
-                meetDependency(paramName, type, EffectsList::parameter(m_effect, 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) {
-            QString realName = i18n(na.toElement().text().toUtf8().data());
-            QString val = m_keyframeEditor->getValue(realName);
-            pa.setAttribute("keyframes", val);
-
-            if (m_keyframeEditor->isVisibleParam(realName)) {
-                pa.setAttribute("intimeline", "1");
-           }
-            else if (pa.hasAttribute("intimeline"))
-                pa.removeAttribute("intimeline");
-        } else if (type == "url") {
-            KUrlRequester *req = ((Urlval*)m_valueItems.value(paramName))->urlwidget;
-            setValue = req->url().path();
-       } else if (type == "keywords"){
-            QLineEdit *line = ((Keywordval*)m_valueItems.value(paramName))->lineeditwidget;
-            QComboBox *combo = ((Keywordval*)m_valueItems.value(paramName))->comboboxwidget;
-            if(combo->currentIndex())
-            {
-                QString comboval = combo->itemData(combo->currentIndex()).toString();
-                line->insert(comboval);
-                combo->setCurrentIndex(0);
-            }
-            setValue = line->text();
-        } else if (type == "fontfamily") {
-            QFontComboBox* fontfamily = ((Fontval*)m_valueItems.value(paramName))->fontfamilywidget;
-            setValue = fontfamily->currentFont().family();
-        }
-        if (!setValue.isNull())
-            pa.setAttribute("value", setValue);
-
-    }
-    emit parameterChanged(oldparam, m_effect, m_effect.attribute("kdenlive_ix").toInt());
+    return m_paramWidget->needsMonitorEffectScene();
 }
 
-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);
-}
-
-void ParameterContainer::updateParameter(const QString &key, const QString &value)
-{
-    m_effect.setAttribute(key, value);
-}
-
-void ParameterContainer::slotStartFilterJobAction()
-{
-    QDomNodeList namenode = m_effect.elementsByTagName("parameter");
-    for (int i = 0; i < namenode.count() ; i++) {
-        QDomElement pa = namenode.item(i).toElement();
-        QString type = pa.attribute("type");
-        if (type == "filterjob") {
-            emit startFilterJob(pa.attribute("filtertag"), pa.attribute("filterparams"), pa.attribute("finalfilter"), pa.attribute("consumer"), pa.attribute("consumerparams"), pa.attribute("wantedproperties"));
-            kDebug()<<" - - -PROPS:\n"<<pa.attribute("filtertag")<<"-"<< pa.attribute("filterparams")<<"-"<< pa.attribute("consumer")<<"-"<< pa.attribute("consumerparams")<<"-"<< pa.attribute("wantedproperties");
-            break;
-        }
-    }
-}
-
-
 
index 59cf59561758c329a023bf467c90917fe6e56327..e9a5ec9f94ed914d74bb8efd58d4b8f1c7d015dc 100644 (file)
 #ifndef COLLAPSIBLEEFFECT_H
 #define COLLAPSIBLEEFFECT_H
 
+#include "parametercontainer.h"
 #include "abstractcollapsiblewidget.h"
 #include "timecode.h"
-#include "keyframeedit.h"
+
 
 #include <QDomElement>
 #include <QToolButton>
 class QFrame;
 class QLabel;
 
-class Monitor;
-class GeometryWidget;
-
-struct EffectMetaInfo {
-    MltVideoProfile profile;
-    Timecode timecode;
-    Monitor *monitor;
-    QPoint frameSize;
-    bool trackMode;
-};
-
-enum WIPE_DIRECTON { UP = 0, DOWN = 1, LEFT = 2, RIGHT = 3, CENTER = 4 };
-
-struct wipeInfo {
-    WIPE_DIRECTON start;
-    WIPE_DIRECTON end;
-    int startTransparency;
-    int endTransparency;
-};
-
-class MySpinBox : public QSpinBox
-{
-    Q_OBJECT
-
-public:
-    MySpinBox(QWidget * parent = 0);
-    
-protected:
-    virtual void focusInEvent(QFocusEvent*);
-    virtual void focusOutEvent(QFocusEvent*);
-};
-
-class ParameterContainer : public QObject
-{
-    Q_OBJECT
-
-public:
-    ParameterContainer(QDomElement effect, ItemInfo info, EffectMetaInfo *metaInfo, QWidget * parent = 0);
-    ~ParameterContainer();
-    void updateTimecodeFormat();
-    void updateProjectFormat(MltVideoProfile profile, Timecode t);
-    void updateParameter(const QString &key, const QString &value);
-
-private slots:
-    void slotCollectAllParameters();
-    void slotStartFilterJobAction();
-
-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;
-    QList<QWidget*> m_uiItems;
-    QMap<QString, QWidget*> m_valueItems;
-    Timecode m_timecode;
-    KeyframeEdit *m_keyframeEditor;
-    GeometryWidget *m_geometryWidget;
-    EffectMetaInfo *m_metaInfo;
-    QDomElement m_effect;
-    QVBoxLayout *m_vbox;
-
-signals:
-    void parameterChanged(const QDomElement, const QDomElement, int);
-    void syncEffectsPos(int);
-    void effectStateChanged(bool);
-    void checkMonitorPosition(int);
-    void seekTimeline(int);
-    void showComments(bool);    
-    /** @brief Start an MLT filter job on this clip. */
-    void startFilterJob(QString filterName, QString filterParams, QString finalFilterName, QString consumer, QString consumerParams, QString properties);
-    
-};
 
 /**)
  * @class CollapsibleEffect
@@ -123,7 +46,6 @@ class CollapsibleEffect : public AbstractCollapsibleWidget
 public:
     CollapsibleEffect(QDomElement effect, QDomElement original_effect, ItemInfo info, EffectMetaInfo *metaInfo, bool lastEffect, QWidget * parent = 0);
     ~CollapsibleEffect();
-    static QMap<QString, QImage> iconCache;
     QLabel *title;
        
     void setupWidget(ItemInfo info, EffectMetaInfo *metaInfo);
@@ -145,12 +67,12 @@ public:
     bool isActive() const;
     /** @brief Should the wheel event be sent to parent widget for scrolling. */
     bool filterWheelEvent;
-    /** @brief Return the stylesheet required for effect parameters. */
-    static const QString getStyleSheet();
     /** @brief Parent group was collapsed, update. */
     void groupStateChanged(bool collapsed);
     /** @brief Show / hide up / down buttons. */
     void adjustButtons(int ix, int max);
+    /** @brief Returns true of this effect requires an on monitor adjustable effect scene. */
+    bool needsMonitorEffectScene();
 
 public slots:
     void slotSyncEffectsPos(int pos);
index 993c0e06c6346f82245ef4e63ba340645faf1046..b2aa5de240b68ed47efb209ed8705aa9730d881e 100644 (file)
@@ -35,6 +35,7 @@
 #include <KStandardDirs>
 #include <KFileDialog>
 #include <KColorScheme>
+#include <KColorUtils>
 
 #include <QMenu>
 #include <QTextStream>
@@ -69,7 +70,7 @@ EffectStackView2::EffectStackView2(Monitor *monitor, QWidget *parent) :
     setEnabled(false);
 
     
-    setStyleSheet(CollapsibleEffect::getStyleSheet());
+    setStyleSheet(getStyleSheet());
 }
 
 EffectStackView2::~EffectStackView2()
@@ -78,7 +79,7 @@ EffectStackView2::~EffectStackView2()
 
 void EffectStackView2::updatePalette()
 {
-    setStyleSheet(CollapsibleEffect::getStyleSheet());
+    setStyleSheet(getStyleSheet());
 }
 
 void EffectStackView2::slotRenderPos(int pos)
@@ -406,10 +407,11 @@ void EffectStackView2::slotSeekTimeline(int pos)
 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);
+       if (!m_effectMetaInfo.monitor->effectSceneDisplayed())
+        //if (!m_effectMetaInfo.monitor->getEffectEdit()->getScene()->views().at(0)->isVisible())
+            m_effectMetaInfo.monitor->slotShowEffectScene(true);
     } else {
-        m_effectMetaInfo.monitor->slotEffectScene(false);
+        m_effectMetaInfo.monitor->slotShowEffectScene(false);
     }
 }
 
@@ -521,6 +523,7 @@ void EffectStackView2::slotSetCurrentEffect(int ix)
        for (int i = 0; i < m_effects.count(); i++) {
            if (m_effects.at(i)->effectIndex() == ix) {
                m_effects.at(i)->setActive(true);
+               m_effectMetaInfo.monitor->slotShowEffectScene(m_effects.at(i)->needsMonitorEffectScene());
                m_ui.labelComment->setText(i18n(m_effects.at(i)->effect().firstChildElement("description").firstChildElement("full").text().toUtf8().data()));
                m_ui.labelComment->setHidden(!m_ui.buttonShowComments->isChecked() || m_ui.labelComment->text().isEmpty());
            }
@@ -866,4 +869,46 @@ void EffectStackView2::dropEvent(QDropEvent *event)
     processDroppedEffect(doc.documentElement(), event);
 }
 
+//static
+const QString EffectStackView2::getStyleSheet()
+{
+    KColorScheme scheme(QApplication::palette().currentColorGroup(), KColorScheme::View, KSharedConfig::openConfig(KdenliveSettings::colortheme()));
+    QColor selected_bg = scheme.decoration(KColorScheme::FocusColor).color();
+    QColor hgh = KColorUtils::mix(QApplication::palette().window().color(), selected_bg, 0.2);
+    QColor hover_bg = scheme.decoration(KColorScheme::HoverColor).color();
+    QColor light_bg = scheme.shade(KColorScheme::LightShade);
+    QColor alt_bg = scheme.background(KColorScheme::NormalBackground).color();
+    
+    QString stylesheet;
+    
+    // effect background
+    stylesheet.append(QString("QFrame#decoframe {border-top-left-radius:5px;border-top-right-radius:5px;border-bottom:2px solid palette(mid);border-top:1px solid palette(light);} QFrame#decoframe[active=\"true\"] {background: %1;}").arg(hgh.name()));
+    
+    // effect in group background
+    stylesheet.append(QString("QFrame#decoframesub {border-top:1px solid palette(light);}  QFrame#decoframesub[active=\"true\"] {background: %1;}").arg(hgh.name()));
+    
+    // group background
+    stylesheet.append(QString("QFrame#decoframegroup {border-top-left-radius:5px;border-top-right-radius:5px;border:2px solid palette(dark);margin:0px;margin-top:2px;} "));
+    
+    // effect title bar
+    stylesheet.append(QString("QFrame#frame {margin-bottom:2px;border-top-left-radius:5px;border-top-right-radius:5px;}  QFrame#frame[target=\"true\"] {background: palette(highlight);}"));
+
+    // group effect title bar
+    stylesheet.append(QString("QFrame#framegroup {border-top-left-radius:2px;border-top-right-radius:2px;background: palette(dark);}  QFrame#framegroup[target=\"true\"] {background: palette(highlight);} "));
+    
+    // draggable effect bar content
+    stylesheet.append(QString("QProgressBar::chunk:horizontal {background: palette(button);border-top-left-radius: 4px;border-bottom-left-radius: 4px;} QProgressBar::chunk:horizontal#dragOnly {background: %1;border-top-left-radius: 4px;border-bottom-left-radius: 4px;} QProgressBar::chunk:horizontal:hover {background: %2;}").arg(alt_bg.name()).arg(selected_bg.name()));
+    
+    // draggable effect bar
+    stylesheet.append(QString("QProgressBar:horizontal {border: 1px solid palette(dark);border-top-left-radius: 4px;border-bottom-left-radius: 4px;border-right:0px;background:%3;padding: 0px;text-align:left center} QProgressBar:horizontal:disabled {border: 1px solid palette(button)} QProgressBar:horizontal#dragOnly {background: %3} QProgressBar:horizontal[inTimeline=\"true\"] { border: 1px solid %1;border-right: 0px;background: %2;padding: 0px;text-align:left center } QProgressBar::chunk:horizontal[inTimeline=\"true\"] {background: %1;}").arg(hover_bg.name()).arg(light_bg.name()).arg(alt_bg.name()));
+    
+    // spin box for draggable widget
+    stylesheet.append(QString("QAbstractSpinBox#dragBox {border: 1px solid palette(dark);border-top-right-radius: 4px;border-bottom-right-radius: 4px;padding-right:0px;} QAbstractSpinBox::down-button#dragBox {width:0px;padding:0px;} QAbstractSpinBox:disabled#dragBox {border: 1px solid palette(button);} QAbstractSpinBox::up-button#dragBox {width:0px;padding:0px;} QAbstractSpinBox[inTimeline=\"true\"]#dragBox { border: 1px solid %1;} QAbstractSpinBox:hover#dragBox {border: 1px solid %2;} ").arg(hover_bg.name()).arg(selected_bg.name()));
+    
+    // group editable labels
+    stylesheet.append(QString("MyEditableLabel { background-color: transparent; color: palette(bright-text); border-radius: 2px;border: 1px solid transparent;} MyEditableLabel:hover {border: 1px solid palette(highlight);} "));
+    
+    return stylesheet;
+}
+
 #include "effectstackview2.moc"
index 6a6cdcc012a1dd23e64568210507b84d62126bec..d6e0e9b14afee5c0cb718800b4353be93d452292 100644 (file)
@@ -25,7 +25,6 @@
 #define EFFECTSTACKVIEW2_H
 
 #include "ui_effectstack2_ui.h"
-#include "effectstackedit.h"
 #include "collapsibleeffect.h"
 #include "collapsiblegroup.h"
 
@@ -72,6 +71,9 @@ public:
     
     /** @brief Process dropped xml effect. */
     void processDroppedEffect(QDomElement e, QDropEvent *event);
+    
+    /** @brief Return the stylesheet required for effect parameters. */
+    static const QString getStyleSheet();
 
 protected:
     virtual void mouseMoveEvent(QMouseEvent * event);
diff --git a/src/effectstack/parametercontainer.cpp b/src/effectstack/parametercontainer.cpp
new file mode 100644 (file)
index 0000000..97e1cfb
--- /dev/null
@@ -0,0 +1,842 @@
+/***************************************************************************
+ *   Copyright (C) 2012 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 "ui_listval_ui.h"
+#include "ui_boolval_ui.h"
+#include "ui_wipeval_ui.h"
+#include "ui_urlval_ui.h"
+#include "ui_keywordval_ui.h"
+#include "ui_fontval_ui.h"
+#include "complexparameter.h"
+#include "geometryval.h"
+#include "positionedit.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 "dragvalue.h"
+#include "beziercurve/beziersplinewidget.h"
+#ifdef USE_QJSON
+#include "rotoscoping/rotowidget.h"
+#endif
+#include "kdenlivesettings.h"
+#include "profilesdialog.h"
+#include "projectlist.h"
+#include "mainwindow.h"
+#include "parametercontainer.h"
+
+#include <KUrlRequester>
+#include <KFileDialog>
+
+#include <QMap>
+#include <QString>
+#include <QImage>
+
+MySpinBox::MySpinBox(QWidget * parent):
+    QSpinBox(parent)
+{
+    setFocusPolicy(Qt::StrongFocus);
+}
+
+void MySpinBox::focusInEvent(QFocusEvent *e)
+{
+     setFocusPolicy(Qt::WheelFocus);
+     e->accept();
+}
+
+void MySpinBox::focusOutEvent(QFocusEvent *e)
+{
+     setFocusPolicy(Qt::StrongFocus);
+     e->accept();
+}
+
+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
+{
+};
+
+class Keywordval: public QWidget, public Ui::Keywordval_UI
+{
+};
+
+class Fontval: public QWidget, public Ui::Fontval_UI
+{
+};
+
+
+ParameterContainer::ParameterContainer(QDomElement effect, ItemInfo info, EffectMetaInfo *metaInfo, QWidget * parent) :
+        m_keyframeEditor(NULL),
+        m_geometryWidget(NULL),
+        m_metaInfo(metaInfo),
+        m_effect(effect)
+{
+    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;
+    m_vbox = new QVBoxLayout(parent);
+    m_vbox->setContentsMargins(4, 0, 4, 0);
+    m_vbox->setSpacing(2);
+
+    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);
+           doubleparam->setFocusPolicy(Qt::StrongFocus);
+            m_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);
+           lsval->list->setFocusPolicy(Qt::StrongFocus);
+            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 (!MainWindow::m_lumacache.contains(entry)) {
+                        QImage pix(entry);
+                        MainWindow::m_lumacache.insert(entry, pix.scaled(30, 30, Qt::KeepAspectRatio, Qt::SmoothTransformation));
+                    }
+                   lsval->list->setItemIcon(i, QPixmap::fromImage(MainWindow::m_lumacache.value(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);
+            m_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);
+                m_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);
+                m_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());
+                }
+                m_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 (pa.hasAttribute("paramprefix")) value.remove(0, pa.attribute("paramprefix").size());
+            if (value.startsWith('#'))
+                value = value.replace('#', "0x");
+            ChooseColorWidget *choosecolor = new ChooseColorWidget(paramName, value, parent);
+           choosecolor->setAlphaChannelEnabled(true);
+            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(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);
+            m_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;
+           if (e.attribute("version").toDouble() > 0.2) {
+               // Rounding gives really weird results. (int) (10 * 0.3) gives 2! So for now, add 0.5 to get correct result
+                number = EffectsList::parameter(e, pa.attribute("number")).toDouble() * 10 + 0.5;
+            } else {
+                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));
+            MySpinBox *spinin = new MySpinBox();
+            spinin->setRange(0, 1000);
+            MySpinBox *spinout = new MySpinBox();
+            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(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;
+            m_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)));
+            m_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 if (type == "keywords") {
+            Keywordval* kval = new Keywordval;
+            kval->setupUi(toFillin);
+            kval->label->setText(paramName);
+            kval->lineeditwidget->setText(value);
+            QDomElement klistelem = pa.firstChildElement("keywords");
+            QDomElement kdisplaylistelem = pa.firstChildElement("keywordsdisplay");
+            QStringList keywordlist;
+            QStringList keyworddisplaylist;
+            if (!klistelem.isNull()) {
+                keywordlist = klistelem.text().split(';');
+                keyworddisplaylist = i18n(kdisplaylistelem.text().toUtf8().data()).split(';');
+            }
+            if (keyworddisplaylist.count() != keywordlist.count()) {
+                keyworddisplaylist = keywordlist;
+            }
+            for (int i = 0; i < keywordlist.count(); i++) {
+                kval->comboboxwidget->addItem(keyworddisplaylist.at(i), keywordlist.at(i));
+            }
+            // Add disabled user prompt at index 0
+            kval->comboboxwidget->insertItem(0, i18n("<select a keyword>"), "");
+            kval->comboboxwidget->model()->setData( kval->comboboxwidget->model()->index(0,0), QVariant(Qt::NoItemFlags), Qt::UserRole -1);
+            kval->comboboxwidget->setCurrentIndex(0);
+            m_valueItems[paramName] = kval;
+            connect(kval->lineeditwidget, SIGNAL(editingFinished()) , this, SLOT(collectAllParameters()));
+            connect(kval->comboboxwidget, SIGNAL(activated (const QString&)), this, SLOT(collectAllParameters()));
+            m_uiItems.append(kval);
+        } else if (type == "fontfamily") {
+            Fontval* fval = new Fontval;
+            fval->setupUi(toFillin);
+            fval->name->setText(paramName);
+            fval->fontfamilywidget->setCurrentFont(QFont(value));
+            m_valueItems[paramName] = fval;
+            connect(fval->fontfamilywidget, SIGNAL(currentFontChanged(const QFont &)), this, SLOT(collectAllParameters())) ;
+            m_uiItems.append(fval);
+        } else if (type == "filterjob") {
+           QVBoxLayout *l= new QVBoxLayout(toFillin);
+           QPushButton *button = new QPushButton(paramName, toFillin);
+           l->addWidget(button);
+            m_valueItems[paramName] = button;
+            connect(button, SIGNAL(pressed()), this, SLOT(slotStartFilterJobAction()));   
+        } else {
+            delete toFillin;
+            toFillin = NULL;
+        }
+
+        if (toFillin)
+            m_vbox->addWidget(toFillin);
+    }
+
+    if (stretch)
+        m_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);
+    }
+}
+
+ParameterContainer::~ParameterContainer()
+{
+    clearLayout(m_vbox);
+    delete m_vbox;
+}
+
+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 + 0.5)));
+        }
+    }
+}
+
+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 = m_effect.elementsByTagName("parameter");
+
+    for (int i = 0; i < namenode.count() ; i++) {
+        QDomElement pa = namenode.item(i).toElement();
+        QDomElement na = pa.firstChildElement("name");
+        QString type = pa.attribute("type");
+        QString paramName = na.isNull() ? pa.attribute("name") : 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();
+           if (pa.hasAttribute("paramprefix")) setValue.prepend(pa.attribute("paramprefix"));
+        } 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 (m_effect.attribute("id") == "fadein" || m_effect.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(m_effect, "in", QString::number(m_in));
+                EffectsList::setParameter(m_effect, "out", QString::number(m_in + pos));
+                setValue.clear();
+            } else if (m_effect.attribute("id") == "fadeout" || m_effect.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(m_effect, "in", QString::number(m_out - pos));
+                EffectsList::setParameter(m_effect, "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.attribute("number");
+            QString inName = pa.attribute("inpoints");
+            QString outName = pa.attribute("outpoints");
+            int off = pa.attribute("min").toInt();
+            int end = pa.attribute("max").toInt();
+            if (oldparam.attribute("version").toDouble() > 0.2) {
+                EffectsList::setParameter(m_effect, number, locale.toString(points.count() / 10.));
+            } else {
+                EffectsList::setParameter(m_effect, 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(m_effect, in, locale.toString(points.at(j).x()));
+                EffectsList::setParameter(m_effect, out, locale.toString(points.at(j).y()));
+            }
+            QString depends = pa.attribute("depends");
+            if (!depends.isEmpty())
+                meetDependency(paramName, type, EffectsList::parameter(m_effect, depends));
+        } else if (type == "bezier_spline") {
+            BezierSplineWidget *widget = (BezierSplineWidget*)m_valueItems.value(paramName);
+            setValue = widget->spline();
+            QString depends = pa.attribute("depends");
+            if (!depends.isEmpty())
+                meetDependency(paramName, type, EffectsList::parameter(m_effect, 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) {
+            QString realName = i18n(na.toElement().text().toUtf8().data());
+            QString val = m_keyframeEditor->getValue(realName);
+            pa.setAttribute("keyframes", val);
+
+            if (m_keyframeEditor->isVisibleParam(realName)) {
+                pa.setAttribute("intimeline", "1");
+           }
+            else if (pa.hasAttribute("intimeline"))
+                pa.removeAttribute("intimeline");
+        } else if (type == "url") {
+            KUrlRequester *req = ((Urlval*)m_valueItems.value(paramName))->urlwidget;
+            setValue = req->url().path();
+       } else if (type == "keywords"){
+            QLineEdit *line = ((Keywordval*)m_valueItems.value(paramName))->lineeditwidget;
+            QComboBox *combo = ((Keywordval*)m_valueItems.value(paramName))->comboboxwidget;
+            if(combo->currentIndex())
+            {
+                QString comboval = combo->itemData(combo->currentIndex()).toString();
+                line->insert(comboval);
+                combo->setCurrentIndex(0);
+            }
+            setValue = line->text();
+        } else if (type == "fontfamily") {
+            QFontComboBox* fontfamily = ((Fontval*)m_valueItems.value(paramName))->fontfamilywidget;
+            setValue = fontfamily->currentFont().family();
+        }
+        if (!setValue.isNull())
+            pa.setAttribute("value", setValue);
+
+    }
+    emit parameterChanged(oldparam, m_effect, m_effect.attribute("kdenlive_ix").toInt());
+}
+
+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);
+}
+
+void ParameterContainer::updateParameter(const QString &key, const QString &value)
+{
+    m_effect.setAttribute(key, value);
+}
+
+void ParameterContainer::slotStartFilterJobAction()
+{
+    QDomNodeList namenode = m_effect.elementsByTagName("parameter");
+    for (int i = 0; i < namenode.count() ; i++) {
+        QDomElement pa = namenode.item(i).toElement();
+        QString type = pa.attribute("type");
+        if (type == "filterjob") {
+            emit startFilterJob(pa.attribute("filtertag"), pa.attribute("filterparams"), pa.attribute("finalfilter"), pa.attribute("consumer"), pa.attribute("consumerparams"), pa.attribute("wantedproperties"));
+            kDebug()<<" - - -PROPS:\n"<<pa.attribute("filtertag")<<"-"<< pa.attribute("filterparams")<<"-"<< pa.attribute("consumer")<<"-"<< pa.attribute("consumerparams")<<"-"<< pa.attribute("wantedproperties");
+            break;
+        }
+    }
+}
+
+
+void ParameterContainer::clearLayout(QLayout *layout)
+{
+    QLayoutItem *item;
+    while((item = layout->takeAt(0))) {
+        if (item->layout()) {
+            clearLayout(item->layout());
+            delete item->layout();
+        }
+        if (item->widget()) {
+            delete item->widget();
+        }
+        delete item;
+    }
+}
+
+bool ParameterContainer::needsMonitorEffectScene()
+{
+    return true;
+}
diff --git a/src/effectstack/parametercontainer.h b/src/effectstack/parametercontainer.h
new file mode 100644 (file)
index 0000000..b428f0d
--- /dev/null
@@ -0,0 +1,109 @@
+/***************************************************************************
+ *   Copyright (C) 2012 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 PARAMETERCONTAINER_H
+#define PARAMETERCONTAINER_H
+
+#include "keyframeedit.h"
+
+class GeometryWidget;
+class Monitor;
+
+struct EffectMetaInfo {
+    MltVideoProfile profile;
+    Timecode timecode;
+    Monitor *monitor;
+    QPoint frameSize;
+    bool trackMode;
+};
+
+enum WIPE_DIRECTON { UP = 0, DOWN = 1, LEFT = 2, RIGHT = 3, CENTER = 4 };
+
+struct wipeInfo {
+    WIPE_DIRECTON start;
+    WIPE_DIRECTON end;
+    int startTransparency;
+    int endTransparency;
+};
+
+class MySpinBox : public QSpinBox
+{
+    Q_OBJECT
+
+public:
+    MySpinBox(QWidget * parent = 0);
+    
+protected:
+    virtual void focusInEvent(QFocusEvent*);
+    virtual void focusOutEvent(QFocusEvent*);
+};
+
+class ParameterContainer : public QObject
+{
+    Q_OBJECT
+
+public:
+    ParameterContainer(QDomElement effect, ItemInfo info, EffectMetaInfo *metaInfo, QWidget * parent = 0);
+    ~ParameterContainer();
+    void updateTimecodeFormat();
+    void updateProjectFormat(MltVideoProfile profile, Timecode t);
+    void updateParameter(const QString &key, const QString &value);
+    /** @brief Returns true of this effect requires an on monitor adjustable effect scene. */
+    bool needsMonitorEffectScene();
+
+private slots:
+    void slotCollectAllParameters();
+    void slotStartFilterJobAction();
+
+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);
+    /** @brief Delete all child widgets */
+    void clearLayout(QLayout *layout);
+    
+    int m_in;
+    int m_out;
+    QList<QWidget*> m_uiItems;
+    QMap<QString, QWidget*> m_valueItems;
+    Timecode m_timecode;
+    KeyframeEdit *m_keyframeEditor;
+    GeometryWidget *m_geometryWidget;
+    EffectMetaInfo *m_metaInfo;
+    QDomElement m_effect;
+    QVBoxLayout *m_vbox;
+
+signals:
+    void parameterChanged(const QDomElement, const QDomElement, int);
+    void syncEffectsPos(int);
+    void effectStateChanged(bool);
+    void checkMonitorPosition(int);
+    void seekTimeline(int);
+    void showComments(bool);    
+    /** @brief Start an MLT filter job on this clip. */
+    void startFilterJob(QString filterName, QString filterParams, QString finalFilterName, QString consumer, QString consumerParams, QString properties);
+    
+};
+
+#endif
+
index 85a526f12e5d5431a2f137ed36ef5662191f0569..85f6a2b1d07569cacf33845a356e383e37cd7e24 100644 (file)
  ***************************************************************************/
 
 #include "effectstackedit.h"
-#include "ui_listval_ui.h"
-#include "ui_boolval_ui.h"
-#include "ui_wipeval_ui.h"
-#include "ui_urlval_ui.h"
-#include "ui_keywordval_ui.h"
-#include "ui_fontval_ui.h"
-#include "complexparameter.h"
-#include "geometryval.h"
-#include "positionedit.h"
-#include "projectlist.h"
+#include "effectstack/effectstackview2.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 <KDebug>
 #include <KLocale>
 #include <KFileDialog>
+#include <KComboBox>
 
 #include <QVBoxLayout>
 #include <QLabel>
 #include <QScrollArea>
 #include <QScrollBar>
 #include <QProgressBar>
+#include <QWheelEvent>
 
 // For QDomNode debugging (output into files); leaving here as sample code.
 //#define DEBUG_ESE
 
 
-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
-{
-};
-
-class Keywordval: public QWidget, public Ui::Keywordval_UI
-{
-};
-
-class Fontval: public QWidget, public Ui::Fontval_UI
-{
-};
-
-QMap<QString, QImage> EffectStackEdit::iconCache;
-
 EffectStackEdit::EffectStackEdit(Monitor *monitor, QWidget *parent) :
     QScrollArea(parent),
     m_in(0),
     m_out(0),
-    m_keyframeEditor(NULL),
-    m_monitor(monitor),
-    m_geometryWidget(NULL),
     m_paramWidget(NULL)
 {
     m_baseWidget = new QWidget(this);
@@ -100,7 +52,7 @@ EffectStackEdit::EffectStackEdit(Monitor *monitor, QWidget *parent) :
     setFrameStyle(QFrame::NoFrame);
     setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::MinimumExpanding));
     
-    setStyleSheet(CollapsibleEffect::getStyleSheet());
+    setStyleSheet(EffectStackView2::getStyleSheet());
     setWidget(m_baseWidget);   
     /*m_vbox = new QVBoxLayout(m_baseWidget);
     m_vbox->setContentsMargins(0, 0, 0, 0);
@@ -110,7 +62,6 @@ EffectStackEdit::EffectStackEdit(Monitor *monitor, QWidget *parent) :
 
 EffectStackEdit::~EffectStackEdit()
 {
-    iconCache.clear();
     delete m_baseWidget;
 }
 
@@ -128,27 +79,6 @@ void EffectStackEdit::updateProjectFormat(MltVideoProfile profile, Timecode t)
 void EffectStackEdit::setFrameSize(QPoint p)
 {
     m_metaInfo.frameSize = p;
-    /*
-    m_frameSize = p;
-    QDomNodeList namenode = m_params.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()) {
-                Geometryval *geom = ((Geometryval*)m_valueItems[paramName+"geometry"]);
-                geom->setFrameSize(m_frameSize);
-                break;
-            }
-            else {
-                if (m_geometryWidget) m_geometryWidget->setFrameSize(m_frameSize);
-                break;
-            }
-        }
-    }*/
 }
 
 void EffectStackEdit::updateTimecodeFormat()
@@ -156,22 +86,6 @@ void EffectStackEdit::updateTimecodeFormat()
     if (m_paramWidget) m_paramWidget->updateTimecodeFormat();
 }
 
-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 == 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)));
-        }
-    }
-}
-
 void EffectStackEdit::updateParameter(const QString &name, const QString &value)
 {
     m_paramWidget->updateParameter(name, value);
@@ -260,594 +174,6 @@ void EffectStackEdit::transferParamDesc(const QDomElement &d, ItemInfo info, boo
     }
     
     return;
-    /*
-    //clearAllItems();
-    if (m_keyframeEditor) delete m_keyframeEditor;
-    m_keyframeEditor = NULL;
-    m_params = d;
-    m_in = isEffect ? info.cropStart.frames(KdenliveSettings::project_fps()) : info.startPos.frames(KdenliveSettings::project_fps());
-    m_out = isEffect ? (info.cropStart + info.cropDuration).frames(KdenliveSettings::project_fps()) - 1 : info.endPos.frames(KdenliveSettings::project_fps());
-    if (m_params.isNull()) {
-//         kDebug() << "// EMPTY EFFECT STACK";
-        return;
-    }
-
-    QDomNodeList namenode = m_params.elementsByTagName("parameter");
-#ifdef DEBUG_ESE
-    QFile debugFile("/tmp/namenodes.txt");
-    if (debugFile.open(QFile::WriteOnly | QFile::Truncate)) {
-        QTextStream out(&debugFile);
-        QTextStream out2(stdout);
-        for (int i = 0; i < namenode.size(); i++) {
-            out << i << ": \n";
-            namenode.at(i).save(out, 2);
-            out2 << i << ": \n";
-            namenode.at(i).save(out2, 2);
-        }
-    }
-#endif
-    int minFrame = d.attribute("start").toInt();
-    int maxFrame = d.attribute("end").toInt();
-    // In transitions, maxFrame is in fact one frame after the end of transition
-    if (maxFrame > 0) maxFrame --;
-
-    bool disable = d.attribute("disable") == "1" && KdenliveSettings::disable_effect_parameters();
-    setEnabled(!disable);
-
-    bool stretch = true;
-
-
-    for (int i = 0; i < namenode.count() ; i++) {
-        QDomElement pa = namenode.item(i).toElement();
-        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());
-        QString value = pa.attribute("value").isNull() ?
-                        pa.attribute("default") : pa.attribute("value");
-
-
-      
-
-        if (type == "double" || type == "constant") {
-            double min;
-            double max;
-            if (pa.attribute("min").contains('%'))
-                min = ProfilesDialog::getStringEval(m_profile, pa.attribute("min"), m_frameSize);
-            else
-                min = pa.attribute("min").toDouble();
-            if (pa.attribute("max").contains('%'))
-                max = ProfilesDialog::getStringEval(m_profile, pa.attribute("max"), m_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(), this);
-            m_vbox->addWidget(doubleparam);
-            m_valueItems[paramName] = doubleparam;
-            connect(doubleparam, SIGNAL(valueChanged(double)), this, SLOT(collectAllParameters()));
-            connect(this, SIGNAL(showComments(bool)), doubleparam, SLOT(slotShowComment(bool)));
-        } else if (type == "list") {
-            Listval *lsval = new Listval;
-            QWidget * toFillin = new QWidget(m_baseWidget);
-            lsval->setupUi(toFillin);
-            m_vbox->addWidget(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 (!EffectStackEdit::iconCache.contains(entry)) {
-                        QImage pix(entry);
-                        EffectStackEdit::iconCache[entry] = pix.scaled(30, 30);
-                    }
-                    lsval->list->setItemIcon(i, QPixmap::fromImage(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(collectAllParameters()));
-            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;
-            QWidget * toFillin = new QWidget(m_baseWidget);
-            bval->setupUi(toFillin);
-            m_vbox->addWidget(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(collectAllParameters()));
-            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(d, pa.attribute("name"), 0, 100);
-            m_vbox->addWidget(pl);
-            m_valueItems[paramName+"complex"] = pl;
-            connect(pl, SIGNAL(parameterChanged()), this, SLOT(collectAllParameters()));
-        } else if (type == "geometry") {
-            if (KdenliveSettings::on_monitor_effects()) {
-                m_geometryWidget = new GeometryWidget(m_monitor, m_timecode, isEffect ? 0 : qMax(0, (int)info.startPos.frames(KdenliveSettings::project_fps())), isEffect, m_params.hasAttribute("showrotation"), this);
-                m_geometryWidget->setFrameSize(m_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(collectAllParameters()));
-                if (minFrame == maxFrame)
-                    m_geometryWidget->setupParam(pa, m_in, m_out);
-                else
-                    m_geometryWidget->setupParam(pa, minFrame, maxFrame);
-                m_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_profile, m_timecode, m_frameSize, isEffect ? 0 : qMax(0, (int)info.startPos.frames(KdenliveSettings::project_fps())));
-                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 == "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_monitor, pa, m_in, m_out, m_timecode, d.attribute("active_keyframe", "-1").toInt(), this);
-                    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_timecode, d.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(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") {
-            ChooseColorWidget *choosecolor = new ChooseColorWidget(paramName, value, this);
-            choosecolor->setAlphaChannelEnabled(pa.attribute("alpha") == "1");
-            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") {
-            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;
-            }
-            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;
-            if (d.attribute("version").toDouble() > 0.2) {
-                number = EffectsList::parameter(d, pa.attribute("number")).toDouble() * 10;
-            } else {
-                number = EffectsList::parameter(d, 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(d, in).toDouble(), EffectsList::parameter(d, 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(d, depends));
-        } else if (type == "bezier_spline") {
-            BezierSplineWidget *widget = new BezierSplineWidget(value, this);
-            stretch = false;
-            m_vbox->addWidget(widget);
-            m_valueItems[paramName] = widget;
-            connect(widget, SIGNAL(modified()), this, SLOT(collectAllParameters()));
-            QString depends = pa.attribute("depends");
-            if (!depends.isEmpty())
-                meetDependency(paramName, type, EffectsList::parameter(d, depends));
-#ifdef USE_QJSON
-        } else if (type == "roto-spline") {
-            RotoWidget *roto = new RotoWidget(value, m_monitor, info, m_timecode, this);
-            roto->slotShowScene(!disable);
-            connect(roto, SIGNAL(valueChanged()), this, SLOT(collectAllParameters()));
-            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)));
-            m_vbox->addWidget(roto);
-            m_valueItems[paramName] = roto;
-#endif
-        } else if (type == "wipe") {
-            Wipeval *wpval = new Wipeval;
-            QWidget * toFillin = new QWidget(m_baseWidget);
-            wpval->setupUi(toFillin);
-            m_vbox->addWidget(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(collectAllParameters()));
-            connect(wpval->end_down, SIGNAL(clicked()), this, SLOT(collectAllParameters()));
-            connect(wpval->end_left, SIGNAL(clicked()), this, SLOT(collectAllParameters()));
-            connect(wpval->end_right, SIGNAL(clicked()), this, SLOT(collectAllParameters()));
-            connect(wpval->end_center, SIGNAL(clicked()), this, SLOT(collectAllParameters()));
-            connect(wpval->start_up, SIGNAL(clicked()), this, SLOT(collectAllParameters()));
-            connect(wpval->start_down, SIGNAL(clicked()), this, SLOT(collectAllParameters()));
-            connect(wpval->start_left, SIGNAL(clicked()), this, SLOT(collectAllParameters()));
-            connect(wpval->start_right, SIGNAL(clicked()), this, SLOT(collectAllParameters()));
-            connect(wpval->start_center, SIGNAL(clicked()), this, SLOT(collectAllParameters()));
-            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_uiItems.append(wpval);
-        } else if (type == "url") {
-            Urlval *cval = new Urlval;
-            QWidget * toFillin = new QWidget(m_baseWidget);
-            cval->setupUi(toFillin);
-            m_vbox->addWidget(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 if (type == "keywords") {
-            Keywordval* kval = new Keywordval;
-            QWidget * toFillin = new QWidget(m_baseWidget);
-            kval->setupUi(toFillin);
-            m_vbox->addWidget(toFillin);
-            kval->label->setText(paramName);
-            kval->lineeditwidget->setText(value);
-            QDomElement klistelem = pa.firstChildElement("keywords");
-            QDomElement kdisplaylistelem = pa.firstChildElement("keywordsdisplay");
-            QStringList keywordlist;
-            QStringList keyworddisplaylist;
-            if (!klistelem.isNull()) {
-                keywordlist = klistelem.text().split(';');
-                keyworddisplaylist = i18n(kdisplaylistelem.text().toUtf8().data()).split(';');
-            }
-            if (keyworddisplaylist.count() != keywordlist.count()) {
-                keyworddisplaylist = keywordlist;
-            }
-            for (int i = 0; i < keywordlist.count(); i++) {
-                kval->comboboxwidget->addItem(keyworddisplaylist.at(i), keywordlist.at(i));
-            }
-            // Add disabled user prompt at index 0
-            kval->comboboxwidget->insertItem(0, i18n("<select a keyword>"), "");
-            kval->comboboxwidget->model()->setData( kval->comboboxwidget->model()->index(0,0), QVariant(Qt::NoItemFlags), Qt::UserRole -1);
-            kval->comboboxwidget->setCurrentIndex(0);
-            m_valueItems[paramName] = kval;
-            connect(kval->lineeditwidget, SIGNAL(editingFinished()) , this, SLOT(collectAllParameters()));
-            connect(kval->comboboxwidget, SIGNAL(activated (const QString&)), this, SLOT(collectAllParameters()));
-            m_uiItems.append(kval);
-        } else if (type == "fontfamily") {
-            Fontval* fval = new Fontval;
-            QWidget * toFillin = new QWidget(m_baseWidget);
-            fval->setupUi(toFillin);
-            m_vbox->addWidget(toFillin);
-            fval->name->setText(paramName);
-            fval->fontfamilywidget->setCurrentFont(QFont(value));
-            m_valueItems[paramName] = fval;
-            connect(fval->fontfamilywidget, SIGNAL(currentFontChanged(const QFont &)), this, SLOT(collectAllParameters())) ;
-            m_uiItems.append(fval);
-        } else if (type == "filterjob") {
-            QPushButton *button = new QPushButton(paramName, m_baseWidget);
-            m_vbox->addWidget(button);
-            m_valueItems[paramName] = button;
-            connect(button, SIGNAL(pressed()), this, SLOT(slotStartFilterJobAction()));   
-        }
-    }
-
-    if (stretch)
-        m_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 EffectStackEdit::collectAllParameters()
-{
-  /*
-    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");
-    QLocale locale;
-
-    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();
-        } 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
-
-                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
-
-                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();
-            if (oldparam.attribute("version").toDouble() > 0.2) {
-                EffectsList::setParameter(newparam, number, locale.toString(points.count() / 10.));
-            } else {
-                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();
-        } else if (type == "keywords"){
-            QLineEdit *line = ((Keywordval*)m_valueItems.value(paramName))->lineeditwidget;
-            QComboBox *combo = ((Keywordval*)m_valueItems.value(paramName))->comboboxwidget;
-            if(combo->currentIndex())
-            {
-                QString comboval = combo->itemData(combo->currentIndex()).toString();
-                line->insert(comboval);
-                combo->setCurrentIndex(0);
-            }
-            setValue = line->text();
-        } else if (type == "fontfamily") {
-            QFontComboBox* fontfamily = ((Fontval*)m_valueItems.value(paramName))->fontfamilywidget;
-            setValue = fontfamily->currentFont().family();
-        }
-
-        if (!setValue.isNull())
-            pa.attributes().namedItem("value").setNodeValue(setValue);
-
-    }
-    emit parameterChanged(oldparam, newparam);*/
-}
-
-void EffectStackEdit::clearAllItems()
-{
-    blockSignals(true);
-    m_valueItems.clear();
-    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;
-    m_geometryWidget = NULL;
-    blockSignals(false);
 }
 
 void EffectStackEdit::slotSyncEffectsPos(int pos)
index 3697e2140fa20a1ebcddf73758029e7f31673259..e6b5efbd5e202330c22d576f12db9d05c946c3f0 100644 (file)
@@ -21,7 +21,7 @@
 #include "definitions.h"
 #include "timecode.h"
 #include "keyframeedit.h"
-#include "effectstack/collapsibleeffect.h"
+#include "effectstack/parametercontainer.h"
 
 #include <QWidget>
 #include <QDomElement>
@@ -56,22 +56,9 @@ public:
     virtual bool eventFilter( QObject * o, QEvent * e );
 
 private:
-    /** @brief Deletes all parameter widgets. */
-    void clearAllItems();
-    /** @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);
-
-    QVBoxLayout *m_vbox;
-    QList<QWidget*> m_uiItems;
-    QMap<QString, QWidget*> m_valueItems;
     int m_in;
     int m_out;
-    KeyframeEdit *m_keyframeEditor;
     Monitor *m_monitor;
-    GeometryWidget *m_geometryWidget;
     EffectMetaInfo m_metaInfo;
     QWidget *m_baseWidget;
     ParameterContainer *m_paramWidget;
@@ -80,11 +67,6 @@ public slots:
     /** @brief Called when an effect is selected, builds the UIĀ for this effect. */
     void transferParamDesc(const QDomElement &d, ItemInfo info, bool isEffect = true);
 
-    /** @brief Called whenever(?) some parameter is changed in the gui.
-     *
-     * Transfers all Dynamic gui parameter settings into m_params(??) */
-    void collectAllParameters();
-
     /** @brief Pass position changes of the timeline cursor to the effects to keep their local timelines in sync. */
     void slotSyncEffectsPos(int pos);
 
index caa49e4ab03266c36da8de44211e6159fa5217f6..57c97da9d96e333ca2242818f73a540292e1f569 100644 (file)
@@ -512,9 +512,9 @@ void EffectStackView::slotCheckMonitorPosition(int renderPos)
 {
     if (m_trackMode || (m_clipref && renderPos >= m_clipref->startPos().frames(KdenliveSettings::project_fps()) && renderPos <= m_clipref->endPos().frames(KdenliveSettings::project_fps()))) {
         if (!m_monitor->getEffectEdit()->getScene()->views().at(0)->isVisible())
-            m_monitor->slotEffectScene(true);
+            m_monitor->slotShowEffectScene(true);
     } else {
-        m_monitor->slotEffectScene(false);
+        m_monitor->slotShowEffectScene(false);
     }
 }
 
index 1aac90f45ed9a1edec569bb6e869c3be87c48273..d654a7995eb9163674382b49472424b58c2cef22 100644 (file)
@@ -100,16 +100,16 @@ GeometryWidget::GeometryWidget(Monitor* monitor, Timecode timecode, int clipPos,
     connect(m_ui.buttonSync,      SIGNAL(toggled(bool)), this, SLOT(slotSetSynchronize(bool)));
 
     m_spinX = new DragValue(i18nc("x axis position", "X"), 0, 0, -99000, 99000, -1, QString(), false, this);
-    m_ui.horizontalLayout->addWidget(m_spinX);
+    m_ui.horizontalLayout->addWidget(m_spinX, 0, 0);
     
     m_spinY = new DragValue(i18nc("y axis position", "Y"), 0, 0, -99000, 99000, -1, QString(), false, this);
-    m_ui.horizontalLayout->addWidget(m_spinY);
+    m_ui.horizontalLayout->addWidget(m_spinY, 0, 1);
     
     m_spinWidth = new DragValue(i18nc("Frame width", "W"), m_monitor->render->frameRenderWidth(), 0, 1, 99000, -1, QString(), false, this);
-    m_ui.horizontalLayout->addWidget(m_spinWidth);
+    m_ui.horizontalLayout->addWidget(m_spinWidth, 0, 2);
     
     m_spinHeight = new DragValue(i18nc("Frame height", "H"), m_monitor->render->renderHeight(), 0, 1, 99000, -1, QString(), false, this);
-    m_ui.horizontalLayout->addWidget(m_spinHeight);
+    m_ui.horizontalLayout->addWidget(m_spinHeight, 0, 3);
 
     QMenu *menu = new QMenu(this);
     QAction *adjustSize = new QAction(i18n("Adjust to original size"), this);
@@ -174,9 +174,10 @@ GeometryWidget::GeometryWidget(Monitor* monitor, Timecode timecode, int clipPos,
     alignButton->setDefaultAction(alignbottom);
     alignButton->setAutoRaise(true);
     alignLayout->addWidget(alignButton);
+    alignLayout->addStretch(10);
 
-    m_ui.horizontalLayout->addLayout(alignLayout);
-    m_ui.horizontalLayout->addStretch(10);
+    m_ui.horizontalLayout->addLayout(alignLayout, 1, 0, 1, 4);
+    //m_ui.horizontalLayout->addStretch(10);
     
     m_spinSize = new DragValue(i18n("Size"), 100, 2, 1, 99000, -1, i18n("%"), false, this);
     m_ui.horizontalLayout2->addWidget(m_spinSize);
@@ -254,7 +255,7 @@ GeometryWidget::~GeometryWidget()
     }
     if (m_monitor) {
         m_monitor->getEffectEdit()->showVisibilityButton(false);
-        m_monitor->slotEffectScene(false);
+        m_monitor->slotShowEffectScene(false);
     }
 }
 
@@ -538,9 +539,9 @@ void GeometryWidget::slotCheckMonitorPosition(int renderPos)
         } else {
             if (renderPos >= m_clipPos && renderPos <= m_clipPos + m_outPoint - m_inPoint) {
                 if (!m_scene->views().at(0)->isVisible())
-                    m_monitor->slotEffectScene(true);
+                    m_monitor->slotShowEffectScene(true);
             } else {
-                m_monitor->slotEffectScene(false);
+                m_monitor->slotShowEffectScene(false);
             }
         }
     }
@@ -707,7 +708,7 @@ void GeometryWidget::slotShowScene(bool show)
 {
     m_showScene = show;
     if (!m_showScene)
-        m_monitor->slotEffectScene(false);
+        m_monitor->slotShowEffectScene(false);
     else
         slotCheckMonitorPosition(m_monitor->render->seekFramePosition());
 }
index 692b3978f45e98e563b6f3564f9eb0284efeb4b0..abe49c4eb7012d6ae5eaf5cde14f4a7548a9f6a8 100644 (file)
@@ -20,7 +20,6 @@
 #include "initeffects.h"
 #include "kdenlivesettings.h"
 #include "effectslist.h"
-#include "effectstackedit.h"
 #include "mainwindow.h"
 
 #include <KDebug>
@@ -49,10 +48,10 @@ void initEffectsThumbnailer::run()
     foreach(const QString & entry, m_list) {
         kDebug() << entry;
         if (!entry.isEmpty() && (entry.endsWith(".png") || entry.endsWith(".pgm"))) {
-            if (!EffectStackEdit::iconCache.contains(entry)) {
+            if (!MainWindow::m_lumacache.contains(entry)) {
                 QImage pix(entry);
                 //if (!pix.isNull())
-                EffectStackEdit::iconCache[entry] = pix.scaled(30, 30);
+               MainWindow::m_lumacache.insert(entry, pix.scaled(30, 30, Qt::KeepAspectRatio, Qt::SmoothTransformation));
                 kDebug() << "stored";
             }
         }
index 2833c3566a765703f77b1139fab1f6132d9e94b5..9f4335682e9f4683b9c0bf15def84c3c79cc3051 100644 (file)
@@ -140,6 +140,8 @@ EffectsList MainWindow::audioEffects;
 EffectsList MainWindow::customEffects;
 EffectsList MainWindow::transitions;
 
+QMap <QString,QImage> MainWindow::m_lumacache;
+
 MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, const QString & clipsToLoad, QWidget *parent) :
     KXmlGuiWindow(parent),
     m_activeDocument(NULL),
@@ -207,7 +209,7 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, const QString &
     // FIXME: the next call returns a newly allocated object, which leaks
     initEffects::parseEffectFiles();
     //initEffects::parseCustomEffectsFile();
-
+    
     m_monitorManager = new MonitorManager();
 
     m_shortcutRemoveFocus = new QShortcut(QKeySequence("Esc"), this);
index 3b33dad7a91b0e49bc4a76871a477c97aad96e66..22265d61e0970d93a37c00a5488b0e0808c1d2e7 100644 (file)
@@ -28,6 +28,9 @@
 #include <QEvent>
 #include <QTimer>
 #include <QShortcut>
+#include <QMap>
+#include <QString>
+#include <QImage>
 
 #include <KXmlGuiWindow>
 #include <KTextEdit>
@@ -38,6 +41,7 @@
 #include <KComboBox>
 #include <kautosavefile.h>
 #include <KActionCategory>
+#include <KImageCache>
 
 #include "effectslist.h"
 #include "gentime.h"
@@ -109,6 +113,10 @@ public:
     static EffectsList audioEffects;
     static EffectsList customEffects;
     static EffectsList transitions;
+    
+    /** @brief Cache for luma files thumbnails. */
+    static QMap <QString,QImage> m_lumacache;
+
 protected:
 
     /** @brief Closes the window.
index 4384a4d202224ecc363186c387912a7a3a408a8a..f97d491532845a420f5f3a4dd9f2de1757265423 100644 (file)
@@ -986,7 +986,7 @@ void Monitor::slotSetSelectedClip(Transition* item)
 }
 
 
-void Monitor::slotEffectScene(bool show)
+void Monitor::slotShowEffectScene(bool show)
 {
     if (m_id == Kdenlive::projectMonitor) {
         if (videoSurface) {
index 2bdf65f45a73ed5c7d290578c7c15265af786c8e..d7e1380c75785fb814e6d44a963196b798c53cda 100644 (file)
@@ -200,7 +200,8 @@ public slots:
     void adjustRulerSize(int length);
     void setTimePos(const QString &pos);
     QStringList getZoneInfo() const;
-    void slotEffectScene(bool show = true);
+    /** @brief Display the on monitor effect scene (to adjust geometry over monitor). */
+    void slotShowEffectScene(bool show = true);
     bool effectSceneDisplayed();
 
     /** @brief Sets m_selectedClip to @param item. Used for looping it. */
index fb3721e46ead16278b6b34b379d6dde04e38045e..0116fd2fed398718996c7e874f375f831988a404 100644 (file)
@@ -91,7 +91,7 @@ RotoWidget::~RotoWidget()
         MonitorEditWidget *edit = m_monitor->getEffectEdit();
         edit->showVisibilityButton(false);
         edit->removeCustomControls();
-        m_monitor->slotEffectScene(false);
+        m_monitor->slotShowEffectScene(false);
     }
 }
 
@@ -112,7 +112,7 @@ void RotoWidget::slotShowScene(bool show)
 {
     m_showScene = show;
     if (!m_showScene)
-        m_monitor->slotEffectScene(false);
+        m_monitor->slotShowEffectScene(false);
     else
         slotCheckMonitorPosition(m_monitor->render->seekFramePosition());
 }
index f890ab18ecedc6785d6c189337abbbefba08e0b1..f89fafc27f607d3698f96730da9baba484e51651 100644 (file)
@@ -224,10 +224,11 @@ void TransitionSettings::slotSeekTimeline(int pos)
 void TransitionSettings::slotCheckMonitorPosition(int renderPos)
 {
     if (renderPos >= m_usedTransition->startPos().frames(KdenliveSettings::project_fps()) && renderPos <= m_usedTransition->endPos().frames(KdenliveSettings::project_fps())) {
-        if (!m_effectEdit->monitor()->getEffectEdit()->getScene()->views().at(0)->isVisible())
-            m_effectEdit->monitor()->slotEffectScene(true);
+        if (!m_effectEdit->monitor()->effectSceneDisplayed())
+           //m_effectEdit->monitor()->getEffectEdit()->getScene()->views().at(0)->isVisible())
+            m_effectEdit->monitor()->slotShowEffectScene(true);
     } else {
-        m_effectEdit->monitor()->slotEffectScene(false);
+        m_effectEdit->monitor()->slotShowEffectScene(false);
     }
 }
 
index e720b3e3495b3dc792fb505b20747ee12d5821e1..b83e2f562f699fc763e33f728b717646ab6baea8 100644 (file)
@@ -7,14 +7,14 @@
     <x>0</x>
     <y>0</y>
     <width>129</width>
-    <height>86</height>
+    <height>85</height>
    </rect>
   </property>
   <layout class="QGridLayout" name="gridLayout_3">
-   <property name="horizontalSpacing">
+   <property name="margin">
     <number>0</number>
    </property>
-   <property name="margin">
+   <property name="spacing">
     <number>0</number>
    </property>
    <item row="0" column="0">
       <property name="margin">
        <number>0</number>
       </property>
-      <item row="0" column="0" colspan="5">
-       <layout class="QHBoxLayout" name="horizontalLayout"/>
+      <item row="0" column="0" colspan="2">
+       <layout class="QGridLayout" name="horizontalLayout"/>
       </item>
-      <item row="2" column="0" colspan="5">
+      <item row="2" column="0" colspan="2">
        <layout class="QHBoxLayout" name="horizontalLayout3"/>
       </item>
-      <item row="1" column="0" colspan="5">
+      <item row="1" column="0" colspan="2">
        <layout class="QHBoxLayout" name="horizontalLayout2">
         <property name="leftMargin">
          <number>0</number>