Browse Source

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 1378245a63
adaptive-webui-19844
Chocobo1 7 years ago
parent
commit
aab752dd2e
No known key found for this signature in database
GPG Key ID: 210D9C873253A68C
  1. 1
      src/gui/mainwindow.cpp
  2. 1
      src/gui/transferlistwidget.cpp
  3. 1
      src/gui/transferlistwidget.h

1
src/gui/mainwindow.cpp

@ -840,6 +840,7 @@ void MainWindow::createKeyboardShortcuts()
m_ui->actionCreateTorrent->setShortcut(QKeySequence::New); m_ui->actionCreateTorrent->setShortcut(QKeySequence::New);
m_ui->actionOpen->setShortcut(QKeySequence::Open); m_ui->actionOpen->setShortcut(QKeySequence::Open);
m_ui->actionDelete->setShortcut(QKeySequence::Delete); 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->actionDownloadFromURL->setShortcut(Qt::CTRL + Qt::SHIFT + Qt::Key_O);
m_ui->actionExit->setShortcut(Qt::CTRL + Qt::Key_Q); m_ui->actionExit->setShortcut(Qt::CTRL + Qt::Key_Q);

1
src/gui/transferlistwidget.cpp

@ -285,6 +285,7 @@ TransferListWidget::TransferListWidget(QWidget *parent, MainWindow *mainWindow)
connect(header(), SIGNAL(sortIndicatorChanged(int, Qt::SortOrder)), this, SLOT(saveSettings())); connect(header(), SIGNAL(sortIndicatorChanged(int, Qt::SortOrder)), this, SLOT(saveSettings()));
m_editHotkey = new QShortcut(Qt::Key_F2, this, SLOT(renameSelectedTorrent()), 0, Qt::WidgetShortcut); 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_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_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); m_recheckHotkey = new QShortcut(Qt::CTRL + Qt::Key_R, this, SLOT(recheckSelectedTorrents()), 0, Qt::WidgetShortcut);

1
src/gui/transferlistwidget.h

@ -132,6 +132,7 @@ private:
TransferListSortModel *m_sortFilterModel; TransferListSortModel *m_sortFilterModel;
MainWindow *m_mainWindow; MainWindow *m_mainWindow;
QShortcut *m_editHotkey; QShortcut *m_editHotkey;
QShortcut *m_deleteHotkey;
QShortcut *m_permDeleteHotkey; QShortcut *m_permDeleteHotkey;
QShortcut *m_doubleClickHotkey; QShortcut *m_doubleClickHotkey;
QShortcut *m_recheckHotkey; QShortcut *m_recheckHotkey;

Loading…
Cancel
Save