diff options
author | Be <be@mixxx.org> | 2020-04-17 14:35:18 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-04-17 14:35:18 -0500 |
commit | 8646d5db28c9e6badbb52004720e6c3ebc7c8ed8 (patch) | |
tree | e95b8a45e7e99b9c087d2acdc35125a377acfcac /src | |
parent | 57917e4a1af83f5d692d008b82993f5dc7150d27 (diff) | |
parent | 5b0cc5ca6bde4c053508fcd449e43b325b054ecb (diff) |
Merge pull request #2674 from uklotzde/trackcontextmenu_ordering
Reorder track context menu entries
Diffstat (limited to 'src')
-rw-r--r-- | src/widget/wtrackmenu.cpp | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/src/widget/wtrackmenu.cpp b/src/widget/wtrackmenu.cpp index dad99f50a9..df14cf72c8 100644 --- a/src/widget/wtrackmenu.cpp +++ b/src/widget/wtrackmenu.cpp @@ -315,6 +315,26 @@ void WTrackMenu::setupActions() { addSeparator(); + if (featureIsEnabled(Feature::BPM)) { + m_pBPMMenu->addAction(m_pBpmDoubleAction); + m_pBPMMenu->addAction(m_pBpmHalveAction); + m_pBPMMenu->addAction(m_pBpmTwoThirdsAction); + m_pBPMMenu->addAction(m_pBpmThreeFourthsAction); + m_pBPMMenu->addAction(m_pBpmFourThirdsAction); + m_pBPMMenu->addAction(m_pBpmThreeHalvesAction); + m_pBPMMenu->addSeparator(); + m_pBPMMenu->addAction(m_pBpmLockAction); + m_pBPMMenu->addAction(m_pBpmUnlockAction); + m_pBPMMenu->addSeparator(); + + addMenu(m_pBPMMenu); + } + + if (featureIsEnabled(Feature::Color)) { + m_pColorMenu->addAction(m_pColorPickerAction); + addMenu(m_pColorMenu); + } + if (featureIsEnabled(Feature::Metadata)) { m_pMetadataMenu->addAction(m_pImportMetadataFromFileAct); m_pMetadataMenu->addAction(m_pImportMetadataFromMusicBrainzAct); @@ -355,26 +375,6 @@ void WTrackMenu::setupActions() { addMenu(m_pClearMetadataMenu); } - if (featureIsEnabled(Feature::BPM)) { - m_pBPMMenu->addAction(m_pBpmDoubleAction); - m_pBPMMenu->addAction(m_pBpmHalveAction); - m_pBPMMenu->addAction(m_pBpmTwoThirdsAction); - m_pBPMMenu->addAction(m_pBpmThreeFourthsAction); - m_pBPMMenu->addAction(m_pBpmFourThirdsAction); - m_pBPMMenu->addAction(m_pBpmThreeHalvesAction); - m_pBPMMenu->addSeparator(); - m_pBPMMenu->addAction(m_pBpmLockAction); - m_pBPMMenu->addAction(m_pBpmUnlockAction); - m_pBPMMenu->addSeparator(); - - addMenu(m_pBPMMenu); - } - - if (featureIsEnabled(Feature::Color)) { - m_pColorMenu->addAction(m_pColorPickerAction); - addMenu(m_pColorMenu); - } - addSeparator(); if (featureIsEnabled(Feature::HideUnhidePurge)) { if (m_pTrackModel->hasCapabilities(TrackModel::TRACKMODELCAPS_HIDE)) { |