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

Fix composition dockwidget name and keyboard navigation in list, add effect tag to description

parent de749476
Pipeline #1710 passed with stage
in 15 minutes and 12 seconds
......@@ -128,9 +128,11 @@ template <typename AssetType> bool AbstractAssetsRepository<AssetType>::parseInf
QScopedPointer<Mlt::Properties> metadata(getMetadata(assetId));
if (metadata && metadata->is_valid()) {
if (metadata->get("title") && metadata->get("identifier") && strlen(metadata->get("title")) > 0) {
QString id = metadata->get("identifier");
res.name = metadata->get("title");
res.name[0] = res.name[0].toUpper();
res.description = metadata->get("description");
res.description.append(QString(" (%1)").arg(id));
res.author = metadata->get("creator");
res.version_str = metadata->get("version");
res.version = ceil(100 * metadata->get_double("version"));
......@@ -139,7 +141,6 @@ template <typename AssetType> bool AbstractAssetsRepository<AssetType>::parseInf
// Create params
QDomDocument doc;
QDomElement eff = doc.createElement(QStringLiteral("effect"));
QString id = metadata->get("identifier");
eff.setAttribute(QStringLiteral("tag"), id);
eff.setAttribute(QStringLiteral("id"), id);
////qCDebug(KDENLIVE_LOG)<<"Effect: "<<id;
......@@ -295,6 +296,7 @@ template <typename AssetType> bool AbstractAssetsRepository<AssetType>::parseInf
QString description = Xml::getSubTagContent(currentAsset, QStringLiteral("description"));
if (!description.isEmpty()) {
res.description = description;
res.description.append(QString(" (%1)").arg(tag));
}
// Update name if the xml provide one
......
......@@ -291,6 +291,7 @@ Rectangle {
drag.target = undefined
}
onPressed: {
treeView.focus = true
if (isItem) {
sel.setCurrentIndex(styleData.index, ItemSelectionModel.ClearAndSelect)
if (mouse.button === Qt.LeftButton) {
......
......@@ -328,7 +328,7 @@ void MainWindow::init()
m_effectListDock = addDock(i18n("Effects"), QStringLiteral("effect_list"), m_effectList2);
m_transitionList2 = new TransitionListWidget(this);
m_transitionListDock = addDock(i18n("Transitions"), QStringLiteral("transition_list"), m_transitionList2);
m_transitionListDock = addDock(i18n("Compositions"), QStringLiteral("transition_list"), m_transitionList2);
// Add monitors here to keep them at the right of the window
m_clipMonitorDock = addDock(i18n("Clip Monitor"), QStringLiteral("clip_monitor"), m_clipMonitor);
......
Markdown is supported
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