diff options
| author | Riccardo Spagni <ric@spagni.net> | 2017-01-08 16:56:17 -0800 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2017-01-08 16:56:17 -0800 |
| commit | 24170f00ccf38ca64f766c78c76dc80900cb1533 (patch) | |
| tree | d99da135c7dd640382c47dd26f4c9e9f64e59bfe | |
| parent | b3424f73a8c37fcde011bd40b60ff5de1a0788fa (diff) | |
| parent | 192bfc70b0a45ec93e6cbfe4b04afa9d41009c0d (diff) | |
| download | monzero-gui-24170f00ccf38ca64f766c78c76dc80900cb1533.tar.gz monzero-gui-24170f00ccf38ca64f766c78c76dc80900cb1533.tar.xz monzero-gui-24170f00ccf38ca64f766c78c76dc80900cb1533.zip | |
Merge pull request #375
192bfc7 Add "(syncing)" after balance when syncing (moneromooo.monero)
| -rw-r--r-- | LeftPanel.qml | 2 | ||||
| -rw-r--r-- | MiddlePanel.qml | 5 | ||||
| -rw-r--r-- | main.qml | 7 |
3 files changed, 12 insertions, 2 deletions
diff --git a/LeftPanel.qml b/LeftPanel.qml index b42f6d81..3f5c7dee 100644 --- a/LeftPanel.qml +++ b/LeftPanel.qml @@ -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 diff --git a/MiddlePanel.qml b/MiddlePanel.qml index b21da0c0..94ecc17e 100644 --- a/MiddlePanel.qml +++ b/MiddlePanel.qml @@ -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 { @@ -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) { |