mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-04-29 14:59:39 -04:00
Merge bitcoin-core/gui#148: Bugfix: GUI: Restore SendConfirmationDialog button default to "Yes"
8775691383
Bugfix: GUI: Restore SendConfirmationDialog button default to "Yes" (Luke Dashjr) Pull request description: The SendConfirmationDialog is used for bumping the fee, where "Send" doesn't really make sense Originally https://github.com/bitcoin/bitcoin/pull/17463, but rewritten here much simpler based on other merged changes. ACKs for top commit: hebasto: ACK8775691383
, tested on Linux Mint 20.1 (x86_64, Qt 5.12.8): Tree-SHA512: 3953cc9c09613c9a629def8b4dc061b537f148ddcb378430645602e0be0f3a9f1cff083aa685b94b2e9372300d02ec97e0d9ea89db6e3c6feec86795090f0f77
This commit is contained in:
commit
cb2c578451
2 changed files with 4 additions and 1 deletions
|
@ -973,6 +973,9 @@ SendConfirmationDialog::SendConfirmationDialog(const QString& title, const QStri
|
|||
setStandardButtons(QMessageBox::Yes | QMessageBox::Cancel);
|
||||
setDefaultButton(QMessageBox::Cancel);
|
||||
yesButton = button(QMessageBox::Yes);
|
||||
if (confirmButtonText.isEmpty()) {
|
||||
confirmButtonText = yesButton->text();
|
||||
}
|
||||
updateYesButton();
|
||||
connect(&countDownTimer, &QTimer::timeout, this, &SendConfirmationDialog::countDown);
|
||||
}
|
||||
|
|
|
@ -115,7 +115,7 @@ class SendConfirmationDialog : public QMessageBox
|
|||
Q_OBJECT
|
||||
|
||||
public:
|
||||
SendConfirmationDialog(const QString& title, const QString& text, const QString& informative_text = "", const QString& detailed_text = "", int secDelay = SEND_CONFIRM_DELAY, const QString& confirmText = "Send", QWidget* parent = nullptr);
|
||||
SendConfirmationDialog(const QString& title, const QString& text, const QString& informative_text = "", const QString& detailed_text = "", int secDelay = SEND_CONFIRM_DELAY, const QString& confirmText = "", QWidget* parent = nullptr);
|
||||
int exec() override;
|
||||
|
||||
private Q_SLOTS:
|
||||
|
|
Loading…
Add table
Reference in a new issue