From d65b74f9b2549cfd16c5d963b4fea25e6d642f70 Mon Sep 17 00:00:00 2001 From: random-zebra Date: Fri, 13 Mar 2020 10:44:34 +0100 Subject: [PATCH] Merge #1396: [GUI] Topbar MNs sync phase status. 70e009f921b24ff2115587a528551c22cef8dcd0 [GUI] Improving topbar MNs sync status text. (furszy) Pull request description: Straightforward change, adding the masternodes sync phase status to the topbar sync text. ACKs for top commit: random-zebra: utACK 70e009f921b24ff2115587a528551c22cef8dcd0 Fuzzbawls: utACK 70e009f921b24ff2115587a528551c22cef8dcd0 Tree-SHA512: 1b79d645ae74e3bcffea990f9a7d32c31ec1bb755f1844720717fd5e1bf0418da85f4585ec9a67b73a7debdfb1896cf8163d1eceffca30d110ccb5ff452ba530 --- src/masternode-sync.cpp | 2 +- src/qt/pivx/topbar.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/masternode-sync.cpp b/src/masternode-sync.cpp index e18dfa444c92f..a2f5a420c4575 100644 --- a/src/masternode-sync.cpp +++ b/src/masternode-sync.cpp @@ -185,7 +185,7 @@ std::string CMasternodeSync::GetSyncStatus() { switch (masternodeSync.RequestedMasternodeAssets) { case MASTERNODE_SYNC_INITIAL: - return _("Synchronization pending..."); + return _("MNs synchronization pending..."); case MASTERNODE_SYNC_SPORKS: return _("Synchronizing sporks..."); case MASTERNODE_SYNC_LIST: diff --git a/src/qt/pivx/topbar.cpp b/src/qt/pivx/topbar.cpp index f9611da26a8c1..ebaa936c0303e 100644 --- a/src/qt/pivx/topbar.cpp +++ b/src/qt/pivx/topbar.cpp @@ -429,7 +429,7 @@ void TopBar::setNumBlocks(int count) { int progress = nAttempt + (masternodeSync.RequestedMasternodeAssets - 1) * MASTERNODE_SYNC_THRESHOLD; if(progress >= 0){ // todo: MN progress.. - text = strprintf("Synchronizing masternodes data... - Block: %d", count); + text = strprintf("%s - Block: %d", masternodeSync.GetSyncStatus(), count); //progressBar->setMaximum(4 * MASTERNODE_SYNC_THRESHOLD); //progressBar->setValue(progress); needState = false;