Library controls color selector

src/controllers/controlpickermenu.cpp

@@ -941,6 +941,11 @@ ControlPickerMenu::ControlPickerMenu(QWidget* pParent)
             tr("Select the previous color in the color palette"
                " for the first selected track"),
             pLibraryMenu);
+    addLibraryControl("track_color_selector",
+            tr("Navigate Through Track Colors"),
+            tr("Select either next or previous color in the"
+               " palette for the first selected track."),
+            pLibraryMenu);
 
     pLibraryMenu->addSeparator();
     addControl("[Recording]",

src/library/librarycontrol.cpp

@@ -337,14 +337,31 @@ LibraryControl::LibraryControl(Library* pLibrary)
     // Track Color controls
     m_pTrackColorPrev = std::make_unique<ControlPushButton>(ConfigKey("[Library]", "track_color_prev"));
     m_pTrackColorNext = std::make_unique<ControlPushButton>(ConfigKey("[Library]", "track_color_next"));
+    m_pTrackColorSelector = std::make_unique<ControlEncoder>(
+            ConfigKey("[Library]", "track_color_selector"), false);
     connect(m_pTrackColorPrev.get(),
             &ControlPushButton::valueChanged,
             this,
-            &LibraryControl::slotTrackColorPrev);
+            [this](double value) {
+                if (value > 0) {
+                    LibraryControl::slotTrackColorSelector(-1);
+                }
+            });
     connect(m_pTrackColorNext.get(),
             &ControlPushButton::valueChanged,
             this,
-            &LibraryControl::slotTrackColorNext);
+            [this](double value) {
+                if (value > 0) {
+                    LibraryControl::slotTrackColorSelector(1);
+                }
+            });
+    connect(m_pTrackColorSelector.get(),
+            &ControlEncoder::valueChanged,
+            this,
+            [this](double steps) {
+                int iSteps = static_cast<int>(steps);
+                LibraryControl::slotTrackColorSelector(iSteps);
+            });
 
     // Controls to select saved searchbox queries and to clear the searchbox
     m_pSelectHistoryNext = std::make_unique<ControlPushButton>(
@@ -1109,24 +1126,17 @@ void LibraryControl::slotDecrementFontSize(double v) {
     }
 }
 
