oak-team/oak-editor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/olive-editor/olive

Browse Source
This commit is contained in:
itsmattkc
2020-04-16 12:21:09 +10:00
parent 32969d2403 4cb02b6769
commit ca071beb33
10 changed files with 124 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/panel/timebased/timebased.cpp
+6 -3
View File
@@ -122,15 +122,16 @@ void TimeBasedPanel::ConnectViewerNode(ViewerOutput *node)
{
if (widget_->GetConnectedNode()) {
disconnect(widget_->GetConnectedNode(), &ViewerOutput::MediaNameChanged, this, &TimeBasedPanel::SetSubtitle);
Retranslate();
}
widget_->ConnectViewerNode(node);
if (node) {
connect(node, &ViewerOutput::MediaNameChanged, this, &TimeBasedPanel::SetSubtitle);
SetSubtitle(node->media_name());
}
// Update strings
Retranslate();
}
void TimeBasedPanel::SetTimeBasedWidget(TimeBasedWidget *widget)
@@ -152,7 +153,9 @@ void TimeBasedPanel::SetTimeBasedWidget(TimeBasedWidget *widget)
void TimeBasedPanel::Retranslate()
{
if (!GetTimeBasedWidget()->GetConnectedNode()) {
if (GetTimeBasedWidget()->GetConnectedNode()) {
SetSubtitle(GetTimeBasedWidget()->GetConnectedNode()->media_name());
} else {
SetSubtitle(tr("(none)"));
}
}