Permalink
Browse files

Merge #7383: [Qt] rename "amount" to "requested amount" in receive co…

…ins table

df6e8e1 [Qt] rename "amount" to "requested amount" in receive coins table (Jonas Schnelli)
  • Loading branch information...
jonasschnelli committed Jan 21, 2016
2 parents b92ea98 + df6e8e1 commit ae2db67feec25fb89412429bd50250cb995bec87
Showing with 4 additions and 8 deletions.
  1. +1 −0 src/qt/receivecoinsdialog.cpp
  2. +1 −1 src/qt/receivecoinsdialog.h
  3. +2 −7 src/qt/recentrequeststablemodel.cpp
@@ -82,6 +82,7 @@ void ReceiveCoinsDialog::setModel(WalletModel *model)
tableView->setSelectionMode(QAbstractItemView::ContiguousSelection);
tableView->setColumnWidth(RecentRequestsTableModel::Date, DATE_COLUMN_WIDTH);
tableView->setColumnWidth(RecentRequestsTableModel::Label, LABEL_COLUMN_WIDTH);
tableView->setColumnWidth(RecentRequestsTableModel::Amount, AMOUNT_MINIMUM_COLUMN_WIDTH);
connect(tableView->selectionModel(),
SIGNAL(selectionChanged(QItemSelection, QItemSelection)), this,
@@ -36,7 +36,7 @@ class ReceiveCoinsDialog : public QDialog
enum ColumnWidths {
DATE_COLUMN_WIDTH = 130,
LABEL_COLUMN_WIDTH = 120,
AMOUNT_MINIMUM_COLUMN_WIDTH = 160,
AMOUNT_MINIMUM_COLUMN_WIDTH = 180,
MINIMUM_COLUMN_WIDTH = 130
};
@@ -83,7 +83,7 @@ QVariant RecentRequestsTableModel::data(const QModelIndex &index, int role) cons
}
case Amount:
if (rec->recipient.amount == 0 && role == Qt::DisplayRole)
return tr("(no amount)");
return tr("(no amount requested)");
else if (role == Qt::EditRole)
return BitcoinUnits::format(walletModel->getOptionsModel()->getDisplayUnit(), rec->recipient.amount, false, BitcoinUnits::separatorNever);
else
@@ -125,12 +125,7 @@ void RecentRequestsTableModel::updateAmountColumnTitle()
/** Gets title for amount column including current display unit if optionsModel reference available. */
QString RecentRequestsTableModel::getAmountTitle()
{
QString amountTitle = tr("Amount");
if (this->walletModel->getOptionsModel() != NULL)
{
amountTitle += " ("+BitcoinUnits::name(this->walletModel->getOptionsModel()->getDisplayUnit()) + ")";
}
return amountTitle;
return (this->walletModel->getOptionsModel() != NULL) ? tr("Requested") + " ("+BitcoinUnits::name(this->walletModel->getOptionsModel()->getDisplayUnit()) + ")" : "";
}
QModelIndex RecentRequestsTableModel::index(int row, int column, const QModelIndex &parent) const

0 comments on commit ae2db67

Please sign in to comment.