Commit 09d14df4 authored by Jean-Baptiste Mardelle's avatar Jean-Baptiste Mardelle
Browse files

* Fix moving keyframe moves parent clip

* Fix warning message about empty i18n string when editing param
parent e97171d8
......@@ -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())
......
......@@ -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;
}
......
......@@ -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));
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment