Skip to content

Commit cb2c578

Browse files
author
MarcoFalke
committed
Merge bitcoin-core#148: Bugfix: GUI: Restore SendConfirmationDialog button default to "Yes"
8775691 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 bitcoin/bitcoin#17463, but rewritten here much simpler based on other merged changes. ACKs for top commit: hebasto: ACK 8775691, tested on Linux Mint 20.1 (x86_64, Qt 5.12.8): Tree-SHA512: 3953cc9c09613c9a629def8b4dc061b537f148ddcb378430645602e0be0f3a9f1cff083aa685b94b2e9372300d02ec97e0d9ea89db6e3c6feec86795090f0f77
2 parents 22fa967 + 8775691 commit cb2c578

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

src/qt/sendcoinsdialog.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -973,6 +973,9 @@ SendConfirmationDialog::SendConfirmationDialog(const QString& title, const QStri
973973
setStandardButtons(QMessageBox::Yes | QMessageBox::Cancel);
974974
setDefaultButton(QMessageBox::Cancel);
975975
yesButton = button(QMessageBox::Yes);
976+
if (confirmButtonText.isEmpty()) {
977+
confirmButtonText = yesButton->text();
978+
}
976979
updateYesButton();
977980
connect(&countDownTimer, &QTimer::timeout, this, &SendConfirmationDialog::countDown);
978981
}

src/qt/sendcoinsdialog.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ class SendConfirmationDialog : public QMessageBox
115115
Q_OBJECT
116116

117117
public:
118-
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);
118+
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);
119119
int exec() override;
120120

121121
private Q_SLOTS:

0 commit comments

Comments
 (0)