From: <ble...@us...> - 2008-03-28 21:05:14
|
Revision: 2139 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=2139&view=rev Author: blendamedt Date: 2008-03-28 14:04:12 -0700 (Fri, 28 Mar 2008) Log Message: ----------- fix when selection transition Modified Paths: -------------- branches/KDE4/src/transition.cpp branches/KDE4/src/transitionsettings.cpp Modified: branches/KDE4/src/transition.cpp =================================================================== --- branches/KDE4/src/transition.cpp 2008-03-28 10:27:52 UTC (rev 2138) +++ branches/KDE4/src/transition.cpp 2008-03-28 21:04:12 UTC (rev 2139) @@ -41,9 +41,10 @@ m_maxDuration = GenTime(10000, fps); //m_referenceClip = clipa; if (params.isNull()) { - QDomDocument doc; - doc.setContent(QString("<ktransition tag=\"luma\"><name>Luma</name><description>Luma Transitions</description><properties id=\"luma\" tag=\"luma\" /><parameter type=\"bool\" name=\"reverse\" max=\"1\" min=\"0\" default=\"1\" factor=\"1\"><name>Reverse</name></parameter></ktransition>")); - m_parameters = doc.documentElement(); + //FIXME we need to setup here the right luma xml file !!! + QDomDocument doc; + doc.setContent(QString("<ktransition tag=\"luma\"><name>Luma</name><description>Luma Transitions</description><properties id=\"luma\" tag=\"luma\" /><parameter type=\"bool\" name=\"reverse\" max=\"1\" min=\"0\" default=\"1\" factor=\"1\"><name>Reverse</name></parameter></ktransition>")); + m_parameters = doc.documentElement(); } else { m_parameters = params; } @@ -80,12 +81,12 @@ QPixmap Transition::transitionPixmap() const { KIcon icon; QString tag = transitionTag(); - if ( tag == "luma") { + if (tag == "luma") { if (invertedTransition()) icon = KIcon("kdenlive_trans_up"); else icon = KIcon("kdenlive_trans_down"); - } else if ( tag == "composite") { + } else if (tag == "composite") { icon = KIcon("kdenlive_trans_wiper"); - } else if ( tag == "lumafile") { + } else if (tag == "lumafile") { icon = KIcon("kdenlive_trans_luma"); } else icon = KIcon("kdenlive_trans_pip"); return icon.pixmap(QSize(15, 15)); Modified: branches/KDE4/src/transitionsettings.cpp =================================================================== --- branches/KDE4/src/transitionsettings.cpp 2008-03-28 10:27:52 UTC (rev 2138) +++ branches/KDE4/src/transitionsettings.cpp 2008-03-28 21:04:12 UTC (rev 2139) @@ -30,6 +30,7 @@ m_transitions = transitions; ui.listWidget->addItems(transitions->effectNames()); kDebug() << transitions->effectNames().size() << " -" << transitions->size(); + ui.listWidget->setCurrentRow(0); connect(ui.listWidget, SIGNAL(currentRowChanged(int)), this, SLOT(slotTransitionChanged())); connect(this, SIGNAL(transferParamDesc(const QDomElement&, int , int)), effectEdit , SLOT(transferParamDesc(const QDomElement&, int , int))); connect(effectEdit, SIGNAL(parameterChanged(const QDomElement&, const QDomElement&)), this , SLOT(slotUpdateEffectParams(const QDomElement&, const QDomElement&))); @@ -41,18 +42,28 @@ QDomElement e = m_usedTransition->toXML(); //set old values from e in <ktransition> to desc (like reverse and so ) - QDomElement desc = m_transitions->getEffectByName(ui.listWidget->currentItem()->text()); - if (m_usedTransition) { - m_usedTransition->setTransitionParameters(desc); - m_usedTransition->update(); - } - emit transitionUpdated(e, m_usedTransition->toXML()); - emit transferParamDesc(desc, 0, 0); + /* QDomElement desc = m_transitions->getEffectByName(ui.listWidget->currentItem()->text()); + if (m_usedTransition) { + m_usedTransition->setTransitionParameters(desc); + m_usedTransition->update(); + } + emit transitionUpdated(e, m_usedTransition->toXML());*/ + if (m_usedTransition && m_usedTransition->transitionName() == ui.listWidget->currentItem()->text() && !e.attribute("tag").isNull()) { + slotUpdateEffectParams(e, e); + } else + slotUpdateEffectParams(e, m_transitions->getEffectByName(ui.listWidget->currentItem()->text())); + emit transferParamDesc(m_usedTransition->toXML(), 0, 0); } void TransitionSettings::slotTransitionItemSelected(Transition* t) { setEnabled(t != NULL); m_usedTransition = t; + if (m_usedTransition) { + QList<QListWidgetItem*> list = ui.listWidget->findItems(m_usedTransition->transitionName(), Qt::MatchExactly); + if (list.size() > 0) { + ui.listWidget->setCurrentItem(list[0]); + } + } } @@ -61,6 +72,11 @@ m_usedTransition->setTransitionParameters(param); m_usedTransition->update(); } + QString test; + QTextStream str(&test); + oldparam.save(str, 2); + m_usedTransition->toXML().save(str, 2); + kDebug() << test; //oldparam must be also first given to Transition and then return the toXML() emit transitionUpdated(oldparam, m_usedTransition->toXML()); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |