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
43954201
Commit
43954201
authored
Mar 06, 2022
by
Julius Künzel
Browse files
Improvements for field order option
parent
b0562678
Pipeline
#145935
passed with stage
in 7 minutes and 5 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/profiles/profilemodel.cpp
View file @
43954201
...
...
@@ -40,7 +40,6 @@ ProfileModel::ProfileModel(const QString &path)
QString
line
=
in
.
readLine
();
if
(
line
.
contains
(
QStringLiteral
(
"bottom_field_first"
)))
{
m_bottom_field_first
=
line
.
split
(
QStringLiteral
(
"="
)).
at
(
1
).
toInt
()
==
1
;
qDebug
()
<<
"FOUND"
<<
"bottom_field_first value:"
<<
m_bottom_field_first
;
f
.
close
();
}
}
...
...
src/project/projectmanager.cpp
View file @
43954201
...
...
@@ -657,6 +657,7 @@ void ProjectManager::doOpenFile(const QUrl &url, KAutoSaveFile *stale)
}
pCore
->
window
()
->
connectDocument
();
pCore
->
mixer
()
->
setModel
(
m_mainTimelineModel
);
m_mainTimelineModel
->
updateFieldOrderFilter
(
pCore
->
getCurrentProfile
());
emit
docOpened
(
m_project
);
pCore
->
displayMessage
(
QString
(),
OperationCompletedMessage
,
100
);
if
(
openBackup
)
{
...
...
src/timeline2/model/timelinemodel.cpp
View file @
43954201
...
...
@@ -5694,10 +5694,15 @@ void TimelineModel::updateFieldOrderFilter(std::unique_ptr<ProfileModel> &ptr)
// If the profile is progressiv, field order is redundant: remove
// Also we only need one field order filter
m_tractor
->
detach
(
*
fl
.
get
());
pCore
->
currentDoc
()
->
setModified
(
true
);
}
else
{
foFilter
=
fl
;
foFilter
->
set
(
"internal_added"
,
237
);
foFilter
->
set
(
"av.order"
,
ptr
->
bottom_field_first
()
?
"bff"
:
"tff"
);
QString
value
=
ptr
->
bottom_field_first
()
?
"bff"
:
"tff"
;
if
(
foFilter
->
get
(
"av.order"
)
!=
value
)
{
pCore
->
currentDoc
()
->
setModified
(
true
);
}
foFilter
->
set
(
"av.order"
,
value
.
toUtf8
().
constData
());
}
}
}
...
...
@@ -5708,6 +5713,7 @@ void TimelineModel::updateFieldOrderFilter(std::unique_ptr<ProfileModel> &ptr)
foFilter
->
set
(
"internal_added"
,
237
);
foFilter
->
set
(
"av.order"
,
ptr
->
bottom_field_first
()
?
"bff"
:
"tff"
);
m_tractor
->
attach
(
*
foFilter
.
get
());
pCore
->
currentDoc
()
->
setModified
(
true
);
}
}
}
...
...
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