KeyboardEventFilter: move menubar toggle connection to WMainMenubar

mixxxdj · Oct 13, 2024 · 19b4434 · 19b4434
1 parent 44f47e9
commit 19b4434
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 22 deletions.
diff --git a/src/controllers/keyboard/keyboardeventfilter.cpp b/src/controllers/keyboard/keyboardeventfilter.cpp
@@ -222,8 +222,21 @@ QKeySequence KeyboardEventFilter::getKeySeq(QKeyEvent* e) {
 }
 
 void KeyboardEventFilter::setEnabled(bool enabled) {
+    if (enabled) {
+        kLogger.debug() << "Enable keyboard shortcuts/mappings";
+    } else {
+        kLogger.debug() << "Disable keyboard shortcuts/mappings";
+    }
     m_enabled = enabled;
     m_pConfig->setValue(ConfigKey("[Keyboard]", "Enabled"), enabled);
+    // Shortcuts may be toggled off and on again to make Mixxx discover a new
+    // Custom.kbd.cfg, so reload now.
+    // Note: the other way around (removing a loaded Custom.kbd.cfg) is covered
+    // by the auto-reloader and we'll try to load a built-in mapping then.
+    if (enabled) {
+        reloadKeyboardConfig();
+    }
+    // Update widget tooltips
     emit shortcutsEnabled(enabled);
 }
 

diff --git a/src/controllers/keyboard/keyboardeventfilter.h b/src/controllers/keyboard/keyboardeventfilter.h
@@ -33,7 +33,6 @@ class KeyboardEventFilter : public QObject {
     // Returns a valid QString with modifier keys from a QKeyEvent
     static QKeySequence getKeySeq(QKeyEvent* e);
 
-    void setEnabled(bool enabled);
     bool isEnabled() {
         return m_enabled;
     }
@@ -51,6 +50,7 @@ class KeyboardEventFilter : public QObject {
     void updateMenuBarActionShortcuts();
 
   public slots:
+    void setEnabled(bool enabled);
     void reloadKeyboardConfig();
 
   signals:

diff --git a/src/coreservices.cpp b/src/coreservices.cpp
@@ -507,16 +507,6 @@ std::shared_ptr<ConfigObject<ConfigValueKbd>> CoreServices::getKeyboardConfig()
     return m_pKeyboardEventFilter->getKeyboardConfig();
 }
 
-void CoreServices::slotOptionsKeyboard(bool toggle) {
-    UserSettingsPointer pConfig = m_pSettingsManager->settings();
-    if (toggle) {
-        qDebug() << "Enable keyboard shortcuts/mappings";
-    } else {
-        qDebug() << "Disable keyboard shortcuts/mappings";
-    }
-    m_pKeyboardEventFilter->setEnabled(toggle);
-}
-
 bool CoreServices::initializeDatabase() {
     kLogger.info() << "Connecting to database";
     QSqlDatabase dbConnection = mixxx::DbConnectionPooled(m_pDbConnectionPool);

diff --git a/src/coreservices.h b/src/coreservices.h
@@ -104,9 +104,6 @@ class CoreServices : public QObject {
   signals:
     void initializationProgressUpdate(int progress, const QString& serviceName);
 
-  public slots:
-    void slotOptionsKeyboard(bool toggle);
-
   private:
     bool initializeDatabase();
     void initializeKeyboard();

diff --git a/src/mixxxmainwindow.cpp b/src/mixxxmainwindow.cpp
@@ -834,13 +834,6 @@ void MixxxMainWindow::connectMenuBar() {
     // Refresh the Fullscreen checkbox for the case we went fullscreen earlier
     m_pMenuBar->onFullScreenStateChange(isFullScreen());
 
-    // Keyboard shortcuts
-    connect(m_pMenuBar,
-            &WMainMenuBar::toggleKeyboardShortcuts,
-            m_pCoreServices.get(),
-            &mixxx::CoreServices::slotOptionsKeyboard,
-            Qt::UniqueConnection);
-
     // Help
     connect(m_pMenuBar,
             &WMainMenuBar::showAbout,

diff --git a/src/widget/wmainmenubar.cpp b/src/widget/wmainmenubar.cpp
@@ -458,7 +458,7 @@ void WMainMenuBar::initialize() {
     pOptionsKeyboard->setChecked(keyboardShortcutsEnabled);
     pOptionsKeyboard->setStatusTip(keyboardShortcutText);
     pOptionsKeyboard->setWhatsThis(buildWhatsThis(keyboardShortcutTitle, keyboardShortcutText));
-    connect(pOptionsKeyboard, &QAction::triggered, this, &WMainMenuBar::toggleKeyboardShortcuts);
+    connect(pOptionsKeyboard, &QAction::triggered, m_pKeyboard, &KeyboardEventFilter::setEnabled);
 
     pOptionsMenu->addAction(pOptionsKeyboard);