Use a combobox instead of a lineedit widget for library search history

res/skins/LateNight/style.qss

@@ -15,7 +15,6 @@ WTrackText,
 WTrackProperty,
 WBeatSpinBox,
 QSpinBox,
-QComboBox,
 WLibrary QHeaderView,
 WLibrary QHeaderView::item,
 QToolTip,
@@ -27,6 +26,7 @@ WCoverArtMenu,
 WTrackMenu,
 WTrackMenu QMenu,
 WOverview /* Hotcue labels in the overview */,
+WBeatSpinBox, #spinBoxTransition,
 WEffectSelector,
 WEffectSelector QAbstractScrollArea,
 #fadeModeCombobox,

src/controllers/controlpickermenu.cpp

@@ -644,7 +644,36 @@ ControlPickerMenu::ControlPickerMenu(QWidget* pParent)
                tr("Add to Auto DJ Queue (replace)"),
                tr("Replace Auto DJ Queue with selected tracks"),
                libraryMenu, false, m_libraryStr);
-    libraryMenu->addSeparator();
+    addControl("[Library]",
+            "search_history_next",
+            tr("Select next search history"),
+            tr("Selects the next search history entry"),
+            libraryMenu,
+            false,
+            m_libraryStr);
+    addControl("[Library]",
+            "search_history_prev",
+            tr("Select previous search history"),
+            tr("Selects the previous search history entry"),
+            libraryMenu,
+            false,
+            m_libraryStr);
+    addControl("[Library]",
+            "search_history_move",
+            tr("Move selected search entry"),
+            tr("Moves the selected search history item into given direction "
+               "and steps"),
+            libraryMenu,
+            false,
+            m_libraryStr);
+
+    // Load track (these can be loaded into any channel)
+    addDeckAndSamplerControl("LoadSelectedTrack",
+                             tr("Load Track"),
+                             tr("Load selected track"), libraryMenu);
+    addDeckAndSamplerAndPreviewDeckControl("LoadSelectedTrackAndPlay", tr("Track Load and Play"),
+                                           tr("Load selected track and play"), libraryMenu);
+
     addControl("[Recording]", "toggle_recording",
                tr("Record Mix"),
                tr("Toggle mix recording"),

src/library/librarycontrol.cpp

@@ -211,6 +211,38 @@ LibraryControl::LibraryControl(Library* pLibrary)
             this,
             &LibraryControl::slotTrackColorNext);
 
+    // Control to navigate between widgets (tab/shit+tab button)
+    m_pSelectHistroyNext = std::make_unique<ControlPushButton>(
+            ConfigKey("[Library]", "search_history_next"));
+    m_pSelectHistoryPrev = std::make_unique<ControlPushButton>(
+            ConfigKey("[Library]", "search_history_prev"));
+    m_pSelectHistoryMove = std::make_unique<ControlEncoder>(
+            ConfigKey("[Library]", "search_history_move"), false);
+    connect(m_pSelectHistroyNext.get(),
+            &ControlPushButton::valueChanged,
+            this,
+            [this]() {
+                if (m_pSearchbox) {
+                    m_pSearchbox->slotMoveSelectedHistory(1);
+                }
+            });
+    connect(m_pSelectHistoryPrev.get(),
+            &ControlPushButton::valueChanged,
+            this,
+            [this]() {
+                if (m_pSearchbox) {
+                    m_pSearchbox->slotMoveSelectedHistory(-1);
+                }
+            });
+    connect(m_pSelectHistoryMove.get(),
+            &ControlEncoder::valueChanged,
+            this,
+            [this](double direction) {
+                if (m_pSearchbox) {
+                    m_pSearchbox->slotMoveSelectedHistory(static_cast<int>(direction));
+                }
+            });
+
     /// Deprecated controls
     m_pSelectNextTrack = std::make_unique<ControlPushButton>(ConfigKey("[Playlist]", "SelectNextTrack"));
     connect(m_pSelectNextTrack.get(),
@@ -537,19 +569,27 @@ void LibraryControl::emitKeyEvent(QKeyEvent&& event) {
     VERIFY_OR_DEBUG_ASSERT(m_pLibraryWidget) {
         return;
     }
+    VERIFY_OR_DEBUG_ASSERT(m_pSearchbox) {
+        return;
+    }
     if (!QApplication::focusWindow()) {
         qDebug() << "Mixxx window is not focused, don't send key events";
         return;
     }
 
     bool keyIsTab = event.key() == static_cast<int>(Qt::Key_Tab);
+    bool keyIsUpDown = event.key() == static_cast<int>(Qt::Key_Up) ||
+            event.key() == static_cast<int>(Qt::Key_Down);
 
     // If the main window has focus, any widget can receive Tab.
     // Other keys should be sent to library widgets only to not
     // accidentally alter spinboxes etc.
+    // If the searchbox has focus allow only Up/Down to select previous queries.
     if (!keyIsTab && !m_pSidebarWidget->hasFocus()
             && !m_pLibraryWidget->getActiveView()->hasFocus()) {
-        setLibraryFocus();
+        if (keyIsUpDown && !m_pSearchbox->hasFocus()) {
+            setLibraryFocus();
+        }
     }
     if (keyIsTab && !QApplication::focusWidget()){
         setLibraryFocus();
@@ -643,6 +683,11 @@ void LibraryControl::slotGoToItem(double v) {
         return activeView->loadSelectedTrack();
     }
 
+    // If searchbox has focus jump to the tracks table
+    if (m_pSearchbox->hasFocus()) {
+        return setLibraryFocus();
+    }
+
     // Clear the search if the searchbox has focus
     emit clearSearchIfClearButtonHasFocus();
 

src/library/librarycontrol.h

@@ -144,6 +144,11 @@ class LibraryControl : public QObject {
     std::unique_ptr<ControlPushButton> m_pTrackColorPrev;
     std::unique_ptr<ControlPushButton> m_pTrackColorNext;
 
+    // Controls to navigate search history
+    std::unique_ptr<ControlPushButton> m_pSelectHistroyNext;
+    std::unique_ptr<ControlPushButton> m_pSelectHistoryPrev;
+    std::unique_ptr<ControlEncoder> m_pSelectHistoryMove;
+
     // Font sizes
     std::unique_ptr<ControlPushButton> m_pFontSizeIncrement;
     std::unique_ptr<ControlPushButton> m_pFontSizeDecrement;

src/preferences/dialog/dlgpreflibrary.cpp

@@ -278,6 +278,8 @@ void DlgPrefLibrary::slotRemoveDir() {
     } else if (removeMsgBox.clickedButton() == deleteAllButton) {
         removalType = Library::RemovalType::PurgeTracks;
     } else {
+        // Only used in DEBUG_ASSERT
+        Q_UNUSED(leaveUnchangedButton);
         DEBUG_ASSERT(removeMsgBox.clickedButton() == leaveUnchangedButton);
         removalType = Library::RemovalType::KeepTracks;
     }