Ecosystem/feather
Ecosystem/feather
1
0
Fork 0
mirror of https://github.com/feather-wallet/feather.git synced 2024-12-23 03:59:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request 'TickerWidget: Format fiat currency using locale' (#170) from tobtoht/feather:ticker_locale into master

Browse source 
Reviewed-on: https://git.wownero.com/feather/feather/pulls/170
This commit is contained in:
tobtoht 2020-11-24 22:29:45 +00:00
commit edad1928ab
4 changed files with 21 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/utils/utils.cpp
View file

@ -581,4 +581,19 @@ QString Utils::formatBytes(quint64 bytes)
_data = 0; _data = 0;
return QString("%1 %2").arg(QString::number(_data, 'f', 1), sizes[i]); return QString("%1 %2").arg(QString::number(_data, 'f', 1), sizes[i]);
}
QString Utils::amountToCurrencyString(double amount, const QString &currencyCode) {
QLocale locale;
QList<QLocale> allLocales = QLocale::matchingLocales(QLocale::AnyLanguage, QLocale::AnyScript, QLocale::AnyCountry);
for (const auto& locale_: allLocales) {
if (locale_.currencySymbol(QLocale::CurrencyIsoCode) == currencyCode) {
locale = locale_;
}
}
if (currencyCode == "USD")
return locale.toCurrencyString(amount, "$");
return locale.toCurrencyString(amount);
} }

1
src/utils/utils.h
View file

@ -96,6 +96,7 @@ public:
static QFont relativeFont(int delta); static QFont relativeFont(int delta);
static double roundSignificant(double N, double n); static double roundSignificant(double N, double n);
static QString formatBytes(quint64 bytes); static QString formatBytes(quint64 bytes);
static QString amountToCurrencyString(double amount, const QString &currencyCode);
static QStringList randomHTTPAgents; static QStringList randomHTTPAgents;

16
src/widgets/tickerwidget.cpp
View file

@ -25,7 +25,7 @@ TickerWidget::TickerWidget(QWidget *parent, QString symbol, QString title, bool
this->setFontSizes(); this->setFontSizes();
this->setPctText(defaultPct, true); this->setPctText(defaultPct, true);
this->setFiatText(defaultFiat, 0.0, true); this->setFiatText(defaultFiat, 0.0);
connect(AppContext::prices, &Prices::fiatPricesUpdated, this, &TickerWidget::init); connect(AppContext::prices, &Prices::fiatPricesUpdated, this, &TickerWidget::init);
connect(AppContext::prices, &Prices::cryptoPricesUpdated, this, &TickerWidget::init); connect(AppContext::prices, &Prices::cryptoPricesUpdated, this, &TickerWidget::init);
@ -56,19 +56,11 @@ void TickerWidget::init() {
auto pct24hText = QString::number(pct24h, 'f', 2); auto pct24hText = QString::number(pct24h, 'f', 2);
this->setPctText(pct24hText, pct24h >= 0.0); this->setPctText(pct24hText, pct24h >= 0.0);
this->setFiatText(fiatCurrency, conversion, true); this->setFiatText(fiatCurrency, conversion);
} }
void TickerWidget::setFiatText(QString &fiatCurrency, double amount, bool round) { void TickerWidget::setFiatText(QString &fiatCurrency, double amount) {
QString number; QString conversionText = Utils::amountToCurrencyString(amount, fiatCurrency);
if(round)
number = QString::number(amount, 'f', 2);
else
number = QString::number(amount);
auto conversionText = QString("%1 %2")\
.arg(number)
.arg(fiatCurrency);
ui->tickerFiat->setText(conversionText); ui->tickerFiat->setText(conversionText);
} }

2
src/widgets/tickerwidget.h
View file

@ -19,7 +19,7 @@ class TickerWidget : public QWidget
public: public:
explicit TickerWidget(QWidget *parent, QString symbol, QString title = "", bool convertBalance = false); explicit TickerWidget(QWidget *parent, QString symbol, QString title = "", bool convertBalance = false);
void removePctContainer(); void removePctContainer();
void setFiatText(QString &fiatCurrency, double amount, bool round); void setFiatText(QString &fiatCurrency, double amount);
void setPctText(QString &text, bool positive); void setPctText(QString &text, bool positive);
void setFontSizes(); void setFontSizes();
~TickerWidget() override; ~TickerWidget() override;