Keyboard: update menubar shortcuts when keyboard mapping is reloaded

mixxxdj · Apr 15, 2024 · 428caf9 · 428caf9
1 parent d1c3e76
commit 428caf9
Show file tree

Hide file tree

Showing 5 changed files with 131 additions and 70 deletions.
diff --git a/src/controllers/keyboard/keyboardeventfilter.cpp b/src/controllers/keyboard/keyboardeventfilter.cpp
@@ -1,5 +1,6 @@
 #include "controllers/keyboard/keyboardeventfilter.h"
 
+#include <QAction>
 #include <QEvent>
 #include <QKeyEvent>
 #include <QtDebug>
@@ -240,9 +241,30 @@ const QString KeyboardEventFilter::buildShortcutString(
     return shortcutTooltip;
 }
 
+const QString KeyboardEventFilter::registerMenuBarActionGetKeySeqString(QAction* pAction,
+        const ConfigKey& command,
+        const QString& defaultShortcut) {
+    VERIFY_OR_DEBUG_ASSERT(treu /* reminder */) {
+    }
+    const auto cmdStr = std::make_pair(command, defaultShortcut);
+    m_menuBarActions.insert(pAction, cmdStr);
+    return m_pKbdConfig->getValue(command, defaultShortcut);
+}
+
+void KeyboardEventFilter::updateMenuBarActions() {
+    QHashIterator<QAction*, std::pair<ConfigKey, QString>> it(m_menuBarActions);
+    while (it.hasNext()) {
+        it.next();
+        const QString keyStr = m_pKbdConfig->getValue(it.value().first, it.value().second);
+        auto pAction = it.key();
+        pAction->setShortcut(QKeySequence(keyStr));
+    }
+}
+
 void KeyboardEventFilter::reloadKeyboardConfig() {
     createKeyboardConfig();
     updateWidgets();
+    updateMenuBarActions();
 }
 
 void KeyboardEventFilter::createKeyboardConfig() {

diff --git a/src/controllers/keyboard/keyboardeventfilter.h b/src/controllers/keyboard/keyboardeventfilter.h
@@ -39,6 +39,12 @@ class KeyboardEventFilter : public QObject {
     void clearWidgets();
     const QString buildShortcutString(const QString& shortcut, const QString& cmd) const;
 
+    const QString registerMenuBarActionGetKeySeqString(
+            QAction* pAction,
+            const ConfigKey& command,
+            const QString& defaultShortcut);
+    void updateMenuBarActions();
+
   public slots:
     void reloadKeyboardConfig();
 
@@ -87,6 +93,10 @@ class KeyboardEventFilter : public QObject {
 
     QFileSystemWatcher m_fileWatcher;
 
+    // Actions in the menu bar
+    // Value pair is the ConfigKey and the default QKeySequence (as QString).
+    QHash<QAction*, std::pair<ConfigKey, QString>> m_menuBarActions;
+
     // Widgets that have mappable connections, registered by LegacySkinParser
     // during skin construction.
     QList<WBaseWidget*> m_widgets;

diff --git a/src/mixxxmainwindow.cpp b/src/mixxxmainwindow.cpp
@@ -704,9 +704,9 @@ void MixxxMainWindow::slotUpdateWindowTitle(TrackPointer pTrack) {
 void MixxxMainWindow::createMenuBar() {
     qWarning() << "     $ createMenuBar";
     ScopedTimer t(u"MixxxMainWindow::createMenuBar");
-    DEBUG_ASSERT(m_pCoreServices->getKeyboardConfig());
+    DEBUG_ASSERT(m_pCoreServices->getKeyboardEventFilter());
     m_pMenuBar = make_parented<WMainMenuBar>(
-            this, m_pCoreServices->getSettings(), m_pCoreServices->getKeyboardConfig().get());
+            this, m_pCoreServices->getSettings(), m_pCoreServices->getKeyboardEventFilter());
     if (m_pCentralWidget) {
         m_pMenuBar->setStyleSheet(m_pCentralWidget->styleSheet());
     }