Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Kdenlive
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
258
Issues
258
List
Boards
Labels
Service Desk
Milestones
Merge Requests
15
Merge Requests
15
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Multimedia
Kdenlive
Commits
8796b4f9
Commit
8796b4f9
authored
May 03, 2020
by
Jean-Baptiste Mardelle
1
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Delete all selected markers in clip properties dialog when requested.
Related to
#660
parent
6d2db4bb
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
5 deletions
+16
-5
src/bin/model/markerlistmodel.hpp
src/bin/model/markerlistmodel.hpp
+0
-1
src/mltcontroller/clippropertiescontroller.cpp
src/mltcontroller/clippropertiescontroller.cpp
+16
-4
No files found.
src/bin/model/markerlistmodel.hpp
View file @
8796b4f9
...
...
@@ -77,7 +77,6 @@ public:
/* @brief Delete all the markers of the model */
bool
removeAllMarkers
();
protected:
/* @brief Same function but accumulates undo/redo */
bool
removeMarker
(
GenTime
pos
,
Fun
&
undo
,
Fun
&
redo
);
...
...
src/mltcontroller/clippropertiescontroller.cpp
View file @
8796b4f9
...
...
@@ -1099,10 +1099,22 @@ void ClipPropertiesController::slotEditMarker()
void
ClipPropertiesController
::
slotDeleteMarker
()
{
auto
markerModel
=
m_controller
->
getMarkerModel
();
auto
current
=
m_markerTree
->
currentIndex
();
if
(
!
current
.
isValid
())
return
;
GenTime
pos
(
markerModel
->
data
(
current
,
MarkerListModel
::
PosRole
).
toDouble
());
markerModel
->
removeMarker
(
pos
);
QModelIndexList
indexes
=
m_markerTree
->
selectionModel
()
->
selectedIndexes
();
QList
<
GenTime
>
positions
;
for
(
auto
&
ix
:
indexes
)
{
if
(
ix
.
isValid
())
{
positions
<<
GenTime
(
markerModel
->
data
(
ix
,
MarkerListModel
::
PosRole
).
toDouble
());
}
}
if
(
!
positions
.
isEmpty
())
{
Fun
undo
=
[]()
{
return
true
;
};
Fun
redo
=
[]()
{
return
true
;
};
for
(
GenTime
pos
:
positions
)
{
markerModel
->
removeMarker
(
pos
,
undo
,
redo
);
}
pCore
->
pushUndo
(
undo
,
redo
,
i18n
(
"Delete marker"
));
}
}
void
ClipPropertiesController
::
slotAddMarker
()
...
...
Mostafa Ahangarha
@ahangarha
mentioned in issue
#660
·
May 09, 2020
mentioned in issue
#660
mentioned in issue #660
Toggle commit list
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