From fa564d4933bfb8a236301ccf11e12567627383ba Mon Sep 17 00:00:00 2001 From: Dan Dennedy Date: Sun, 10 Jul 2011 08:03:47 +0000 Subject: [PATCH] Replace locale-dependent comma with slash in geometry valuee. svn path=/trunk/kdenlive/; revision=5784 --- src/initeffects.cpp | 6 +++--- src/mltdevicecapture.cpp | 2 +- src/slideshowclip.cpp | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/initeffects.cpp b/src/initeffects.cpp index e21c65f7..1c995ad2 100644 --- a/src/initeffects.cpp +++ b/src/initeffects.cpp @@ -790,7 +790,7 @@ void initEffects::fillTransitionsList(Mlt::Repository *repository, EffectsList * ktrans.setAttribute("id", name); tname.appendChild(ret.createTextNode(i18n("Composite"))); desc.appendChild(ret.createTextNode(i18n("A key-framable alpha-channel compositor for two frames."))); - paramList.append(quickParameterFill(ret, i18n("Geometry"), "geometry", "geometry", "0%,0%:100%x100%:100", "-500;-500;-500;-500;0", "500;500;500;500;100")); + paramList.append(quickParameterFill(ret, i18n("Geometry"), "geometry", "geometry", "0%/0%:100%x100%:100", "-500;-500;-500;-500;0", "500;500;500;500;100")); paramList.append(quickParameterFill(ret, i18n("Alpha Channel Operation"), "operator", "list", "over", "", "", "over,and,or,xor", i18n("Over,And,Or,Xor"))); paramList.append(quickParameterFill(ret, i18n("Align"), "aligned", "bool", "1", "0", "1")); paramList.append(quickParameterFill(ret, i18n("Fill"), "fill", "bool", "1", "0", "1")); @@ -817,7 +817,7 @@ void initEffects::fillTransitionsList(Mlt::Repository *repository, EffectsList * paramList.append(quickParameterFill(ret, i18n("Fix Shear Z"), "fix_shear_z", "double", "0", "0", "360"));*/ paramList.append(quickParameterFill(ret, "keyed", "keyed", "fixed", "1", "1", "1")); - paramList.append(quickParameterFill(ret, i18n("Geometry"), "geometry", "geometry", "0,0,100%,100%,100%", "0,0,100%,100%,100%", "0,0,100%,100%,100%", "", "", "", "", "", "true")); + paramList.append(quickParameterFill(ret, i18n("Geometry"), "geometry", "geometry", "0/0:100%x100%:100%", "0/0:100%x100%:100%", "0/0:100%x100%:100%", "", "", "", "", "", "true")); paramList.append(quickParameterFill(ret, i18n("Rotate X"), "rotate_x", "addedgeometry", "0", "-1800", "1800", QString(), QString(), "10")); paramList.append(quickParameterFill(ret, i18n("Rotate Y"), "rotate_y", "addedgeometry", "0", "-1800", "1800", QString(), QString(), "10")); @@ -835,7 +835,7 @@ void initEffects::fillTransitionsList(Mlt::Repository *repository, EffectsList * tname.appendChild(ret.createTextNode(i18n("Region"))); desc.appendChild(ret.createTextNode(i18n("Use alpha channel of another clip to create a transition."))); paramList.append(quickParameterFill(ret, i18n("Transparency clip"), "resource", "url", "", "", "", "", "", "")); - paramList.append(quickParameterFill(ret, i18n("Geometry"), "composite.geometry", "geometry", "0%,0%:100%x100%:100", "-500;-500;-500;-500;0", "500;500;500;500;100")); + paramList.append(quickParameterFill(ret, i18n("Geometry"), "composite.geometry", "geometry", "0%/0%:100%x100%:100", "-500;-500;-500;-500;0", "500;500;500;500;100")); paramList.append(quickParameterFill(ret, i18n("Alpha Channel Operation"), "composite.operator", "list", "over", "", "", "over,and,or,xor", i18n("Over,And,Or,Xor"))); paramList.append(quickParameterFill(ret, i18n("Align"), "composite.aligned", "bool", "1", "0", "1")); paramList.append(quickParameterFill(ret, i18n("Fill"), "composite.fill", "bool", "1", "0", "1")); diff --git a/src/mltdevicecapture.cpp b/src/mltdevicecapture.cpp index 71bee1b3..506d83e7 100644 --- a/src/mltdevicecapture.cpp +++ b/src/mltdevicecapture.cpp @@ -507,7 +507,7 @@ void MltDeviceCapture::setOverlay(const QString &path) Mlt::Field *field = tractor.field(); Mlt::Transition *transition = new Mlt::Transition(*m_mltProfile, "composite"); transition->set_in_and_out(0, 0); - transition->set("geometry", "0,0:100%x100%:70"); + transition->set("geometry", "0/0:100%x100%:70"); transition->set("fill", 1); transition->set("operator", "and"); transition->set("a_track", 0); diff --git a/src/slideshowclip.cpp b/src/slideshowclip.cpp index 336b3c92..6e65a160 100644 --- a/src/slideshowclip.cpp +++ b/src/slideshowclip.cpp @@ -454,15 +454,15 @@ QString SlideshowClip::animationToGeometry(const QString &animation, int &ttl) { QString geometry; if (animation.startsWith("Pan and zoom")) { - geometry = QString().sprintf("0=0,0:100%%x100%%;%d=-14%%,-14%%:120%%x120%%;%d=-5%%,-5%%:110%%x110%%;%d=0,0:110%%x110%%;%d=0,-5%%:110%%x110%%;%d=-5%%,0:110%%x110%%", + geometry = QString().sprintf("0=0/0:100%%x100%%;%d=-14%%/-14%%:120%%x120%%;%d=-5%%/-5%%:110%%x110%%;%d=0/0:110%%x110%%;%d=0/-5%%:110%%x110%%;%d=-5%%/0:110%%x110%%", ttl - 1, ttl, ttl * 2 - 1, ttl * 2, ttl * 3 - 1); ttl *= 3; } else if (animation.startsWith("Pan")) { - geometry = QString().sprintf("0=-5%%,-5%%:110%%x110%%;%d=0,0:110%%x110%%;%d=0,0:110%%x110%%;%d=0,-5%%:110%%x110%%;%d=0,-5%%:110%%x110%%;%d=-5%%,-5%%:110%%x110%%;%d=0,-5%%:110%%x110%%;%d=-5%%,0:110%%x110%%", + geometry = QString().sprintf("0=-5%%/-5%%:110%%x110%%;%d=0/0:110%%x110%%;%d=0/0:110%%x110%%;%d=0/-5%%:110%%x110%%;%d=0/-5%%:110%%x110%%;%d=-5%%/-5%%:110%%x110%%;%d=0/-5%%:110%%x110%%;%d=-5%%/0:110%%x110%%", ttl - 1, ttl, ttl * 2 - 1, ttl * 2, ttl * 3 - 1, ttl * 3, ttl * 4 - 1); ttl *= 4; } else if (animation.startsWith("Zoom")) { - geometry = QString().sprintf("0=0,0:100%%x100%%;%d=-14%%,-14%%:120%%x120%%", ttl - 1); + geometry = QString().sprintf("0=0/0:100%%x100%%;%d=-14%%/-14%%:120%%x120%%", ttl - 1); } return geometry; } -- 2.39.2