aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIlya Kitaev <mbg033@gmail.com>2016-10-09 01:32:03 +0300
committerIlya Kitaev <mbg033@gmail.com>2016-10-10 00:25:56 +0300
commit7ed623e6d9c8eabcc3caefb381fea54d7c50b858 (patch)
tree33b5a79d2cddbb6c94da31f00492dd09adf40fc6
parenteafcf71382ad26e6e4be959405ae0701bc1ce0c9 (diff)
downloadmonzero-gui-7ed623e6d9c8eabcc3caefb381fea54d7c50b858.tar.gz
monzero-gui-7ed623e6d9c8eabcc3caefb381fea54d7c50b858.tar.xz
monzero-gui-7ed623e6d9c8eabcc3caefb381fea54d7c50b858.zip
Basic mode: updating balance properly
-rw-r--r--MiddlePanel.qml14
-rw-r--r--main.qml5
2 files changed, 11 insertions, 8 deletions
diff --git a/MiddlePanel.qml b/MiddlePanel.qml
index 97dcf56c..b60cb838 100644
--- a/MiddlePanel.qml
+++ b/MiddlePanel.qml
@@ -43,6 +43,10 @@ Rectangle {
property History historyView: History { }
property Settings settingsView: Settings { }
+ property string balanceText
+ property string unlockedBalanceText
+
+
signal paymentClicked(string address, string paymentId, double amount, int mixinCount, int priority)
signal generatePaymentIdInvoked()
@@ -144,7 +148,7 @@ Rectangle {
Layout.fillWidth: true
Layout.preferredHeight: 64
color: "#FFFFFF"
- visible: false
+ visible: basicMode
Image {
id: logo
@@ -172,7 +176,7 @@ Rectangle {
horizontalAlignment: Text.AlignLeft
verticalAlignment: Text.AlignBottom
color: "#535353"
- text: qsTr("Locked Balance:")
+ text: qsTr("Balance:")
}
Text {
@@ -186,7 +190,7 @@ Rectangle {
horizontalAlignment: Text.AlignLeft
verticalAlignment: Text.AlignBottom
color: "#000000"
- text: qsTr("78.9239845")
+ text: root.balanceText
}
Item {
@@ -210,7 +214,7 @@ Rectangle {
horizontalAlignment: Text.AlignLeft
verticalAlignment: Text.AlignBottom
color: "#535353"
- text: qsTr("Available Balance:")
+ text: qsTr("Unlocked Balance:")
}
Text {
@@ -224,7 +228,7 @@ Rectangle {
horizontalAlignment: Text.AlignLeft
verticalAlignment: Text.AlignBottom
color: "#000000"
- text: qsTr("2324.9239845")
+ text: root.unlockedBalanceText
}
}
diff --git a/main.qml b/main.qml
index ee14a167..6cf753e8 100644
--- a/main.qml
+++ b/main.qml
@@ -230,9 +230,8 @@ ApplicationWindow {
function onWalletUpdate() {
console.log(">>> wallet updated")
-// basicPanel.unlockedBalanceText = leftPanel.unlockedBalanceText =
-// walletManager.displayAmount(currentWallet.unlockedBalance);
-// basicPanel.balanceText = leftPanel.balanceText = walletManager.displayAmount(currentWallet.balance);
+ middlePanel.unlockedBalanceText = leftPanel.unlockedBalanceText = walletManager.displayAmount(currentWallet.unlockedBalance);
+ middlePanel.balanceText = leftPanel.balanceText = walletManager.displayAmount(currentWallet.balance);
}
function onWalletRefresh() {