Skip to content

Commit c3b6bbb

Browse files
apoelstraapoelstra
committed
Merge 0865a88 into merged_master (Bitcoin PR bitcoin-core/gui#3)
2 parents 888295e + 0865a88 commit c3b6bbb

10 files changed

+39
-39
lines changed

‎src/qt/bitcoinamountfield.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ class AmountSpinBox: public QAbstractSpinBox
6767
if(valid)
6868
{
6969
val = qBound(m_min_amount, val, m_max_amount);
70-
input = GUIUtil::formatAssetAmount(current_asset, val, currentUnit, BitcoinUnits::separatorAlways, false);
70+
input = GUIUtil::formatAssetAmount(current_asset, val, currentUnit, BitcoinUnits::SeparatorStyle::ALWAYS, false);
7171
lineEdit()->setText(input);
7272
}
7373
}
@@ -86,7 +86,7 @@ class AmountSpinBox: public QAbstractSpinBox
8686
void setValue(const CAsset& asset, CAmount value)
8787
{
8888
current_asset = asset;
89-
lineEdit()->setText(GUIUtil::formatAssetAmount(asset, value, currentUnit, BitcoinUnits::separatorAlways, false));
89+
lineEdit()->setText(GUIUtil::formatAssetAmount(asset, value, currentUnit, BitcoinUnits::SeparatorStyle::ALWAYS, false));
9090
Q_EMIT valueChanged();
9191
}
9292

@@ -155,7 +155,7 @@ class AmountSpinBox: public QAbstractSpinBox
155155

156156
current_asset = Params().GetConsensus().pegged_asset;
157157
currentUnit = unit;
158-
lineEdit()->setPlaceholderText(BitcoinUnits::format(currentUnit, m_min_amount, false, BitcoinUnits::separatorAlways));
158+
lineEdit()->setPlaceholderText(BitcoinUnits::format(currentUnit, m_min_amount, false, BitcoinUnits::SeparatorStyle::ALWAYS));
159159

