Usability/Keyboard: Add Ctrl+Shift+F shortcut to search the main tracks database

res/keyboard/cs_CZ.kbd.cfg

@@ -141,6 +141,8 @@ vinylcontrol_cueing Ctrl+Alt+U
 FileMenu_LoadDeck1 Ctrl+o
 FileMenu_LoadDeck2 Ctrl+Shift+O
 FileMenu_Quit Ctrl+q
+LibraryMenu_SearchInCurrentView Ctrl+f
+LibraryMenu_SearchInAllTracks Ctrl+Shift+F
 LibraryMenu_NewPlaylist Ctrl+n
 LibraryMenu_NewCrate Ctrl+Shift+N
 ViewMenu_ShowSkinSettings Ctrl+1

res/keyboard/da_DK.kbd.cfg

@@ -141,6 +141,8 @@ vinylcontrol_cueing Ctrl+Alt+U
 FileMenu_LoadDeck1 Ctrl+o
 FileMenu_LoadDeck2 Ctrl+Shift+O
 FileMenu_Quit Ctrl+q
+LibraryMenu_SearchInCurrentView Ctrl+f
+LibraryMenu_SearchInAllTracks Ctrl+Shift+F
 LibraryMenu_NewPlaylist Ctrl+n
 LibraryMenu_NewCrate Ctrl+Shift+N
 ViewMenu_ShowSkinSettings Ctrl+1

res/keyboard/de_CH.kbd.cfg

@@ -141,6 +141,8 @@ vinylcontrol_cueing Ctrl+Alt+U
 FileMenu_LoadDeck1 Ctrl+o
 FileMenu_LoadDeck2 Ctrl+Shift+O
 FileMenu_Quit Ctrl+q
+LibraryMenu_SearchInCurrentView Ctrl+f
+LibraryMenu_SearchInAllTracks Ctrl+Shift+F
 LibraryMenu_NewPlaylist Ctrl+n
 LibraryMenu_NewCrate Ctrl+Shift+N
 ViewMenu_ShowSkinSettings Ctrl+1

res/keyboard/de_DE.kbd.cfg

@@ -141,6 +141,8 @@ vinylcontrol_cueing Ctrl+Alt+U
 FileMenu_LoadDeck1 Ctrl+o
 FileMenu_LoadDeck2 Ctrl+Shift+O
 FileMenu_Quit Ctrl+q
+LibraryMenu_SearchInCurrentView Ctrl+f
+LibraryMenu_SearchInAllTracks Ctrl+Shift+F
 LibraryMenu_NewPlaylist Ctrl+n
 LibraryMenu_NewCrate Ctrl+Shift+N
 ViewMenu_ShowSkinSettings Ctrl+1

res/keyboard/el_GR.kbd.cfg

@@ -145,6 +145,8 @@ vinylcontrol_cueing Ctrl+Alt+Θ
 FileMenu_LoadDeck1 Ctrl+o
 FileMenu_LoadDeck2 Ctrl+Shift+O
 FileMenu_Quit Ctrl+q
+LibraryMenu_SearchInCurrentView Ctrl+f
+LibraryMenu_SearchInAllTracks Ctrl+Shift+F
 LibraryMenu_NewPlaylist Ctrl+n
 LibraryMenu_NewCrate Ctrl+Shift+N
 ViewMenu_ShowSkinSettings Ctrl+1

res/keyboard/en_US.kbd.cfg

@@ -141,6 +141,8 @@ vinylcontrol_cueing Ctrl+Alt+U
 FileMenu_LoadDeck1 Ctrl+o
 FileMenu_LoadDeck2 Ctrl+Shift+O
 FileMenu_Quit Ctrl+q
+LibraryMenu_SearchInCurrentView Ctrl+f
+LibraryMenu_SearchInAllTracks Ctrl+Shift+F
 LibraryMenu_NewPlaylist Ctrl+n
 LibraryMenu_NewCrate Ctrl+Shift+N
 ViewMenu_ShowSkinSettings Ctrl+1

res/keyboard/es_ES.kbd.cfg

@@ -141,6 +141,8 @@ vinylcontrol_cueing Ctrl+Alt+U
 FileMenu_LoadDeck1 Ctrl+o
 FileMenu_LoadDeck2 Ctrl+Shift+O
 FileMenu_Quit Ctrl+q
