Browse Source

Merge pull request #3094 from Diapolo/btcamountfield

make BitcoinAmountField::setReadOnly() usable
0.10
Gavin Andresen 11 years ago
parent
commit
03db5c6112
  1. 5
      src/qt/bitcoinamountfield.cpp
  2. 8
      src/qt/forms/sendcoinsentry.ui
  3. 1
      src/qt/sendcoinsentry.cpp

5
src/qt/bitcoinamountfield.cpp

@ -130,9 +130,10 @@ void BitcoinAmountField::setValue(qint64 value) @@ -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)

8
src/qt/forms/sendcoinsentry.ui

@ -621,7 +621,7 @@ @@ -621,7 +621,7 @@
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="buddy">
<cstring>payAmount</cstring>
<cstring>payAmount_s</cstring>
</property>
</widget>
</item>
@ -640,15 +640,9 @@ @@ -640,15 +640,9 @@
</item>
<item row="5" column="2">
<widget class="BitcoinAmountField" name="payAmount_s">
<property name="enabled">
<bool>false</bool>
</property>
<property name="acceptDrops">
<bool>false</bool>
</property>
<property name="readOnly">
<bool>true</bool>
</property>
</widget>
</item>
<item row="3" column="2">

1
src/qt/sendcoinsentry.cpp

@ -174,6 +174,7 @@ void SendCoinsEntry::setValue(const SendCoinsRecipient &value) @@ -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);
}
}

Loading…
Cancel
Save