Commit d5251aa2 authored by Jean-Baptiste Mardelle's avatar Jean-Baptiste Mardelle
Browse files

Merge branch 'cherry-pick-1fac2573' into 'release/20.04'

Add menu item in timeline  to change audio thumbnail format

See merge request kde/kdenlive!90
parents a9e55149 16b8a091
...@@ -561,6 +561,11 @@ void MainWindow::init() ...@@ -561,6 +561,11 @@ void MainWindow::init()
timelineHeadersMenu->addAction(actionCollection()->action(QStringLiteral("insert_track"))); timelineHeadersMenu->addAction(actionCollection()->action(QStringLiteral("insert_track")));
timelineHeadersMenu->addAction(actionCollection()->action(QStringLiteral("delete_track"))); timelineHeadersMenu->addAction(actionCollection()->action(QStringLiteral("delete_track")));
timelineHeadersMenu->addAction(actionCollection()->action(QStringLiteral("show_track_record"))); timelineHeadersMenu->addAction(actionCollection()->action(QStringLiteral("show_track_record")));
QAction *separate_channels = new QAction(QIcon(), i18n("Separate Channels"), this);
separate_channels->setCheckable(true);
separate_channels->setChecked(KdenliveSettings::displayallchannels());
connect(separate_channels, &QAction::triggered, this, &MainWindow::slotSeparateAudioChannel);
timelineHeadersMenu->addAction(separate_channels);
QMenu *thumbsMenu = new QMenu(i18n("Thumbnails"), this); QMenu *thumbsMenu = new QMenu(i18n("Thumbnails"), this);
QActionGroup *thumbGroup = new QActionGroup(this); QActionGroup *thumbGroup = new QActionGroup(this);
QAction *inFrame = new QAction(i18n("In Frame"), thumbGroup); QAction *inFrame = new QAction(i18n("In Frame"), thumbGroup);
...@@ -2566,6 +2571,12 @@ void MainWindow::slotRemoveAllSpace() ...@@ -2566,6 +2571,12 @@ void MainWindow::slotRemoveAllSpace()
getMainTimeline()->controller()->removeSpace(-1, -1, true); getMainTimeline()->controller()->removeSpace(-1, -1, true);
} }
void MainWindow::slotSeparateAudioChannel()
{
KdenliveSettings::setDisplayallchannels(!KdenliveSettings::displayallchannels());
getCurrentTimeline()->controller()->audioThumbFormatChanged();
}
void MainWindow::slotInsertTrack() void MainWindow::slotInsertTrack()
{ {
pCore->monitorManager()->activateMonitor(Kdenlive::ProjectMonitor); pCore->monitorManager()->activateMonitor(Kdenlive::ProjectMonitor);
......
...@@ -380,6 +380,7 @@ private slots: ...@@ -380,6 +380,7 @@ private slots:
void slotResizeItemStart(); void slotResizeItemStart();
void slotResizeItemEnd(); void slotResizeItemEnd();
void configureNotifications(); void configureNotifications();
void slotSeparateAudioChannel();
void slotInsertTrack(); void slotInsertTrack();
void slotDeleteTrack(); void slotDeleteTrack();
void slotShowTrackRec(); void slotShowTrackRec();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment