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

@@ -105,11 +105,11 @@ bool TxTableModel::exportToCsv(QString fileName) const {
case Column::Confirmations: return QString::number(dat.confirmations);
case Column::Amount: {
// Sum up all the amounts
double total = 0;
CAmount total;
for (int i=0; i < dat.items.length(); i++) {
total += dat.items[i].amount;
total = total + dat.items[i].amount;
}
return Settings::gethushDisplayFormat(total);
return total.toDecimalhushString();
}
}
}
@@ -141,11 +141,11 @@ bool TxTableModel::exportToCsv(QString fileName) const {
case Column::Confirmations: return QString("%1 Network Confirmations").arg(QString::number(dat.confirmations));
case Column::Amount: {
// Sum up all the amounts
double total = 0;
CAmount total;
for (int i=0; i < dat.items.length(); i++) {
total += dat.items[i].amount;
total = total + dat.items[i].amount;
}
return Settings::getInstance()->getUSDFormat(total);
return total.toDecimalUSDString();
}
}
}
@@ -237,9 +237,9 @@ QString TxTableModel::getType(int row) const {
QString TxTableModel::getAmt(int row) const {
auto dat = modeldata->at(row);
double total = 0;
CAmount total;
for (int i=0; i < dat.items.length(); i++) {
total += dat.items[i].amount;
total = total + dat.items[i].amount;
}
return Settings::getDecimalString(total);
return total.toDecimalString();
}