X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Feffectstackedit.cpp;h=24bc2275f3493c127896547a7a212b996c53d012;hb=787f4f5c61761da7d96b3b9143ca28a7b1dd4e5c;hp=a496a6ec229de690cc876f0ad6797e56975d5151;hpb=1fe460ed73bcab3a2b4ca3fd1eb60f3f0d916651;p=kdenlive diff --git a/src/effectstackedit.cpp b/src/effectstackedit.cpp index a496a6ec..24bc2275 100644 --- a/src/effectstackedit.cpp +++ b/src/effectstackedit.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - effecstackview.cpp - description + effecstackedit.cpp - description ------------------- begin : Feb 15 2008 copyright : (C) 2008 by Marco Gittler @@ -16,10 +16,8 @@ ***************************************************************************/ #include "effectstackedit.h" -#include "ui_constval_ui.h" #include "ui_listval_ui.h" #include "ui_boolval_ui.h" -#include "ui_colorval_ui.h" #include "ui_wipeval_ui.h" #include "ui_urlval_ui.h" #include "complexparameter.h" @@ -31,28 +29,32 @@ #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 QJSON +#include "rotoscoping/rotowidget.h" +#endif #include #include #include +#include #include -#include #include #include #include #include +// For QDomNode debugging (output into files); leaving here as sample code. +//#define DEBUG_ESE -class Boolval: public QWidget, public Ui::Boolval_UI -{ -}; - -class Colorval: public QWidget, public Ui::Colorval_UI -{ -}; -class Constval: public QWidget, public Ui::Constval_UI +class Boolval: public QWidget, public Ui::Boolval_UI { }; @@ -70,25 +72,36 @@ class Urlval: public QWidget, public Ui::Urlval_UI QMap EffectStackEdit::iconCache; -EffectStackEdit::EffectStackEdit(QWidget *parent) : - QScrollArea(parent), - m_in(0), - m_out(0), - m_frameSize(QPoint()), - m_keyframeEditor(NULL) +EffectStackEdit::EffectStackEdit(Monitor *monitor, QWidget *parent) : + QScrollArea(parent), + m_in(0), + m_out(0), + m_frameSize(QPoint()), + m_keyframeEditor(NULL), + m_monitor(monitor), + m_geometryWidget(NULL) { m_baseWidget = new QWidget(this); setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded); setFrameStyle(QFrame::NoFrame); setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::MinimumExpanding)); - + + QPalette p = palette(); + KColorScheme scheme(p.currentColorGroup(), KColorScheme::View, KSharedConfig::openConfig(KdenliveSettings::colortheme())); + QColor dark_bg = scheme.shade(KColorScheme::DarkShade); + QColor selected_bg = scheme.decoration(KColorScheme::FocusColor).color(); + QColor hover_bg = scheme.decoration(KColorScheme::HoverColor).color(); + QColor light_bg = scheme.shade(KColorScheme::LightShade); + + QString stylesheet(QString("QProgressBar:horizontal {border: 1px solid %1;border-radius:0px;border-top-left-radius: 4px;border-bottom-left-radius: 4px;border-right: 0px;background:%4;padding: 0px;text-align:left center} QProgressBar:horizontal#dragOnly {background: %1} QProgressBar:horizontal:hover#dragOnly {background: %3} QProgressBar:horizontal:hover {border: 1px solid %3;border-right: 0px;} QProgressBar::chunk:horizontal {background: %1;} QProgressBar::chunk:horizontal:hover {background: %3;} QProgressBar:horizontal[inTimeline=\"true\"] { border: 1px solid %2;border-right: 0px;background: %4;padding: 0px;text-align:left center } QProgressBar::chunk:horizontal[inTimeline=\"true\"] {background: %2;} QAbstractSpinBox#dragBox {border: 1px solid %1;border-top-right-radius: 4px;border-bottom-right-radius: 4px;padding-right:0px;} QAbstractSpinBox::down-button#dragBox {width:0px;padding:0px;} QAbstractSpinBox::up-button#dragBox {width:0px;padding:0px;} QAbstractSpinBox[inTimeline=\"true\"]#dragBox { border: 1px solid %2;} QAbstractSpinBox:hover#dragBox {border: 1px solid %3;} ").arg(dark_bg.name()).arg(selected_bg.name()).arg(hover_bg.name()).arg(light_bg.name())); + setStyleSheet(stylesheet); + setWidget(m_baseWidget); setWidgetResizable(true); m_vbox = new QVBoxLayout(m_baseWidget); m_vbox->setContentsMargins(0, 0, 0, 0); - m_vbox->setSpacing(0); - //wid->show(); + m_vbox->setSpacing(2); } EffectStackEdit::~EffectStackEdit() @@ -108,9 +121,15 @@ void EffectStackEdit::setFrameSize(QPoint p) QString paramName = i18n(na.toElement().text().toUtf8().data()); if (type == "geometry") { - Geometryval *geom = ((Geometryval*)m_valueItems[paramName+"geometry"]); - geom->setFrameSize(m_frameSize); - break; + 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; + } } } } @@ -119,6 +138,7 @@ void EffectStackEdit::updateTimecodeFormat() { if (m_keyframeEditor) m_keyframeEditor->updateTimecodeFormat(); + QDomNodeList namenode = m_params.elementsByTagName("parameter"); for (int i = 0; i < namenode.count() ; i++) { QDomNode pa = namenode.item(i); @@ -127,8 +147,12 @@ void EffectStackEdit::updateTimecodeFormat() QString paramName = i18n(na.toElement().text().toUtf8().data()); if (type == "geometry") { - Geometryval *geom = ((Geometryval*)m_valueItems[paramName+"geometry"]); - geom->updateTimecodeFormat(); + if (KdenliveSettings::on_monitor_effects()) { + if (m_geometryWidget) m_geometryWidget->updateTimecodeFormat(); + } else { + Geometryval *geom = ((Geometryval*)m_valueItems[paramName+"geometry"]); + geom->updateTimecodeFormat(); + } break; } if (type == "position") { @@ -139,6 +163,22 @@ void EffectStackEdit::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::updateProjectFormat(MltVideoProfile profile, Timecode t) { m_profile = profile; @@ -148,9 +188,16 @@ void EffectStackEdit::updateProjectFormat(MltVideoProfile profile, Timecode t) void EffectStackEdit::updateParameter(const QString &name, const QString &value) { m_params.setAttribute(name, value); + + if (name == "disable") { + // if effect is disabled, disable parameters widget + bool enabled = value.toInt() == 0 || !KdenliveSettings::disable_effect_parameters(); + setEnabled(enabled); + emit effectStateChanged(enabled); + } } -void EffectStackEdit::transferParamDesc(const QDomElement d, int pos, int in, int out) +void EffectStackEdit::transferParamDesc(const QDomElement d, int pos, int in, int out, bool isEffect) { clearAllItems(); if (m_keyframeEditor) delete m_keyframeEditor; @@ -163,21 +210,39 @@ void EffectStackEdit::transferParamDesc(const QDomElement d, int pos, int in, in return; } - /*QDomDocument doc; - doc.appendChild(doc.importNode(m_params, true)); - kDebug() << "IMPORTED TRANS: " << doc.toString();*/ - 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 QDomElement e = m_params.toElement(); const int minFrame = e.attribute("start").toInt(); const int maxFrame = e.attribute("end").toInt(); + bool disable = d.attribute("disable") == "1" && KdenliveSettings::disable_effect_parameters(); + setEnabled(!disable); + + bool stretch = true; + for (int i = 0; i < namenode.count() ; i++) { QDomElement pa = namenode.item(i).toElement(); - QDomNode na = pa.firstChildElement("name"); + QDomElement na = pa.firstChildElement("name"); + QDomElement commentElem = pa.firstChildElement("comment"); QString type = pa.attribute("type"); - QString paramName = i18n(na.toElement().text().toUtf8().data()); + QString paramName = i18n(na.text().toUtf8().data()); + QString comment; + if (!commentElem.isNull()) + comment = i18n(commentElem.text().toUtf8().data()); QWidget * toFillin = new QWidget(m_baseWidget); QString value = pa.attribute("value").isNull() ? pa.attribute("default") : pa.attribute("value"); @@ -206,16 +271,23 @@ void EffectStackEdit::transferParamDesc(const QDomElement d, int pos, int in, in max = (int) ProfilesDialog::getStringEval(m_profile, pa.attribute("max")); else max = pa.attribute("max").toInt(); - createSliderItem(paramName, (int)(value.toDouble() + 0.5) , min, max, pa.attribute("suffix", QString())); - delete toFillin; - toFillin = NULL; + + DoubleParameterWidget *doubleparam = new DoubleParameterWidget(paramName, (int)(value.toDouble() + 0.5), min, max, + pa.attribute("default").toInt(), comment, -1, pa.attribute("suffix"), this); + m_vbox->addWidget(doubleparam); + m_valueItems[paramName] = doubleparam; + connect(doubleparam, SIGNAL(valueChanged(int)), this, SLOT(collectAllParameters())); + connect(this, SIGNAL(showComments(bool)), doubleparam, SLOT(slotShowComment(bool))); } else if (type == "list") { Listval *lsval = new Listval; lsval->setupUi(toFillin); QStringList listitems = pa.attribute("paramlist").split(','); - QStringList listitemsdisplay = pa.attribute("paramlistdisplay").split(','); - if (listitemsdisplay.count() != listitems.count()) listitemsdisplay = listitems; - //lsval->list->addItems(listitems); + 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)); @@ -229,81 +301,107 @@ void EffectStackEdit::transferParamDesc(const QDomElement d, int pos, int in, in } } if (!value.isEmpty()) lsval->list->setCurrentIndex(listitems.indexOf(value)); - lsval->title->setTitle(paramName); + 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; bval->setupUi(toFillin); bval->checkBox->setCheckState(value == "0" ? Qt::Unchecked : Qt::Checked); - bval->checkBox->setText(paramName); + 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") { - /*QStringList names=nodeAtts.namedItem("name").nodeValue().split(';'); - QStringList max=nodeAtts.namedItem("max").nodeValue().split(';'); - QStringList min=nodeAtts.namedItem("min").nodeValue().split(';'); - QStringList val=value.split(';'); - kDebug() << "in complex"<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") { - Geometryval *geo = new Geometryval(m_profile, m_timecode, m_frameSize, pos); - if (minFrame == maxFrame) - geo->setupParam(pa, m_in, m_out); - else - geo->setupParam(pa, minFrame, maxFrame); - m_vbox->addWidget(geo); - m_valueItems[paramName+"geometry"] = geo; - connect(geo, SIGNAL(parameterChanged()), this, SLOT(collectAllParameters())); - connect(geo, SIGNAL(seekToPos(int)), this, SIGNAL(seekTimeline(int))); + if (KdenliveSettings::on_monitor_effects()) { + m_geometryWidget = new GeometryWidget(m_monitor, m_timecode, pos, 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, pos); + if (minFrame == maxFrame) + geo->setupParam(pa, m_in, m_out); + else + geo->setupParam(pa, minFrame, maxFrame); + m_vbox->addWidget(geo); + m_valueItems[paramName+"geometry"] = geo; + connect(geo, SIGNAL(parameterChanged()), this, SLOT(collectAllParameters())); + connect(geo, SIGNAL(seekToPos(int)), this, SIGNAL(seekTimeline(int))); + connect(this, SIGNAL(syncEffectsPos(int)), geo, SLOT(slotSyncPosition(int))); + } + } else if (type == "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 - kDebug() << "min: " << m_in << ", MAX: " << m_out; + // keyframe editor widget if (m_keyframeEditor == NULL) { - KeyframeEdit *geo = new KeyframeEdit(pa, m_in, m_in + m_out, pa.attribute("min").toInt(), pa.attribute("max").toInt(), m_timecode, e.attribute("active_keyframe", "-1").toInt()); + KeyframeEdit *geo; + if (pa.attribute("widget") == "corners") { + // we want a corners-keyframe-widget + CornersWidget *corners = new CornersWidget(m_monitor, pa, m_in, m_in + m_out, m_timecode, e.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(corners); + } else { + geo = new KeyframeEdit(pa, m_in, m_in + m_out, m_timecode, e.attribute("active_keyframe", "-1").toInt()); + } m_vbox->addWidget(geo); m_valueItems[paramName+"keyframe"] = geo; m_keyframeEditor = geo; connect(geo, SIGNAL(parameterChanged()), this, SLOT(collectAllParameters())); connect(geo, SIGNAL(seekToPos(int)), this, SIGNAL(seekTimeline(int))); + connect(this, SIGNAL(showComments(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") { - Colorval *cval = new Colorval; - cval->setupUi(toFillin); + if (value.startsWith('#')) + value = value.replace('#', "0x"); bool ok; - if (value.startsWith('#')) value = value.replace('#', "0x"); - cval->kcolorbutton->setColor(value.toUInt(&ok, 16)); - //kDebug() << "color: " << value << ", " << value.toUInt(&ok, 16); - cval->label->setText(paramName); - m_valueItems[paramName] = cval; - connect(cval->kcolorbutton, SIGNAL(clicked()) , this, SLOT(collectAllParameters())); - m_uiItems.append(cval); + ChooseColorWidget *choosecolor = new ChooseColorWidget(paramName, QColor(value.toUInt(&ok, 16)), this); + m_vbox->addWidget(choosecolor); + m_valueItems[paramName] = choosecolor; + connect(choosecolor, SIGNAL(displayMessage(const QString&, int)), this, SIGNAL(displayMessage(const QString&, int))); + connect(choosecolor, SIGNAL(modified()) , this, SLOT(collectAllParameters())); } else if (type == "position") { int pos = value.toInt(); if (d.attribute("id") == "fadein" || d.attribute("id") == "fade_from_black") { pos = pos - m_in; } else if (d.attribute("id") == "fadeout" || d.attribute("id") == "fade_to_black") { // fadeout position starts from clip end - pos = m_out - (pos - m_in); + pos = m_out - pos; } - PositionEdit *posedit = new PositionEdit(paramName, pos, 1, m_out, m_timecode); + 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())); @@ -332,8 +430,34 @@ void EffectStackEdit::transferParamDesc(const QDomElement d, int pos, int in, in m_vbox->addWidget(curve); m_vbox->addWidget(spinin); m_vbox->addWidget(spinout); + connect(curve, SIGNAL(modified()), this, SLOT(collectAllParameters())); m_valueItems[paramName] = curve; + + QString depends = pa.attribute("depends"); + if (!depends.isEmpty()) + meetDependency(paramName, type, EffectsList::parameter(e, depends)); + } else if (type == "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(e, depends)); +#ifdef QJSON + } else if (type == "roto-spline") { + RotoWidget *roto = new RotoWidget(value, m_monitor, m_in, m_out, 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; wpval->setupUi(toFillin); @@ -407,7 +531,22 @@ void EffectStackEdit::transferParamDesc(const QDomElement d, int pos, int in, in if (toFillin) m_vbox->addWidget(toFillin); } - m_vbox->addStretch(); + + if (stretch) + m_vbox->addStretch(); + + if (m_keyframeEditor) + m_keyframeEditor->checkVisibleParam(); + + // Make sure all doubleparam spinboxes have the same width, looks much better + QList allWidgets = findChildren(); + 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); + } } wipeInfo EffectStackEdit::getWipeInfo(QString value) @@ -516,15 +655,15 @@ void EffectStackEdit::collectAllParameters() paramName.append("geometry"); else if (type == "keyframe") paramName.append("keyframe"); - if (type != "simplekeyframe" && !m_valueItems.contains(paramName)) { + if (type != "simplekeyframe" && type != "fixed" && type != "addedgeometry" && !m_valueItems.contains(paramName)) { kDebug() << "// Param: " << paramName << " NOT FOUND"; continue; } QString setValue; if (type == "double" || type == "constant") { - QSlider* slider = ((Constval*)m_valueItems.value(paramName))->horizontalSlider; - setValue = QString::number(slider->value()); + DoubleParameterWidget *doubleparam = (DoubleParameterWidget*)m_valueItems.value(paramName); + setValue = QString::number(doubleparam->getValue()); } else if (type == "list") { KComboBox *box = ((Listval*)m_valueItems.value(paramName))->list; setValue = box->itemData(box->currentIndex()).toString(); @@ -532,14 +671,20 @@ void EffectStackEdit::collectAllParameters() QCheckBox *box = ((Boolval*)m_valueItems.value(paramName))->checkBox; setValue = box->checkState() == Qt::Checked ? "1" : "0" ; } else if (type == "color") { - KColorButton *color = ((Colorval*)m_valueItems.value(paramName))->kcolorbutton; - setValue = color->color().name(); + ChooseColorWidget *choosecolor = ((ChooseColorWidget*)m_valueItems.value(paramName)); + setValue = choosecolor->getColor().name(); } else if (type == "complex") { ComplexParameter *complex = ((ComplexParameter*)m_valueItems.value(paramName)); namenode.item(i) = complex->getParamDesc(); } else if (type == "geometry") { - Geometryval *geom = ((Geometryval*)m_valueItems.value(paramName)); - namenode.item(i).toElement().setAttribute("value", geom->getValue()); + 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(); @@ -559,8 +704,8 @@ void EffectStackEdit::collectAllParameters() pos = m_out; pedit->setPosition(pos); }*/ - EffectsList::setParameter(newparam, "in", QString::number(m_out + m_in - pos)); - EffectsList::setParameter(newparam, "out", QString::number(m_out + m_in)); + EffectsList::setParameter(newparam, "in", QString::number(m_out - pos)); + EffectsList::setParameter(newparam, "out", QString::number(m_out)); setValue.clear(); } } else if (type == "curve") { @@ -580,6 +725,20 @@ void EffectStackEdit::collectAllParameters() EffectsList::setParameter(newparam, in, QString::number(points.at(j).x())); EffectsList::setParameter(newparam, out, QString::number(points.at(j).y())); } + QString depends = pa.attributes().namedItem("depends").nodeValue(); + if (!depends.isEmpty()) + meetDependency(paramName, type, EffectsList::parameter(newparam, depends)); + } else if (type == "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 QJSON + } else if (type == "roto-spline") { + RotoWidget *widget = static_cast(m_valueItems.value(paramName)); + setValue = widget->getSpline(); +#endif } else if (type == "wipe") { Wipeval *wp = (Wipeval*)m_valueItems.value(paramName); wipeInfo info; @@ -613,10 +772,15 @@ void EffectStackEdit::collectAllParameters() 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); - kDebug() << "SET VALUE: " << val; - namenode.item(i).toElement().setAttribute("keyframes", val); + 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(); @@ -629,30 +793,6 @@ void EffectStackEdit::collectAllParameters() emit parameterChanged(oldparam, newparam); } -void EffectStackEdit::createSliderItem(const QString& name, int val , int min, int max, const QString suffix) -{ - QWidget* toFillin = new QWidget(m_baseWidget); - Constval *ctval = new Constval; - ctval->setupUi(toFillin); - ctval->horizontalSlider->setMinimum(min); - ctval->horizontalSlider->setMaximum(max); - if (!suffix.isEmpty()) ctval->spinBox->setSuffix(suffix); - ctval->spinBox->setMinimum(min); - ctval->spinBox->setMaximum(max); - ctval->horizontalSlider->setPageStep((int)(max - min) / 10); - ctval->horizontalSlider->setValue(val); - ctval->label->setText(name); - m_valueItems[name] = ctval; - m_uiItems.append(ctval); - connect(ctval->horizontalSlider, SIGNAL(valueChanged(int)) , this, SLOT(collectAllParameters())); - m_vbox->addWidget(toFillin); -} - -void EffectStackEdit::slotSliderMoved(int) -{ - collectAllParameters(); -} - void EffectStackEdit::clearAllItems() { blockSignals(true); @@ -671,5 +811,11 @@ void EffectStackEdit::clearAllItems() if (wid) delete wid; } m_keyframeEditor = NULL; + m_geometryWidget = NULL; blockSignals(false); } + +void EffectStackEdit::slotSyncEffectsPos(int pos) +{ + emit syncEffectsPos(pos); +}