Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Multimedia
Kdenlive
Commits
e61020df
Commit
e61020df
authored
Mar 20, 2019
by
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
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/assets/abstractassetsrepository.ipp
View file @
e61020df
...
...
@@ -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
...
...
src/assets/assetlist/view/qml/assetList.qml
View file @
e61020df
...
...
@@ -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
)
{
...
...
src/mainwindow.cpp
View file @
e61020df
...
...
@@ -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
(
"
Tran
sitions"
),
QStringLiteral
(
"transition_list"
),
m_transitionList2
);
m_transitionListDock
=
addDock
(
i18n
(
"
Compo
sitions"
),
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
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment