CrateFeature: Defer initActions invocation until bindLibraryWidget is…

… called
cr7pt0gr4ph7 · Apr 26, 2024 · f957646 · f957646
1 parent be201bd
commit f957646
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/library/trackset/crate/cratefeature.cpp b/src/library/trackset/crate/cratefeature.cpp
@@ -7,6 +7,7 @@
 #include <vector>
 
 #include "analyzer/analyzerscheduledtrack.h"
+#include "controllers/keyboard/keyboardeventfilter.h"
 #include "library/export/trackexportwizard.h"
 #include "library/library.h"
 #include "library/library_prefs.h"
@@ -60,15 +61,19 @@ CrateFeature::CrateFeature(Library* pLibrary,
     connectTrackCollection();
 }
 
-void CrateFeature::initActions() {
+void CrateFeature::initActions(KeyboardEventFilter* pKeyboard) {
     m_pCreateCrateAction = make_parented<QAction>(tr("Create New Crate"), this);
     connect(m_pCreateCrateAction.get(),
             &QAction::triggered,
             this,
             &CrateFeature::slotCreateCrate);
 
     m_pRenameCrateAction = make_parented<QAction>(tr("Rename"), this);
-    m_pRenameCrateAction->setShortcut(kRenameSidebarItemShortcutKey);
+    pKeyboard->registerActionForShortcut(
+            m_pRenameCrateAction,
+            ConfigKey("[Library]", "EditItem"),
+            QKeySequence(kRenameSidebarItemShortcutKey).toString(),
+            true);
     connect(m_pRenameCrateAction.get(),
             &QAction::triggered,
             this,

diff --git a/src/library/trackset/crate/cratefeature.h b/src/library/trackset/crate/cratefeature.h
@@ -77,7 +77,7 @@ class CrateFeature : public BaseTrackSetFeature {
     void slotUpdateCrateLabels(const QSet<CrateId>& updatedCrateIds);
 
   private:
-    void initActions();
+    void initActions(KeyboardEventFilter* pKeyboard);
     void connectLibrary(Library* pLibrary);
     void connectTrackCollection();