Skip to content

Commit c7d3161

Browse files
hebastoknst
hebasto
authored and
knst
committed
Merge bitcoin-core/gui#362: Add keyboard shortcuts to context menus
e4c916a Bugfix: GUI: Use a different shortcut for "1 d&ay" banning, due to conflict with "&Disconnect" (Luke Dashjr) 94e7cdd GUI: Add keyboard shortcuts for other context menus (Luke Dashjr) 02b5263 GUI: Restore keyboard shortcuts for context menu entries (Luke Dashjr) Pull request description: Various keyboard shortcuts were lost in #263; this restores them, and also adds new ones for other context menus. Note that with a context menu open, simply the shortcut by itself (no Alt) is used. ACKs for top commit: jarolrod: Code Review ACK e4c916a hebasto: ACK e4c916a, tested on Linux Mint 20.1 (Qt 5.12.8). Tree-SHA512: 949461acf7aac592bc48a1c5abad41b167365830e0cedb3aa11b6a87bd347e16126830ea87936f9c9efc4b7df5b09d3833fae784964d6d119ed45703cfba2ffd
1 parent 25f87b9 commit c7d3161

File tree

6 files changed

+35
-35
lines changed

6 files changed

+35
-35
lines changed

‎src/qt/addressbookpage.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -109,16 +109,16 @@ AddressBookPage::AddressBookPage(Mode _mode, Tabs _tab, QWidget* parent) :
109109

110110
// Build context menu
111111
contextMenu = new QMenu(this);
112-
contextMenu->addAction(tr("Copy Address"), this, &AddressBookPage::on_copyAddress_clicked);
113-
contextMenu->addAction(tr("Copy Label"), this, &AddressBookPage::onCopyLabelAction);
114-
contextMenu->addAction(tr("Edit"), this, &AddressBookPage::onEditAction);
115-
[[maybe_unused]] QAction* qrAction = contextMenu->addAction(tr("Show address QR code"), this, &AddressBookPage::on_showAddressQRCode_clicked);
112+
contextMenu->addAction(tr("&Copy Address"), this, &AddressBookPage::on_copyAddress_clicked);
113+
contextMenu->addAction(tr("Copy &Label"), this, &AddressBookPage::onCopyLabelAction);
114+
contextMenu->addAction(tr("&Edit"), this, &AddressBookPage::onEditAction);
115+
[[maybe_unused]] QAction* qrAction = contextMenu->addAction(tr("Show address &QR code"), this, &AddressBookPage::on_showAddressQRCode_clicked);
116116
#ifndef USE_QRCODE
117117
qrAction->setEnabled(false);
118118
#endif
119119

120120
if (tab == SendingTab) {
121-
contextMenu->addAction(tr("Delete"), this, &AddressBookPage::on_deleteAddress_clicked);
121+
contextMenu->addAction(tr("&Delete"), this, &AddressBookPage::on_deleteAddress_clicked);
122122
}
123123

124124
connect(ui->tableView, &QWidget::customContextMenuRequested, this, &AddressBookPage::contextualMenu);

