diff options
| author | Jonas Schnelli <dev@jonasschnelli.ch> | 2016-04-05 16:55:41 +0200 |
|---|---|---|
| committer | Russell Yanofsky <russ@yanofsky.org> | 2017-01-25 12:51:06 -0500 |
| commit | 838a58e7ca5c534ae125ab510fbd65d2feec72a9 (patch) | |
| tree | 00750aad071cde8d5fa4a7ef0442520f11ff06ec /src | |
| parent | 568c05a591705552b435d384e526f702e23a08c9 (diff) | |
| download | bitcoin-838a58e7ca5c534ae125ab510fbd65d2feec72a9.tar.xz | |
[Qt] Add simple optin-RBF checkbox and confirmation info
Diffstat (limited to 'src')
| -rw-r--r-- | src/qt/forms/sendcoinsdialog.ui | 14 | ||||
| -rw-r--r-- | src/qt/sendcoinsdialog.cpp | 9 |
2 files changed, 21 insertions, 2 deletions
diff --git a/src/qt/forms/sendcoinsdialog.ui b/src/qt/forms/sendcoinsdialog.ui index ca8ecffafe..e25fe054e3 100644 --- a/src/qt/forms/sendcoinsdialog.ui +++ b/src/qt/forms/sendcoinsdialog.ui @@ -1158,6 +1158,16 @@ </item> </layout> </item> + <item> + <widget class="QCheckBox" name="optInRBF"> + <property name="text"> + <string>Request Replace-By-Fee</string> + </property> + <property name="toolTip"> + <string>Indicates that the sender may wish to replace this transaction with a new one paying higher fees (prior to being confirmed).</string> + </property> + </widget> + </item> </layout> </widget> </item> @@ -1168,8 +1178,8 @@ </property> <property name="sizeHint" stdset="0"> <size> - <width>800</width> - <height>1</height> + <width>40</width> + <height>5</height> </size> </property> </spacer> diff --git a/src/qt/sendcoinsdialog.cpp b/src/qt/sendcoinsdialog.cpp index 5aeda7a30d..c30120c027 100644 --- a/src/qt/sendcoinsdialog.cpp +++ b/src/qt/sendcoinsdialog.cpp @@ -245,6 +245,8 @@ void SendCoinsDialog::on_sendButton_clicked() else ctrl.nConfirmTarget = 0; + ctrl.signalRbf = ui->optInRBF->isChecked(); + prepareStatus = model->prepareTransaction(currentTransaction, &ctrl); // process prepareStatus and on error generate message shown to user @@ -324,6 +326,13 @@ void SendCoinsDialog::on_sendButton_clicked() questionString.append(QString("<span style='font-size:10pt;font-weight:normal;'><br />(=%2)</span>") .arg(alternativeUnits.join(" " + tr("or") + "<br />"))); + if (ui->optInRBF->isChecked()) + { + questionString.append("<hr /><span>"); + questionString.append(tr("This transaction signals replaceability (optin-RBF).")); + questionString.append("</span>"); + } + SendConfirmationDialog confirmationDialog(tr("Confirm send coins"), questionString.arg(formatted.join("<br />")), SEND_CONFIRM_DELAY, this); confirmationDialog.exec(); |