Search related tracks in collection

CMakeLists.txt

@@ -902,6 +902,7 @@ add_library(mixxx-lib STATIC EXCLUDE_FROM_ALL
   src/widget/wpushbutton.cpp
   src/widget/wrecordingduration.cpp
   src/widget/wsearchlineedit.cpp
+  src/widget/wsearchrelatedtracksmenu.cpp
   src/widget/wsingletoncontainer.cpp
   src/widget/wsizeawarestack.cpp
   src/widget/wskincolor.cpp

build/depends.py

@@ -980,6 +980,7 @@ def sources(self, build):
                    "src/widget/wspinny.cpp",
                    "src/widget/wskincolor.cpp",
                    "src/widget/wsearchlineedit.cpp",
+                   "src/widget/wsearchrelatedtracksmenu.cpp",
                    "src/widget/wpixmapstore.cpp",
                    "src/widget/paintable.cpp",
                    "src/widget/wimagestore.cpp",

src/library/autodj/dlgautodj.cpp

@@ -16,8 +16,7 @@ const char* kPreferenceGroupName = "[Auto DJ]";
 const char* kRepeatPlaylistPreference = "Requeue";
 } // anonymous namespace
 
-DlgAutoDJ::DlgAutoDJ(
-        WLibrary* parent,
+DlgAutoDJ::DlgAutoDJ(WLibrary* parent,
         UserSettingsPointer pConfig,
         Library* pLibrary,
         AutoDJProcessor* pProcessor,
@@ -26,10 +25,11 @@ DlgAutoDJ::DlgAutoDJ(
           Ui::DlgAutoDJ(),
           m_pConfig(pConfig),
           m_pAutoDJProcessor(pProcessor),
-          m_pTrackTableView(new WTrackTableView(this, m_pConfig,
-                                                pLibrary->trackCollections(),
-                                                parent->getTrackTableBackgroundColorOpacity(),
-                                                /*no sorting*/ false)),
+          m_pTrackTableView(new WTrackTableView(this,
+                  m_pConfig,
+                  pLibrary,
+                  parent->getTrackTableBackgroundColorOpacity(),
+                  /*no sorting*/ false)),
           m_bShowButtonText(parent->getShowButtonText()),
           m_pAutoDJTableModel(nullptr) {
     setupUi(this);

src/library/dlganalysis.cpp

@@ -24,7 +24,7 @@ DlgAnalysis::DlgAnalysis(WLibrary* parent,
     m_pAnalysisLibraryTableView = new WAnalysisLibraryTableView(
             this,
             pConfig,
-            pLibrary->trackCollections(),
+            pLibrary,
             parent->getTrackTableBackgroundColorOpacity());
     connect(m_pAnalysisLibraryTableView,
             &WAnalysisLibraryTableView::loadTrack,

src/library/dlghidden.cpp

@@ -17,7 +17,7 @@ DlgHidden::DlgHidden(
                   new WTrackTableView(
                           this,
                           pConfig,
-                          pLibrary->trackCollections(),
+                          pLibrary,
                           parent->getTrackTableBackgroundColorOpacity(),
                           false)) {
     setupUi(this);

src/library/dlgmissing.cpp

@@ -17,7 +17,7 @@ DlgMissing::DlgMissing(
                   new WTrackTableView(
                           this,
                           pConfig,
-                          pLibrary->trackCollections(),
+                          pLibrary,
                           parent->getTrackTableBackgroundColorOpacity(),
                           false)) {
     setupUi(this);

src/library/library.cpp

@@ -298,7 +298,7 @@ void Library::bindLibraryWidget(
         WLibrary* pLibraryWidget, KeyboardEventFilter* pKeyboard) {
     WTrackTableView* pTrackTableView = new WTrackTableView(pLibraryWidget,
             m_pConfig,
-            m_pTrackCollectionManager,
+            this,
             pLibraryWidget->getTrackTableBackgroundColorOpacity(),
             true);
     pTrackTableView->installEventFilter(pKeyboard);
@@ -551,3 +551,12 @@ TrackCollection& Library::trackCollection() {
     DEBUG_ASSERT(m_pTrackCollectionManager->internalCollection());
     return *m_pTrackCollectionManager->internalCollection();
 }
+
+void Library::searchTracksInCollection(const QString& query) {
+    VERIFY_OR_DEBUG_ASSERT(m_pMixxxLibraryFeature) {
+        return;
+    }
+    m_pMixxxLibraryFeature->searchAndActivate(query);
+    emit switchToView(m_sTrackViewName);
+    m_pSidebarModel->activateDefaultSelection();
+}

src/library/library.h

@@ -90,6 +90,10 @@ class Library: public QObject {
     void setRowHeight(int rowHeight);
     void setEditMedatataSelectedClick(bool enable);
 
+    /// Triggers a new search in the internal track collection
+    /// and shows the results by switching the view.
+    void searchTracksInCollection(const QString& query);
+
   public slots:
     void slotShowTrackModel(QAbstractItemModel* model);
     void slotSwitchToView(const QString& view);

src/library/mixxxlibraryfeature.cpp

@@ -152,8 +152,15 @@ void MixxxLibraryFeature::refreshLibraryModels() {
     }
 }
 
+void MixxxLibraryFeature::searchAndActivate(const QString& query) {
+    VERIFY_OR_DEBUG_ASSERT(m_pLibraryTableModel) {
+        return;
+    }
+    m_pLibraryTableModel->search(query);
+    activate();
+}
+
 void MixxxLibraryFeature::activate() {
-    qDebug() << "MixxxLibraryFeature::activate()";
     emit showTrackModel(m_pLibraryTableModel);
     emit enableCoverArtDisplay(true);
 }

src/library/mixxxlibraryfeature.h

@@ -44,6 +44,8 @@ class MixxxLibraryFeature final : public LibraryFeature {
         return true;
     }
 
+    void searchAndActivate(const QString& query);
+
   public slots:
     void activate() override;
     void activateChild(const QModelIndex& index) override;

src/library/recording/dlgrecording.cpp

@@ -22,7 +22,7 @@ DlgRecording::DlgRecording(
                   new WTrackTableView(
                           this,
                           pConfig,
-                          pLibrary->trackCollections(),
+                          pLibrary,
                           parent->getTrackTableBackgroundColorOpacity(),
                           true)),
           m_browseModel(this, pLibrary->trackCollections(), pRecordingManager),

src/skin/legacyskinparser.cpp

@@ -989,7 +989,7 @@ QWidget* LegacySkinParser::parseText(const QDomElement& node) {
 
     WTrackText* p = new WTrackText(m_pParent,
             m_pConfig,
-            m_pLibrary->trackCollections(),
+            m_pLibrary,
             group);
     setupLabelWidget(node, p);
 
@@ -1021,7 +1021,7 @@ QWidget* LegacySkinParser::parseTrackProperty(const QDomElement& node) {
     WTrackProperty* p = new WTrackProperty(
             m_pParent,
             m_pConfig,
-            m_pLibrary->trackCollections(),
+            m_pLibrary,
             group);
     setupLabelWidget(node, p);
 
@@ -1053,7 +1053,7 @@ QWidget* LegacySkinParser::parseTrackWidgetGroup(const QDomElement& node) {
     WTrackWidgetGroup* pGroup = new WTrackWidgetGroup(
             m_pParent,
             m_pConfig,
-            m_pLibrary->trackCollections(),
+            m_pLibrary,
             group);
     commonWidgetSetup(node, pGroup);
     pGroup->setup(node, *m_pContext);

src/widget/wanalysislibrarytableview.cpp

@@ -4,11 +4,11 @@
 WAnalysisLibraryTableView::WAnalysisLibraryTableView(
         QWidget* parent,
         UserSettingsPointer pConfig,
-        TrackCollectionManager* pTrackCollectionManager,
+        Library* pLibrary,
         double trackTableBackgroundColorOpacity)
         : WTrackTableView(parent,
                   pConfig,
-                  pTrackCollectionManager,
+                  pLibrary,
                   trackTableBackgroundColorOpacity,
                   true) {
     setDragDropMode(QAbstractItemView::DragOnly);

src/widget/wanalysislibrarytableview.h

@@ -11,7 +11,7 @@ class WAnalysisLibraryTableView : public WTrackTableView {
     WAnalysisLibraryTableView(
             QWidget* parent,
             UserSettingsPointer pConfig,
-            TrackCollectionManager* pTrackCollectionManager,
+            Library* pLibrary,
             double trackTableBackgroundColorOpacity);
 
     void onSearch(const QString& text) override;