-void LibraryControl::slotTrackColorPrev(double v) {
-    if (!m_pLibraryWidget || v <= 0) {
+void LibraryControl::slotTrackColorSelector(int steps) {
+    if (!m_pLibraryWidget || steps == 0) {
         return;
     }
 
-    WTrackTableView* pTrackTableView = m_pLibraryWidget->getCurrentTrackTableView();
-    if (pTrackTableView) {
-        pTrackTableView->assignPreviousTrackColor();
-    }
-}
-
-void LibraryControl::slotTrackColorNext(double v) {
-    if (!m_pLibraryWidget || v <= 0) {
+    LibraryView* pActiveView = m_pLibraryWidget->getCurrentTrackTableView();
+    if (!pActiveView) {
         return;
     }
 
-    WTrackTableView* pTrackTableView = m_pLibraryWidget->getCurrentTrackTableView();
-    if (pTrackTableView) {
-        pTrackTableView->assignNextTrackColor();
+    if (steps != 0) {
+        pActiveView->selectTrackColor(steps);
     }
 }

src/library/librarycontrol.h

@@ -84,8 +84,7 @@ class LibraryControl : public QObject {
     void slotMoveTrack(double);
     void slotGoToItem(double v);
 
-    void slotTrackColorPrev(double v);
-    void slotTrackColorNext(double v);
+    void slotTrackColorSelector(int steps);
 
     // Deprecated navigation slots
     void slotSelectNextTrack(double v);
@@ -165,6 +164,7 @@ class LibraryControl : public QObject {
     // Controls to change track color
     std::unique_ptr<ControlPushButton> m_pTrackColorPrev;
     std::unique_ptr<ControlPushButton> m_pTrackColorNext;
+    std::unique_ptr<ControlEncoder> m_pTrackColorSelector;
 
     // Control to show/hide the track menu
     std::unique_ptr<ControlPushButton> m_pShowTrackMenu;

src/library/libraryview.h

@@ -38,8 +38,7 @@ class LibraryView {
     }
     /// If applicable, requests that the LibraryView changes the track color of
     /// the selected track. Does nothing otherwise.
-    virtual void assignPreviousTrackColor() {
-    }
-    virtual void assignNextTrackColor() {
+    virtual void selectTrackColor(int steps) {
+        Q_UNUSED(steps)
     }
 };

src/mixer/basetrackplayer.cpp

@@ -874,16 +874,7 @@ void BaseTrackPlayerImpl::slotTrackColorSelector(int steps) {
     ColorPalette colorPalette = colorPaletteSettings.getTrackColorPalette();
     mixxx::RgbColor::optional_t color = m_pLoadedTrack->getColor();
 
-    while (steps != 0) {
-        if (steps > 0) {
-            color = colorPalette.nextColor(color);
-            steps--;
-        } else {
-            color = colorPalette.previousColor(color);
-            steps++;
-        }
-    }
-    m_pLoadedTrack->setColor(color);
+    m_pLoadedTrack->setColor(colorPalette.getNthColor(color, steps));
 }
 
 void BaseTrackPlayerImpl::slotTrackColorChangeRequest(double v) {

src/util/color/colorpalette.cpp

@@ -38,6 +38,21 @@ mixxx::RgbColor::optional_t ColorPalette::previousColor(mixxx::RgbColor::optiona
     return at(size() - 1);
 }
 
+mixxx::RgbColor::optional_t ColorPalette::getNthColor(
+        mixxx::RgbColor::optional_t color, int steps) const {
+    // TODO : Use rem_euclid modulo function instead of a loop
+    while (steps) {
+        if (steps > 0) {
+            color = nextColor(color);
+            steps--;
+        } else {
+            color = previousColor(color);
+            steps++;
+        }
+    }
+    return color;
+}
+
 mixxx::RgbColor ColorPalette::colorForHotcueIndex(unsigned int hotcueIndex) const {
     int colorIndex;
     if (m_colorIndicesByHotcue.isEmpty()) {

src/util/color/colorpalette.h

@@ -35,6 +35,7 @@ class ColorPalette final {
     mixxx::RgbColor::optional_t nextColor(mixxx::RgbColor::optional_t color) const;
     mixxx::RgbColor previousColor(mixxx::RgbColor color) const;
     mixxx::RgbColor::optional_t previousColor(mixxx::RgbColor::optional_t color) const;
+    mixxx::RgbColor::optional_t getNthColor(mixxx::RgbColor::optional_t color, int steps) const;
     mixxx::RgbColor colorForHotcueIndex(unsigned int index) const;
 
     QList<mixxx::RgbColor>::const_iterator begin() const {

src/widget/wtracktableview.cpp

@@ -423,7 +423,7 @@ TrackModel::SortColumnId WTrackTableView::getColumnIdFromCurrentIndex() {
     return trackModel->sortColumnIdFromColumnIndex(currentIndex().column());
 }
 
-void WTrackTableView::assignPreviousTrackColor() {
+void WTrackTableView::selectTrackColor(int steps) {
     const QModelIndexList indices = getSelectedRows();
     if (indices.isEmpty()) {
         return;
@@ -436,33 +436,15 @@ void WTrackTableView::assignPreviousTrackColor() {
 
     QModelIndex index = indices.at(0);
     TrackPointer pTrack = trackModel->getTrack(index);
-    if (pTrack) {
-        ColorPaletteSettings colorPaletteSettings(m_pConfig);
-        ColorPalette colorPalette = colorPaletteSettings.getTrackColorPalette();
-        mixxx::RgbColor::optional_t color = pTrack->getColor();
-        pTrack->setColor(colorPalette.previousColor(color));
-    }
-}
-
-void WTrackTableView::assignNextTrackColor() {
-    const QModelIndexList indices = getSelectedRows();
-    if (indices.isEmpty()) {
+    if (!pTrack) {
         return;
     }
 
-    TrackModel* trackModel = getTrackModel();
-    if (!trackModel) {
-        return;
-    }
+    ColorPaletteSettings colorPaletteSettings(m_pConfig);
+    ColorPalette colorPalette = colorPaletteSettings.getTrackColorPalette();
+    mixxx::RgbColor::optional_t color = pTrack->getColor();
 
-    QModelIndex index = indices.at(0);
-    TrackPointer pTrack = trackModel->getTrack(index);
-    if (pTrack) {
-        ColorPaletteSettings colorPaletteSettings(m_pConfig);
-        ColorPalette colorPalette = colorPaletteSettings.getTrackColorPalette();
-        mixxx::RgbColor::optional_t color = pTrack->getColor();
-        pTrack->setColor(colorPalette.nextColor(color));
-    }
+    pTrack->setColor(colorPalette.getNthColor(color, steps));
 }
 
 void WTrackTableView::slotPurge() {

src/widget/wtracktableview.h

@@ -39,8 +39,7 @@ class WTrackTableView : public WLibraryTableView {
     void resizeEvent(QResizeEvent* event) override;
     void activateSelectedTrack();
     void loadSelectedTrackToGroup(const QString& group, bool play);
-    void assignNextTrackColor() override;
-    void assignPreviousTrackColor() override;
+    void selectTrackColor(int) override;
     TrackModel::SortColumnId getColumnIdFromCurrentIndex() override;
     QList<TrackId> getSelectedTrackIds() const;
     bool isTrackInCurrentView(const TrackId& trackId);