mirror of
https://github.com/monero-project/monero-gui.git
synced 2024-12-23 03:59:38 +00:00
Basic mode: updating balance properly
This commit is contained in:
parent
eafcf71382
commit
7ed623e6d9
2 changed files with 11 additions and 8 deletions
|
@ -43,6 +43,10 @@ Rectangle {
|
||||||
property History historyView: History { }
|
property History historyView: History { }
|
||||||
property Settings settingsView: Settings { }
|
property Settings settingsView: Settings { }
|
||||||
|
|
||||||
|
property string balanceText
|
||||||
|
property string unlockedBalanceText
|
||||||
|
|
||||||
|
|
||||||
signal paymentClicked(string address, string paymentId, double amount, int mixinCount, int priority)
|
signal paymentClicked(string address, string paymentId, double amount, int mixinCount, int priority)
|
||||||
signal generatePaymentIdInvoked()
|
signal generatePaymentIdInvoked()
|
||||||
|
|
||||||
|
@ -144,7 +148,7 @@ Rectangle {
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
Layout.preferredHeight: 64
|
Layout.preferredHeight: 64
|
||||||
color: "#FFFFFF"
|
color: "#FFFFFF"
|
||||||
visible: false
|
visible: basicMode
|
||||||
|
|
||||||
Image {
|
Image {
|
||||||
id: logo
|
id: logo
|
||||||
|
@ -172,7 +176,7 @@ Rectangle {
|
||||||
horizontalAlignment: Text.AlignLeft
|
horizontalAlignment: Text.AlignLeft
|
||||||
verticalAlignment: Text.AlignBottom
|
verticalAlignment: Text.AlignBottom
|
||||||
color: "#535353"
|
color: "#535353"
|
||||||
text: qsTr("Locked Balance:")
|
text: qsTr("Balance:")
|
||||||
}
|
}
|
||||||
|
|
||||||
Text {
|
Text {
|
||||||
|
@ -186,7 +190,7 @@ Rectangle {
|
||||||
horizontalAlignment: Text.AlignLeft
|
horizontalAlignment: Text.AlignLeft
|
||||||
verticalAlignment: Text.AlignBottom
|
verticalAlignment: Text.AlignBottom
|
||||||
color: "#000000"
|
color: "#000000"
|
||||||
text: qsTr("78.9239845")
|
text: root.balanceText
|
||||||
}
|
}
|
||||||
|
|
||||||
Item {
|
Item {
|
||||||
|
@ -210,7 +214,7 @@ Rectangle {
|
||||||
horizontalAlignment: Text.AlignLeft
|
horizontalAlignment: Text.AlignLeft
|
||||||
verticalAlignment: Text.AlignBottom
|
verticalAlignment: Text.AlignBottom
|
||||||
color: "#535353"
|
color: "#535353"
|
||||||
text: qsTr("Available Balance:")
|
text: qsTr("Unlocked Balance:")
|
||||||
}
|
}
|
||||||
|
|
||||||
Text {
|
Text {
|
||||||
|
@ -224,7 +228,7 @@ Rectangle {
|
||||||
horizontalAlignment: Text.AlignLeft
|
horizontalAlignment: Text.AlignLeft
|
||||||
verticalAlignment: Text.AlignBottom
|
verticalAlignment: Text.AlignBottom
|
||||||
color: "#000000"
|
color: "#000000"
|
||||||
text: qsTr("2324.9239845")
|
text: root.unlockedBalanceText
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
5
main.qml
5
main.qml
|
@ -230,9 +230,8 @@ ApplicationWindow {
|
||||||
|
|
||||||
function onWalletUpdate() {
|
function onWalletUpdate() {
|
||||||
console.log(">>> wallet updated")
|
console.log(">>> wallet updated")
|
||||||
// basicPanel.unlockedBalanceText = leftPanel.unlockedBalanceText =
|
middlePanel.unlockedBalanceText = leftPanel.unlockedBalanceText = walletManager.displayAmount(currentWallet.unlockedBalance);
|
||||||
// walletManager.displayAmount(currentWallet.unlockedBalance);
|
middlePanel.balanceText = leftPanel.balanceText = walletManager.displayAmount(currentWallet.balance);
|
||||||
// basicPanel.balanceText = leftPanel.balanceText = walletManager.displayAmount(currentWallet.balance);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function onWalletRefresh() {
|
function onWalletRefresh() {
|
||||||
|
|
Loading…
Reference in a new issue