160160
if (!was_pegged) {
161161
// Leave the text as-is, if it's valid
@@ -184,7 +184,7 @@ class AmountSpinBox: public QAbstractSpinBox
184184

185185
const QFontMetrics fm(fontMetrics());
186186
int h = lineEdit()->minimumSizeHint().height();
187-
int w = GUIUtil::TextWidth(fm, BitcoinUnits::format(BitcoinUnits::BTC, BitcoinUnits::maxMoney(), false, BitcoinUnits::separatorAlways));
187+
int w = GUIUtil::TextWidth(fm, BitcoinUnits::format(BitcoinUnits::BTC, BitcoinUnits::maxMoney(), false, BitcoinUnits::SeparatorStyle::ALWAYS));
188188
w += 2; // cursor blinking space
189189

190190
QStyleOptionSpinBox opt;

‎src/qt/bitcoinunits.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ QString BitcoinUnits::format(int unit, const CAmount& nIn, bool fPlus, Separator
114114
// confused with the decimal marker.
115115
QChar thin_sp(THIN_SP_CP);
116116
int q_size = quotient_str.size();
117-
if (separators == separatorAlways || (separators == separatorStandard && q_size > 4))
117+
if (separators == SeparatorStyle::ALWAYS || (separators == SeparatorStyle::STANDARD && q_size > 4))
118118
for (int i = 3; i < q_size; i += 3)
119119
quotient_str.insert(q_size - i, thin_sp);
120120

‎src/qt/bitcoinunits.h‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,11 @@ class BitcoinUnits: public QAbstractListModel
4646
SAT
4747
};
4848

49-
enum SeparatorStyle
49+
enum class SeparatorStyle
5050
{
51-
separatorNever,
52-
separatorStandard,
53-
separatorAlways
51+
NEVER,
52+
STANDARD,
53+
ALWAYS
5454
};
5555

5656
//! @name Static API
@@ -72,11 +72,11 @@ class BitcoinUnits: public QAbstractListModel
7272
//! Number of decimals left
7373
static int decimals(int unit);
7474
//! Format as string
75-
static QString format(int unit, const CAmount& amount, bool plussign = false, SeparatorStyle separators = separatorStandard, bool justify = false);
75+
static QString format(int unit, const CAmount& amount, bool plussign = false, SeparatorStyle separators = SeparatorStyle::STANDARD, bool justify = false);
7676
//! Format as string (with unit)
77-
static QString formatWithUnit(int unit, const CAmount& amount, bool plussign=false, SeparatorStyle separators=separatorStandard);
77+
static QString formatWithUnit(int unit, const CAmount& amount, bool plussign=false, SeparatorStyle separators=SeparatorStyle::STANDARD);
7878
//! Format as HTML string (with unit)
79-
static QString formatHtmlWithUnit(int unit, const CAmount& amount, bool plussign=false, SeparatorStyle separators=separatorStandard);
79+
static QString formatHtmlWithUnit(int unit, const CAmount& amount, bool plussign=false, SeparatorStyle separators=SeparatorStyle::STANDARD);
8080
//! Format as string (with unit) of fixed length to preserve privacy, if it is set.
8181
static QString formatWithPrivacy(int unit, const CAmount& amount, SeparatorStyle separators, bool privacy);
8282
//! Parse string to coin amount

‎src/qt/guiutil.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ QString formatBitcoinURI(const SendCoinsRecipient &info)
195195

196196
if (info.amount)
197197
{
198-
ret += QString("?amount=%1").arg(BitcoinUnits::format(BitcoinUnits::BTC, info.amount, false, BitcoinUnits::separatorNever));
198+
ret += QString("?amount=%1").arg(BitcoinUnits::format(BitcoinUnits::BTC, info.amount, false, BitcoinUnits::SeparatorStyle::NEVER));
199199
paramCount++;
200200
}
201201

‎src/qt/overviewpage.cpp‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -179,25 +179,25 @@ void OverviewPage::setBalance(const interfaces::WalletBalances& balances)
179179

180180
if (walletModel->wallet().isLegacy()) {
181181
if (walletModel->wallet().privateKeysDisabled()) {
182-
ui->labelBalance->setText(GUIUtil::formatMultiAssetAmount(balances.watch_only_balance, unit, BitcoinUnits::separatorAlways, "\n"));
183-
ui->labelUnconfirmed->setText(GUIUtil::formatMultiAssetAmount(balances.unconfirmed_watch_only_balance, unit, BitcoinUnits::separatorAlways, "\n"));
184-
ui->labelImmature->setText(GUIUtil::formatMultiAssetAmount(balances.immature_watch_only_balance, unit, BitcoinUnits::separatorAlways, "\n"));
185-
ui->labelTotal->setText(GUIUtil::formatMultiAssetAmount(balances.watch_only_balance + balances.unconfirmed_watch_only_balance + balances.immature_watch_only_balance, unit, BitcoinUnits::separatorAlways, "\n"));
182+
ui->labelBalance->setText(GUIUtil::formatMultiAssetAmount(balances.watch_only_balance, unit, BitcoinUnits::SeparatorStyle::ALWAYS, "\n"));
183+
ui->labelUnconfirmed->setText(GUIUtil::formatMultiAssetAmount(balances.unconfirmed_watch_only_balance, unit, BitcoinUnits::SeparatorStyle::ALWAYS, "\n"));
184+
ui->labelImmature->setText(GUIUtil::formatMultiAssetAmount(balances.immature_watch_only_balance, unit, BitcoinUnits::SeparatorStyle::ALWAYS, "\n"));
185+
ui->labelTotal->setText(GUIUtil::formatMultiAssetAmount(balances.watch_only_balance + balances.unconfirmed_watch_only_balance + balances.immature_watch_only_balance, unit, BitcoinUnits::SeparatorStyle::ALWAYS, "\n"));
186186
} else {
187-
ui->labelBalance->setText(GUIUtil::formatMultiAssetAmount(balances.balance, unit, BitcoinUnits::separatorAlways, "\n"));
188-
ui->labelUnconfirmed->setText(GUIUtil::formatMultiAssetAmount(balances.unconfirmed_balance, unit, BitcoinUnits::separatorAlways, "\n"));
189-
ui->labelImmature->setText(GUIUtil::formatMultiAssetAmount(balances.immature_balance, unit, BitcoinUnits::separatorAlways, "\n"));
190-
ui->labelTotal->setText(GUIUtil::formatMultiAssetAmount(balances.balance + balances.unconfirmed_balance + balances.immature_balance, unit, BitcoinUnits::separatorAlways, "\n"));
191-
ui->labelWatchAvailable->setText(GUIUtil::formatMultiAssetAmount(balances.watch_only_balance, unit, BitcoinUnits::separatorAlways, "\n"));
192-
ui->labelWatchPending->setText(GUIUtil::formatMultiAssetAmount(balances.unconfirmed_watch_only_balance, unit, BitcoinUnits::separatorAlways, "\n"));
193-
ui->labelWatchImmature->setText(GUIUtil::formatMultiAssetAmount(balances.immature_watch_only_balance, unit, BitcoinUnits::separatorAlways, "\n"));
194-
ui->labelWatchTotal->setText(GUIUtil::formatMultiAssetAmount(balances.watch_only_balance + balances.unconfirmed_watch_only_balance + balances.immature_watch_only_balance, unit, BitcoinUnits::separatorAlways, "\n"));
187+
ui->labelBalance->setText(GUIUtil::formatMultiAssetAmount(balances.balance, unit, BitcoinUnits::SeparatorStyle::ALWAYS, "\n"));
188+
ui->labelUnconfirmed->setText(GUIUtil::formatMultiAssetAmount(balances.unconfirmed_balance, unit, BitcoinUnits::SeparatorStyle::ALWAYS, "\n"));
189+
ui->labelImmature->setText(GUIUtil::formatMultiAssetAmount(balances.immature_balance, unit, BitcoinUnits::SeparatorStyle::ALWAYS, "\n"));
190+
ui->labelTotal->setText(GUIUtil::formatMultiAssetAmount(balances.balance + balances.unconfirmed_balance + balances.immature_balance, unit, BitcoinUnits::SeparatorStyle::ALWAYS, "\n"));
191+
ui->labelWatchAvailable->setText(GUIUtil::formatMultiAssetAmount(balances.watch_only_balance, unit, BitcoinUnits::SeparatorStyle::ALWAYS, "\n"));
192+
ui->labelWatchPending->setText(GUIUtil::formatMultiAssetAmount(balances.unconfirmed_watch_only_balance, unit, BitcoinUnits::SeparatorStyle::ALWAYS, "\n"));
193+
ui->labelWatchImmature->setText(GUIUtil::formatMultiAssetAmount(balances.immature_watch_only_balance, unit, BitcoinUnits::SeparatorStyle::ALWAYS, "\n"));
194+
ui->labelWatchTotal->setText(GUIUtil::formatMultiAssetAmount(balances.watch_only_balance + balances.unconfirmed_watch_only_balance + balances.immature_watch_only_balance, unit, BitcoinUnits::SeparatorStyle::ALWAYS, "\n"));
195195
}
196196
} else {
197-
ui->labelBalance->setText(GUIUtil::formatMultiAssetAmount(balances.balance, unit, BitcoinUnits::separatorAlways, "\n"));
198-
ui->labelUnconfirmed->setText(GUIUtil::formatMultiAssetAmount(balances.unconfirmed_balance, unit, BitcoinUnits::separatorAlways, "\n"));
199-
ui->labelImmature->setText(GUIUtil::formatMultiAssetAmount(balances.immature_balance, unit, BitcoinUnits::separatorAlways, "\n"));
200-
ui->labelTotal->setText(GUIUtil::formatMultiAssetAmount(balances.balance + balances.unconfirmed_balance + balances.immature_balance, unit, BitcoinUnits::separatorAlways, "\n"));
197+
ui->labelBalance->setText(GUIUtil::formatMultiAssetAmount(balances.balance, unit, BitcoinUnits::SeparatorStyle::ALWAYS, "\n"));
198+
ui->labelUnconfirmed->setText(GUIUtil::formatMultiAssetAmount(balances.unconfirmed_balance, unit, BitcoinUnits::SeparatorStyle::ALWAYS, "\n"));
199+
ui->labelImmature->setText(GUIUtil::formatMultiAssetAmount(balances.immature_balance, unit, BitcoinUnits::SeparatorStyle::ALWAYS, "\n"));
200+
ui->labelTotal->setText(GUIUtil::formatMultiAssetAmount(balances.balance + balances.unconfirmed_balance + balances.immature_balance, unit, BitcoinUnits::SeparatorStyle::ALWAYS, "\n"));
201201
}
202202
// only show immature (newly mined) balance if it's non-zero, so as not to complicate things
203203
// for the non-mining users

‎src/qt/recentrequeststablemodel.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ QVariant RecentRequestsTableModel::data(const QModelIndex &index, int role) cons
8282
if (rec->recipient.amount == 0 && role == Qt::DisplayRole)
8383
return tr("(no amount requested)");
8484
else if (role == Qt::EditRole)
85-
return BitcoinUnits::format(walletModel->getOptionsModel()->getDisplayUnit(), rec->recipient.amount, false, BitcoinUnits::separatorNever);
85+
return BitcoinUnits::format(walletModel->getOptionsModel()->getDisplayUnit(), rec->recipient.amount, false, BitcoinUnits::SeparatorStyle::NEVER);
8686
else
8787
return BitcoinUnits::format(walletModel->getOptionsModel()->getDisplayUnit(), rec->recipient.amount);
8888
}

