- Add ability to disable opacity in geometryval

- Disable opacity in AffineComposite, Automask, Pan and Zoom, Rotate and Shear

svn path=/trunk/kdenlive/; revision=4430

diff --git a/effects/automask.xml b/effects/automask.xml
index e963b41ca340c78512e418dc773240cbac2192b8..a0965eaba168d2541113ab4ec88ec992d6847df2 100644 (file)
--- a/effects/automask.xml
+++ b/effects/automask.xml
@@ -3,7 +3,7 @@
        <name>Auto Mask</name>
        <description>Hide a selected zone and follow its movements</description>
        <author>Zachary Drew</author>
-       <parameter type="geometry" name="geometry" default="50%,50%:50%x50%" fixed="1">
+       <parameter type="geometry" name="geometry" default="50%,50%:50%x50%" fixed="1" opacity="false">
                <name>Geometry</name>
        </parameter>
        <parameter type="bool" name="debug" default="1">

diff --git a/effects/pan_zoom.xml b/effects/pan_zoom.xml
index bc6df3c86e1f90bb577dad72c7b833a28b99258d..407baa0ccb04955f4afdfb1b211f2f4d601efae4 100644 (file)
--- a/effects/pan_zoom.xml
+++ b/effects/pan_zoom.xml
@@ -3,7 +3,7 @@
        <name>Pan and Zoom</name>
        <description>Adjust size and position of clip</description>
        <author>Charles Yates</author>
-       <parameter type="geometry" name="transition.geometry" default="0%,0%:100%x100%" fixed="1">
+       <parameter type="geometry" name="transition.geometry" default="0%,0%:100%x100%" fixed="1" opacity="false">
                <name>Rectangle</name>
        </parameter>
 </effect>

diff --git a/effects/rotation.xml b/effects/rotation.xml
index dac7e4f3644b88a9e7b7adf2cce526f49401aaa2..99e35ed5be1f31de2d33ea19d2f69ebf034352db 100644 (file)
--- a/effects/rotation.xml
+++ b/effects/rotation.xml
@@ -33,7 +33,7 @@
        <parameter type="constant" name="transition.shear_y" max="200" min="-200" default="0" factor="10">
                <name>Animate Shear Y</name>
        </parameter>
-       <parameter type="geometry" name="transition.geometry" default="0%,0%:100%x100%" fixed="1">
+       <parameter type="geometry" name="transition.geometry" default="0%,0%:100%x100%" fixed="1" opacity="false">
                <name>Pan and Zoom</name>
        </parameter>
 </effect>

diff --git a/src/geometryval.cpp b/src/geometryval.cpp
index c6fb07c6399678d48f981efeda60c7c5630a24ee..78874c13763275157323fbf25c3652bfff525509 100644 (file)
--- a/src/geometryval.cpp
+++ b/src/geometryval.cpp
@@ -360,6 +360,10 @@ void Geometryval::setupParam(const QDomElement par, int minFrame, int maxFrame)
         m_helper->setHidden(true);
         spinPos->setHidden(true);
     }
+    if (par.attribute("opacity") == "false") {
+        label_opacity->setHidden(true);
+        spinTransp->setHidden(true);
+    }
     char *tmp = (char *) qstrdup(val.toUtf8().data());
     if (m_geom) m_geom->parse(tmp, maxFrame - minFrame, m_profile.width, m_profile.height);
     else m_geom = new Mlt::Geometry(tmp, maxFrame - minFrame, m_profile.width, m_profile.height);

diff --git a/src/initeffects.cpp b/src/initeffects.cpp
index d807db3723fd9667a8a8b4d7f537b23427bc9862..38d3790a61c835640801ce4dbd39a1387cbe6023 100644 (file)
--- a/src/initeffects.cpp
+++ b/src/initeffects.cpp
@@ -723,7 +723,7 @@ void initEffects::fillTransitionsList(Mlt::Repository * repository, EffectsList*
                 paramList.append(quickParameterFill(ret, "Fix Shear Z", "fix_shear_z", "double", "0", "0", "360"));
                 paramList.append(quickParameterFill(ret, "Mirror", "mirror_off", "bool", "0", "0", "1"));
                 paramList.append(quickParameterFill(ret, "Repeat", "repeat_off", "bool", "0", "0", "1"));
-                paramList.append(quickParameterFill(ret, "Geometry", "geometry", "geometry",  "0,0,100%,100%,100%", "0,0,100%,100%,100%", "0,0,100%,100%,100%"));
+                paramList.append(quickParameterFill(ret, "Geometry", "geometry", "geometry",  "0,0,100%,100%,100%", "0,0,100%,100%,100%", "0,0,100%,100%,100%", "", "", "", "", "", "false"));
                 tname.appendChild(ret.createTextNode("Composite"));
             } else if (name == "region") {
                 tname.appendChild(ret.createTextNode("Region"));
@@ -765,7 +765,7 @@ void initEffects::fillTransitionsList(Mlt::Repository * repository, EffectsList*
     transitions->append(ret2.documentElement());*/
 }
 
-QDomElement initEffects::quickParameterFill(QDomDocument & doc, QString name, QString tag, QString type, QString def, QString min, QString max, QString list, QString listdisplaynames, QString factor, QString namedesc, QString format)
+QDomElement initEffects::quickParameterFill(QDomDocument & doc, QString name, QString tag, QString type, QString def, QString min, QString max, QString list, QString listdisplaynames, QString factor, QString namedesc, QString format, QString opacity)
 {
     QDomElement parameter = doc.createElement("parameter");
     parameter.setAttribute("tag", tag);
@@ -784,6 +784,8 @@ QDomElement initEffects::quickParameterFill(QDomDocument & doc, QString name, QS
         parameter.setAttribute("namedesc", namedesc);
     if (!format.isEmpty())
         parameter.setAttribute("format", format);
+    if (!opacity.isEmpty())
+        parameter.setAttribute("opacity", opacity);
     QDomElement pname = doc.createElement("name");
     pname.appendChild(doc.createTextNode(name));
     parameter.appendChild(pname);

diff --git a/src/initeffects.h b/src/initeffects.h
index 1b19b687434d7320ef1417a72b96d0333537444e..128c6e1afa06ab6dccbb4b437bf5875c4bd1bf7c 100644 (file)
--- a/src/initeffects.h
+++ b/src/initeffects.h
@@ -49,7 +49,7 @@ public:
     static void refreshLumas();
     static QDomDocument createDescriptionFromMlt(Mlt::Repository* repository, const QString& type, const QString& name);
     static void fillTransitionsList(Mlt::Repository *, EffectsList* transitions, QStringList names);
-    static QDomElement quickParameterFill(QDomDocument & doc, QString name, QString tag, QString type, QString def = QString(), QString min = QString(), QString max = QString(), QString list = QString(), QString listdisplaynames = QString(), QString factor = QString(), QString namedesc = QString(), QString format = QString());
+    static QDomElement quickParameterFill(QDomDocument & doc, QString name, QString tag, QString type, QString def = QString(), QString min = QString(), QString max = QString(), QString list = QString(), QString listdisplaynames = QString(), QString factor = QString(), QString namedesc = QString(), QString format = QString(), QString opacity = QString());
     static void parseEffectFile(EffectsList *customEffectList, EffectsList *audioEffectList, EffectsList *videoEffectList, QString name, QStringList filtersList, QStringList producersList);
     static void parseCustomEffectsFile();
     static const char* ladspaEffectString(int ladspaId, QStringList params);