mirror of
https://github.com/dashpay/dash.git
synced 2024-12-25 12:02:48 +01:00
Merge #9461: [Qt] Improve progress display during headers-sync and peer-finding
40ec7c7
[Qt] Improve progress display during headers-sync and peer-finding (Jonas Schnelli)
This commit is contained in:
commit
b25068697f
@ -748,6 +748,15 @@ void BitcoinGUI::setNetworkActive(bool networkActive)
|
||||
updateNetworkState();
|
||||
}
|
||||
|
||||
void BitcoinGUI::updateHeadersSyncProgressLabel()
|
||||
{
|
||||
int64_t headersTipTime = clientModel->getHeaderTipTime();
|
||||
int headersTipHeight = clientModel->getHeaderTipHeight();
|
||||
int estHeadersLeft = (GetTime() - headersTipTime)/600;
|
||||
if (estHeadersLeft > REQ_HEADER_HEIGHT_DELTA_SYNC)
|
||||
progressBarLabel->setText(tr("Syncing Headers (%1%)...").arg(QString::number(100.0 / (headersTipHeight+estHeadersLeft)*headersTipHeight, 'f', 1)));
|
||||
}
|
||||
|
||||
void BitcoinGUI::setNumBlocks(int count, const QDateTime& blockDate, double nVerificationProgress, bool header)
|
||||
{
|
||||
if (modalOverlay)
|
||||
@ -768,9 +777,11 @@ void BitcoinGUI::setNumBlocks(int count, const QDateTime& blockDate, double nVer
|
||||
switch (blockSource) {
|
||||
case BLOCK_SOURCE_NETWORK:
|
||||
if (header) {
|
||||
updateHeadersSyncProgressLabel();
|
||||
return;
|
||||
}
|
||||
progressBarLabel->setText(tr("Synchronizing with network..."));
|
||||
updateHeadersSyncProgressLabel();
|
||||
break;
|
||||
case BLOCK_SOURCE_DISK:
|
||||
if (header) {
|
||||
@ -786,8 +797,7 @@ void BitcoinGUI::setNumBlocks(int count, const QDateTime& blockDate, double nVer
|
||||
if (header) {
|
||||
return;
|
||||
}
|
||||
// Case: not Importing, not Reindexing and no network connection
|
||||
progressBarLabel->setText(tr("No block source available..."));
|
||||
progressBarLabel->setText(tr("Connecting to peers..."));
|
||||
break;
|
||||
}
|
||||
|
||||
|
@ -149,6 +149,8 @@ private:
|
||||
/** Update UI with latest network info from model. */
|
||||
void updateNetworkState();
|
||||
|
||||
void updateHeadersSyncProgressLabel();
|
||||
|
||||
Q_SIGNALS:
|
||||
/** Signal raised when a URI was entered or dragged to the GUI */
|
||||
void receivedURI(const QString &uri);
|
||||
|
@ -66,7 +66,7 @@ public:
|
||||
|
||||
//! Return true if core is doing initial block download
|
||||
bool inInitialBlockDownload() const;
|
||||
//! Return true if core is importing blocks
|
||||
//! Returns enum BlockSource of the current importing/syncing state
|
||||
enum BlockSource getBlockSource() const;
|
||||
//! Return true if network activity in core is enabled
|
||||
bool getNetworkActive() const;
|
||||
|
@ -8,6 +8,9 @@
|
||||
#include <QDateTime>
|
||||
#include <QWidget>
|
||||
|
||||
//! The required delta of headers to the estimated number of available headers until we show the IBD progress
|
||||
static const int REQ_HEADER_HEIGHT_DELTA_SYNC = 24;
|
||||
|
||||
namespace Ui {
|
||||
class ModalOverlay;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user