From 8fe11dff91ea012d9fd89d3a54494d98e24051af Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Tue, 10 Oct 2017 01:31:06 +0800 Subject: [PATCH] Fix delete key has no effect due to "Ambiguous shortcut overload" We want to show the accelerator key in the menu but without hitting the ambiguous overload error. Fixup of 1378245a632d04b81be21532dae657eeb6d897ec --- src/gui/mainwindow.cpp | 1 + src/gui/transferlistwidget.cpp | 1 + src/gui/transferlistwidget.h | 1 + 3 files changed, 3 insertions(+) diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp index 1525f0a93..79cccde8b 100644 --- a/src/gui/mainwindow.cpp +++ b/src/gui/mainwindow.cpp @@ -840,6 +840,7 @@ void MainWindow::createKeyboardShortcuts() m_ui->actionCreateTorrent->setShortcut(QKeySequence::New); m_ui->actionOpen->setShortcut(QKeySequence::Open); m_ui->actionDelete->setShortcut(QKeySequence::Delete); + m_ui->actionDelete->setShortcutContext(Qt::WidgetShortcut); // nullify its effect: delete key event is handled by respective widgets, not here m_ui->actionDownloadFromURL->setShortcut(Qt::CTRL + Qt::SHIFT + Qt::Key_O); m_ui->actionExit->setShortcut(Qt::CTRL + Qt::Key_Q); diff --git a/src/gui/transferlistwidget.cpp b/src/gui/transferlistwidget.cpp index ae8dfd087..34d9e75a0 100644 --- a/src/gui/transferlistwidget.cpp +++ b/src/gui/transferlistwidget.cpp @@ -285,6 +285,7 @@ TransferListWidget::TransferListWidget(QWidget *parent, MainWindow *mainWindow) connect(header(), SIGNAL(sortIndicatorChanged(int, Qt::SortOrder)), this, SLOT(saveSettings())); m_editHotkey = new QShortcut(Qt::Key_F2, this, SLOT(renameSelectedTorrent()), 0, Qt::WidgetShortcut); + m_deleteHotkey = new QShortcut(QKeySequence::Delete, this, SLOT(softDeleteSelectedTorrents()), 0, Qt::WidgetShortcut); m_permDeleteHotkey = new QShortcut(Qt::SHIFT + Qt::Key_Delete, this, SLOT(permDeleteSelectedTorrents()), 0, Qt::WidgetShortcut); m_doubleClickHotkey = new QShortcut(Qt::Key_Return, this, SLOT(torrentDoubleClicked()), 0, Qt::WidgetShortcut); m_recheckHotkey = new QShortcut(Qt::CTRL + Qt::Key_R, this, SLOT(recheckSelectedTorrents()), 0, Qt::WidgetShortcut); diff --git a/src/gui/transferlistwidget.h b/src/gui/transferlistwidget.h index a7c67dc37..2ad24ab69 100644 --- a/src/gui/transferlistwidget.h +++ b/src/gui/transferlistwidget.h @@ -132,6 +132,7 @@ private: TransferListSortModel *m_sortFilterModel; MainWindow *m_mainWindow; QShortcut *m_editHotkey; + QShortcut *m_deleteHotkey; QShortcut *m_permDeleteHotkey; QShortcut *m_doubleClickHotkey; QShortcut *m_recheckHotkey;