‎src/qt/sendcoinsdialog.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ bool SendCoinsDialog::PrepareSendText(QString& question_string, QString& informa
280280
for (const SendAssetsRecipient &rcp : m_current_transaction->getRecipients())
281281
{
282282
// generate amount string with wallet name in case of multiwallet
283-
QString amount = GUIUtil::formatAssetAmount(rcp.asset, rcp.asset_amount, bitcoin_unit, BitcoinUnits::separatorStandard, true);
283+
QString amount = GUIUtil::formatAssetAmount(rcp.asset, rcp.asset_amount, bitcoin_unit, BitcoinUnits::SeparatorStyle::STANDARD, true);
284284
if (model->isMultiwallet()) {
285285
amount.append(tr(" from wallet '%1'").arg(GUIUtil::HtmlEscape(model->getWalletName())));
286286
}
@@ -359,7 +359,7 @@ bool SendCoinsDialog::PrepareSendText(QString& question_string, QString& informa
359359
.arg(alternativeUnits.join(" " + tr("or") + " ")));
360360
totalAmount.erase(Params().GetConsensus().pegged_asset);
361361
if (!!totalAmount) {
362-
question_string.append(" " + tr("and") + "<br />" + GUIUtil::formatMultiAssetAmount(totalAmount, -1 /*bitcoin unit, hide*/, BitcoinUnits::separatorStandard, ";<br />"));
362+
question_string.append(" " + tr("and") + "<br />" + GUIUtil::formatMultiAssetAmount(totalAmount, -1 /*bitcoin unit, hide*/, BitcoinUnits::SeparatorStyle::STANDARD, ";<br />"));
363363
}
364364

365365
if (formatted.size() > 1) {
@@ -422,7 +422,7 @@ void SendCoinsDialog::on_sendButton_clicked()
422422
fileNameSuggestion.append(" - ");
423423
}
424424
QString labelOrAddress = rcp.label.isEmpty() ? rcp.address : rcp.label;
425-
QString amount = GUIUtil::formatAssetAmount(rcp.asset, rcp.asset_amount, bitcoin_unit, BitcoinUnits::separatorStandard, true);
425+
QString amount = GUIUtil::formatAssetAmount(rcp.asset, rcp.asset_amount, bitcoin_unit, BitcoinUnits::BitcoinUnits::SeparatorStyle::STANDARD, true);
426426
fileNameSuggestion.append(labelOrAddress + "-" + amount);
427427
first = false;
428428
}

‎src/qt/test/wallettests.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ void TestGUI(interfaces::Node& node)
179179
QString balanceText = balanceLabel->text();
180180
int unit = walletModel.getOptionsModel()->getDisplayUnit();
181181
CAmount balance = valueFor(walletModel.wallet().getBalance(), ::policyAsset);
182-
QString balanceComparison = BitcoinUnits::formatWithUnit(unit, balance, false, BitcoinUnits::separatorAlways);
182+
QString balanceComparison = BitcoinUnits::formatWithUnit(unit, balance, false, BitcoinUnits::SeparatorStyle::ALWAYS);
183183
QCOMPARE(balanceText, balanceComparison);
184184
}
185185

