/***************************************************************************
- effecstackview.cpp - description
+ effecstackedit.cpp - description
-------------------
begin : Feb 15 2008
copyright : (C) 2008 by Marco Gittler
***************************************************************************/
#include "effectstackedit.h"
-#include "ui_constval_ui.h"
#include "ui_listval_ui.h"
#include "ui_boolval_ui.h"
-#include "ui_colorval_ui.h"
#include "ui_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 "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 <KColorScheme>
#include <QVBoxLayout>
-#include <QSlider>
#include <QLabel>
#include <QPushButton>
#include <QCheckBox>
#include <QScrollArea>
+// 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 Listval: public QWidget, public Ui::Listval_UI
{
};
-class Constval: public QWidget, public Ui::Constval_UI
+class Wipeval: public QWidget, public Ui::Wipeval_UI
{
};
-class Listval: public QWidget, public Ui::Listval_UI
+class Urlval: public QWidget, public Ui::Urlval_UI
{
};
-class Wipeval: public QWidget, public Ui::Wipeval_UI
+class Keywordval: public QWidget, public Ui::Keywordval_UI
{
};
-class Urlval: public QWidget, public Ui::Urlval_UI
+class Fontval: public QWidget, public Ui::Fontval_UI
{
};
QMap<QString, QImage> 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);
+ setHorizontalScrollBarPolicy(Qt::ScrollBarAsNeeded);
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()
QDomNodeList namenode = m_params.elementsByTagName("parameter");
for (int i = 0; i < namenode.count() ; i++) {
QDomNode pa = namenode.item(i);
- QDomNode na = pa.firstChildElement("name");
+ QDomElement na = pa.firstChildElement("name");
QString type = pa.attributes().namedItem("type").nodeValue();
- QString paramName = i18n(na.toElement().text().toUtf8().data());
+ QString paramName = na.isNull() ? pa.attributes().namedItem("name").nodeValue() : i18n(na.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;
+ }
}
}
}
void EffectStackEdit::updateTimecodeFormat()
{
+ if (m_keyframeEditor)
+ m_keyframeEditor->updateTimecodeFormat();
+
QDomNodeList namenode = m_params.elementsByTagName("parameter");
for (int i = 0; i < namenode.count() ; i++) {
QDomNode pa = namenode.item(i);
- QDomNode na = pa.firstChildElement("name");
+ QDomElement na = pa.firstChildElement("name");
QString type = pa.attributes().namedItem("type").nodeValue();
- QString paramName = i18n(na.toElement().text().toUtf8().data());
+ QString paramName = na.isNull() ? pa.attributes().namedItem("name").nodeValue() : i18n(na.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") {
+ } else if (type == "position") {
PositionEdit *posi = ((PositionEdit*)m_valueItems[paramName+"position"]);
posi->updateTimecodeFormat();
break;
+ } else if (type == "roto-spline") {
+ RotoWidget *widget = static_cast<RotoWidget *>(m_valueItems[paramName]);
+ widget->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_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, ItemInfo info, bool isEffect)
{
clearAllItems();
if (m_keyframeEditor) delete m_keyframeEditor;
m_keyframeEditor = NULL;
m_params = d;
- m_in = in;
- m_out = out;
+ 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";
+// kDebug() << "// EMPTY EFFECT STACK";
return;
}
- /*QDomDocument doc;
- doc.appendChild(doc.importNode(m_params, true));
- kDebug() << "IMPORTED TRANS: " << doc.toString();*/
-
QDomNodeList namenode = m_params.elementsByTagName("parameter");
- QDomElement e = m_params.toElement();
- const int minFrame = e.attribute("start").toInt();
- const int maxFrame = e.attribute("end").toInt();
+#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();
- 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 = 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(m_baseWidget);
QString value = pa.attribute("value").isNull() ?
pa.attribute("default") : pa.attribute("value");
- /** Currently supported parameter types are:
- * constant (=double): a slider with an integer value (use the "factor" attribute to divide the value so that you can get a double
- * list: a combobox containing a list of values to choose
- * bool: a checkbox
- * complex: designed for keyframe parameters, but old and not finished, do not use
- * geometry: a rectangle that can be moved & resized, with possible keyframes, used in composite transition
- * keyframe: a list widget with a list of entries (position and value)
- * color: a color chooser button
- * position: a slider representing the position of a frame in the current clip
- * curve: a single curve representing multiple points
- * wipe: a widget designed for the wipe transition, allowing to choose a position (left, right, top,...)
- */
+
+ /** See effects/README for info on the different types */
if (type == "double" || type == "constant") {
- int min;
- int max;
- if (pa.attribute("min").startsWith('%')) {
- min = (int) ProfilesDialog::getStringEval(m_profile, pa.attribute("min"));
- } else min = pa.attribute("min").toInt();
- if (pa.attribute("max").startsWith('%')) {
- 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;
+ 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;
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);
+ 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));
}
}
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"<<names.size() << " " << max.size() << " " << min.size() << " " << val.size() ;
- if ( (names.size() == max.size() ) &&
- (names.size()== min.size()) &&
- (names.size()== val.size()) )
- {
- for (int i=0;i< names.size();i++){
- createSliderItem(names[i],val[i].toInt(),min[i].toInt(),max[i].toInt());
- };
- }*/
ComplexParameter *pl = new ComplexParameter;
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") {
- 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, 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
- 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_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") {
- Colorval *cval = new Colorval;
- cval->setupUi(toFillin);
- 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, 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 - 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()));
KisCurveWidget *curve = new KisCurveWidget(this);
curve->setMaxPoints(pa.attribute("max").toInt());
QList<QPointF> points;
- int number = EffectsList::parameter(e, pa.attribute("number")).toInt();
+ 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();
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());
+ points << QPointF(EffectsList::parameter(d, in).toDouble(), EffectsList::parameter(d, out).toDouble());
}
- if (!points.isEmpty()) curve->setCurve(KisCubicCurve(points));
+ if (!points.isEmpty())
+ curve->setCurve(KisCubicCurve(points));
QSpinBox *spinin = new QSpinBox();
spinin->setRange(0, 1000);
QSpinBox *spinout = new QSpinBox();
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;
wpval->setupUi(toFillin);
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;
+ 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 {
delete toFillin;
toFillin = NULL;
}
- if (toFillin) {
+ 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<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);
+ }
}
wipeInfo EffectStackEdit::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;
+ 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;
}
QString end;
switch (info.start) {
case LEFT:
- start = "-100%,0%:100%x100%";
+ start = "-100%/0%:100%x100%";
break;
case RIGHT:
- start = "100%,0%:100%x100%";
+ start = "100%/0%:100%x100%";
break;
case DOWN:
- start = "0%,100%:100%x100%";
+ start = "0%/100%:100%x100%";
break;
case UP:
- start = "0%,-100%:100%x100%";
+ start = "0%/-100%:100%x100%";
break;
default:
- start = "0%,0%:100%x100%";
+ start = "0%/0%:100%x100%";
break;
}
start.append(':' + QString::number(info.startTransparency));
switch (info.end) {
case LEFT:
- end = "-100%,0%:100%x100%";
+ end = "-100%/0%:100%x100%";
break;
case RIGHT:
- end = "100%,0%:100%x100%";
+ end = "100%/0%:100%x100%";
break;
case DOWN:
- end = "0%,100%:100%x100%";
+ end = "0%/100%:100%x100%";
break;
case UP:
- end = "0%,-100%:100%x100%";
+ end = "0%/-100%:100%x100%";
break;
default:
- end = "0%,0%:100%x100%";
+ end = "0%/0%:100%x100%";
break;
}
end.append(':' + QString::number(info.endTransparency));
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);
- QDomNode na = pa.firstChildElement("name");
+ QDomElement na = pa.firstChildElement("name");
QString type = pa.attributes().namedItem("type").nodeValue();
- QString paramName = i18n(na.toElement().text().toUtf8().data());
- if (type == "complex") paramName.append("complex");
- else if (type == "position") paramName.append("position");
- else if (type == "geometry") paramName.append("geometry");
- else if (type == "keyframe") paramName.append("keyframe");
- if (type != "simplekeyframe" && !m_valueItems.contains(paramName)) {
+ 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") {
- QSlider* slider = ((Constval*)m_valueItems.value(paramName))->horizontalSlider;
- setValue = QString::number(slider->value());
+ 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();
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();
} 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();
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") {
QString outName = pa.attributes().namedItem("outpoints").nodeValue();
int off = pa.attributes().namedItem("min").nodeValue().toInt();
int end = pa.attributes().namedItem("max").nodeValue().toInt();
- EffectsList::setParameter(newparam, number, QString::number(points.count()));
+ 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, QString::number(points.at(j).x()));
- EffectsList::setParameter(newparam, out, QString::number(points.at(j).y()));
+ 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;
+ if (wp->start_left->isChecked())
+ info.start = LEFT;
+ else if (wp->start_right->isChecked())
+ info.start = RIGHT;
+ else if (wp->start_up->isChecked())
+ info.start = UP;
+ else if (wp->start_down->isChecked())
+ info.start = DOWN;
+ else if (wp->start_center->isChecked())
+ info.start = CENTER;
+ else
+ info.start = LEFT;
info.startTransparency = wp->start_transp->value();
- if (wp->end_left->isChecked()) info.end = LEFT;
- else if (wp->end_right->isChecked()) info.end = RIGHT;
- else if (wp->end_up->isChecked()) info.end = UP;
- else if (wp->end_down->isChecked()) info.end = DOWN;
- else if (wp->end_center->isChecked()) info.end = CENTER;
- else info.end = RIGHT;
+
+ if (wp->end_left->isChecked())
+ info.end = LEFT;
+ else if (wp->end_right->isChecked())
+ info.end = RIGHT;
+ else if (wp->end_up->isChecked())
+ info.end = UP;
+ else if (wp->end_down->isChecked())
+ info.end = DOWN;
+ else if (wp->end_center->isChecked())
+ info.end = CENTER;
+ else
+ info.end = RIGHT;
info.endTransparency = wp->end_transp->value();
+
setValue = getWipeString(info);
} else if ((type == "simplekeyframe" || type == "keyframe") && m_keyframeEditor) {
+ QDomElement elem = pa.toElement();
QString realName = i18n(na.toElement().text().toUtf8().data());
QString val = m_keyframeEditor->getValue(realName);
- 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();
+ } 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()) {
+
+ if (!setValue.isNull())
pa.attributes().namedItem("value").setNodeValue(setValue);
- }
+
}
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);
if (wid) delete wid;
}
m_keyframeEditor = NULL;
+ m_geometryWidget = NULL;
blockSignals(false);
}
+
+void EffectStackEdit::slotSyncEffectsPos(int pos)
+{
+ emit syncEffectsPos(pos);
+}
projects / kdenlive / blobdiff