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
0fe2d82e
Commit
0fe2d82e
authored
Dec 07, 2020
by
Jean-Baptiste Mardelle
Browse files
show/lock subtitle track now correctly uses undo/redo
parent
263af4bf
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/timeline2/view/timelinecontroller.cpp
View file @
0fe2d82e
...
...
@@ -3936,9 +3936,15 @@ void TimelineController::switchSubtitleDisable()
{
auto
subtitleModel
=
pCore
->
getSubtitleModel
();
if
(
subtitleModel
)
{
subtitleModel
->
switchDisabled
();
emit
subtitlesDisabledChanged
();
pCore
->
requestMonitorRefresh
();
bool
disabled
=
subtitleModel
->
isDisabled
();
Fun
local_switch
=
[
this
,
subtitleModel
]()
{
subtitleModel
->
switchDisabled
();
emit
subtitlesDisabledChanged
();
pCore
->
requestMonitorRefresh
();
return
true
;
};
local_switch
();
pCore
->
pushUndo
(
local_switch
,
local_switch
,
disabled
?
i18n
(
"Show subtitle track"
)
:
i18n
(
"Hide subtitle track"
));
}
}
...
...
@@ -3955,8 +3961,14 @@ void TimelineController::switchSubtitleLock()
{
auto
subtitleModel
=
pCore
->
getSubtitleModel
();
if
(
subtitleModel
)
{
subtitleModel
->
switchLocked
();
emit
subtitlesLockedChanged
();
bool
locked
=
subtitleModel
->
isLocked
();
Fun
local_switch
=
[
this
,
subtitleModel
]()
{
subtitleModel
->
switchLocked
();
emit
subtitlesLockedChanged
();
return
true
;
};
local_switch
();
pCore
->
pushUndo
(
local_switch
,
local_switch
,
locked
?
i18n
(
"Unlock subtitle track"
)
:
i18n
(
"Lock subtitle track"
));
}
}
bool
TimelineController
::
subtitlesLocked
()
const
...
...
src/widgets/colorpickerwidget.cpp
View file @
0fe2d82e
...
...
@@ -92,6 +92,7 @@ ColorPickerWidget::~ColorPickerWidget()
void
ColorPickerWidget
::
paintEvent
(
QPaintEvent
*
event
)
{
Q_UNUSED
(
event
);
QStylePainter
painter
(
this
);
QStyleOptionComplex
option
;
...
...
Write
Preview
Supports
Markdown
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