[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdenlive] src: * Fix moving keyframe moves parent clip
From:       Jean-Baptiste Mardelle <jb () kdenlive ! org>
Date:       2016-11-14 21:33:05
Message-ID: E1c6OsD-0000Bx-C4 () code ! kde ! org
[Download RAW message or body]

Git commit 09d14df42c0a1ba76058c1bc82285a7331a12023 by Jean-Baptiste Mardelle.
Committed on 14/11/2016 at 21:32.
Pushed by mardelle into branch 'master'.

* Fix moving keyframe moves parent clip
* Fix warning message about empty i18n string when editing param

M  +5    -1    src/effectstack/parametercontainer.cpp
M  +1    -1    src/timeline/managers/selectmanager.cpp
M  +3    -2    src/timeline/timelinecommands.cpp

http://commits.kde.org/kdenlive/09d14df42c0a1ba76058c1bc82285a7331a12023

diff --git a/src/effectstack/parametercontainer.cpp \
b/src/effectstack/parametercontainer.cpp index ccec798..9648325 100644
--- a/src/effectstack/parametercontainer.cpp
+++ b/src/effectstack/parametercontainer.cpp
@@ -216,9 +216,13 @@ ParameterContainer::ParameterContainer(const QDomElement \
&effect, const ItemInfo  m_conditionalWidgets << mw;
         }
         if (pa.tagName() != QLatin1String("parameter")) continue;
+        QString type = pa.attribute(QStringLiteral("type"));
+        if (type == QLatin1String("fixed")) {
+            // Fixed parameters are not exposed in the UI
+            continue;
+        }
         QDomElement na = pa.firstChildElement(QStringLiteral("name"));
         QDomElement commentElem = pa.firstChildElement(QStringLiteral("comment"));
-        QString type = pa.attribute(QStringLiteral("type"));
         QString paramName = na.isNull() ? pa.attribute(QStringLiteral("name")) : \
i18n(na.text().toUtf8().data());  QString comment;
         if (!commentElem.isNull())
diff --git a/src/timeline/managers/selectmanager.cpp \
b/src/timeline/managers/selectmanager.cpp index 43be89a..74f09df 100644
--- a/src/timeline/managers/selectmanager.cpp
+++ b/src/timeline/managers/selectmanager.cpp
@@ -86,7 +86,7 @@ bool SelectManager::mouseMove(QMouseEvent *event, int, int)
     if (!m_dragMoved && event->buttons() & Qt::LeftButton) {
         if ((m_clickPoint - event->pos()).manhattanLength() < \
QApplication::startDragDistance()) {  event->ignore();
-            return false;
+            return true;
         }
         m_dragMoved = true;
     }
diff --git a/src/timeline/timelinecommands.cpp b/src/timeline/timelinecommands.cpp
index d2c4323..8e14d37 100644
--- a/src/timeline/timelinecommands.cpp
+++ b/src/timeline/timelinecommands.cpp
@@ -37,7 +37,7 @@ AddEffectCommand::AddEffectCommand(CustomTrackView *view, const int \
track, const  QString effectName;
     QDomElement namenode = m_effect.firstChildElement(QStringLiteral("name"));
     if (!namenode.isNull())
-        effectName = i18n(namenode.text().toUtf8().data());
+        effectName = i18n(namenode.text().toUtf8().constData());
     else
         effectName = i18n("effect");
     if (doIt)
@@ -277,8 +277,9 @@ EditEffectCommand::EditEffectCommand(CustomTrackView *view, const \
int track, con  {
     QString effectName;
     QDomElement namenode = effect.firstChildElement(QStringLiteral("name"));
+    qDebug()<<"editing EFFECT; "<<namenode.text();
     if (!namenode.isNull())
-        effectName = i18n(namenode.text().toUtf8().data());
+        effectName = i18n(namenode.text().toUtf8().constData());
     else
         effectName = i18n("effect");
     setText(i18n("Edit effect %1", effectName));


[prev in list] [next in list] [prev in thread] [next in thread]