From fa24439ff3d8ab5b9efaf66ef4dae6713b88cb35 Mon Sep 17 00:00:00 2001 From: MarcoFalke Date: Sun, 13 Dec 2015 17:58:29 +0100 Subject: Bump copyright headers to 2015 --- src/qt/bitcoinunits.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/qt/bitcoinunits.cpp') diff --git a/src/qt/bitcoinunits.cpp b/src/qt/bitcoinunits.cpp index 425b45d91..de5799130 100644 --- a/src/qt/bitcoinunits.cpp +++ b/src/qt/bitcoinunits.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2013 The Bitcoin Core developers +// Copyright (c) 2011-2015 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -- cgit v1.2.3 From 5fdf32de7ed85a1a0aec7cdedb83f750f4a0f7ff Mon Sep 17 00:00:00 2001 From: fanquake Date: Sat, 26 Dec 2015 11:49:19 +0800 Subject: Replace some instances of formatWithUnit with formatHtmlWithUnit Strings in a HTML context should be using formatHtmlWithUnit. --- src/qt/bitcoinunits.cpp | 7 ------- 1 file changed, 7 deletions(-) (limited to 'src/qt/bitcoinunits.cpp') diff --git a/src/qt/bitcoinunits.cpp b/src/qt/bitcoinunits.cpp index 425b45d91..9c86cb71d 100644 --- a/src/qt/bitcoinunits.cpp +++ b/src/qt/bitcoinunits.cpp @@ -111,13 +111,6 @@ QString BitcoinUnits::format(int unit, const CAmount& nIn, bool fPlus, Separator } -// TODO: Review all remaining calls to BitcoinUnits::formatWithUnit to -// TODO: determine whether the output is used in a plain text context -// TODO: or an HTML context (and replace with -// TODO: BtcoinUnits::formatHtmlWithUnit in the latter case). Hopefully -// TODO: there aren't instances where the result could be used in -// TODO: either context. - // NOTE: Using formatWithUnit in an HTML context risks wrapping // quantities at the thousands separator. More subtly, it also results // in a standard space rather than a thin space, due to a bug in Qt's -- cgit v1.2.3 From 27765b6403cece54320374b37afb01a0cfe571c3 Mon Sep 17 00:00:00 2001 From: isle2983 Date: Sat, 31 Dec 2016 11:01:21 -0700 Subject: Increment MIT Licence copyright header year on files modified in 2016 Edited via: $ contrib/devtools/copyright_header.py update . --- src/qt/bitcoinunits.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/qt/bitcoinunits.cpp') diff --git a/src/qt/bitcoinunits.cpp b/src/qt/bitcoinunits.cpp index 649005789..4da414a4e 100644 --- a/src/qt/bitcoinunits.cpp +++ b/src/qt/bitcoinunits.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2015 The Bitcoin Core developers +// Copyright (c) 2011-2016 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -- cgit v1.2.3 From 148a2aca05fe98031bcf857fa186d792c507090c Mon Sep 17 00:00:00 2001 From: Ross Nicoll Date: Mon, 27 Jul 2015 16:35:30 +0100 Subject: Introduce basic Dogecoin branding --- src/qt/bitcoinunits.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/qt/bitcoinunits.cpp') diff --git a/src/qt/bitcoinunits.cpp b/src/qt/bitcoinunits.cpp index 4da414a4e..54b3a8afe 100644 --- a/src/qt/bitcoinunits.cpp +++ b/src/qt/bitcoinunits.cpp @@ -40,9 +40,9 @@ QString BitcoinUnits::name(int unit) { switch(unit) { - case BTC: return QString("BTC"); - case mBTC: return QString("mBTC"); - case uBTC: return QString::fromUtf8("μBTC"); + case BTC: return QString("DOGE"); + case mBTC: return QString("mDOGE"); + case uBTC: return QString::fromUtf8("μDOGE"); default: return QString("???"); } } -- cgit v1.2.3 From 7ccf62e1a4a2894657907a5767bcc7ce4914a405 Mon Sep 17 00:00:00 2001 From: Ross Nicoll Date: Sun, 4 Feb 2018 17:02:26 +0000 Subject: [Qt] Disable milli and micro units, introduce kilo and mega units (#1463) milli- and micro-Dogecoins are below dust threshold so do not make any sense as display units. Instead, kilo- and mega-dogecoins are probably more useful, as those make common amounts easier to read instead of harder --- src/qt/bitcoinunits.cpp | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) (limited to 'src/qt/bitcoinunits.cpp') diff --git a/src/qt/bitcoinunits.cpp b/src/qt/bitcoinunits.cpp index 54b3a8afe..6b2ec5220 100644 --- a/src/qt/bitcoinunits.cpp +++ b/src/qt/bitcoinunits.cpp @@ -18,8 +18,10 @@ QList BitcoinUnits::availableUnits() { QList unitlist; unitlist.append(BTC); - unitlist.append(mBTC); - unitlist.append(uBTC); + unitlist.append(kBTC); + unitlist.append(MBTC); + //unitlist.append(mBTC); + //unitlist.append(uBTC); return unitlist; } @@ -27,10 +29,12 @@ bool BitcoinUnits::valid(int unit) { switch(unit) { + case MBTC: + case kBTC: case BTC: + return true; case mBTC: case uBTC: - return true; default: return false; } @@ -40,6 +44,8 @@ QString BitcoinUnits::name(int unit) { switch(unit) { + case MBTC: return QString("MDOGE"); + case kBTC: return QString("kDOGE"); case BTC: return QString("DOGE"); case mBTC: return QString("mDOGE"); case uBTC: return QString::fromUtf8("μDOGE"); @@ -51,9 +57,11 @@ QString BitcoinUnits::description(int unit) { switch(unit) { - case BTC: return QString("Bitcoins"); - case mBTC: return QString("Milli-Bitcoins (1 / 1" THIN_SP_UTF8 "000)"); - case uBTC: return QString("Micro-Bitcoins (1 / 1" THIN_SP_UTF8 "000" THIN_SP_UTF8 "000)"); + case MBTC: return QString("Mega-Dogecoins (1" THIN_SP_UTF8 "000" THIN_SP_UTF8 "000)"); + case kBTC: return QString("Kilo-Dogecoins (1" THIN_SP_UTF8 "000)"); + case BTC: return QString("Dogecoins"); + case mBTC: return QString("Milli-Dogecoins (1 / 1" THIN_SP_UTF8 "000)"); + case uBTC: return QString("Micro-Dogecoins (1 / 1" THIN_SP_UTF8 "000" THIN_SP_UTF8 "000)"); default: return QString("???"); } } @@ -62,6 +70,8 @@ qint64 BitcoinUnits::factor(int unit) { switch(unit) { + case MBTC: return 100000000000000; + case kBTC: return 100000000000; case BTC: return 100000000; case mBTC: return 100000; case uBTC: return 100; @@ -73,6 +83,8 @@ int BitcoinUnits::decimals(int unit) { switch(unit) { + case MBTC: return 14; + case kBTC: return 11; case BTC: return 8; case mBTC: return 5; case uBTC: return 2; -- cgit v1.2.3