mirror of
https://github.com/monero-project/monero-gui.git
synced 2024-12-23 12:09:57 +00:00
Merge pull request #375
192bfc7
Add "(syncing)" after balance when syncing (moneromooo.monero)
This commit is contained in:
commit
24170f00cc
3 changed files with 12 additions and 2 deletions
|
@ -35,6 +35,7 @@ Rectangle {
|
|||
id: panel
|
||||
|
||||
property alias unlockedBalanceText: unlockedBalanceText.text
|
||||
property alias balanceLabelText: balanceLabel.text
|
||||
property alias balanceText: balanceText.text
|
||||
property alias networkStatus : networkStatus
|
||||
property alias progressBar : progressBar
|
||||
|
@ -109,6 +110,7 @@ Rectangle {
|
|||
spacing: 5
|
||||
|
||||
Label {
|
||||
id: balanceLabel
|
||||
text: qsTr("Balance") + translationManager.emptyString
|
||||
anchors.left: parent.left
|
||||
anchors.leftMargin: 50
|
||||
|
|
|
@ -42,6 +42,7 @@ Rectangle {
|
|||
property Item currentView
|
||||
property Item previousView
|
||||
property bool basicMode : false
|
||||
property string balanceLabelText: qsTr("Balance")
|
||||
property string balanceText
|
||||
property string unlockedBalanceText
|
||||
|
||||
|
@ -198,7 +199,7 @@ Rectangle {
|
|||
columns: 3
|
||||
|
||||
Text {
|
||||
|
||||
id: balanceLabel
|
||||
width: 116
|
||||
height: 20
|
||||
font.family: "Arial"
|
||||
|
@ -208,7 +209,7 @@ Rectangle {
|
|||
horizontalAlignment: Text.AlignLeft
|
||||
verticalAlignment: Text.AlignBottom
|
||||
color: "#535353"
|
||||
text: qsTr("Balance:")
|
||||
text: root.balanceLabelText + ":"
|
||||
}
|
||||
|
||||
Text {
|
||||
|
|
7
main.qml
7
main.qml
|
@ -221,6 +221,7 @@ ApplicationWindow {
|
|||
function connectWallet(wallet) {
|
||||
showProcessingSplash("Please wait...")
|
||||
currentWallet = wallet
|
||||
updateSyncing(false)
|
||||
|
||||
// connect handlers
|
||||
currentWallet.refreshed.connect(onWalletRefresh)
|
||||
|
@ -309,6 +310,7 @@ ApplicationWindow {
|
|||
// TODO: implement onDaemonSynced or similar in wallet API and don't start refresh thread before daemon is synced
|
||||
daemonSynced = (currentWallet.connected != Wallet.ConnectionStatus_Disconnected && dCurrentBlock >= dTargetBlock)
|
||||
leftPanel.progressBar.updateProgress(dCurrentBlock,dTargetBlock);
|
||||
updateSyncing((currentWallet.connected !== Wallet.ConnectionStatus_Disconnected) && (dCurrentBlock < dTargetBlock))
|
||||
middlePanel.updateStatus();
|
||||
|
||||
// If wallet isnt connected and no daemon is running - Ask
|
||||
|
@ -617,6 +619,11 @@ ApplicationWindow {
|
|||
informationPopup.open()
|
||||
}
|
||||
|
||||
function updateSyncing(syncing) {
|
||||
var text = (syncing ? qsTr("Balance (syncing)") : qsTr("Balance")) + translationManager.emptyString
|
||||
leftPanel.balanceLabelText = text
|
||||
middlePanel.balanceLabelText = text
|
||||
}
|
||||
|
||||
// blocks UI if wallet can't be opened or no connection to the daemon
|
||||
function enableUI(enable) {
|
||||
|
|
Loading…
Reference in a new issue