github/monero-gui
1
Fork 0
mirror of https://github.com/monero-project/monero-gui synced 2024-11-25 10:47:19 +01:00
Code Releases Activity

wallet sync: progressbar ui improvements

Browse Source
This commit is contained in:
Jaquee 2017-02-24 21:51:37 +01:00
parent 2d6ddf043e
commit 3adeab87ed
No known key found for this signature in database
GPG Key ID: 384E52B09F45DC39
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
components/ProgressBar.qml
View File

@ -37,7 +37,7 @@ Item {
visible: false visible: false
//clip: true //clip: true
function updateProgress(currentBlock,targetBlock){ function updateProgress(currentBlock,targetBlock, blocksToSync){
if(targetBlock == 1) { if(targetBlock == 1) {
fillLevel = 0 fillLevel = 0
progressText.text = qsTr("Establishing connection..."); progressText.text = qsTr("Establishing connection...");
@ -46,9 +46,15 @@ Item {
} }
if(targetBlock > 0) { if(targetBlock > 0) {
var progressLevel = ((currentBlock/targetBlock) * 100).toFixed(0); var remaining = targetBlock - currentBlock
// wallet sync
if(blocksToSync > 0)
var progressLevel = (100*(blocksToSync - remaining)/blocksToSync).toFixed(0);
// Daemon sync
else
var progressLevel = (100*(currentBlock/targetBlock)).toFixed(0);
fillLevel = progressLevel fillLevel = progressLevel
progressText.text = qsTr("Synchronizing blocks %1/%2").arg(currentBlock.toFixed(0)).arg(targetBlock.toFixed(0)); progressText.text = qsTr("Blocks remaining: %1").arg(remaining.toFixed(0));
progressBar.visible = currentBlock < targetBlock progressBar.visible = currentBlock < targetBlock
} }
} }

8
main.qml
View File

@ -66,6 +66,7 @@ ApplicationWindow {
property bool foundNewBlock: false property bool foundNewBlock: false
property int timeToUnlock: 0 property int timeToUnlock: 0
property bool qrScannerEnabled: builtWithScanner && (QtMultimedia.availableCameras.length > 0) property bool qrScannerEnabled: builtWithScanner && (QtMultimedia.availableCameras.length > 0)
property int blocksToSync: 1
// true if wallet ever synchronized // true if wallet ever synchronized
property bool walletInitialized : false property bool walletInitialized : false
@ -408,7 +409,12 @@ ApplicationWindow {
function onWalletNewBlock(blockHeight, targetHeight) { function onWalletNewBlock(blockHeight, targetHeight) {
// Update progress bar // Update progress bar
leftPanel.progressBar.updateProgress(blockHeight,targetHeight); var remaining = targetHeight - blockHeight;
if(blocksToSync < remaining) {
blocksToSync = remaining;
}
leftPanel.progressBar.updateProgress(blockHeight,targetHeight, blocksToSync);
foundNewBlock = true; foundNewBlock = true;
} }