X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Feffectstackedit.cpp;h=fe62a739fc22442e33af06d48da7464c87a0382e;hb=5feac3c2f6edfa8639d8e9b9aa5a82c21f3d1776;hp=fc979af8230492198315f635d7ab9032e4c3c6a3;hpb=d8702e10b55338ae1cfe51d186ae60c7a645ee78;p=kdenlive diff --git a/src/effectstackedit.cpp b/src/effectstackedit.cpp index fc979af8..fe62a739 100644 --- a/src/effectstackedit.cpp +++ b/src/effectstackedit.cpp @@ -33,10 +33,16 @@ #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 @@ -44,6 +50,9 @@ #include #include +// For QDomNode debugging (output into files); leaving here as sample code. +//#define DEBUG_ESE + class Boolval: public QWidget, public Ui::Boolval_UI { @@ -64,25 +73,35 @@ class Urlval: public QWidget, public Ui::Urlval_UI QMap EffectStackEdit::iconCache; EffectStackEdit::EffectStackEdit(Monitor *monitor, QWidget *parent) : - QScrollArea(parent), - m_in(0), - m_out(0), - m_frameSize(QPoint()), - m_keyframeEditor(NULL), - m_monitor(monitor) + QScrollArea(parent), + m_in(0), + m_out(0), + m_frameSize(QPoint()), + m_keyframeEditor(NULL), + m_monitor(monitor) { 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); + QColor mid_bg = scheme.shade(KColorScheme::DarkShade); + + QString stylesheet(QString("QProgressBar:horizontal {border: 1px solid %5;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: %5} QProgressBar:horizontal:hover#dragOnly {background: %3} QProgressBar:horizontal:hover {border: 1px solid %3;border-right: 0px;} QProgressBar::chunk:horizontal {background: %5;} 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;} QSpinBox#dragBox {border: 1px solid %1;border-top-right-radius: 4px;border-bottom-right-radius: 4px;padding-right:0px;} QSpinBox::down-button#dragBox {width:0px;padding:0px;} QSpinBox::up-button#dragBox {width:0px;padding:0px;} QSpinBox[inTimeline=\"true\"]#dragBox { border: 1px solid %2;} QSpinBox:hover#dragBox {border: 1px solid %3;} ").arg(dark_bg.name()).arg(selected_bg.name()).arg(hover_bg.name()).arg(light_bg.name()).arg(mid_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() @@ -101,10 +120,17 @@ void EffectStackEdit::setFrameSize(QPoint p) QString type = pa.attributes().namedItem("type").nodeValue(); QString paramName = i18n(na.toElement().text().toUtf8().data()); - if (type == "geometry" && !KdenliveSettings::on_monitor_effects()) { - Geometryval *geom = ((Geometryval*)m_valueItems[paramName+"geometry"]); - geom->setFrameSize(m_frameSize); - break; + if (type == "geometry") { + if (!KdenliveSettings::on_monitor_effects()) { + Geometryval *geom = ((Geometryval*)m_valueItems[paramName+"geometry"]); + geom->setFrameSize(m_frameSize); + break; + } + else { + GeometryWidget *geom = ((GeometryWidget*)m_valueItems[paramName+"geometry"]); + geom->setFrameSize(m_frameSize); + break; + } } } } @@ -145,7 +171,12 @@ void EffectStackEdit::meetDependency(const QString& name, QString type, QString KisCurveWidget *curve = (KisCurveWidget*)m_valueItems[name]; if (curve) { int color = value.toInt(); - curve->setPixmap(QPixmap::fromImage(ColorTools::rgbCurvePlane(curve->size(), (ColorTools::ColorsRGB)color))); + 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))); } } } @@ -159,6 +190,13 @@ 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, bool isEffect) @@ -175,16 +213,38 @@ void EffectStackEdit::transferParamDesc(const QDomElement d, int pos, int in, in } 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"); @@ -215,17 +275,21 @@ void EffectStackEdit::transferParamDesc(const QDomElement d, int pos, int in, in max = pa.attribute("max").toInt(); DoubleParameterWidget *doubleparam = new DoubleParameterWidget(paramName, (int)(value.toDouble() + 0.5), min, max, - pa.attribute("default").toInt(), pa.attribute("suffix"), this); + 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)); @@ -239,17 +303,25 @@ 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") { ComplexParameter *pl = new ComplexParameter; @@ -260,6 +332,8 @@ void EffectStackEdit::transferParamDesc(const QDomElement d, int pos, int in, in } else if (type == "geometry") { if (KdenliveSettings::on_monitor_effects()) { GeometryWidget *geometry = new GeometryWidget(m_monitor, m_timecode, pos, isEffect, this); + geometry->setFrameSize(m_frameSize); + geometry->slotShowScene(!disable); // connect this before setupParam to make sure the monitor scene shows up at startup connect(geometry, SIGNAL(checkMonitorPosition(int)), this, SIGNAL(checkMonitorPosition(int))); connect(geometry, SIGNAL(parameterChanged()), this, SLOT(collectAllParameters())); @@ -271,6 +345,7 @@ void EffectStackEdit::transferParamDesc(const QDomElement d, int pos, int in, in m_valueItems[paramName+"geometry"] = geometry; connect(geometry, SIGNAL(seekToPos(int)), this, SIGNAL(seekTimeline(int))); connect(this, SIGNAL(syncEffectsPos(int)), geometry, SLOT(slotSyncPosition(int))); + connect(this, SIGNAL(effectStateChanged(bool)), geometry, SLOT(slotShowScene(bool))); } else { Geometryval *geo = new Geometryval(m_profile, m_timecode, m_frameSize, pos); if (minFrame == maxFrame) @@ -284,15 +359,26 @@ void EffectStackEdit::transferParamDesc(const QDomElement d, int pos, int in, in connect(this, SIGNAL(syncEffectsPos(int)), geo, SLOT(slotSyncPosition(int))); } } 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); @@ -350,6 +436,26 @@ void EffectStackEdit::transferParamDesc(const QDomElement d, int pos, int in, in 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, this); + roto->slotShowScene(!disable); + connect(roto, SIGNAL(valueChanged()), this, SLOT(collectAllParameters())); + connect(roto, SIGNAL(checkMonitorPosition(int)), this, SIGNAL(checkMonitorPosition(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); @@ -423,7 +529,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) @@ -604,6 +725,17 @@ void EffectStackEdit::collectAllParameters() 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; @@ -637,10 +769,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();