Merge pull request #1312 from willcode/fix/restore-bookmark-delete-key

bookmarks: restore Delete key
gqrx-sdr · Oct 19, 2023 · 91a87cf · 91a87cf
2 parents ef017bc + 03ebc21
commit 91a87cf
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/resources/news.txt b/resources/news.txt
@@ -1,4 +1,9 @@
 
+    2.17.3: In progress...
+
+     FIXED: Delete key shortcut for bookmark removal.
+
+
     2.17.2: Released October 9, 2023
 
        NEW: FORCE_QT6 and FORCE_QT5 CMake options to force Qt version.

diff --git a/src/qtgui/dockbookmarks.cpp b/src/qtgui/dockbookmarks.cpp
@@ -158,12 +158,20 @@ void DockBookmarks::on_tableWidgetTagList_itemChanged(QTableWidgetItem *item)
 
 bool DockBookmarks::eventFilter(QObject* object, QEvent* event)
 {
-    if (event->type() == QEvent::KeyPress)
+    // Since Key_Delete can be (is) used as a global shortcut, override the
+    // shortcut. Accepting a ShortcutOverride causes the event to be delivered
+    // again, but as a KeyPress.
+    if (event->type() == QEvent::KeyPress || event->type() == QEvent::ShortcutOverride)
     {
         QKeyEvent* pKeyEvent = static_cast<QKeyEvent *>(event);
-        if (pKeyEvent->key() == Qt::Key_Delete && ui->tableViewFrequencyList->hasFocus())
+        if (pKeyEvent->key() == Qt::Key_Delete)
         {
-            return DeleteSelectedBookmark();
+            if (event->type() == QEvent::ShortcutOverride) {
+                event->accept();
+            }
+            else {
+                return DeleteSelectedBookmark();
+            }
         }
     }
     return QWidget::eventFilter(object, event);