From 75fa27eacaa12ce9c9630db787f69fd0d70bcfc3 Mon Sep 17 00:00:00 2001 From: Philip Kaufmann Date: Tue, 15 Oct 2013 15:26:22 +0200 Subject: [PATCH] make BitcoinAmountField::setReadOnly() usable - use it for secure payment-requests (this change allows a copy&paste of the amount and looks a little nicer than just a disabled GUI element) --- src/qt/bitcoinamountfield.cpp | 5 +++-- src/qt/forms/sendcoinsentry.ui | 8 +------- src/qt/sendcoinsentry.cpp | 1 + 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/qt/bitcoinamountfield.cpp b/src/qt/bitcoinamountfield.cpp index d9d4e3b2..37b8743e 100644 --- a/src/qt/bitcoinamountfield.cpp +++ b/src/qt/bitcoinamountfield.cpp @@ -130,9 +130,10 @@ void BitcoinAmountField::setValue(qint64 value) setText(BitcoinUnits::format(currentUnit, value)); } -void BitcoinAmountField::setReadOnly(bool fReadeOnly) +void BitcoinAmountField::setReadOnly(bool fReadOnly) { - // TODO ... + amount->setReadOnly(fReadOnly); + unit->setEnabled(!fReadOnly); } void BitcoinAmountField::unitChanged(int idx) diff --git a/src/qt/forms/sendcoinsentry.ui b/src/qt/forms/sendcoinsentry.ui index 2c1cec60..5c6afd6c 100644 --- a/src/qt/forms/sendcoinsentry.ui +++ b/src/qt/forms/sendcoinsentry.ui @@ -621,7 +621,7 @@ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - payAmount + payAmount_s @@ -640,15 +640,9 @@ - - false - false - - true - diff --git a/src/qt/sendcoinsentry.cpp b/src/qt/sendcoinsentry.cpp index 59724c94..aa671e05 100644 --- a/src/qt/sendcoinsentry.cpp +++ b/src/qt/sendcoinsentry.cpp @@ -174,6 +174,7 @@ void SendCoinsEntry::setValue(const SendCoinsRecipient &value) ui->payTo_s->setText(recipient.authenticatedMerchant); ui->memoTextLabel_s->setText(QString::fromStdString(details.memo())); ui->payAmount_s->setValue(recipient.amount); + ui->payAmount_s->setReadOnly(true); setCurrentWidget(ui->SendCoinsSecure); } }