+LibraryMenu_SearchInCurrentView Ctrl+f
+LibraryMenu_SearchInAllTracks Ctrl+Shift+F
 LibraryMenu_NewPlaylist Ctrl+n
 LibraryMenu_NewCrate Ctrl+Shift+N
 ViewMenu_ShowSkinSettings Ctrl+1

res/keyboard/fi_FI.kbd.cfg

@@ -141,6 +141,8 @@ vinylcontrol_cueing Ctrl+Alt+U
 FileMenu_LoadDeck1 Ctrl+o
 FileMenu_LoadDeck2 Ctrl+Shift+O
 FileMenu_Quit Ctrl+q
+LibraryMenu_SearchInCurrentView Ctrl+f
+LibraryMenu_SearchInAllTracks Ctrl+Shift+F
 LibraryMenu_NewPlaylist Ctrl+n
 LibraryMenu_NewCrate Ctrl+Shift+N
 ViewMenu_ShowSkinSettings Ctrl+1

res/keyboard/fr_CH.kbd.cfg

@@ -141,6 +141,8 @@ vinylcontrol_cueing Ctrl+Alt+U
 FileMenu_LoadDeck1 Ctrl+o
 FileMenu_LoadDeck2 Ctrl+Shift+O
 FileMenu_Quit Ctrl+q
+LibraryMenu_SearchInCurrentView Ctrl+f
+LibraryMenu_SearchInAllTracks Ctrl+Shift+F
 LibraryMenu_NewPlaylist Ctrl+n
 LibraryMenu_NewCrate Ctrl+Shift+N
 ViewMenu_ShowSkinSettings Ctrl+1

res/keyboard/fr_FR.kbd.cfg

@@ -141,6 +141,8 @@ vinylcontrol_cueing Ctrl+Alt+U
 FileMenu_LoadDeck1 Ctrl+o
 FileMenu_LoadDeck2 Ctrl+Shift+O
 FileMenu_Quit Ctrl+q
+LibraryMenu_SearchInCurrentView Ctrl+f
+LibraryMenu_SearchInAllTracks Ctrl+Shift+F
 LibraryMenu_NewPlaylist Ctrl+n
 LibraryMenu_NewCrate Ctrl+Shift+N
 ViewMenu_ShowSkinSettings Ctrl+1

res/keyboard/it_IT.kbd.cfg

@@ -141,6 +141,8 @@ vinylcontrol_cueing Ctrl+Alt+U
 FileMenu_LoadDeck1 Ctrl+o
 FileMenu_LoadDeck2 Ctrl+Shift+O
 FileMenu_Quit Ctrl+q
+LibraryMenu_SearchInCurrentView Ctrl+f
+LibraryMenu_SearchInAllTracks Ctrl+Shift+F
 LibraryMenu_NewPlaylist Ctrl+n
 LibraryMenu_NewCrate Ctrl+Shift+N
 ViewMenu_ShowSkinSettings Ctrl+1

res/keyboard/ru_RU.kbd.cfg

@@ -141,6 +141,8 @@ vinylcontrol_cueing Ctrl+Alt+Г
 FileMenu_LoadDeck1 Ctrl+o
 FileMenu_LoadDeck2 Ctrl+Shift+O
 FileMenu_Quit Ctrl+q
+LibraryMenu_SearchInCurrentView Ctrl+f
+LibraryMenu_SearchInAllTracks Ctrl+Shift+F
 LibraryMenu_NewPlaylist Ctrl+n
 LibraryMenu_NewCrate Ctrl+Shift+N
 ViewMenu_ShowSkinSettings Ctrl+1

src/library/library.cpp

@@ -730,13 +730,27 @@ void Library::setEditMetadataSelectedClick(bool enabled) {
     emit setSelectedClick(enabled);
 }
 
+void Library::slotSearchInCurrentView() {
+    m_pLibraryControl->setLibraryFocus(FocusWidget::Searchbar, Qt::ShortcutFocusReason);
+}
+
+void Library::slotSearchInAllTracks() {
+    searchTracksInCollection();
+}
+
+void Library::searchTracksInCollection() {
+    VERIFY_OR_DEBUG_ASSERT(m_pMixxxLibraryFeature) {
+        return;
+    }
+    m_pMixxxLibraryFeature->selectAndActivate();
+    m_pLibraryControl->setLibraryFocus(FocusWidget::Searchbar, Qt::ShortcutFocusReason);
+}
+
 void Library::searchTracksInCollection(const QString& query) {
     VERIFY_OR_DEBUG_ASSERT(m_pMixxxLibraryFeature) {
         return;
     }
     m_pMixxxLibraryFeature->searchAndActivate(query);
-    emit switchToView(m_sTrackViewName);
-    m_pSidebarModel->activateDefaultSelection();
 }
 
 #ifdef __ENGINEPRIME__

