diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2013-06-09 01:06:36 -0700 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2013-06-09 01:06:36 -0700 |
| commit | 8b313c93311813e8697807a701604d182ee83d44 (patch) | |
| tree | 4ac50203ceab1a33f4ab7583341ad68b43ed90b3 | |
| parent | a743522216842bf76658deaad550c5cfaed1b814 (diff) | |
| parent | cb85aeb06cfcac0812c56f24ebf429cf0904658b (diff) | |
Merge pull request #2749 from laanwj/2013_06_addtotalbalance
qt: Add total balance in overview page
| -rw-r--r-- | src/qt/forms/overviewpage.ui | 42 | ||||
| -rw-r--r-- | src/qt/overviewpage.cpp | 1 |
2 files changed, 40 insertions, 3 deletions
diff --git a/src/qt/forms/overviewpage.ui b/src/qt/forms/overviewpage.ui index 57aa624cc2..a4cf641195 100644 --- a/src/qt/forms/overviewpage.ui +++ b/src/qt/forms/overviewpage.ui @@ -103,7 +103,7 @@ <item row="0" column="0"> <widget class="QLabel" name="label"> <property name="text"> - <string>Balance:</string> + <string>Confirmed:</string> </property> </widget> </item> @@ -119,7 +119,7 @@ <cursorShape>IBeamCursor</cursorShape> </property> <property name="toolTip"> - <string>Your current balance</string> + <string>Your current spendable balance</string> </property> <property name="text"> <string notr="true">0 BTC</string> @@ -148,7 +148,7 @@ <cursorShape>IBeamCursor</cursorShape> </property> <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 name="text"> <string notr="true">0 BTC</string> @@ -184,6 +184,42 @@ </property> </widget> </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> </item> </layout> diff --git a/src/qt/overviewpage.cpp b/src/qt/overviewpage.cpp index ad2d682b7b..ddd8891335 100644 --- a/src/qt/overviewpage.cpp +++ b/src/qt/overviewpage.cpp @@ -140,6 +140,7 @@ void OverviewPage::setBalance(qint64 balance, qint64 unconfirmedBalance, qint64 ui->labelBalance->setText(BitcoinUnits::formatWithUnit(unit, balance)); ui->labelUnconfirmed->setText(BitcoinUnits::formatWithUnit(unit, unconfirmedBalance)); 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 // for the non-mining users |