From 3c173ee596b6117f694e97249a5e293a77f2c3ca Mon Sep 17 00:00:00 2001 From: fsb4000 Date: Sat, 28 Feb 2015 06:37:10 +0600 Subject: [PATCH] =?utf8?q?=D0=BF=D0=BE=D0=BA=D0=B0=D0=B7=D1=8B=D0=B2=D0=B0=D1=82=D1=8C=20=D0=BD=D0=B0=20=D0=B3=D0=BB=D0=B0=D0=B2=D0=BD=D0=BE=D0=B9=20=D1=81=D1=82=D1=80=D0=B0=D0=BD=D0=B8=D1=86=D0=B5=20=D0=BE=D0=B1=D1=89=D0=B5=D0=B5=20=D1=87=D0=B8=D1=81=D0=BB=D0=BE=20=D0=BC=D0=BE=D0=BD=D0=B5=D1=82=20=D0=BA=D0=BE=D1=88=D0=B5=D0=BB=D1=8C=D0=BA=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/qt/forms/overviewpage.ui | 114 +++++++++++++++++++++++++--------- src/qt/locale/bitcoin_en.ts | 142 ++++++++++++++++++++++++++++-------------- src/qt/overviewpage.cpp | 3 +- 3 files changed, 180 insertions(+), 79 deletions(-) diff --git a/src/qt/forms/overviewpage.ui b/src/qt/forms/overviewpage.ui index af64c69..db6003c 100644 --- a/src/qt/forms/overviewpage.ui +++ b/src/qt/forms/overviewpage.ui @@ -37,7 +37,7 @@ - Wallet + Balances @@ -84,17 +84,17 @@ 12 - + - Your current balance + Your current available balance - Balance: + Available: - + 75 @@ -105,28 +105,31 @@ IBeamCursor - Your current balance + Your current available balance 0 NVC + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse - + - Your unspendable balance + Total of coins that was staked, and do not yet count toward the current balance - Unspendable: + Stake: - + 75 @@ -137,28 +140,31 @@ IBeamCursor - Your unspendable balance + Total of coins that was staked, and do not yet count toward the current balance 0 NVC + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse - + - Total of coins that was staked, and do not yet count toward the current balance + Total of transactions that have yet to be confirmed, and do not yet count toward the current balance - Stake: + Unconfirmed: - + 75 @@ -169,28 +175,63 @@ IBeamCursor - Total of coins that was staked, and do not yet count toward the current balance + Total of transactions that have yet to be confirmed, and do not yet count toward the current balance 0 NVC + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse - + - Total of transactions that have yet to be confirmed, and do not yet count toward the current balance + Mined balance that has not yet matured - Unconfirmed: + Immature: - + + + + 75 + true + + + + Mined balance that has not yet matured + + + 0 NVC + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse + + + + + + + Your unspendable balance + + + Unspendable: + + + + + 75 @@ -201,28 +242,38 @@ IBeamCursor - Total of transactions that have yet to be confirmed, and do not yet count toward the current balance + Your unspendable balance 0 NVC + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse - - + + + + Qt::Horizontal + + + + + - Mined balance that has not yet matured + Your current total balance - Immature: + Total: - - + + 75 @@ -230,17 +281,20 @@ - Mined balance that has not yet matured + Your current total balance 0 NVC + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse - + Total number of transactions in wallet @@ -250,7 +304,7 @@ - + Total number of transactions in wallet diff --git a/src/qt/locale/bitcoin_en.ts b/src/qt/locale/bitcoin_en.ts index 18ebe39..e486b38 100644 --- a/src/qt/locale/bitcoin_en.ts +++ b/src/qt/locale/bitcoin_en.ts @@ -1,4 +1,6 @@ - + + + AboutDialog @@ -603,7 +605,10 @@ Copyright © 2012-2015 The NovaCoin developers %n active connection(s) to NovaCoin network - %n active connection to NovaCoin network%n active connections to NovaCoin network + + %n active connection to NovaCoin network + %n active connections to NovaCoin network + @@ -613,7 +618,10 @@ Copyright © 2012-2015 The NovaCoin developers ~%n block(s) remaining - ~%n block remaining~%n blocks remaining + + ~%n block remaining + ~%n blocks remaining + @@ -628,22 +636,34 @@ Copyright © 2012-2015 The NovaCoin developers %n second(s) ago - %n second ago%n seconds ago + + %n second ago + %n seconds ago + %n minute(s) ago - %n minute ago%n minutes ago + + %n minute ago + %n minutes ago + %n hour(s) ago - %n hour ago%n hours ago + + %n hour ago + %n hours ago + %n day(s) ago - %n day ago%n days ago + + %n day ago + %n days ago + @@ -2086,84 +2106,95 @@ Reduce the number of addresses involved in the address creation. Form - - Wallet - Wallet - - - + The displayed information may be out of date. Your wallet automatically synchronizes with the NovaCoin network after a connection is established, but this process has not completed yet. The displayed information may be out of date. Your wallet automatically synchronizes with the NovaCoin network after a connection is established, but this process has not completed yet. - - - Your current balance - Your current balance - - - - Balance: - Balance: - - - - + + Your unspendable balance Your unspendable balance - + Unspendable: Unspendable: - - + + Total of coins that was staked, and do not yet count toward the current balance Total of coins that was staked, and do not yet count toward the current balance - + + Balances + + + + + + Your current available balance + + + + + Available: + + + + Stake: Stake: - - + + Total of transactions that have yet to be confirmed, and do not yet count toward the current balance Total of transactions that have yet to be confirmed, and do not yet count toward the current balance - + Unconfirmed: Unconfirmed: - - + + Mined balance that has not yet matured Mined balance that has not yet matured - + Immature: Immature: - + + + Your current total balance + + + + Total: + + + + + Total number of transactions in wallet Total number of transactions in wallet - + Number of transactions: Number of transactions: - + <b>Recent transactions</b> <b>Recent transactions</b> @@ -2197,22 +2228,22 @@ Reduce the number of addresses involved in the address creation. Amount - + %1 d %1 d - + %1 h %1 h - + %1 m %1 m - + %1 s %1 s @@ -3025,7 +3056,10 @@ Reduce the number of addresses involved in the address creation. Open for %n block(s) - Open for %n blockOpen for %n blocks + + Open for %n block + Open for %n blocks + @@ -3060,7 +3094,10 @@ Reduce the number of addresses involved in the address creation. , broadcast through %n node(s) - , broadcast through %n node, broadcast through %n nodes + + , broadcast through %n node + , broadcast through %n nodes + @@ -3122,7 +3159,10 @@ Reduce the number of addresses involved in the address creation. matures in %n more block(s) - matures in %n more blockmatures in %n more blocks + + matures in %n more block + matures in %n more blocks + @@ -3231,7 +3271,10 @@ Reduce the number of addresses involved in the address creation. Open for %n block(s) - Open for %n blockOpen for %n blocks + + Open for %n block + Open for %n blocks + @@ -3256,7 +3299,10 @@ Reduce the number of addresses involved in the address creation. Mined balance will be available when it matures in %n more block(s) - Mined balance will be available when it matures in %n more blockMined balance will be available when it matures in %n more blocks + + Mined balance will be available when it matures in %n more block + Mined balance will be available when it matures in %n more blocks + diff --git a/src/qt/overviewpage.cpp b/src/qt/overviewpage.cpp index 21cdba0..9c77a21 100644 --- a/src/qt/overviewpage.cpp +++ b/src/qt/overviewpage.cpp @@ -141,11 +141,12 @@ void OverviewPage::setBalance(qint64 total, qint64 watchOnly, qint64 stake, qint currentStake = stake; currentUnconfirmedBalance = unconfirmedBalance; currentImmatureBalance = immatureBalance; - ui->labelBalanceTotal->setText(BitcoinUnits::formatWithUnit(unit, total)); + ui->labelAvailable->setText(BitcoinUnits::formatWithUnit(unit, total)); ui->labelBalanceWatchOnly->setText(BitcoinUnits::formatWithUnit(unit, watchOnly)); ui->labelStake->setText(BitcoinUnits::formatWithUnit(unit, stake)); ui->labelUnconfirmed->setText(BitcoinUnits::formatWithUnit(unit, unconfirmedBalance)); ui->labelImmature->setText(BitcoinUnits::formatWithUnit(unit, immatureBalance)); + ui->labelTotal->setText(BitcoinUnits::formatWithUnit(unit, total+stake+unconfirmedBalance+immatureBalance)); // only show immature (newly mined) balance if it's non-zero, so as not to complicate things // for the non-mining users -- 1.7.1