From 607a3c452ae9494da6f3a5e2f9af5fb2477c3dce Mon Sep 17 00:00:00 2001 From: ronso0 Date: Tue, 28 Jun 2022 13:11:44 +0200 Subject: [PATCH 1/2] WTrackMenu: group AutoDJ actions into submenu --- src/widget/wtrackmenu.cpp | 18 ++++++++++++------ src/widget/wtrackmenu.h | 1 + 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/src/widget/wtrackmenu.cpp b/src/widget/wtrackmenu.cpp index bbcfbcc5ab78..12df5f403503 100644 --- a/src/widget/wtrackmenu.cpp +++ b/src/widget/wtrackmenu.cpp @@ -105,6 +105,11 @@ void WTrackMenu::popup(const QPoint& pos, QAction* at) { } void WTrackMenu::createMenus() { + if (featureIsEnabled(Feature::AutoDJ)) { + m_pAutoDJMenu = new QMenu(this); + m_pAutoDJMenu->setTitle(tr("Add to Auto DJ queue")); + } + if (featureIsEnabled(Feature::LoadTo)) { m_pLoadToMenu = new QMenu(this); m_pLoadToMenu->setTitle(tr("Load to")); @@ -198,13 +203,13 @@ void WTrackMenu::createActions() { kPropertiesShortcutKey); if (featureIsEnabled(Feature::AutoDJ)) { - m_pAutoDJBottomAct = new QAction(tr("Add to Auto DJ Queue (bottom)"), this); + m_pAutoDJBottomAct = new QAction(tr("Add to Auto DJ Queue (bottom)"), m_pAutoDJMenu); connect(m_pAutoDJBottomAct, &QAction::triggered, this, &WTrackMenu::slotAddToAutoDJBottom); - m_pAutoDJTopAct = new QAction(tr("Add to Auto DJ Queue (top)"), this); + m_pAutoDJTopAct = new QAction(tr("Add to Auto DJ Queue (top)"), m_pAutoDJMenu); connect(m_pAutoDJTopAct, &QAction::triggered, this, &WTrackMenu::slotAddToAutoDJTop); - m_pAutoDJReplaceAct = new QAction(tr("Add to Auto DJ Queue (replace)"), this); + m_pAutoDJReplaceAct = new QAction(tr("Add to Auto DJ Queue (replace)"), m_pAutoDJMenu); connect(m_pAutoDJReplaceAct, &QAction::triggered, this, &WTrackMenu::slotAddToAutoDJReplace); } @@ -450,9 +455,10 @@ void WTrackMenu::setupActions() { } if (featureIsEnabled(Feature::AutoDJ)) { - addAction(m_pAutoDJBottomAct); - addAction(m_pAutoDJTopAct); - addAction(m_pAutoDJReplaceAct); + m_pAutoDJMenu->addAction(m_pAutoDJBottomAct); + m_pAutoDJMenu->addAction(m_pAutoDJTopAct); + m_pAutoDJMenu->addAction(m_pAutoDJReplaceAct); + addMenu(m_pAutoDJMenu); addSeparator(); } diff --git a/src/widget/wtrackmenu.h b/src/widget/wtrackmenu.h index 2808ed79d32a..866503894f19 100644 --- a/src/widget/wtrackmenu.h +++ b/src/widget/wtrackmenu.h @@ -215,6 +215,7 @@ class WTrackMenu : public QMenu { const ControlProxy* m_pNumPreviewDecks{}; // Submenus + QMenu* m_pAutoDJMenu{}; QMenu* m_pLoadToMenu{}; QMenu* m_pDeckMenu{}; QMenu* m_pSamplerMenu{}; From 7c0dfae7147f1ca506facbe11362f10208b85604 Mon Sep 17 00:00:00 2001 From: ronso0 Date: Tue, 28 Jun 2022 15:17:11 +0200 Subject: [PATCH 2/2] WTrackMenu: group File Browser & Delete from Disk --- src/widget/wtrackmenu.cpp | 34 ++++++++++++++++++---------------- src/widget/wtrackmenu.h | 2 +- 2 files changed, 19 insertions(+), 17 deletions(-) diff --git a/src/widget/wtrackmenu.cpp b/src/widget/wtrackmenu.cpp index 12df5f403503..6c3caa90a465 100644 --- a/src/widget/wtrackmenu.cpp +++ b/src/widget/wtrackmenu.cpp @@ -190,9 +190,10 @@ void WTrackMenu::createMenus() { }); } - if (featureIsEnabled(Feature::RemoveFromDisk)) { - m_pRemoveFromDiskMenu = new QMenu(this); - m_pRemoveFromDiskMenu->setTitle(tr("Delete Track Files")); + if (featureIsEnabled(Feature::RemoveFromDisk) || + featureIsEnabled(Feature::FileBrowser)) { + m_pFileMenu = new QMenu(this); + m_pFileMenu->setTitle(tr("Track Files")); } } @@ -250,8 +251,13 @@ void WTrackMenu::createActions() { connect(m_pPurgeAct, &QAction::triggered, this, &WTrackMenu::slotPurge); } + if (featureIsEnabled(Feature::FileBrowser)) { + m_pFileBrowserAct = new QAction(tr("Open in File Browser"), m_pFileMenu); + connect(m_pFileBrowserAct, &QAction::triggered, this, &WTrackMenu::slotOpenInFileBrowser); + } + if (featureIsEnabled(Feature::RemoveFromDisk)) { - m_pRemoveFromDiskAct = new QAction(tr("Delete Files from Disk"), m_pRemoveFromDiskMenu); + m_pRemoveFromDiskAct = new QAction(tr("Delete Files from Disk"), m_pFileMenu); connect(m_pRemoveFromDiskAct, &QAction::triggered, this, @@ -273,11 +279,6 @@ void WTrackMenu::createActions() { connect(m_pPropertiesAct, &QAction::triggered, this, &WTrackMenu::slotShowDlgTrackInfo); } - if (featureIsEnabled(Feature::FileBrowser)) { - m_pFileBrowserAct = new QAction(tr("Open in File Browser"), this); - connect(m_pFileBrowserAct, &QAction::triggered, this, &WTrackMenu::slotOpenInFileBrowser); - } - if (featureIsEnabled(Feature::SelectInLibrary)) { m_pSelectInLibraryAct = new QAction(tr("Select in Library"), this); connect(m_pSelectInLibraryAct, &QAction::triggered, this, &WTrackMenu::slotSelectInLibrary); @@ -595,13 +596,14 @@ void WTrackMenu::setupActions() { } } - if (featureIsEnabled(Feature::RemoveFromDisk)) { - m_pRemoveFromDiskMenu->addAction(m_pRemoveFromDiskAct); - addMenu(m_pRemoveFromDiskMenu); - } - - if (featureIsEnabled(Feature::FileBrowser)) { - addAction(m_pFileBrowserAct); + if (m_pFileMenu) { + if (featureIsEnabled(Feature::FileBrowser)) { + m_pFileMenu->addAction(m_pFileBrowserAct); + } + if (featureIsEnabled(Feature::RemoveFromDisk)) { + m_pFileMenu->addAction(m_pRemoveFromDiskAct); + } + addMenu(m_pFileMenu); } if (featureIsEnabled(Feature::Properties)) { diff --git a/src/widget/wtrackmenu.h b/src/widget/wtrackmenu.h index 866503894f19..2ab7a291749f 100644 --- a/src/widget/wtrackmenu.h +++ b/src/widget/wtrackmenu.h @@ -229,7 +229,7 @@ class WTrackMenu : public QMenu { QMenu* m_pColorMenu{}; WCoverArtMenu* m_pCoverMenu{}; parented_ptr m_pSearchRelatedMenu; - QMenu* m_pRemoveFromDiskMenu{}; + QMenu* m_pFileMenu{}; // Update ReplayGain from Track QAction* m_pUpdateReplayGainAct{};