Skip to content

Commit a920377

Browse files
apoelstraapoelstra
committed
Merge 3f68f02 into merged_master (Bitcoin PR bitcoin-core/gui#362)
Re-added line I (accidentally) dropped in 071510d6a8678594fd33458c6b404ad63dfd60b4
2 parents 6b94940 + 3f68f02 commit a920377

File tree

6 files changed

+32
-31
lines changed

6 files changed

+32
-31
lines changed

‎src/qt/addressbookpage.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -114,12 +114,12 @@ AddressBookPage::AddressBookPage(const PlatformStyle *platformStyle, Mode _mode,
114114

115115
// Build context menu
116116
contextMenu = new QMenu(this);
117-
contextMenu->addAction(tr("Copy Address"), this, &AddressBookPage::on_copyAddress_clicked);
118-
contextMenu->addAction(tr("Copy Label"), this, &AddressBookPage::onCopyLabelAction);
119-
contextMenu->addAction(tr("Edit"), this, &AddressBookPage::onEditAction);
117+
contextMenu->addAction(tr("&Copy Address"), this, &AddressBookPage::on_copyAddress_clicked);
118+
contextMenu->addAction(tr("Copy &Label"), this, &AddressBookPage::onCopyLabelAction);
119+
contextMenu->addAction(tr("&Edit"), this, &AddressBookPage::onEditAction);
120120

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

125125
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
@@ -52,13 +52,13 @@ CoinControlDialog::CoinControlDialog(CCoinControl& coin_control, WalletModel* _m
5252

5353
// context menu
5454
contextMenu = new QMenu(this);
55-
contextMenu->addAction(tr("Copy address"), this, &CoinControlDialog::copyAddress);
56-
contextMenu->addAction(tr("Copy label"), this, &CoinControlDialog::copyLabel);
57-
contextMenu->addAction(tr("Copy amount"), this, &CoinControlDialog::copyAmount);
58-
copyTransactionHashAction = contextMenu->addAction(tr("Copy transaction ID"), this, &CoinControlDialog::copyTransactionHash);
55+
contextMenu->addAction(tr("&Copy address"), this, &CoinControlDialog::copyAddress);
56+
contextMenu->addAction(tr("Copy &label"), this, &CoinControlDialog::copyLabel);
57+
contextMenu->addAction(tr("Copy &amount"), this, &CoinControlDialog::copyAmount);
58+
copyTransactionHashAction = contextMenu->addAction(tr("Copy transaction &ID"), this, &CoinControlDialog::copyTransactionHash);
5959
contextMenu->addSeparator();
60-
lockAction = contextMenu->addAction(tr("Lock unspent"), this, &CoinControlDialog::lockCoin);
61-
unlockAction = contextMenu->addAction(tr("Unlock unspent"), this, &CoinControlDialog::unlockCoin);
60+
lockAction = contextMenu->addAction(tr("L&ock unspent"), this, &CoinControlDialog::lockCoin);
61+
unlockAction = contextMenu->addAction(tr("&Unlock unspent"), this, &CoinControlDialog::unlockCoin);
6262
connect(ui->treeWidget, &QWidget::customContextMenuRequested, this, &CoinControlDialog::showMenu);
6363

6464
// 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: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,10 @@ ReceiveCoinsDialog::ReceiveCoinsDialog(const PlatformStyle *_platformStyle, QWid
4949

5050
// context menu
5151
contextMenu = new QMenu(this);
52-
contextMenu->addAction(tr("Copy address"), this, &ReceiveCoinsDialog::copyAddress);
53-
copyLabelAction = contextMenu->addAction(tr("Copy label"), this, &ReceiveCoinsDialog::copyLabel);
54-
copyMessageAction = contextMenu->addAction(tr("Copy message"), this, &ReceiveCoinsDialog::copyMessage);
55-
copyAmountAction = contextMenu->addAction(tr("Copy amount"), this, &ReceiveCoinsDialog::copyAmount);
52+
contextMenu->addAction(tr("&Copy address"), this, &ReceiveCoinsDialog::copyAddress);
53+
copyLabelAction = contextMenu->addAction(tr("Copy &label"), this, &ReceiveCoinsDialog::copyLabel);
54+
copyMessageAction = contextMenu->addAction(tr("Copy &message"), this, &ReceiveCoinsDialog::copyMessage);
55+
copyAmountAction = contextMenu->addAction(tr("Copy &amount"), this, &ReceiveCoinsDialog::copyAmount);
5656
connect(ui->recentRequestsView, &QWidget::customContextMenuRequested, this, &ReceiveCoinsDialog::showMenu);
5757

5858
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
@@ -675,11 +675,11 @@ void RPCConsole::setClientModel(ClientModel *model, int bestblock_height, int64_
675675

676676
// create peer table context menu
677677
peersTableContextMenu = new QMenu(this);
678-
peersTableContextMenu->addAction(tr("Disconnect"), this, &RPCConsole::disconnectSelectedNode);
679-
peersTableContextMenu->addAction(ts.ban_for + " " + tr("1 hour"), [this] { banSelectedNode(60 * 60); });
680-
peersTableContextMenu->addAction(ts.ban_for + " " + tr("1 day"), [this] { banSelectedNode(60 * 60 * 24); });
681-
peersTableContextMenu->addAction(ts.ban_for + " " + tr("1 week"), [this] { banSelectedNode(60 * 60 * 24 * 7); });
682-
peersTableContextMenu->addAction(ts.ban_for + " " + tr("1 year"), [this] { banSelectedNode(60 * 60 * 24 * 365); });
678+
peersTableContextMenu->addAction(tr("&Disconnect"), this, &RPCConsole::disconnectSelectedNode);
679+
peersTableContextMenu->addAction(ts.ban_for + " " + tr("1 &hour"), [this] { banSelectedNode(60 * 60); });
680+
peersTableContextMenu->addAction(ts.ban_for + " " + tr("1 d&ay"), [this] { banSelectedNode(60 * 60 * 24); });
681+
peersTableContextMenu->addAction(ts.ban_for + " " + tr("1 &week"), [this] { banSelectedNode(60 * 60 * 24 * 7); });
682+
peersTableContextMenu->addAction(ts.ban_for + " " + tr("1 &year"), [this] { banSelectedNode(60 * 60 * 24 * 365); });
683683
connect(ui->peerWidget, &QTableView::customContextMenuRequested, this, &RPCConsole::showPeersTableContextMenu);
684684

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

702702
// create ban table context menu
703703
banTableContextMenu = new QMenu(this);
704-
banTableContextMenu->addAction(tr("Unban"), this, &RPCConsole::unbanSelectedNode);
704+
banTableContextMenu->addAction(tr("&Unban"), this, &RPCConsole::unbanSelectedNode);
705705
connect(ui->banlistWidget, &QTableView::customContextMenuRequested, this, &RPCConsole::showBanTableContextMenu);
706706

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

‎src/qt/transactionview.cpp‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -164,18 +164,19 @@ TransactionView::TransactionView(const PlatformStyle *platformStyle, QWidget *pa
164164

165165
contextMenu = new QMenu(this);
166166
contextMenu->setObjectName("contextMenu");
167-
copyAddressAction = contextMenu->addAction(tr("Copy address"), this, &TransactionView::copyAddress);
168-
copyLabelAction = contextMenu->addAction(tr("Copy label"), this, &TransactionView::copyLabel);
169-
contextMenu->addAction(tr("Copy amount"), this, &TransactionView::copyAmount);
170-
contextMenu->addAction(tr("Copy transaction ID"), this, &TransactionView::copyTxID);
171-
contextMenu->addAction(tr("Copy raw transaction"), this, &TransactionView::copyTxHex);
172-
contextMenu->addAction(tr("Copy full transaction details"), this, &TransactionView::copyTxPlainText);
167+
copyAddressAction = contextMenu->addAction(tr("&Copy address"), this, &TransactionView::copyAddress);
168+
copyLabelAction = contextMenu->addAction(tr("Copy &label"), this, &TransactionView::copyLabel);
169+
contextMenu->addAction(tr("Copy &amount"), this, &TransactionView::copyAmount);
170+
contextMenu->addAction(tr("Copy transaction &ID"), this, &TransactionView::copyTxID);
171+
contextMenu->addAction(tr("Copy &raw transaction"), this, &TransactionView::copyTxHex);
172+
contextMenu->addAction(tr("Copy full transaction &details"), this, &TransactionView::copyTxPlainText);
173+
contextMenu->addAction(tr("&Show transaction details"), this, &TransactionView::showDetails);
173174
contextMenu->addSeparator();
174-
bumpFeeAction = contextMenu->addAction(tr("Increase transaction fee"));
175+
bumpFeeAction = contextMenu->addAction(tr("Increase transaction &fee"));
175176
GUIUtil::ExceptionSafeConnect(bumpFeeAction, &QAction::triggered, this, &TransactionView::bumpFee);
176177
bumpFeeAction->setObjectName("bumpFeeAction");
177-
abandonAction = contextMenu->addAction(tr("Abandon transaction"), this, &TransactionView::abandonTx);
178-
contextMenu->addAction(tr("Edit address label"), this, &TransactionView::editLabel);
178+
abandonAction = contextMenu->addAction(tr("A&bandon transaction"), this, &TransactionView::abandonTx);
179+
contextMenu->addAction(tr("&Edit address label"), this, &TransactionView::editLabel);
179180

180181
connect(dateWidget, qOverload<int>(&QComboBox::activated), this, &TransactionView::chooseDate);
181182
connect(typeWidget, qOverload<int>(&QComboBox::activated), this, &TransactionView::chooseType);

0 commit comments

Comments
 (0)