move refresh progress to leftpanel

This commit is contained in:
Jaquee
2016-12-14 13:48:12 +01:00
parent 47edfd7211
commit 705bc83ae1
4 changed files with 10 additions and 20 deletions

View File

@@ -300,7 +300,7 @@ ApplicationWindow {
// Daemon fully synced
// 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.daemonProgress.updateProgress(dCurrentBlock,dTargetBlock);
leftPanel.progressBar.updateProgress(dCurrentBlock,dTargetBlock);
middlePanel.updateStatus();
// If wallet isnt connected and no daemon is running - Ask
@@ -351,27 +351,22 @@ ApplicationWindow {
}
function onDaemonStopped(){
console.log("daemon stopped");
hideProcessingSplash();
daemonRunning = false;
}
function onWalletNewBlock(blockHeight) {
if (splash.visible) {
var currHeight = blockHeight
// Update progress bar
var currHeight = blockHeight
//fast refresh until restoreHeight is reached
var increment = ((restoreHeight == 0) || currHeight < restoreHeight)? 1000 : 10
if(currHeight > splashCounter + increment){
splashCounter = currHeight
var locale = Qt.locale()
var currHeightString = currHeight.toLocaleString(locale,"f",0)
var targetHeightString = currentWallet.daemonBlockChainTargetHeight().toLocaleString(locale,"f",0)
var progressText = qsTr("Synchronizing blocks %1 / %2").arg(currHeightString).arg(targetHeightString);
console.log("Progress text: " + progressText);
splash.heightProgressText = progressText
leftPanel.progressBar.updateProgress(currHeight,currentWallet.daemonBlockChainTargetHeight());
}
}
}
function onWalletMoneyReceived(txId, amount) {