#include "ui_listval_ui.h"
#include "ui_boolval_ui.h"
#include "ui_colorval_ui.h"
-#include "ui_positionval_ui.h"
#include "ui_wipeval_ui.h"
+#include "ui_keyframeeditor_ui.h"
#include "complexparameter.h"
#include "geometryval.h"
+#include "keyframeedit.h"
+#include "positionedit.h"
+#include "effectslist.h"
#include "kdenlivesettings.h"
+#include "profilesdialog.h"
#include <KDebug>
#include <KLocale>
{
};
-class Positionval: public EffectStackEdit::UiItem, public Ui::Positionval_UI
-{
-};
-
class Wipeval: public EffectStackEdit::UiItem, public Ui::Wipeval_UI
{
};
QWidget *wid = new QWidget(parent);
area->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
area->setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded);
+ area->setFrameStyle(QFrame::NoFrame);
wid->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum));
area->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::MinimumExpanding));
void EffectStackEdit::setFrameSize(QPoint p)
{
m_frameSize = p;
+ QDomNodeList namenode = m_params.elementsByTagName("parameter");
+ for (int i = 0; i < namenode.count() ; i++) {
+ QDomNode pa = namenode.item(i);
+ QDomNode na = pa.firstChildElement("name");
+ QString type = pa.attributes().namedItem("type").nodeValue();
+ QString paramName = i18n(na.toElement().text().toUtf8().data());
+
+ if (type == "geometry") {
+ Geometryval *geom = ((Geometryval*)m_valueItems[paramName+"geometry"]);
+ geom->setFrameSize(m_frameSize);
+ break;
+ }
+ }
+
}
void EffectStackEdit::updateProjectFormat(MltVideoProfile profile, Timecode t)
m_params.setAttribute(name, value);
}
-void EffectStackEdit::transferParamDesc(const QDomElement& d, int in, int out)
+void EffectStackEdit::transferParamDesc(const QDomElement d, int in, int out)
{
kDebug() << "in";
m_params = d;
const int maxFrame = e.attribute("end").toInt();
- for (int i = 0;i < namenode.count() ;i++) {
+ for (int i = 0; i < namenode.count() ; i++) {
kDebug() << "in form";
QDomElement pa = namenode.item(i).toElement();
QDomNode na = pa.firstChildElement("name");
QWidget * toFillin = new QWidget;
QString value = pa.attribute("value").isNull() ?
pa.attribute("default") : pa.attribute("value");
+
if (type == "geometry") {
/*pa.setAttribute("namedesc", "X;Y;Width;Height;Transparency");
pa.setAttribute("format", "%d%,%d%:%d%x%d%:%d");
//TODO constant, list, bool, complex , color, geometry, position
if (type == "double" || type == "constant") {
- createSliderItem(paramName, value.toInt(), pa.attribute("min").toInt(), pa.attribute("max").toInt());
+ 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;
} else if (type == "list") {
if (listitemsdisplay.count() != listitems.count()) listitemsdisplay = listitems;
//lsval->list->addItems(listitems);
lsval->list->setIconSize(QSize(30, 30));
- for (int i = 0;i < listitems.count();i++) {
+ 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 (!value.isEmpty()) lsval->list->setCurrentIndex(listitems.indexOf(value));
-
- connect(lsval->list, SIGNAL(currentIndexChanged(int)) , this, SLOT(collectAllParameters()));
lsval->title->setTitle(paramName);
m_valueItems[paramName] = lsval;
+ connect(lsval->list, SIGNAL(currentIndexChanged(int)) , this, SLOT(collectAllParameters()));
m_uiItems.append(lsval);
} else if (type == "bool") {
Boolval *bval = new Boolval;
bval->setupUi(toFillin);
bval->checkBox->setCheckState(value == "0" ? Qt::Unchecked : Qt::Checked);
-
- connect(bval->checkBox, SIGNAL(stateChanged(int)) , this, SLOT(collectAllParameters()));
bval->checkBox->setText(paramName);
m_valueItems[paramName] = bval;
+ connect(bval->checkBox, SIGNAL(stateChanged(int)) , this, SLOT(collectAllParameters()));
m_uiItems.append(bval);
} else if (type == "complex") {
/*QStringList names=nodeAtts.namedItem("name").nodeValue().split(';');
};
}*/
ComplexParameter *pl = new ComplexParameter;
- connect(pl, SIGNAL(parameterChanged()), this, SLOT(collectAllParameters()));
pl->setupParam(d, pa.attribute("name"), 0, 100);
m_vbox->addWidget(pl);
m_valueItems[paramName+"complex"] = pl;
+ connect(pl, SIGNAL(parameterChanged()), this, SLOT(collectAllParameters()));
m_items.append(pl);
} else if (type == "geometry") {
Geometryval *geo = new Geometryval(m_profile, m_frameSize);
- connect(geo, SIGNAL(parameterChanged()), this, SLOT(collectAllParameters()));
- connect(geo, SIGNAL(seekToPos(int)), this, SLOT(slotSeekToPos(int)));
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, SLOT(slotSeekToPos(int)));
+ m_items.append(geo);
+ } else if (type == "keyframe") {
+ // keyframe editor widget
+ kDebug() << "min: " << m_in << ", MAX: " << m_out;
+ KeyframeEdit *geo = new KeyframeEdit(pa, m_out - m_in, pa.attribute("min").toInt(), pa.attribute("max").toInt(), m_timecode);
+ //geo->setupParam(100, pa.attribute("min").toInt(), pa.attribute("max").toInt(), pa.attribute("keyframes"));
+ //connect(geo, SIGNAL(seekToPos(int)), this, SLOT(slotSeekToPos(int)));
+ //geo->setupParam(pa, minFrame, maxFrame);
+ m_vbox->addWidget(geo);
+ m_valueItems[paramName+"keyframe"] = geo;
+ connect(geo, SIGNAL(parameterChanged()), this, SLOT(collectAllParameters()));
m_items.append(geo);
} else if (type == "color") {
Colorval *cval = new Colorval;
if (value.startsWith('#')) value = value.replace('#', "0x");
cval->kcolorbutton->setColor(value.toUInt(&ok, 16));
//kDebug() << "color: " << value << ", " << value.toUInt(&ok, 16);
-
- connect(cval->kcolorbutton, SIGNAL(clicked()) , this, SLOT(collectAllParameters()));
cval->label->setText(paramName);
m_valueItems[paramName] = cval;
+ connect(cval->kcolorbutton, SIGNAL(clicked()) , this, SLOT(collectAllParameters()));
m_uiItems.append(cval);
} else if (type == "position") {
- Positionval *pval = new Positionval;
- pval->setupUi(toFillin);
int pos = value.toInt();
if (d.attribute("id") == "fadein" || d.attribute("id") == "fade_from_black") {
pos = pos - m_in;
// fadeout position starts from clip end
pos = m_out - (pos - m_in);
}
- pval->krestrictedline->setText(m_timecode.getTimecodeFromFrames(pos));
- connect(pval->krestrictedline, SIGNAL(editingFinished()), this, SLOT(collectAllParameters()));
- pval->label->setText(paramName);
- m_valueItems[paramName + "position"] = pval;
- m_uiItems.append(pval);
+ PositionEdit *posedit = new PositionEdit(paramName, pos, 1, m_out, m_timecode);
+ m_vbox->addWidget(posedit);
+ m_valueItems[paramName+"position"] = posedit;
+ connect(posedit, SIGNAL(parameterChanged()), this, SLOT(collectAllParameters()));
+ m_items.append(posedit);
} else if (type == "wipe") {
Wipeval *wpval = new Wipeval;
wpval->setupUi(toFillin);
}
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->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_valueItems[paramName] = wpval;
m_uiItems.append(wpval);
} else {
delete toFillin;
void EffectStackEdit::collectAllParameters()
{
+ if (m_valueItems.isEmpty()) return;
QDomElement oldparam = m_params.cloneNode().toElement();
QDomNodeList namenode = m_params.elementsByTagName("parameter");
- for (int i = 0;i < namenode.count() ;i++) {
+ for (int i = 0; i < namenode.count() ; i++) {
QDomNode pa = namenode.item(i);
QDomNode 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 (!m_valueItems.contains(paramName)) {
+ kDebug() << "// Param: " << paramName << " NOT FOUND";
+ continue;
+ }
QString setValue;
if (type == "double" || type == "constant") {
- QSlider* slider = ((Constval*)m_valueItems[paramName])->horizontalSlider;
+ QSlider* slider = ((Constval*)m_valueItems.value(paramName))->horizontalSlider;
setValue = QString::number(slider->value());
} else if (type == "list") {
- KComboBox *box = ((Listval*)m_valueItems[paramName])->list;
+ KComboBox *box = ((Listval*)m_valueItems.value(paramName))->list;
setValue = box->itemData(box->currentIndex()).toString();
} else if (type == "bool") {
- QCheckBox *box = ((Boolval*)m_valueItems[paramName])->checkBox;
+ QCheckBox *box = ((Boolval*)m_valueItems.value(paramName))->checkBox;
setValue = box->checkState() == Qt::Checked ? "1" : "0" ;
} else if (type == "color") {
- KColorButton *color = ((Colorval*)m_valueItems[paramName])->kcolorbutton;
+ KColorButton *color = ((Colorval*)m_valueItems.value(paramName))->kcolorbutton;
setValue = color->color().name();
} else if (type == "complex") {
- ComplexParameter *complex = ((ComplexParameter*)m_valueItems[paramName+"complex"]);
+ ComplexParameter *complex = ((ComplexParameter*)m_valueItems.value(paramName));
namenode.item(i) = complex->getParamDesc();
} else if (type == "geometry") {
- Geometryval *geom = ((Geometryval*)m_valueItems[paramName+"geometry"]);
+ Geometryval *geom = ((Geometryval*)m_valueItems.value(paramName));
namenode.item(i) = geom->getParamDesc();
} else if (type == "position") {
- KRestrictedLine *line = ((Positionval*)m_valueItems[paramName+"position"])->krestrictedline;
- int pos = m_timecode.getFrameCount(line->text(), KdenliveSettings::project_fps());
+ PositionEdit *pedit = ((PositionEdit*)m_valueItems.value(paramName));
+ int pos = pedit->getPosition();
+ setValue = QString::number(pos);
if (m_params.attribute("id") == "fadein" || m_params.attribute("id") == "fade_from_black") {
- pos += m_in;
- if (pos > m_out) {
+ // Make sure duration is not longer than clip
+ /*if (pos > m_out) {
pos = m_out;
- line->setText(m_timecode.getTimecodeFromFrames(pos));
- }
+ pedit->setPosition(pos);
+ }*/
+ EffectsList::setParameter(m_params, "in", QString::number(m_in));
+ EffectsList::setParameter(m_params, "out", QString::number(m_in + pos));
+ setValue.clear();
} else if (m_params.attribute("id") == "fadeout" || m_params.attribute("id") == "fade_to_black") {
- pos = m_out - (pos - m_in);
- if (pos > m_out - m_in) {
- pos = m_out - m_in;
- line->setText(m_timecode.getTimecodeFromFrames(pos));
- }
+ // Make sure duration is not longer than clip
+ /*if (pos > m_out) {
+ pos = m_out;
+ pedit->setPosition(pos);
+ }*/
+ EffectsList::setParameter(m_params, "in", QString::number(m_out + m_in - pos));
+ EffectsList::setParameter(m_params, "out", QString::number(m_out + m_in));
+ setValue.clear();
}
- setValue = QString::number(pos);
} else if (type == "wipe") {
- Wipeval *wp = (Wipeval*)m_valueItems[paramName];
+ 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;
emit parameterChanged(oldparam, m_params);
}
-void EffectStackEdit::createSliderItem(const QString& name, int val , int min, int max)
+void EffectStackEdit::createSliderItem(const QString& name, int val , int min, int max, const QString suffix)
{
QWidget* toFillin = new QWidget;
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);
void EffectStackEdit::clearAllItems()
{
- qDeleteAll(m_items);
+ blockSignals(true);
+ m_valueItems.clear();
+
+ while (!m_items.isEmpty()) {
+ QWidget * die = m_items.takeFirst();
+ die->disconnect();
+ delete die;
+ }
+
qDeleteAll(m_uiItems);
m_uiItems.clear();
m_items.clear();
- m_valueItems.clear();
QLayoutItem *item = m_vbox->itemAt(0);
while (item) {
m_vbox->removeItem(item);
delete item;
item = m_vbox->itemAt(0);
}
+ blockSignals(false);
}
projects / kdenlive / blobdiff