summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Baptiste Mardelle <jb@kdenlive.org>2016-11-14 21:32:48 (GMT)
committerJean-Baptiste Mardelle <jb@kdenlive.org>2016-11-14 21:32:48 (GMT)
commit09d14df42c0a1ba76058c1bc82285a7331a12023 (patch)
treec1c0b446e8d5c4df93df6c192b382505f0b6a35b
parente97171d8d399574824a50fafd321b52b8a3d59f8 (diff)
* Fix moving keyframe moves parent clip
* Fix warning message about empty i18n string when editing param
-rw-r--r--src/effectstack/parametercontainer.cpp6
-rw-r--r--src/timeline/managers/selectmanager.cpp2
-rw-r--r--src/timeline/timelinecommands.cpp5
3 files changed, 9 insertions, 4 deletions
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));