Browse Source

qt: Add total balance in overview page

miguelfreitas
Wladimir J. van der Laan 12 years ago
parent
commit
cb85aeb06c
  1. 42
      src/qt/forms/overviewpage.ui
  2. 1
      src/qt/overviewpage.cpp

42
src/qt/forms/overviewpage.ui

@ -103,7 +103,7 @@
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="label"> <widget class="QLabel" name="label">
<property name="text"> <property name="text">
<string>Balance:</string> <string>Confirmed:</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -119,7 +119,7 @@
<cursorShape>IBeamCursor</cursorShape> <cursorShape>IBeamCursor</cursorShape>
</property> </property>
<property name="toolTip"> <property name="toolTip">
<string>Your current balance</string> <string>Your current spendable balance</string>
</property> </property>
<property name="text"> <property name="text">
<string notr="true">0 BTC</string> <string notr="true">0 BTC</string>
@ -148,7 +148,7 @@
<cursorShape>IBeamCursor</cursorShape> <cursorShape>IBeamCursor</cursorShape>
</property> </property>
<property name="toolTip"> <property name="toolTip">
<string>Total of transactions that have yet to be confirmed, and do not yet count toward the current balance</string> <string>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</string>
</property> </property>
<property name="text"> <property name="text">
<string notr="true">0 BTC</string> <string notr="true">0 BTC</string>
@ -184,6 +184,42 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="0">
<widget class="QLabel" name="labelTotalText">
<property name="text">
<string>Total:</string>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QLabel" name="labelTotal">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="cursor">
<cursorShape>IBeamCursor</cursorShape>
</property>
<property name="toolTip">
<string>Your current total balance</string>
</property>
<property name="text">
<string notr="true">0 BTC</string>
</property>
<property name="textInteractionFlags">
<set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
</property>
</widget>
</item>
<item row="3" column="0" colspan="2">
<widget class="Line" name="line">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
</layout> </layout>
</item> </item>
</layout> </layout>

1
src/qt/overviewpage.cpp

@ -140,6 +140,7 @@ void OverviewPage::setBalance(qint64 balance, qint64 unconfirmedBalance, qint64
ui->labelBalance->setText(BitcoinUnits::formatWithUnit(unit, balance)); ui->labelBalance->setText(BitcoinUnits::formatWithUnit(unit, balance));
ui->labelUnconfirmed->setText(BitcoinUnits::formatWithUnit(unit, unconfirmedBalance)); ui->labelUnconfirmed->setText(BitcoinUnits::formatWithUnit(unit, unconfirmedBalance));
ui->labelImmature->setText(BitcoinUnits::formatWithUnit(unit, immatureBalance)); ui->labelImmature->setText(BitcoinUnits::formatWithUnit(unit, immatureBalance));
ui->labelTotal->setText(BitcoinUnits::formatWithUnit(unit, balance + unconfirmedBalance + immatureBalance));
// only show immature (newly mined) balance if it's non-zero, so as not to complicate things // only show immature (newly mined) balance if it's non-zero, so as not to complicate things
// for the non-mining users // for the non-mining users

Loading…
Cancel
Save