WTrackMenu: show Properties shortcut when invoked from tracks table

mixxxdj · Oct 2, 2021 · a2e5373 · a2e5373
1 parent 0c58377
commit a2e5373
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/src/widget/wtrackmenu.cpp b/src/widget/wtrackmenu.cpp
@@ -211,6 +211,12 @@ void WTrackMenu::createActions() {
 
     if (featureIsEnabled(Feature::Properties)) {
         m_pPropertiesAct = new QAction(tr("Properties"), this);
+        // This is just for having the shortcut displayed next to the action
+        // when the menu is invoked from the tracks table.
+        // The actual shortcut is set in WTrackTableView::keyPressEvent
+        if (m_pTrackModel) {
+            m_pPropertiesAct->setShortcut(QKeySequence(tr("Ctrl+Return")));
+        }
         connect(m_pPropertiesAct, &QAction::triggered, this, &WTrackMenu::slotShowDlgTrackInfo);
     }
 

diff --git a/src/widget/wtracktableview.cpp b/src/widget/wtracktableview.cpp
@@ -757,6 +757,7 @@ TrackModel* WTrackTableView::getTrackModel() const {
 void WTrackTableView::keyPressEvent(QKeyEvent* event) {
     if (event->key() == Qt::Key_Return) {
         // Ctrl+Enter opens track properties dialog
+        // The shortcut display string needs to be set in WTrackMenu accordingly.
         if (event->modifiers() & Qt::ControlModifier) {
             QModelIndexList indices = selectionModel()->selectedRows();
             if (indices.length() == 1) {