highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-11-11 06:28:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source 
Conflicts:
	src/qt/overviewpage.cpp
	src/qt/transactiondesc.cpp
This commit is contained in:
Roy Badami
2014-07-07 22:06:21 +01:00
parent 2e4fee2ac4 1fedd65fcf
commit 96df327834
331 changed files with 19565 additions and 8435 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/qt/bitcoinunits.cpp
View File

@@ -34,6 +34,17 @@ bool BitcoinUnits::valid(int unit)
}
}
QString BitcoinUnits::id(int unit)
{
switch(unit)
{
case BTC: return QString("btc");
case mBTC: return QString("mbtc");
case uBTC: return QString("ubtc");
default: return QString("???");
}
}
QString BitcoinUnits::name(int unit)
{
switch(unit)
@@ -188,6 +199,16 @@ bool BitcoinUnits::parse(int unit, const QString &value, qint64 *val_out)
return ok;
}
QString BitcoinUnits::getAmountColumnTitle(int unit)
{
QString amountTitle = QObject::tr("Amount");
if (BitcoinUnits::valid(unit))
{
amountTitle += " ("+BitcoinUnits::name(unit) + ")";
}
return amountTitle;
}
int BitcoinUnits::rowCount(const QModelIndex &parent) const
{
Q_UNUSED(parent);