From ee6dd2ec56a8b4e426dc3d96a8824d377d43934e Mon Sep 17 00:00:00 2001 From: Jaquee Date: Tue, 20 Mar 2018 19:19:30 +0100 Subject: progress bar improvements --- components/ProgressBar.qml | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) (limited to 'components') diff --git a/components/ProgressBar.qml b/components/ProgressBar.qml index cf5b3a12..04b92b3a 100644 --- a/components/ProgressBar.qml +++ b/components/ProgressBar.qml @@ -37,27 +37,16 @@ Rectangle { color: "#1C1C1C" function updateProgress(currentBlock,targetBlock, blocksToSync, statusTxt){ - if(targetBlock == 1) { - fillLevel = 0 - progressText.text = qsTr("Establishing connection..."); - progressBar.visible = true - return - } - if(targetBlock > 0) { var remaining = (currentBlock < targetBlock) ? targetBlock - currentBlock : 0 - var progressLevel = (blocksToSync > 0) ? (100*(blocksToSync - remaining)/blocksToSync).toFixed(0) : 100 + var progressLevel = (blocksToSync > 0 && blocksToSync != remaining) ? (100*(blocksToSync - remaining)/blocksToSync).toFixed(0) : 100*(currentBlock / targetBlock).toFixed(0) fillLevel = progressLevel if(typeof statusTxt != "undefined" && statusTxt != "") { progressText.text = statusTxt; } else { progressText.text = syncText + remaining.toFixed(0); } - } - - if(remaining == 0 && (typeof statusTxt == "undefined" || statusTxt == "")) - progressText.text = qsTr("%1 is synchronized").arg(syncType) } Item { -- cgit v1.2.3