Revise librarycontrol // FocusWidget

src/library/autodj/dlgautodj.cpp

@@ -241,8 +241,8 @@ void DlgAutoDJ::onSearch(const QString& text) {
     Q_UNUSED(text);
 }
 
-void DlgAutoDJ::loadSelectedTrack() {
-    m_pTrackTableView->loadSelectedTrack();
+void DlgAutoDJ::activateSelectedTrack() {
+    m_pTrackTableView->activateSelectedTrack();
 }
 
 void DlgAutoDJ::loadSelectedTrackToGroup(const QString& group, bool play) {

src/library/autodj/dlgautodj.h

@@ -31,7 +31,7 @@ class DlgAutoDJ : public QWidget, public Ui::DlgAutoDJ, public LibraryView {
     bool hasFocus() const override;
     void setFocus() override;
     void onSearch(const QString& text) override;
-    void loadSelectedTrack() override;
+    void activateSelectedTrack() override;
     void loadSelectedTrackToGroup(const QString& group, bool play) override;
     void moveSelection(int delta) override;
     void saveCurrentViewState() override;

src/library/browse/browsefeature.cpp

@@ -225,7 +225,6 @@ void BrowseFeature::bindLibraryWidget(WLibrary* libraryWidget,
     WLibraryTextBrowser* edit = new WLibraryTextBrowser(libraryWidget);
     edit->setHtml(getRootViewHtml());
     libraryWidget->registerView("BROWSEHOME", edit);
-    m_pLibrary->bindFeatureRootView(edit);
 }
 
 void BrowseFeature::bindSidebarWidget(WLibrarySidebar* pSidebarWidget) {

src/library/dlganalysis.cpp

@@ -119,8 +119,8 @@ void DlgAnalysis::onSearch(const QString& text) {
     m_pAnalysisLibraryTableModel->search(text);
 }
 
-void DlgAnalysis::loadSelectedTrack() {
-    m_pAnalysisLibraryTableView->loadSelectedTrack();
+void DlgAnalysis::activateSelectedTrack() {
+    m_pAnalysisLibraryTableView->activateSelectedTrack();
 }
 
 void DlgAnalysis::loadSelectedTrackToGroup(const QString& group, bool play) {

src/library/dlganalysis.h

@@ -26,7 +26,7 @@ class DlgAnalysis : public QWidget, public Ui::DlgAnalysis, public virtual Libra
     void onShow() override;
     bool hasFocus() const override;
     void setFocus() override;
-    void loadSelectedTrack() override;
+    void activateSelectedTrack() override;
     void loadSelectedTrackToGroup(const QString& group, bool play) override;
     void slotAddToAutoDJBottom() override;
     void slotAddToAutoDJTop() override;

src/library/library.cpp

@@ -43,7 +43,6 @@
 #include "util/sandbox.h"
 #include "widget/wlibrary.h"
 #include "widget/wlibrarysidebar.h"
-#include "widget/wlibrarytextbrowser.h"
 #include "widget/wsearchlineedit.h"
 #include "widget/wtracktableview.h"
 
@@ -318,7 +317,7 @@ void Library::bindSearchboxWidget(WSearchLineEdit* pSearchboxWidget) {
     emit setTrackTableFont(m_trackTableFont);
     m_pLibraryControl->bindSearchboxWidget(pSearchboxWidget);
     connect(pSearchboxWidget,
-            &WSearchLineEdit::searchbarFocusChange,
+            &WSearchLineEdit::setLibraryFocus,
             m_pLibraryControl,
             &LibraryControl::setLibraryFocus);
 }
@@ -352,7 +351,7 @@ void Library::bindSidebarWidget(WLibrarySidebar* pSidebarWidget) {
             &SidebarModel::rightClicked);
 
     connect(pSidebarWidget,
-            &WLibrarySidebar::sidebarFocusChange,
+            &WLibrarySidebar::setLibraryFocus,
             m_pLibraryControl,
             &LibraryControl::setLibraryFocus);
 
@@ -420,10 +419,6 @@ void Library::bindLibraryWidget(
             &WTrackTableView::setSelectedClick);
 
     m_pLibraryControl->bindLibraryWidget(pLibraryWidget, pKeyboard);
-    connect(pTrackTableView,
-            &WTrackTableView::trackTableFocusChange,
-            m_pLibraryControl,
-            &LibraryControl::setLibraryFocus);
 
     for (const auto& feature : qAsConst(m_features)) {
         feature->bindLibraryWidget(pLibraryWidget, pKeyboard);
@@ -436,13 +431,6 @@ void Library::bindLibraryWidget(
     emit setSelectedClick(m_editMetadataSelectedClick);
 }
 
-void Library::bindFeatureRootView(WLibraryTextBrowser* pTextBrowser) {
-    connect(pTextBrowser,
-            &WLibraryTextBrowser::textBrowserFocusChange,
-            m_pLibraryControl,
-            &LibraryControl::setLibraryFocus);
-}
-
 void Library::addFeature(LibraryFeature* feature) {
     VERIFY_OR_DEBUG_ASSERT(feature) {
         return;

src/library/library.h

@@ -36,7 +36,6 @@ class TrackModel;
 class WSearchLineEdit;
 class WLibrarySidebar;
 class WLibrary;
-class WLibraryTextBrowser;
 
 #ifdef __ENGINEPRIME__
 namespace mixxx {
@@ -74,7 +73,6 @@ class Library: public QObject {
     void bindSidebarWidget(WLibrarySidebar* sidebarWidget);
     void bindLibraryWidget(WLibrary* libraryWidget,
                     KeyboardEventFilter* pKeyboard);
-    void bindFeatureRootView(WLibraryTextBrowser* pTextBrowser);
 
     void addFeature(LibraryFeature* feature);
 

src/library/library_decl.h

@@ -13,6 +13,9 @@ enum class FocusWidget {
     Searchbar,
     Sidebar,
     TracksTable, // or a feature root view (WLibraryTextBrowser)
-    Count        // used for setting the number of PushButton states of
-                 // m_pLibraryFocusedWidgetCO in librarycontrol.cpp
+    ContextMenu, // See LibraryControl::getFocusedWidget() for detailed
+    Dialog,      // descriptions
+    Unknown,     // Unknown skin widget or unknown window
+    Count        // Used for setting the number of PushButton states of
+                 // m_pFocusedWidget in librarycontrol.cpp
 };