‎src/qt/coincontroldialog.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,13 +64,13 @@ CoinControlDialog::CoinControlDialog(CCoinControl& coin_control, WalletModel* _m
6464

6565
// context menu
6666
contextMenu = new QMenu(this);
67-
contextMenu->addAction(tr("Copy address"), this, &CoinControlDialog::copyAddress);
68-
contextMenu->addAction(tr("Copy label"), this, &CoinControlDialog::copyLabel);
69-
contextMenu->addAction(tr("Copy amount"), this, &CoinControlDialog::copyAmount);
70-
copyTransactionHashAction = contextMenu->addAction(tr("Copy transaction ID"), this, &CoinControlDialog::copyTransactionHash);
67+
contextMenu->addAction(tr("&Copy address"), this, &CoinControlDialog::copyAddress);
68+
contextMenu->addAction(tr("Copy &label"), this, &CoinControlDialog::copyLabel);
69+
contextMenu->addAction(tr("Copy &amount"), this, &CoinControlDialog::copyAmount);
70+
copyTransactionHashAction = contextMenu->addAction(tr("Copy transaction &ID"), this, &CoinControlDialog::copyTransactionHash);
7171
contextMenu->addSeparator();
72-
lockAction = contextMenu->addAction(tr("Lock unspent"), this, &CoinControlDialog::lockCoin);
73-
unlockAction = contextMenu->addAction(tr("Unlock unspent"), this, &CoinControlDialog::unlockCoin);
72+
lockAction = contextMenu->addAction(tr("L&ock unspent"), this, &CoinControlDialog::lockCoin);
73+
unlockAction = contextMenu->addAction(tr("&Unlock unspent"), this, &CoinControlDialog::unlockCoin);
7474
connect(ui->treeWidget, &QWidget::customContextMenuRequested, this, &CoinControlDialog::showMenu);
7575

7676
// clipboard actions

‎src/qt/qrimagewidget.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ QRImageWidget::QRImageWidget(QWidget *parent):
2727
QLabel(parent), contextMenu(nullptr)
2828
{
2929
contextMenu = new QMenu(this);
30-
contextMenu->addAction(tr("Save Image…"), this, &QRImageWidget::saveImage);
31-
contextMenu->addAction(tr("Copy Image"), this, &QRImageWidget::copyImage);
30+
contextMenu->addAction(tr("&Save Image…"), this, &QRImageWidget::saveImage);
31+
contextMenu->addAction(tr("&Copy Image"), this, &QRImageWidget::copyImage);
3232
}
3333

3434
bool QRImageWidget::setQR(const QString& data, const QString& text)

‎src/qt/receivecoinsdialog.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@ ReceiveCoinsDialog::ReceiveCoinsDialog(QWidget* parent) :
3333

3434
// context menu
3535
contextMenu = new QMenu(this);
36-
contextMenu->addAction(tr("Copy URI"), this, &ReceiveCoinsDialog::copyURI);
37-
contextMenu->addAction(tr("Copy address"), this, &ReceiveCoinsDialog::copyAddress);
38-
copyLabelAction = contextMenu->addAction(tr("Copy label"), this, &ReceiveCoinsDialog::copyLabel);
39-
copyMessageAction = contextMenu->addAction(tr("Copy message"), this, &ReceiveCoinsDialog::copyMessage);
40-
copyAmountAction = contextMenu->addAction(tr("Copy amount"), this, &ReceiveCoinsDialog::copyAmount);
36+
contextMenu->addAction(tr("Copy &URI"), this, &ReceiveCoinsDialog::copyURI);
37+
contextMenu->addAction(tr("&Copy address"), this, &ReceiveCoinsDialog::copyAddress);
38+
copyLabelAction = contextMenu->addAction(tr("Copy &label"), this, &ReceiveCoinsDialog::copyLabel);
39+
copyMessageAction = contextMenu->addAction(tr("Copy &message"), this, &ReceiveCoinsDialog::copyMessage);
40+
copyAmountAction = contextMenu->addAction(tr("Copy &amount"), this, &ReceiveCoinsDialog::copyAmount);
4141
connect(ui->recentRequestsView, &QWidget::customContextMenuRequested, this, &ReceiveCoinsDialog::showMenu);
4242

4343
connect(ui->clearButton, &QPushButton::clicked, this, &ReceiveCoinsDialog::clear);

‎src/qt/rpcconsole.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -708,11 +708,11 @@ void RPCConsole::setClientModel(ClientModel *model, int bestblock_height, int64_
708708

709709
// create peer table context menu
710710
peersTableContextMenu = new QMenu(this);
711-
peersTableContextMenu->addAction(tr("Disconnect"), this, &RPCConsole::disconnectSelectedNode);
712-
peersTableContextMenu->addAction(ts.ban_for + " " + tr("1 hour"), [this] { banSelectedNode(60 * 60); });
713-
peersTableContextMenu->addAction(ts.ban_for + " " + tr("1 day"), [this] { banSelectedNode(60 * 60 * 24); });
714-
peersTableContextMenu->addAction(ts.ban_for + " " + tr("1 week"), [this] { banSelectedNode(60 * 60 * 24 * 7); });
715-
peersTableContextMenu->addAction(ts.ban_for + " " + tr("1 year"), [this] { banSelectedNode(60 * 60 * 24 * 365); });
711+
peersTableContextMenu->addAction(tr("&Disconnect"), this, &RPCConsole::disconnectSelectedNode);
712+
peersTableContextMenu->addAction(ts.ban_for + " " + tr("1 &hour"), [this] { banSelectedNode(60 * 60); });
713+
peersTableContextMenu->addAction(ts.ban_for + " " + tr("1 d&ay"), [this] { banSelectedNode(60 * 60 * 24); });
714+
peersTableContextMenu->addAction(ts.ban_for + " " + tr("1 &week"), [this] { banSelectedNode(60 * 60 * 24 * 7); });
715+
peersTableContextMenu->addAction(ts.ban_for + " " + tr("1 &year"), [this] { banSelectedNode(60 * 60 * 24 * 365); });
716716
connect(ui->peerWidget, &QTableView::customContextMenuRequested, this, &RPCConsole::showPeersTableContextMenu);
717717

718718
// peer table signal handling - update peer details when selecting new node
@@ -731,7 +731,7 @@ void RPCConsole::setClientModel(ClientModel *model, int bestblock_height, int64_
731731

732732
// create ban table context menu
733733
banTableContextMenu = new QMenu(this);
734-
banTableContextMenu->addAction(tr("Unban"), this, &RPCConsole::unbanSelectedNode);
734+
banTableContextMenu->addAction(tr("&Unban"), this, &RPCConsole::unbanSelectedNode);
735735
connect(ui->banlistWidget, &QTableView::customContextMenuRequested, this, &RPCConsole::showBanTableContextMenu);
736736

737737
// ban table signal handling - clear peer details when clicking a peer in the ban table

‎src/qt/transactionview.cpp‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -147,18 +147,18 @@ TransactionView::TransactionView(QWidget* parent) :
147147

148148
contextMenu = new QMenu(this);
149149
contextMenu->setObjectName("contextMenu");
150-
copyAddressAction = contextMenu->addAction(tr("Copy address"), this, &TransactionView::copyAddress);
151-
copyLabelAction = contextMenu->addAction(tr("Copy label"), this, &TransactionView::copyLabel);
152-
contextMenu->addAction(tr("Copy amount"), this, &TransactionView::copyAmount);
153-
contextMenu->addAction(tr("Copy transaction ID"), this, &TransactionView::copyTxID);
154-
contextMenu->addAction(tr("Copy raw transaction"), this, &TransactionView::copyTxHex);
155-
contextMenu->addAction(tr("Copy full transaction details"), this, &TransactionView::copyTxPlainText);
156-
contextMenu->addAction(tr("Show transaction details"), this, &TransactionView::showDetails);
150+
copyAddressAction = contextMenu->addAction(tr("&Copy address"), this, &TransactionView::copyAddress);
151+
copyLabelAction = contextMenu->addAction(tr("Copy &label"), this, &TransactionView::copyLabel);
152+
contextMenu->addAction(tr("Copy &amount"), this, &TransactionView::copyAmount);
153+
contextMenu->addAction(tr("Copy transaction &ID"), this, &TransactionView::copyTxID);
154+
contextMenu->addAction(tr("Copy &raw transaction"), this, &TransactionView::copyTxHex);
155+
contextMenu->addAction(tr("Copy full transaction &details"), this, &TransactionView::copyTxPlainText);
156+
contextMenu->addAction(tr("&Show transaction details"), this, &TransactionView::showDetails);
157157
contextMenu->addSeparator();
158-
abandonAction = contextMenu->addAction(tr("Abandon transaction"), this, &TransactionView::abandonTx);
159-
resendAction = contextMenu->addAction(tr("Resend transaction"), this, &TransactionView::resendTx);
160-
contextMenu->addAction(tr("Edit address label"), this, &TransactionView::editLabel);
161-
[[maybe_unused]] QAction* showAddressQRCodeAction = contextMenu->addAction(tr("Show address QR code"), this, &TransactionView::showAddressQRCode);
158+
abandonAction = contextMenu->addAction(tr("A&bandon transaction"), this, &TransactionView::abandonTx);
159+
resendAction = contextMenu->addAction(tr("Rese&nd transaction"), this, &TransactionView::resendTx);
160+
contextMenu->addAction(tr("&Edit address label"), this, &TransactionView::editLabel);
161+
[[maybe_unused]] QAction* showAddressQRCodeAction = contextMenu->addAction(tr("Show address &QR code"), this, &TransactionView::showAddressQRCode);
162162
#ifndef USE_QRCODE
163163
showAddressQRCodeAction->setEnabled(false);
164164
#endif

0 commit comments

Comments
 (0)