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
23b87be1
Commit
23b87be1
authored
Jul 14, 2020
by
Jean-Baptiste Mardelle
Browse files
Rename "Split audio" to "Restore audio". Related to
#756
parent
d3a4c270
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/mainwindow.cpp
View file @
23b87be1
...
...
@@ -1517,7 +1517,7 @@ void MainWindow::setupActions()
editClipMarker
->
setObjectName
(
QStringLiteral
(
"edit_marker"
));
editClipMarker
->
setData
(
'P'
);
QAction
*
splitAudio
=
addAction
(
QStringLiteral
(
"clip_split"
),
i18n
(
"
Split
Audio"
),
this
,
SLOT
(
slotSplitAV
()),
QAction
*
splitAudio
=
addAction
(
QStringLiteral
(
"clip_split"
),
i18n
(
"
Restore
Audio"
),
this
,
SLOT
(
slotSplitAV
()),
QIcon
::
fromTheme
(
QStringLiteral
(
"document-new"
)),
QKeySequence
(),
clipActionCategory
);
// "S" will be handled specifically to change the action name depending on current selection
splitAudio
->
setData
(
'S'
);
...
...
src/timeline2/model/timelinefunctions.cpp
View file @
23b87be1
...
...
@@ -777,7 +777,7 @@ bool TimelineFunctions::requestSplitAudio(const std::shared_ptr<TimelineItemMode
if
(
possibleTracks
.
isEmpty
())
{
// No available audio track for splitting, abort
undo
();
pCore
->
displayMessage
(
i18n
(
"No available audio track for
split
operation"
),
ErrorMessage
);
pCore
->
displayMessage
(
i18n
(
"No available audio track for
restore
operation"
),
ErrorMessage
);
return
false
;
}
int
newId
;
...
...
@@ -785,7 +785,7 @@ bool TimelineFunctions::requestSplitAudio(const std::shared_ptr<TimelineItemMode
if
(
!
res
)
{
bool
undone
=
undo
();
Q_ASSERT
(
undone
);
pCore
->
displayMessage
(
i18n
(
"Audio
split
failed"
),
ErrorMessage
);
pCore
->
displayMessage
(
i18n
(
"Audio
restore
failed"
),
ErrorMessage
);
return
false
;
}
bool
success
=
false
;
...
...
@@ -798,14 +798,14 @@ bool TimelineFunctions::requestSplitAudio(const std::shared_ptr<TimelineItemMode
if
(
!
success
)
{
bool
undone
=
undo
();
Q_ASSERT
(
undone
);
pCore
->
displayMessage
(
i18n
(
"Audio
split
failed"
),
ErrorMessage
);
pCore
->
displayMessage
(
i18n
(
"Audio
restore
failed"
),
ErrorMessage
);
return
false
;
}
done
=
true
;
}
if
(
done
)
{
timeline
->
requestSetSelection
(
clips
,
undo
,
redo
);
pCore
->
pushUndo
(
undo
,
redo
,
i18n
(
"
Split
Audio"
));
pCore
->
pushUndo
(
undo
,
redo
,
i18n
(
"
Restore
Audio"
));
}
return
done
;
}
...
...
@@ -837,7 +837,7 @@ bool TimelineFunctions::requestSplitVideo(const std::shared_ptr<TimelineItemMode
if
(
possibleTracks
.
isEmpty
())
{
// No available audio track for splitting, abort
undo
();
pCore
->
displayMessage
(
i18n
(
"No available video track for
split
operation"
),
ErrorMessage
);
pCore
->
displayMessage
(
i18n
(
"No available video track for
restore
operation"
),
ErrorMessage
);
return
false
;
}
int
newId
;
...
...
@@ -845,7 +845,7 @@ bool TimelineFunctions::requestSplitVideo(const std::shared_ptr<TimelineItemMode
if
(
!
res
)
{
bool
undone
=
undo
();
Q_ASSERT
(
undone
);
pCore
->
displayMessage
(
i18n
(
"Video
split
failed"
),
ErrorMessage
);
pCore
->
displayMessage
(
i18n
(
"Video
restore
failed"
),
ErrorMessage
);
return
false
;
}
bool
success
=
false
;
...
...
@@ -858,13 +858,13 @@ bool TimelineFunctions::requestSplitVideo(const std::shared_ptr<TimelineItemMode
if
(
!
success
)
{
bool
undone
=
undo
();
Q_ASSERT
(
undone
);
pCore
->
displayMessage
(
i18n
(
"Video
split
failed"
),
ErrorMessage
);
pCore
->
displayMessage
(
i18n
(
"Video
restore
failed"
),
ErrorMessage
);
return
false
;
}
done
=
true
;
}
if
(
done
)
{
pCore
->
pushUndo
(
undo
,
redo
,
i18n
(
"
Split
Video"
));
pCore
->
pushUndo
(
undo
,
redo
,
i18n
(
"
Restore
Video"
));
}
return
done
;
}
...
...
src/timeline2/view/timelinecontroller.cpp
View file @
23b87be1
...
...
@@ -2895,7 +2895,7 @@ void TimelineController::updateClipActions()
}
}
}
act
->
setText
(
state
==
PlaylistState
::
AudioOnly
?
i18n
(
"
Split
video"
)
:
i18n
(
"
Split
audio"
));
act
->
setText
(
state
==
PlaylistState
::
AudioOnly
?
i18n
(
"
Restore
video"
)
:
i18n
(
"
Restore
audio"
));
}
}
else
if
(
actionData
==
QLatin1Char
(
'W'
))
{
enableAction
=
clip
!=
nullptr
;
...
...
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