Merge branch '2.3' of github.com:mixxxdj/mixxx into main

1 files changed, 51 insertions, 0 deletions

diff --git a/src/controllers/controlpickermenu.cpp b/src/controllers/controlpickermenu.cpp
index 8c731c9c83..baddce4f0e 100644
--- a/src/controllers/controlpickermenu.cpp
+++ b/src/controllers/controlpickermenu.cpp
@@ -415,6 +415,57 @@ ControlPickerMenu::ControlPickerMenu(QWidget* pParent)
         hotcueMainMenu->addMenu(hotcueMoreMenu);
     }
 
+    // Intro/outro range markers
+    QMenu* introOutroMenu = addSubmenu(tr("Intro / Outro Cues"));
+    QString introStartTitle(tr("Intro Start Cue"));
+    QString introEndTitle(tr("Intro End Cue"));
+    QString outroStartTitle(tr("Outro Start Cue"));
+    QString outroEndTitle(tr("Outro End Cue"));
+    QMenu* introStartMenu = addSubmenu(introStartTitle, introOutroMenu);
+    QMenu* introEndMenu = addSubmenu(introEndTitle, introOutroMenu);
+    QMenu* outroStartMenu = addSubmenu(outroStartTitle, introOutroMenu);
+    QMenu* outroEndMenu = addSubmenu(outroEndTitle, introOutroMenu);
+    QList<QMenu*> introOutroSubmenus = {
+            introStartMenu,
+            introEndMenu,
+            outroStartMenu,
+            outroEndMenu};
+    const QStringList cueTypeTitles = {
+            introStartTitle,
+            introEndTitle,
+            outroStartTitle,
+            outroEndTitle};
+    const QStringList cueTypeNames = {
+            tr("intro start cue"),
+            tr("intro end cue"),
+            tr("outro start cue"),
+            tr("outro end cue")};
+    const QStringList cueTypeCOs = {
+            "intro_start",
+            "intro_end",
+            "outro_start",
+            "outro_end"};
+
+    for (int i = 0; i < introOutroSubmenus.size(); ++i) {
+        addDeckAndSamplerAndPreviewDeckControl(
+                QString("%1_activate").arg(cueTypeCOs[i]),
+                tr("Activate %1").arg(cueTypeTitles[i]),
+                tr("Jump to or set the %1")
+                        .arg(cueTypeNames[i]),
+                introOutroSubmenus[i]);
+        addDeckAndSamplerAndPreviewDeckControl(
+                QString("%1_set").arg(cueTypeCOs[i]),
+                tr("Set %1").arg(cueTypeTitles[i]),
+                tr("Set or jump to the %1")
+                        .arg(cueTypeNames[i]),
+                introOutroSubmenus[i]);
+        addDeckAndSamplerAndPreviewDeckControl(
+                QString("%1_clear").arg(cueTypeCOs[i]),
+                tr("Clear %1").arg(cueTypeTitles[i]),
+                tr("Clear the %1").arg(cueTypeNames[i]),
+                introOutroSubmenus[i]);
+    }
+
     // Loops
     QMenu* loopMenu = addSubmenu(tr("Looping"));
     // add beatloop_activate and beatlooproll_activate to both the