src/library/library.h

@@ -98,6 +98,10 @@ class Library: public QObject {
     void setRowHeight(int rowHeight);
     void setEditMetadataSelectedClick(bool enable);
 
+    /// Switches to the internal track collection view
+    /// and focuses the search box.
+    void searchTracksInCollection();
+
     /// Triggers a new search in the internal track collection
     /// and shows the results by switching the view.
     void searchTracksInCollection(const QString& query);
@@ -126,6 +130,8 @@ class Library: public QObject {
     void slotRefreshLibraryModels();
     void slotCreatePlaylist();
     void slotCreateCrate();
+    void slotSearchInCurrentView();
+    void slotSearchInAllTracks();
     void onSkinLoadFinished();
     void slotSaveCurrentViewState() const;
     void slotRestoreCurrentViewState() const;

src/library/librarycontrol.cpp

@@ -944,15 +944,11 @@ FocusWidget LibraryControl::getFocusedWidget() {
     }
 }
 
-void LibraryControl::setLibraryFocus(FocusWidget newFocusWidget) {
-    if (!QApplication::focusWindow()) {
-        qInfo() << "No Mixxx window, popup or menu has focus."
-                << "Don't attempt to focus a specific widget.";
-        return;
-    }
-
-    // ignore no-op
-    if (newFocusWidget == m_focusedWidget) {
+void LibraryControl::setLibraryFocus(FocusWidget newFocusWidget, Qt::FocusReason focusReason) {
+    // The search box wants to do special handling when the Ctrl+f is used
+    // while it is already focused. Non-shortcut cases should still be a
+    // no-op when a control is already focused.
+    if (newFocusWidget == m_focusedWidget && focusReason != Qt::ShortcutFocusReason) {
         return;
     }
 
@@ -961,13 +957,13 @@ void LibraryControl::setLibraryFocus(FocusWidget newFocusWidget) {
         VERIFY_OR_DEBUG_ASSERT(m_pSearchbox) {
             return;
         }
-        m_pSearchbox->setFocus();
+        m_pSearchbox->setFocus(focusReason);
         return;
     case FocusWidget::Sidebar:
         VERIFY_OR_DEBUG_ASSERT(m_pSidebarWidget) {
             return;
         }
-        m_pSidebarWidget->setFocus();
+        m_pSidebarWidget->setFocus(focusReason);
         return;
     case FocusWidget::TracksTable:
         VERIFY_OR_DEBUG_ASSERT(m_pLibraryWidget) {

src/library/librarycontrol.h

@@ -58,8 +58,9 @@ class LibraryControl : public QObject {
     void bindLibraryWidget(WLibrary* pLibrary, KeyboardEventFilter* pKeyboard);
     void bindSidebarWidget(WLibrarySidebar* pLibrarySidebar);
     void bindSearchboxWidget(WSearchLineEdit* pSearchbox);
-    // Give the keyboard focus to one of the library widgets
-    void setLibraryFocus(FocusWidget newFocusWidget);
+    /// Give the keyboard focus to one of the library widgets
+    void setLibraryFocus(FocusWidget newFocusWidget,
+            Qt::FocusReason focusReason = Qt::OtherFocusReason);
     FocusWidget getFocusedWidget();
 
   signals:

src/library/libraryfeature.cpp

@@ -32,6 +32,17 @@ LibraryFeature::LibraryFeature(
     }
 }
 
+void LibraryFeature::selectAndActivate(const QModelIndex& index) {
+    if (index.isValid()) {
+        emit featureSelect(this, index);
+        activateChild(index);
+    } else {
+        // calling featureSelect with invalid index will select the root item
+        emit featureSelect(this, QModelIndex());
+        activate();
+    }
+}
+
 QStringList LibraryFeature::getPlaylistFiles(QFileDialog::FileMode mode) const {
     QString lastPlaylistDirectory = m_pConfig->getValue(
             ConfigKey("[Library]", "LastImportExportPlaylistDirectory"),

src/library/libraryfeature.h

@@ -106,6 +106,10 @@ class LibraryFeature : public QObject {
     const UserSettingsPointer m_pConfig;
 
   public slots:
+    /// Pretend that the user has clicked on a tree item belonging
+    /// to this LibraryFeature by updating both the library view
+    /// and the sidebar selection.
+    void selectAndActivate(const QModelIndex& index = QModelIndex());
     // called when you single click on the root item
     virtual void activate() = 0;
     // called when you single click on a child item, e.g., a concrete playlist or crate

src/library/mixxxlibraryfeature.cpp

@@ -173,7 +173,7 @@ void MixxxLibraryFeature::searchAndActivate(const QString& query) {
         return;
     }
     m_pLibraryTableModel->search(query);
-    activate();
+    selectAndActivate();
 }
 
 #ifdef __ENGINEPRIME__

src/library/trackset/playlistfeature.cpp

@@ -308,8 +308,7 @@ void PlaylistFeature::slotPlaylistTableChanged(int playlistId) {
         // Else (root item was selected or for some reason no index could be created)
         // there's nothing to do: either no child was selected earlier, or the root
         // was selected and will remain selected after the child model was rebuilt.
-        activateChild(newIndex);
-        emit featureSelect(this, newIndex);
+        selectAndActivate(newIndex);
     }
 }
 

src/library/trackset/setlogfeature.cpp

@@ -707,13 +707,8 @@ void SetlogFeature::slotPlaylistTableChanged(int playlistId) {
             newIndex = m_pSidebarModel->index(selectedYearIndexRow - 1, 0);
         }
     }
-    if (newIndex.isValid()) {
-        emit featureSelect(this, newIndex);
-        activateChild(newIndex);
-    } else if (rootWasSelected) {
-        // calling featureSelect with invalid index will select the root item
-        emit featureSelect(this, newIndex);
-        activate(); // to reload the new current playlist
+    if (newIndex.isValid() || rootWasSelected) {
+        selectAndActivate(newIndex);
     }
 }
 

src/mixxxmainwindow.cpp

@@ -933,6 +933,16 @@ void MixxxMainWindow::connectMenuBar() {
     }
 
     if (m_pCoreServices->getLibrary()) {
+        connect(m_pMenuBar,
+                &WMainMenuBar::searchInCurrentView,
+                m_pCoreServices->getLibrary().get(),
+                &Library::slotSearchInCurrentView,
+                Qt::UniqueConnection);
+        connect(m_pMenuBar,
+                &WMainMenuBar::searchInAllTracks,
+                m_pCoreServices->getLibrary().get(),
+                &Library::slotSearchInAllTracks,
+                Qt::UniqueConnection);
         connect(m_pMenuBar,
                 &WMainMenuBar::createCrate,
                 m_pCoreServices->getLibrary().get(),

src/skin/legacy/legacyskinparser.cpp

@@ -1525,6 +1525,19 @@ QWidget* LegacySkinParser::parseSearchBox(const QDomElement& node) {
     commonWidgetSetup(node, pLineEditSearch, false);
     pLineEditSearch->setup(node, *m_pContext);
 
+    // Translate shortcuts to native text
+    QString searchInCurrentViewShortcut =
+            localizeShortcutKeys(m_pKeyboard->getKeyboardConfig()->getValue(
+                    ConfigKey("[KeyboardShortcuts]",
+                            "LibraryMenu_SearchInCurrentView"),
+                    "Ctrl+f"));
+    QString searchInAllTracksShortcut =
+            localizeShortcutKeys(m_pKeyboard->getKeyboardConfig()->getValue(
+                    ConfigKey("[KeyboardShortcuts]",
+                            "LibraryMenu_SearchInAllTracks"),
+                    "Ctrl+Shift+F"));
+    pLineEditSearch->setupToolTip(searchInCurrentViewShortcut, searchInAllTracksShortcut);
+
     m_pLibrary->bindSearchboxWidget(pLineEditSearch);
 
     return pLineEditSearch;
@@ -2587,20 +2600,23 @@ void LegacySkinParser::addShortcutToToolTip(WBaseWidget* pWidget,
 
     QString tooltip;
 
-    // translate shortcut to native text
-    QString nativeShortcut = QKeySequence(shortcut, QKeySequence::PortableText).toString(QKeySequence::NativeText);
-
     tooltip += "\n";
     tooltip += tr("Shortcut");
     if (!cmd.isEmpty()) {
         tooltip += " ";
         tooltip += cmd;
     }
     tooltip += ": ";
-    tooltip += nativeShortcut;
+    tooltip += localizeShortcutKeys(shortcut);
     pWidget->appendBaseTooltip(tooltip);
 }
 
+QString LegacySkinParser::localizeShortcutKeys(const QString& shortcut) {
+    // Translate shortcut to native text
+    return QKeySequence(shortcut, QKeySequence::PortableText)
+            .toString(QKeySequence::NativeText);
+}
+
 QString LegacySkinParser::parseLaunchImageStyle(const QDomNode& skinDoc) {
     QString schemeLaunchImageStyle;
     // Check if the skins has color schemes

src/skin/legacy/legacyskinparser.h

@@ -141,6 +141,7 @@ class LegacySkinParser : public QObject, public SkinParser {
                      bool setupPosition=true);
     void setupConnections(const QDomNode& node, WBaseWidget* pWidget);
     void addShortcutToToolTip(WBaseWidget* pWidget, const QString& shortcut, const QString& cmd);
+    QString localizeShortcutKeys(const QString& shortcut);
     QString getLibraryStyle(const QDomNode& node);
 
     QString lookupNodeGroup(const QDomElement& node);

src/widget/wlibrary.h

@@ -56,7 +56,8 @@ class WLibrary : public QStackedWidget, public WBaseWidget {
     }
 
   signals:
-    FocusWidget setLibraryFocus(FocusWidget newFocus);
+    FocusWidget setLibraryFocus(FocusWidget newFocus,
+            Qt::FocusReason focusReason = Qt::OtherFocusReason);
 
   public slots:
     // Show the view registered with the given name. Does nothing if the current

src/widget/wlibrarysidebar.h

@@ -37,7 +37,8 @@ class WLibrarySidebar : public QTreeView, public WBaseWidget {
     void rightClicked(const QPoint&, const QModelIndex&);
     void renameItem(const QModelIndex&);
     void deleteItem(const QModelIndex&);
-    FocusWidget setLibraryFocus(FocusWidget newFocus);
+    FocusWidget setLibraryFocus(FocusWidget newFocus,
+            Qt::FocusReason focusReason = Qt::OtherFocusReason);
 
   protected:
     bool event(QEvent* pEvent) override;

src/widget/wmainmenubar.cpp

@@ -168,6 +168,34 @@ void WMainMenuBar::initialize() {
 
     pLibraryMenu->addSeparator();
 
+    QString searchHereTitle = tr("Search in Current View...");
+    QString searchHereText = tr("Search for tracks in the current library view");
+    auto* pSearchHere = new QAction(searchHereTitle, this);
+    pSearchHere->setShortcut(QKeySequence(m_pKbdConfig->getValue(
+            ConfigKey("[KeyboardShortcuts]", "LibraryMenu_SearchInCurrentView"),
+            tr("Ctrl+f"))));
+    pSearchHere->setShortcutContext(Qt::ApplicationShortcut);
+    pSearchHere->setStatusTip(searchHereText);
+    pSearchHere->setWhatsThis(buildWhatsThis(searchHereTitle, searchHereText));
+    connect(pSearchHere, &QAction::triggered, this, &WMainMenuBar::searchInCurrentView);
+    pLibraryMenu->addAction(pSearchHere);
+
+    QString searchAllTitle = tr("Search in Tracks Library...");
+    QString searchAllText =
+            tr("Search in the internal track collection under \"Tracks\" in "
+               "the library");
+    auto* pSearchAll = new QAction(searchAllTitle, this);
+    pSearchAll->setShortcut(QKeySequence(m_pKbdConfig->getValue(
+            ConfigKey("[KeyboardShortcuts]", "LibraryMenu_SearchInAllTracks"),
+            tr("Ctrl+Shift+F"))));
+    pSearchAll->setShortcutContext(Qt::ApplicationShortcut);
+    pSearchAll->setStatusTip(searchAllText);
+    pSearchAll->setWhatsThis(buildWhatsThis(searchAllText, searchAllText));
+    connect(pSearchAll, &QAction::triggered, this, &WMainMenuBar::searchInAllTracks);
+    pLibraryMenu->addAction(pSearchAll);
+
+    pLibraryMenu->addSeparator();
+
     QString createPlaylistTitle = tr("Create &New Playlist");
     QString createPlaylistText = tr("Create a new playlist");
     auto* pLibraryCreatePlaylist = new QAction(createPlaylistTitle, this);