merge and updates

This commit is contained in:
DenioD
2019-10-27 19:46:36 +01:00
35 changed files with 661 additions and 1253 deletions

View File

@@ -24,16 +24,16 @@ void AddressCombo::setCurrentText(const QString& text) {
}
}
void AddressCombo::addItem(const QString& text, double bal) {
void AddressCombo::addItem(const QString& text, CAmount bal) {
QString txt = AddressBook::addLabelToAddress(text);
if (bal > 0)
txt = txt % "(" % Settings::gethushDisplayFormat(bal) % ")";
if (bal.toqint64() > 0)
txt = txt % "(" % bal.toDecimalhushString() % ")";
QComboBox::addItem(txt);
}
void AddressCombo::insertItem(int index, const QString& text, double bal) {
void AddressCombo::insertItem(int index, const QString& text, CAmount bal) {
QString txt = AddressBook::addLabelToAddress(text) %
"(" % Settings::gethushDisplayFormat(bal) % ")";
"(" % bal.toDecimalhushString() % ")";
QComboBox::insertItem(index, txt);
}