@@ -205,7 +205,7 @@ void TestGUI(interfaces::Node& node)
205205
QString balanceText = balanceLabel->text().trimmed();
206206
int unit = walletModel.getOptionsModel()->getDisplayUnit();
207207
CAmount balance = valueFor(walletModel.wallet().getBalance(), ::policyAsset);
208-
QString balanceComparison = BitcoinUnits::formatWithUnit(unit, balance, false, BitcoinUnits::separatorAlways);
208+
QString balanceComparison = BitcoinUnits::formatWithUnit(unit, balance, false, BitcoinUnits::SeparatorStyle::ALWAYS);
209209
QCOMPARE(balanceText, balanceComparison);
210210

211211
// Check Request Payment button

‎src/qt/transactiontablemodel.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -529,7 +529,7 @@ QVariant TransactionTableModel::data(const QModelIndex &index, int role) const
529529
case ToAddress:
530530
return formatTxToAddress(rec, false);
531531
case Amount:
532-
return formatTxAmount(rec, true, BitcoinUnits::separatorAlways);
532+
return formatTxAmount(rec, true, BitcoinUnits::SeparatorStyle::ALWAYS);
533533
}
534534
break;
535535
case Qt::EditRole:
@@ -619,14 +619,14 @@ QVariant TransactionTableModel::data(const QModelIndex &index, int role) const
619619
details.append(QString::fromStdString(rec->address));
620620
details.append(" ");
621621
}
622-
details.append(formatTxAmount(rec, false, BitcoinUnits::separatorNever));
622+
details.append(formatTxAmount(rec, false, BitcoinUnits::SeparatorStyle::NEVER));
623623
return details;
624624
}
625625
case ConfirmedRole:
626626
return rec->status.status == TransactionStatus::Status::Confirming || rec->status.status == TransactionStatus::Status::Confirmed;
627627
case FormattedAmountRole:
628628
// Used for copy/export, so don't include separators
629-
return formatTxAmount(rec, false, BitcoinUnits::separatorNever);
629+
return formatTxAmount(rec, false, BitcoinUnits::SeparatorStyle::NEVER);
630630
case StatusRole:
631631
return rec->status.status;
632632
}

‎src/qt/transactiontablemodel.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ class TransactionTableModel : public QAbstractTableModel
101101
QString formatTxDate(const TransactionRecord *wtx) const;
102102
QString formatTxType(const TransactionRecord *wtx) const;
103103
QString formatTxToAddress(const TransactionRecord *wtx, bool tooltip) const;
104-
QString formatTxAmount(const TransactionRecord *wtx, bool showUnconfirmed=true, BitcoinUnits::SeparatorStyle separators=BitcoinUnits::separatorStandard) const;
104+
QString formatTxAmount(const TransactionRecord *wtx, bool showUnconfirmed=true, BitcoinUnits::SeparatorStyle separators=BitcoinUnits::SeparatorStyle::STANDARD) const;
105105
QString formatTooltip(const TransactionRecord *rec) const;
106106
QVariant txStatusDecoration(const TransactionRecord *wtx) const;
107107
QVariant txWatchonlyDecoration(const TransactionRecord *wtx) const;

0 commit comments

Comments
 (0)