|
|
@ -83,7 +83,7 @@ QVariant RecentRequestsTableModel::data(const QModelIndex &index, int role) cons |
|
|
|
} |
|
|
|
} |
|
|
|
case Amount: |
|
|
|
case Amount: |
|
|
|
if (rec->recipient.amount == 0 && role == Qt::DisplayRole) |
|
|
|
if (rec->recipient.amount == 0 && role == Qt::DisplayRole) |
|
|
|
return tr("(no amount)"); |
|
|
|
return tr("(no amount requested)"); |
|
|
|
else if (role == Qt::EditRole) |
|
|
|
else if (role == Qt::EditRole) |
|
|
|
return BitcoinUnits::format(walletModel->getOptionsModel()->getDisplayUnit(), rec->recipient.amount, false, BitcoinUnits::separatorNever); |
|
|
|
return BitcoinUnits::format(walletModel->getOptionsModel()->getDisplayUnit(), rec->recipient.amount, false, BitcoinUnits::separatorNever); |
|
|
|
else |
|
|
|
else |
|
|
@ -125,12 +125,7 @@ void RecentRequestsTableModel::updateAmountColumnTitle() |
|
|
|
/** Gets title for amount column including current display unit if optionsModel reference available. */ |
|
|
|
/** Gets title for amount column including current display unit if optionsModel reference available. */ |
|
|
|
QString RecentRequestsTableModel::getAmountTitle() |
|
|
|
QString RecentRequestsTableModel::getAmountTitle() |
|
|
|
{ |
|
|
|
{ |
|
|
|
QString amountTitle = tr("Amount"); |
|
|
|
return (this->walletModel->getOptionsModel() != NULL) ? tr("Requested") + " ("+BitcoinUnits::name(this->walletModel->getOptionsModel()->getDisplayUnit()) + ")" : ""; |
|
|
|
if (this->walletModel->getOptionsModel() != NULL) |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
amountTitle += " ("+BitcoinUnits::name(this->walletModel->getOptionsModel()->getDisplayUnit()) + ")"; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
return amountTitle; |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
QModelIndex RecentRequestsTableModel::index(int row, int column, const QModelIndex &parent) const |
|
|
|
QModelIndex RecentRequestsTableModel::index(int row, int column, const QModelIndex &parent) const |
|
|
|