-
Notifications
You must be signed in to change notification settings - Fork 1.2k
backport: bitcoin-core#gui18, #121, #257, #263, #281, #335, #362, #828, bitcoin#21912, #21942, #21988 #6168
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Changes from 4 commits
1e585b1
c36bb8e
4f89c98
1cdd9fb
b5fb559
1d56d20
c2735a8
0e2e315
b442a59
c52b756
ed56e28
25f87b9
c7d3161
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change | ||||||
|---|---|---|---|---|---|---|---|---|
|
|
@@ -145,36 +145,23 @@ TransactionView::TransactionView(QWidget* parent) : | |||||||
|
|
||||||||
| transactionView->setObjectName("transactionView"); | ||||||||
|
|
||||||||
| // Actions | ||||||||
| abandonAction = new QAction(tr("Abandon transaction"), this); | ||||||||
| resendAction = new QAction(tr("Resend transaction"), this); | ||||||||
| copyAddressAction = new QAction(tr("Copy address"), this); | ||||||||
| copyLabelAction = new QAction(tr("Copy label"), this); | ||||||||
| QAction *copyAmountAction = new QAction(tr("Copy amount"), this); | ||||||||
| QAction *copyTxIDAction = new QAction(tr("Copy transaction ID"), this); | ||||||||
| QAction *copyTxHexAction = new QAction(tr("Copy raw transaction"), this); | ||||||||
| QAction *copyTxPlainText = new QAction(tr("Copy full transaction details"), this); | ||||||||
| QAction *editLabelAction = new QAction(tr("Edit address label"), this); | ||||||||
| QAction *showDetailsAction = new QAction(tr("Show transaction details"), this); | ||||||||
| QAction *showAddressQRCodeAction = new QAction(tr("Show address QR code"), this); | ||||||||
| #ifndef USE_QRCODE | ||||||||
| showAddressQRCodeAction->setEnabled(false); | ||||||||
| #endif | ||||||||
|
|
||||||||
| contextMenu = new QMenu(this); | ||||||||
| contextMenu->setObjectName("contextMenu"); | ||||||||
| contextMenu->addAction(copyAddressAction); | ||||||||
| contextMenu->addAction(copyLabelAction); | ||||||||
| contextMenu->addAction(copyAmountAction); | ||||||||
| contextMenu->addAction(copyTxIDAction); | ||||||||
| contextMenu->addAction(copyTxHexAction); | ||||||||
| contextMenu->addAction(copyTxPlainText); | ||||||||
| contextMenu->addAction(showDetailsAction); | ||||||||
| contextMenu->addAction(showAddressQRCodeAction); | ||||||||
| copyAddressAction = contextMenu->addAction(tr("Copy address"), this, &TransactionView::copyAddress); | ||||||||
| copyLabelAction = contextMenu->addAction(tr("Copy label"), this, &TransactionView::copyLabel); | ||||||||
| contextMenu->addAction(tr("Copy amount"), this, &TransactionView::copyAmount); | ||||||||
| contextMenu->addAction(tr("Copy transaction ID"), this, &TransactionView::copyTxID); | ||||||||
| contextMenu->addAction(tr("Copy raw transaction"), this, &TransactionView::copyTxHex); | ||||||||
| contextMenu->addAction(tr("Copy full transaction details"), this, &TransactionView::copyTxPlainText); | ||||||||
| contextMenu->addAction(tr("Show transaction details"), this, &TransactionView::showDetails); | ||||||||
| contextMenu->addSeparator(); | ||||||||
| contextMenu->addAction(abandonAction); | ||||||||
| contextMenu->addAction(resendAction); | ||||||||
| contextMenu->addAction(editLabelAction); | ||||||||
| abandonAction = contextMenu->addAction(tr("Abandon transaction"), this, &TransactionView::abandonTx); | ||||||||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. gui263:
Suggested change
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. was this resolved?
Collaborator
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. yes: 4f89c98#diff-dab82be063a09e257636f19825b81c93782c2e3158a4d471a45208a0568edb7cR159 - lost this line in the very first version |
||||||||
| resendAction = contextMenu->addAction(tr("Resend transaction"), this, &TransactionView::resendTx); | ||||||||
| contextMenu->addAction(tr("Edit address label"), this, &TransactionView::editLabel); | ||||||||
| [[maybe_unused]] QAction* showAddressQRCodeAction = contextMenu->addAction(tr("Show address QR code"), this, &TransactionView::showAddressQRCode); | ||||||||
| #ifndef USE_QRCODE | ||||||||
| showAddressQRCodeAction->setEnabled(false); | ||||||||
| #endif | ||||||||
|
|
||||||||
| connect(dateWidget, static_cast<void (QComboBox::*)(int)>(&QComboBox::activated), this, &TransactionView::chooseDate); | ||||||||
| connect(typeWidget, static_cast<void (QComboBox::*)(int)>(&QComboBox::activated), this, &TransactionView::chooseType); | ||||||||
|
|
@@ -188,17 +175,6 @@ TransactionView::TransactionView(QWidget* parent) : | |||||||
| connect(transactionView, &QTableView::clicked, this, &TransactionView::computeSum); | ||||||||
| connect(transactionView, &QTableView::customContextMenuRequested, this, &TransactionView::contextualMenu); | ||||||||
|
|
||||||||
| connect(abandonAction, &QAction::triggered, this, &TransactionView::abandonTx); | ||||||||
| connect(resendAction, &QAction::triggered, this, &TransactionView::resendTx); | ||||||||
| connect(copyAddressAction, &QAction::triggered, this, &TransactionView::copyAddress); | ||||||||
| connect(copyLabelAction, &QAction::triggered, this, &TransactionView::copyLabel); | ||||||||
| connect(copyAmountAction, &QAction::triggered, this, &TransactionView::copyAmount); | ||||||||
| connect(copyTxIDAction, &QAction::triggered, this, &TransactionView::copyTxID); | ||||||||
| connect(copyTxHexAction, &QAction::triggered, this, &TransactionView::copyTxHex); | ||||||||
| connect(copyTxPlainText, &QAction::triggered, this, &TransactionView::copyTxPlainText); | ||||||||
| connect(editLabelAction, &QAction::triggered, this, &TransactionView::editLabel); | ||||||||
| connect(showDetailsAction, &QAction::triggered, this, &TransactionView::showDetails); | ||||||||
| connect(showAddressQRCodeAction, &QAction::triggered, this, &TransactionView::showAddressQRCode); | ||||||||
| // Double-clicking on a transaction on the transaction history page shows details | ||||||||
| connect(this, &TransactionView::doubleClicked, this, &TransactionView::showDetails); | ||||||||
| } | ||||||||
|
|
||||||||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
please edit the commit message for 1cdd9fb to include justification / why
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
same as bitcoin-core/gui#263