Merge branch 'buildsystem' into next

[kdenlive] / src / effectslist.cpp

diff --git a/src/effectslist.cpp b/src/effectslist.cpp
index 1b400ae64020b3ba5fd0f692ea9cbc9cd50208cb..5b435cbedc1c9ef0461ad79ef4dba3b3040f04e7 100644 (file)
--- a/src/effectslist.cpp
+++ b/src/effectslist.cpp
@@ -38,8 +38,8 @@ QDomElement EffectsList::getEffectByName(const QString & name) const
     QDomNodeList effects = m_baseElement.childNodes();
     for (int i = 0; i < effects.count(); i++) {
         QDomElement effect =  effects.at(i).toElement();
-        QDomNode namenode = effect.elementsByTagName("name").item(0);
-        if (!namenode.isNull()) effectName = i18n(namenode.toElement().text().toUtf8().data());
+        QDomElement namenode = effect.firstChildElement("name");
+        if (!namenode.isNull()) effectName = i18n(namenode.text().toUtf8().data());
         if (name == effectName) {
             QDomNodeList params = effect.elementsByTagName("parameter");
             for (int i = 0; i < params.count(); i++) {
@@ -100,8 +100,8 @@ QStringList EffectsList::effectIdInfo(const int ix) const
 {
     QStringList info;
     QDomElement effect = m_baseElement.childNodes().at(ix).toElement();
-    QDomNode namenode = effect.elementsByTagName("name").item(0);
-    info << i18n(namenode.toElement().text().toUtf8().data()) << effect.attribute("tag") << effect.attribute("id");
+    QDomElement namenode = effect.firstChildElement("name");
+    info << i18n(namenode.text().toUtf8().data()) << effect.attribute("tag") << effect.attribute("id");
     return info;
 }
 
@@ -111,8 +111,8 @@ QStringList EffectsList::effectNames()
     QDomNodeList effects = m_baseElement.childNodes();
     for (int i = 0; i < effects.count(); i++) {
         QDomElement effect =  effects.at(i).toElement();
-        QDomNode namenode = effect.elementsByTagName("name").item(0);
-        if (!namenode.isNull()) list.append(i18n(namenode.toElement().text().toUtf8().data()));
+        QDomElement namenode = effect.firstChildElement("name");
+        if (!namenode.isNull()) list.append(i18n(namenode.text().toUtf8().data()));
     }
     return list;
 }
@@ -120,22 +120,30 @@ QStringList EffectsList::effectNames()
 QString EffectsList::getInfo(const QString & tag, const QString & id) const
 {
     QString info;
-    QDomElement effect = getEffectByTag(tag, id);
-    QDomNode namenode = effect.elementsByTagName("description").item(0);
-    if (!namenode.isNull()) info = i18n(namenode.toElement().text().toUtf8().data());
-    namenode = effect.elementsByTagName("author").item(0);
-    if (!namenode.isNull()) info.append("<br /><strong>" + i18n("Author:") + " </strong>" + i18n(namenode.toElement().text().toUtf8().data()));
-    return info;
+    return getEffectInfo(getEffectByTag(tag, id));
 }
 
 QString EffectsList::getInfoFromIndex(const int ix) const
 {
     QString info;
-    QDomElement effect = m_baseElement.childNodes().at(ix).toElement();
-    QDomNode namenode = effect.elementsByTagName("description").item(0);
-    if (!namenode.isNull()) info = i18n(namenode.toElement().text().toUtf8().data());
-    namenode = effect.elementsByTagName("author").item(0);
-    if (!namenode.isNull()) info.append("<br /><strong>" + i18n("Author:") + " </strong>" + i18n(namenode.toElement().text().toUtf8().data()));
+    return getEffectInfo(m_baseElement.childNodes().at(ix).toElement());
+}
+
+QString EffectsList::getEffectInfo(const QDomElement effect) const
+{
+    QString info;
+    QDomElement namenode = effect.firstChildElement("description");
+    if (!namenode.isNull())
+        info = i18n(namenode.firstChild().nodeValue().simplified().toUtf8().data());
+
+    namenode = effect.firstChildElement("author");
+    if (!namenode.isNull())
+        info.append("<br /><strong>" + i18n("Author:") + " </strong>" + i18n(namenode.text().toUtf8().data()));
+
+    namenode = effect.firstChildElement("version");
+    if (!namenode.isNull())
+        info.append(QString(" (%1)").arg(namenode.text()));
+
     return info;
 }
 
@@ -161,7 +169,19 @@ bool EffectsList::hasSimpleKeyFrames(QDomElement effect)
     return false;
 }
 
-void EffectsList::clone(const EffectsList original)
+// static
+bool EffectsList::hasGeometryKeyFrames(QDomElement effect)
+{
+    QDomNodeList params = effect.elementsByTagName("parameter");
+    for (int i = 0; i < params.count(); ++i) {
+        QDomElement param = params.item(i).toElement();
+        if (param.attribute("type") == "geometry" && !param.hasAttribute("fixed"))
+            return true;
+    }
+    return false;
+}
+
+void EffectsList::clone(const EffectsList &original)
 {
     setContent(original.toString());
     m_baseElement = documentElement();
@@ -203,6 +223,7 @@ QString EffectsList::parameter(QDomElement effect, const QString &name)
 void EffectsList::setProperty(QDomElement effect, const QString &name, const QString &value)
 {
     QDomNodeList params = effect.elementsByTagName("property");
+    // Update property if it already exists
     for (int i = 0; i < params.count(); i++) {
         QDomElement e = params.item(i).toElement();
         if (e.attribute("name") == name) {
@@ -212,6 +233,20 @@ void EffectsList::setProperty(QDomElement effect, const QString &name, const QSt
     }
 }
 
+// static
+void EffectsList::renameProperty(QDomElement effect, const QString &oldName, const QString &newName)
+{
+    QDomNodeList params = effect.elementsByTagName("property");
+    // Update property if it already exists
+    for (int i = 0; i < params.count(); i++) {
+        QDomElement e = params.item(i).toElement();
+        if (e.attribute("name") == oldName) {
+            e.setAttribute("name", newName);
+            break;
+        }
+    }
+}
+
 // static
 QString EffectsList::property(QDomElement effect, const QString &name)
 {
@@ -225,6 +260,32 @@ QString EffectsList::property(QDomElement effect, const QString &name)
     return QString();
 }
 
+// static
+void EffectsList::removeProperty(QDomElement effect, const QString &name)
+{
+    QDomNodeList params = effect.elementsByTagName("property");
+    for (int i = 0; i < params.count(); i++) {
+        QDomElement e = params.item(i).toElement();
+        if (e.attribute("name") == name) {
+            effect.removeChild(params.item(i));
+            break;
+        }
+    }
+}
+
+// static
+void EffectsList::removeMetaProperties(QDomElement producer)
+{
+    QDomNodeList params = producer.elementsByTagName("property");
+    for (int i = 0; i < params.count(); i++) {
+        QDomElement e = params.item(i).toElement();
+        if (e.attribute("name").startsWith("meta")) {
+            producer.removeChild(params.item(i));
+            i--;
+        }
+    }
+}
+
 void EffectsList::append(QDomElement e)
 {
     m_baseElement.appendChild(importNode(e, true));
@@ -237,33 +298,34 @@ int EffectsList::count() const
 
 bool EffectsList::isEmpty() const
 {
-    return m_baseElement.childNodes().count() == 0;
+    return !m_baseElement.hasChildNodes();
 }
 
 const QDomElement EffectsList::at(int ix) const
 {
     QDomNodeList effects = m_baseElement.childNodes();
-    if (ix >= effects.count()) return QDomElement();
+    if (ix < 0 || ix >= effects.count()) return QDomElement();
     return effects.at(ix).toElement();
 }
 
 void EffectsList::removeAt(int ix)
 {
     QDomNodeList effects = m_baseElement.childNodes();
-    if (ix >= effects.count()) return;
+    if (ix < 0 || ix >= effects.count()) return;
     m_baseElement.removeChild(effects.at(ix));
 }
 
 QDomElement EffectsList::item(int ix)
 {
     QDomNodeList effects = m_baseElement.childNodes();
-    if (ix >= effects.count()) return QDomElement();
+    if (ix < 0 || ix >= effects.count()) return QDomElement();
     return effects.at(ix).toElement();
 }
 
 void EffectsList::insert(int ix, QDomElement effect)
 {
     QDomNodeList effects = m_baseElement.childNodes();
+    if (ix < 0) ix = 0;
     if (ix >= effects.count()) m_baseElement.appendChild(importNode(effect, true));
     else m_baseElement.insertBefore(importNode(effect, true), effects.at(ix));
 }
@@ -271,6 +333,7 @@ void EffectsList::insert(int ix, QDomElement effect)
 void EffectsList::replace(int ix, QDomElement effect)
 {
     QDomNodeList effects = m_baseElement.childNodes();
+    if (ix < 0) ix = 0;
     if (ix < effects.count()) m_baseElement.removeChild(effects.at(ix));
     if (ix == effects.count()) m_baseElement.appendChild(importNode(effect, true));
     else m_baseElement.insertBefore(importNode(effect, true), effects.at(ix));