Merge pull request #3622 from poelzi/fix-wheel

keywheel fixes: Add keywheel to qrc file, change shortcut to F12
mixxxdj · Feb 8, 2021 · f7277cc · f7277cc
2 parents 93ed1e5 + 1cca1ee
commit f7277cc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/res/mixxx.qrc b/res/mixxx.qrc
@@ -36,6 +36,8 @@
         <file>images/skin_preview_placeholder.png</file>
         <file>images/ic_checkmark.svg</file>
         <file>images/ic_delete.svg</file>
+      <!-- keywheel dialog image -->
+        <file>images/keywheel/keywheel.svg</file>
       <!-- dark icon set for preferences -->
         <file>images/preferences/dark/ic_preferences_autodj.svg</file>
         <file>images/preferences/dark/ic_preferences_bpmdetect.svg</file>

diff --git a/src/widget/wmainmenubar.cpp b/src/widget/wmainmenubar.cpp
@@ -539,7 +539,7 @@ void WMainMenuBar::initialize() {
     m_pViewKeywheel->setShortcut(
             QKeySequence(m_pKbdConfig->getValue(
                     ConfigKey("[KeyboardShortcuts]", "ViewMenu_ShowKeywheel"),
-                    tr("F2", "Menubar|View|Show Keywheel"))));
+                    tr("F12", "Menubar|View|Show Keywheel"))));
     m_pViewKeywheel->setShortcutContext(Qt::ApplicationShortcut);
     m_pViewKeywheel->setStatusTip(keywheelText);
     m_pViewKeywheel->setWhatsThis(buildWhatsThis(keywheelTitle, keywheelText));