From ede67ffa6ffdf5fa7c1197fb44ba8d797c7f999e Mon Sep 17 00:00:00 2001 From: Patrick Fedick Date: Tue, 2 Jul 2024 20:28:36 +0200 Subject: [PATCH] sort music keys by name in all context menues --- gui/src/editor/edit.cpp | 58 ++++++++++++++++++++--------------- gui/src/playlist/playlist.cpp | 58 ++++++++++++++++++++--------------- gui/src/search/search.cpp | 57 +++++++++++++++++++--------------- 3 files changed, 98 insertions(+), 75 deletions(-) diff --git a/gui/src/editor/edit.cpp b/gui/src/editor/edit.cpp index f9d09182..f8acaf3a 100644 --- a/gui/src/editor/edit.cpp +++ b/gui/src/editor/edit.cpp @@ -2309,32 +2309,40 @@ void Edit::on_trackList_customContextMenuRequested(const QPoint& pos) void Edit::createSetMusicKeyContextMenu(QMenu* m) { + de::pfp::winmusik::MusicalKeys& keys=wm_main->MusicKeys; + m->addAction(tr("unknown", "trackList Context Menue"), this, SLOT(on_contextMusicKey0_triggered())); - m->addAction(wm->MusicKeys.keyName(22, musicKeyDisplay), this, SLOT(on_contextMusicKey22_triggered())); - m->addAction(wm->MusicKeys.keyName(12, musicKeyDisplay), this, SLOT(on_contextMusicKey12_triggered())); - m->addAction(wm->MusicKeys.keyName(5, musicKeyDisplay), this, SLOT(on_contextMusicKey5_triggered())); - m->addAction(wm->MusicKeys.keyName(15, musicKeyDisplay), this, SLOT(on_contextMusicKey15_triggered())); - m->addAction(wm->MusicKeys.keyName(2, musicKeyDisplay), this, SLOT(on_contextMusicKey2_triggered())); - m->addAction(wm->MusicKeys.keyName(19, musicKeyDisplay), this, SLOT(on_contextMusicKey19_triggered())); - m->addAction(wm->MusicKeys.keyName(16, musicKeyDisplay), this, SLOT(on_contextMusicKey16_triggered())); - m->addAction(wm->MusicKeys.keyName(6, musicKeyDisplay), this, SLOT(on_contextMusicKey6_triggered())); - m->addAction(wm->MusicKeys.keyName(23, musicKeyDisplay), this, SLOT(on_contextMusicKey23_triggered())); - m->addAction(wm->MusicKeys.keyName(9, musicKeyDisplay), this, SLOT(on_contextMusicKey9_triggered())); - m->addAction(wm->MusicKeys.keyName(20, musicKeyDisplay), this, SLOT(on_contextMusicKey20_triggered())); - m->addAction(wm->MusicKeys.keyName(10, musicKeyDisplay), this, SLOT(on_contextMusicKey10_triggered())); - m->addAction(wm->MusicKeys.keyName(3, musicKeyDisplay), this, SLOT(on_contextMusicKey3_triggered())); - m->addAction(wm->MusicKeys.keyName(13, musicKeyDisplay), this, SLOT(on_contextMusicKey13_triggered())); - m->addAction(wm->MusicKeys.keyName(24, musicKeyDisplay), this, SLOT(on_contextMusicKey24_triggered())); - m->addAction(wm->MusicKeys.keyName(17, musicKeyDisplay), this, SLOT(on_contextMusicKey17_triggered())); - m->addAction(wm->MusicKeys.keyName(14, musicKeyDisplay), this, SLOT(on_contextMusicKey14_triggered())); - m->addAction(wm->MusicKeys.keyName(4, musicKeyDisplay), this, SLOT(on_contextMusicKey4_triggered())); - m->addAction(wm->MusicKeys.keyName(21, musicKeyDisplay), this, SLOT(on_contextMusicKey21_triggered())); - m->addAction(wm->MusicKeys.keyName(7, musicKeyDisplay), this, SLOT(on_contextMusicKey7_triggered())); - m->addAction(wm->MusicKeys.keyName(18, musicKeyDisplay), this, SLOT(on_contextMusicKey18_triggered())); - m->addAction(wm->MusicKeys.keyName(8, musicKeyDisplay), this, SLOT(on_contextMusicKey8_triggered())); - m->addAction(wm->MusicKeys.keyName(1, musicKeyDisplay), this, SLOT(on_contextMusicKey1_triggered())); - m->addAction(wm->MusicKeys.keyName(11, musicKeyDisplay), this, SLOT(on_contextMusicKey11_triggered())); - m->addAction(wm->MusicKeys.keyName(25, musicKeyDisplay), this, SLOT(on_contextMusicKey25_triggered())); + std::map sortedkeys; + sortedkeys.insert(std::pair(keys.keyName(1, musicKeyDisplay), SLOT(on_contextMusicKey1_triggered()))); + sortedkeys.insert(std::pair(keys.keyName(2, musicKeyDisplay), SLOT(on_contextMusicKey2_triggered()))); + sortedkeys.insert(std::pair(keys.keyName(3, musicKeyDisplay), SLOT(on_contextMusicKey3_triggered()))); + sortedkeys.insert(std::pair(keys.keyName(4, musicKeyDisplay), SLOT(on_contextMusicKey4_triggered()))); + sortedkeys.insert(std::pair(keys.keyName(5, musicKeyDisplay), SLOT(on_contextMusicKey5_triggered()))); + sortedkeys.insert(std::pair(keys.keyName(6, musicKeyDisplay), SLOT(on_contextMusicKey6_triggered()))); + sortedkeys.insert(std::pair(keys.keyName(7, musicKeyDisplay), SLOT(on_contextMusicKey7_triggered()))); + sortedkeys.insert(std::pair(keys.keyName(8, musicKeyDisplay), SLOT(on_contextMusicKey8_triggered()))); + sortedkeys.insert(std::pair(keys.keyName(9, musicKeyDisplay), SLOT(on_contextMusicKey9_triggered()))); + sortedkeys.insert(std::pair(keys.keyName(10, musicKeyDisplay), SLOT(on_contextMusicKey10_triggered()))); + sortedkeys.insert(std::pair(keys.keyName(11, musicKeyDisplay), SLOT(on_contextMusicKey11_triggered()))); + sortedkeys.insert(std::pair(keys.keyName(12, musicKeyDisplay), SLOT(on_contextMusicKey12_triggered()))); + sortedkeys.insert(std::pair(keys.keyName(13, musicKeyDisplay), SLOT(on_contextMusicKey13_triggered()))); + sortedkeys.insert(std::pair(keys.keyName(14, musicKeyDisplay), SLOT(on_contextMusicKey14_triggered()))); + sortedkeys.insert(std::pair(keys.keyName(15, musicKeyDisplay), SLOT(on_contextMusicKey15_triggered()))); + sortedkeys.insert(std::pair(keys.keyName(16, musicKeyDisplay), SLOT(on_contextMusicKey16_triggered()))); + sortedkeys.insert(std::pair(keys.keyName(17, musicKeyDisplay), SLOT(on_contextMusicKey17_triggered()))); + sortedkeys.insert(std::pair(keys.keyName(18, musicKeyDisplay), SLOT(on_contextMusicKey18_triggered()))); + sortedkeys.insert(std::pair(keys.keyName(19, musicKeyDisplay), SLOT(on_contextMusicKey19_triggered()))); + sortedkeys.insert(std::pair(keys.keyName(20, musicKeyDisplay), SLOT(on_contextMusicKey20_triggered()))); + sortedkeys.insert(std::pair(keys.keyName(21, musicKeyDisplay), SLOT(on_contextMusicKey21_triggered()))); + sortedkeys.insert(std::pair(keys.keyName(22, musicKeyDisplay), SLOT(on_contextMusicKey22_triggered()))); + sortedkeys.insert(std::pair(keys.keyName(23, musicKeyDisplay), SLOT(on_contextMusicKey23_triggered()))); + sortedkeys.insert(std::pair(keys.keyName(24, musicKeyDisplay), SLOT(on_contextMusicKey24_triggered()))); + sortedkeys.insert(std::pair(keys.keyName(25, musicKeyDisplay), SLOT(on_contextMusicKey25_triggered()))); + + std::map::const_iterator it; + for (it=sortedkeys.begin();it != sortedkeys.end();++it) { + m->addAction(it->first, this, it->second); + } } void Edit::on_contextMusicKeyVerified_triggered() diff --git a/gui/src/playlist/playlist.cpp b/gui/src/playlist/playlist.cpp index 482d7b07..b5a1e61c 100644 --- a/gui/src/playlist/playlist.cpp +++ b/gui/src/playlist/playlist.cpp @@ -1263,32 +1263,40 @@ void Playlist::on_tracks_customContextMenuRequested(const QPoint& pos) void Playlist::createSetMusicKeyContextMenu(QMenu* m) { + de::pfp::winmusik::MusicalKeys& keys=wm_main->MusicKeys; m->addAction(tr("unknown", "trackList Context Menue"), this, SLOT(on_contextMusicKey0_triggered())); - m->addAction(wm_main->MusicKeys.keyName(22, musicKeyDisplay), this, SLOT(on_contextMusicKey22_triggered())); - m->addAction(wm_main->MusicKeys.keyName(12, musicKeyDisplay), this, SLOT(on_contextMusicKey12_triggered())); - m->addAction(wm_main->MusicKeys.keyName(5, musicKeyDisplay), this, SLOT(on_contextMusicKey5_triggered())); - m->addAction(wm_main->MusicKeys.keyName(15, musicKeyDisplay), this, SLOT(on_contextMusicKey15_triggered())); - m->addAction(wm_main->MusicKeys.keyName(2, musicKeyDisplay), this, SLOT(on_contextMusicKey2_triggered())); - m->addAction(wm_main->MusicKeys.keyName(19, musicKeyDisplay), this, SLOT(on_contextMusicKey19_triggered())); - m->addAction(wm_main->MusicKeys.keyName(16, musicKeyDisplay), this, SLOT(on_contextMusicKey16_triggered())); - m->addAction(wm_main->MusicKeys.keyName(6, musicKeyDisplay), this, SLOT(on_contextMusicKey6_triggered())); - m->addAction(wm_main->MusicKeys.keyName(23, musicKeyDisplay), this, SLOT(on_contextMusicKey23_triggered())); - m->addAction(wm_main->MusicKeys.keyName(9, musicKeyDisplay), this, SLOT(on_contextMusicKey9_triggered())); - m->addAction(wm_main->MusicKeys.keyName(20, musicKeyDisplay), this, SLOT(on_contextMusicKey20_triggered())); - m->addAction(wm_main->MusicKeys.keyName(10, musicKeyDisplay), this, SLOT(on_contextMusicKey10_triggered())); - m->addAction(wm_main->MusicKeys.keyName(3, musicKeyDisplay), this, SLOT(on_contextMusicKey3_triggered())); - m->addAction(wm_main->MusicKeys.keyName(13, musicKeyDisplay), this, SLOT(on_contextMusicKey13_triggered())); - m->addAction(wm_main->MusicKeys.keyName(24, musicKeyDisplay), this, SLOT(on_contextMusicKey24_triggered())); - m->addAction(wm_main->MusicKeys.keyName(17, musicKeyDisplay), this, SLOT(on_contextMusicKey17_triggered())); - m->addAction(wm_main->MusicKeys.keyName(14, musicKeyDisplay), this, SLOT(on_contextMusicKey14_triggered())); - m->addAction(wm_main->MusicKeys.keyName(4, musicKeyDisplay), this, SLOT(on_contextMusicKey4_triggered())); - m->addAction(wm_main->MusicKeys.keyName(21, musicKeyDisplay), this, SLOT(on_contextMusicKey21_triggered())); - m->addAction(wm_main->MusicKeys.keyName(7, musicKeyDisplay), this, SLOT(on_contextMusicKey7_triggered())); - m->addAction(wm_main->MusicKeys.keyName(18, musicKeyDisplay), this, SLOT(on_contextMusicKey18_triggered())); - m->addAction(wm_main->MusicKeys.keyName(8, musicKeyDisplay), this, SLOT(on_contextMusicKey8_triggered())); - m->addAction(wm_main->MusicKeys.keyName(1, musicKeyDisplay), this, SLOT(on_contextMusicKey1_triggered())); - m->addAction(wm_main->MusicKeys.keyName(11, musicKeyDisplay), this, SLOT(on_contextMusicKey11_triggered())); - m->addAction(wm_main->MusicKeys.keyName(25, musicKeyDisplay), this, SLOT(on_contextMusicKey25_triggered())); + std::map sortedkeys; + sortedkeys.insert(std::pair(keys.keyName(1, musicKeyDisplay), SLOT(on_contextMusicKey1_triggered()))); + sortedkeys.insert(std::pair(keys.keyName(2, musicKeyDisplay), SLOT(on_contextMusicKey2_triggered()))); + sortedkeys.insert(std::pair(keys.keyName(3, musicKeyDisplay), SLOT(on_contextMusicKey3_triggered()))); + sortedkeys.insert(std::pair(keys.keyName(4, musicKeyDisplay), SLOT(on_contextMusicKey4_triggered()))); + sortedkeys.insert(std::pair(keys.keyName(5, musicKeyDisplay), SLOT(on_contextMusicKey5_triggered()))); + sortedkeys.insert(std::pair(keys.keyName(6, musicKeyDisplay), SLOT(on_contextMusicKey6_triggered()))); + sortedkeys.insert(std::pair(keys.keyName(7, musicKeyDisplay), SLOT(on_contextMusicKey7_triggered()))); + sortedkeys.insert(std::pair(keys.keyName(8, musicKeyDisplay), SLOT(on_contextMusicKey8_triggered()))); + sortedkeys.insert(std::pair(keys.keyName(9, musicKeyDisplay), SLOT(on_contextMusicKey9_triggered()))); + sortedkeys.insert(std::pair(keys.keyName(10, musicKeyDisplay), SLOT(on_contextMusicKey10_triggered()))); + sortedkeys.insert(std::pair(keys.keyName(11, musicKeyDisplay), SLOT(on_contextMusicKey11_triggered()))); + sortedkeys.insert(std::pair(keys.keyName(12, musicKeyDisplay), SLOT(on_contextMusicKey12_triggered()))); + sortedkeys.insert(std::pair(keys.keyName(13, musicKeyDisplay), SLOT(on_contextMusicKey13_triggered()))); + sortedkeys.insert(std::pair(keys.keyName(14, musicKeyDisplay), SLOT(on_contextMusicKey14_triggered()))); + sortedkeys.insert(std::pair(keys.keyName(15, musicKeyDisplay), SLOT(on_contextMusicKey15_triggered()))); + sortedkeys.insert(std::pair(keys.keyName(16, musicKeyDisplay), SLOT(on_contextMusicKey16_triggered()))); + sortedkeys.insert(std::pair(keys.keyName(17, musicKeyDisplay), SLOT(on_contextMusicKey17_triggered()))); + sortedkeys.insert(std::pair(keys.keyName(18, musicKeyDisplay), SLOT(on_contextMusicKey18_triggered()))); + sortedkeys.insert(std::pair(keys.keyName(19, musicKeyDisplay), SLOT(on_contextMusicKey19_triggered()))); + sortedkeys.insert(std::pair(keys.keyName(20, musicKeyDisplay), SLOT(on_contextMusicKey20_triggered()))); + sortedkeys.insert(std::pair(keys.keyName(21, musicKeyDisplay), SLOT(on_contextMusicKey21_triggered()))); + sortedkeys.insert(std::pair(keys.keyName(22, musicKeyDisplay), SLOT(on_contextMusicKey22_triggered()))); + sortedkeys.insert(std::pair(keys.keyName(23, musicKeyDisplay), SLOT(on_contextMusicKey23_triggered()))); + sortedkeys.insert(std::pair(keys.keyName(24, musicKeyDisplay), SLOT(on_contextMusicKey24_triggered()))); + sortedkeys.insert(std::pair(keys.keyName(25, musicKeyDisplay), SLOT(on_contextMusicKey25_triggered()))); + + std::map::const_iterator it; + for (it=sortedkeys.begin();it != sortedkeys.end();++it) { + m->addAction(it->first, this, it->second); + } + } void Playlist::createSetEnergyLevelContextMenu(QMenu* m) diff --git a/gui/src/search/search.cpp b/gui/src/search/search.cpp index 184b3bcb..93c7cebf 100644 --- a/gui/src/search/search.cpp +++ b/gui/src/search/search.cpp @@ -820,31 +820,38 @@ void Search::createSetMusicKeyContextMenu(QMenu* m) { de::pfp::winmusik::MusicalKeys& keys=wm_main->MusicKeys; m->addAction(tr("unknown", "trackList Context Menue"), this, SLOT(on_contextMusicKey0_triggered())); - m->addAction(keys.keyName(22, musicKeyDisplay), this, SLOT(on_contextMusicKey22_triggered())); - m->addAction(keys.keyName(12, musicKeyDisplay), this, SLOT(on_contextMusicKey12_triggered())); - m->addAction(keys.keyName(5, musicKeyDisplay), this, SLOT(on_contextMusicKey5_triggered())); - m->addAction(keys.keyName(15, musicKeyDisplay), this, SLOT(on_contextMusicKey15_triggered())); - m->addAction(keys.keyName(2, musicKeyDisplay), this, SLOT(on_contextMusicKey2_triggered())); - m->addAction(keys.keyName(19, musicKeyDisplay), this, SLOT(on_contextMusicKey19_triggered())); - m->addAction(keys.keyName(16, musicKeyDisplay), this, SLOT(on_contextMusicKey16_triggered())); - m->addAction(keys.keyName(6, musicKeyDisplay), this, SLOT(on_contextMusicKey6_triggered())); - m->addAction(keys.keyName(23, musicKeyDisplay), this, SLOT(on_contextMusicKey23_triggered())); - m->addAction(keys.keyName(9, musicKeyDisplay), this, SLOT(on_contextMusicKey9_triggered())); - m->addAction(keys.keyName(20, musicKeyDisplay), this, SLOT(on_contextMusicKey20_triggered())); - m->addAction(keys.keyName(10, musicKeyDisplay), this, SLOT(on_contextMusicKey10_triggered())); - m->addAction(keys.keyName(3, musicKeyDisplay), this, SLOT(on_contextMusicKey3_triggered())); - m->addAction(keys.keyName(13, musicKeyDisplay), this, SLOT(on_contextMusicKey13_triggered())); - m->addAction(keys.keyName(24, musicKeyDisplay), this, SLOT(on_contextMusicKey24_triggered())); - m->addAction(keys.keyName(17, musicKeyDisplay), this, SLOT(on_contextMusicKey17_triggered())); - m->addAction(keys.keyName(14, musicKeyDisplay), this, SLOT(on_contextMusicKey14_triggered())); - m->addAction(keys.keyName(4, musicKeyDisplay), this, SLOT(on_contextMusicKey4_triggered())); - m->addAction(keys.keyName(21, musicKeyDisplay), this, SLOT(on_contextMusicKey21_triggered())); - m->addAction(keys.keyName(7, musicKeyDisplay), this, SLOT(on_contextMusicKey7_triggered())); - m->addAction(keys.keyName(18, musicKeyDisplay), this, SLOT(on_contextMusicKey18_triggered())); - m->addAction(keys.keyName(8, musicKeyDisplay), this, SLOT(on_contextMusicKey8_triggered())); - m->addAction(keys.keyName(1, musicKeyDisplay), this, SLOT(on_contextMusicKey1_triggered())); - m->addAction(keys.keyName(11, musicKeyDisplay), this, SLOT(on_contextMusicKey11_triggered())); - m->addAction(keys.keyName(25, musicKeyDisplay), this, SLOT(on_contextMusicKey25_triggered())); + std::map sortedkeys; + sortedkeys.insert(std::pair(keys.keyName(1, musicKeyDisplay), SLOT(on_contextMusicKey1_triggered()))); + sortedkeys.insert(std::pair(keys.keyName(2, musicKeyDisplay), SLOT(on_contextMusicKey2_triggered()))); + sortedkeys.insert(std::pair(keys.keyName(3, musicKeyDisplay), SLOT(on_contextMusicKey3_triggered()))); + sortedkeys.insert(std::pair(keys.keyName(4, musicKeyDisplay), SLOT(on_contextMusicKey4_triggered()))); + sortedkeys.insert(std::pair(keys.keyName(5, musicKeyDisplay), SLOT(on_contextMusicKey5_triggered()))); + sortedkeys.insert(std::pair(keys.keyName(6, musicKeyDisplay), SLOT(on_contextMusicKey6_triggered()))); + sortedkeys.insert(std::pair(keys.keyName(7, musicKeyDisplay), SLOT(on_contextMusicKey7_triggered()))); + sortedkeys.insert(std::pair(keys.keyName(8, musicKeyDisplay), SLOT(on_contextMusicKey8_triggered()))); + sortedkeys.insert(std::pair(keys.keyName(9, musicKeyDisplay), SLOT(on_contextMusicKey9_triggered()))); + sortedkeys.insert(std::pair(keys.keyName(10, musicKeyDisplay), SLOT(on_contextMusicKey10_triggered()))); + sortedkeys.insert(std::pair(keys.keyName(11, musicKeyDisplay), SLOT(on_contextMusicKey11_triggered()))); + sortedkeys.insert(std::pair(keys.keyName(12, musicKeyDisplay), SLOT(on_contextMusicKey12_triggered()))); + sortedkeys.insert(std::pair(keys.keyName(13, musicKeyDisplay), SLOT(on_contextMusicKey13_triggered()))); + sortedkeys.insert(std::pair(keys.keyName(14, musicKeyDisplay), SLOT(on_contextMusicKey14_triggered()))); + sortedkeys.insert(std::pair(keys.keyName(15, musicKeyDisplay), SLOT(on_contextMusicKey15_triggered()))); + sortedkeys.insert(std::pair(keys.keyName(16, musicKeyDisplay), SLOT(on_contextMusicKey16_triggered()))); + sortedkeys.insert(std::pair(keys.keyName(17, musicKeyDisplay), SLOT(on_contextMusicKey17_triggered()))); + sortedkeys.insert(std::pair(keys.keyName(18, musicKeyDisplay), SLOT(on_contextMusicKey18_triggered()))); + sortedkeys.insert(std::pair(keys.keyName(19, musicKeyDisplay), SLOT(on_contextMusicKey19_triggered()))); + sortedkeys.insert(std::pair(keys.keyName(20, musicKeyDisplay), SLOT(on_contextMusicKey20_triggered()))); + sortedkeys.insert(std::pair(keys.keyName(21, musicKeyDisplay), SLOT(on_contextMusicKey21_triggered()))); + sortedkeys.insert(std::pair(keys.keyName(22, musicKeyDisplay), SLOT(on_contextMusicKey22_triggered()))); + sortedkeys.insert(std::pair(keys.keyName(23, musicKeyDisplay), SLOT(on_contextMusicKey23_triggered()))); + sortedkeys.insert(std::pair(keys.keyName(24, musicKeyDisplay), SLOT(on_contextMusicKey24_triggered()))); + sortedkeys.insert(std::pair(keys.keyName(25, musicKeyDisplay), SLOT(on_contextMusicKey25_triggered()))); + + std::map::const_iterator it; + for (it=sortedkeys.begin();it != sortedkeys.end();++it) { + m->addAction(it->first, this, it->second); + } + }