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
71333c83
Commit
71333c83
authored
Jul 21, 2020
by
Jean-Baptiste Mardelle
Browse files
Fix activate track target shortcut always activating first stream.
Related to
#225
parent
168e486a
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/mainwindow.cpp
View file @
71333c83
...
...
@@ -1744,7 +1744,7 @@ void MainWindow::setupActions()
connect
(
ac2
,
&
QAction
::
triggered
,
this
,
&
MainWindow
::
slotActivateVideoTrackSequence
);
addAction
(
QString
(
"activate_video_%1"
).
arg
(
i
),
ac2
,
QKeySequence
(
keysequence
[
i
-
1
]),
timelineActions
);
QAction
*
ac3
=
new
QAction
(
QIcon
(),
i18n
(
"Select Target %1"
,
i
),
this
);
ac
2
->
setData
(
i
-
1
);
ac
3
->
setData
(
i
-
1
);
connect
(
ac3
,
&
QAction
::
triggered
,
this
,
&
MainWindow
::
slotActivateTarget
);
addAction
(
QString
(
"activate_target_%1"
).
arg
(
i
),
ac3
,
QKeySequence
(
Qt
::
Key_Q
,
keysequence
[
i
-
1
]),
timelineActions
);
}
...
...
@@ -4107,8 +4107,10 @@ void MainWindow::slotActivateVideoTrackSequence()
void
MainWindow
::
slotActivateTarget
()
{
auto
*
action
=
qobject_cast
<
QAction
*>
(
sender
());
const
QList
<
int
>
trackIds
=
getMainTimeline
()
->
controller
()
->
getModel
()
->
getTracksIds
(
false
);
getCurrentTimeline
()
->
controller
()
->
assignCurrentTarget
(
action
->
data
().
toInt
());
if
(
action
)
{
int
ix
=
action
->
data
().
toInt
();
getCurrentTimeline
()
->
controller
()
->
assignCurrentTarget
(
ix
);
}
}
#ifdef DEBUG_MAINW
...
...
src/timeline2/view/qml/TrackHead.qml
View file @
71333c83
...
...
@@ -173,7 +173,7 @@ Rectangle {
}
}
ToolTip
{
visible
:
targetArea
.
containsMouse
visible
:
targetArea
.
containsMouse
&&
!
targetMouse
.
hovered
font
:
miniFont
delay
:
1500
timeout
:
5000
...
...
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