zcash-hackworks
/
bitcoin
mirror of https://github.com/zcash-hackworks/bitcoin.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

modified block DL progressbar to be dynamic and more precise

This commit is contained in:
Philip Kaufmann 2012-04-02 07:57:54 +02:00
parent 85ea8b4f43
commit 9ceae8acea
1 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/qt/bitcoingui.cpp
View File

@ -332,8 +332,12 @@ void BitcoinGUI::setClientModel(ClientModel *clientModel)
setNumConnections(clientModel->getNumConnections()); setNumConnections(clientModel->getNumConnections());
connect(clientModel, SIGNAL(numConnectionsChanged(int)), this, SLOT(setNumConnections(int))); connect(clientModel, SIGNAL(numConnectionsChanged(int)), this, SLOT(setNumConnections(int)));
setNumBlocks(clientModel->getNumBlocks()); // don't display the sync. message, if we are not connected to the network
connect(clientModel, SIGNAL(numBlocksChanged(int)), this, SLOT(setNumBlocks(int))); if (clientModel->getNumConnections() > 0)
{
setNumBlocks(clientModel->getNumBlocks());
connect(clientModel, SIGNAL(numBlocksChanged(int)), this, SLOT(setNumBlocks(int)));
}
// Report errors from network/worker thread // Report errors from network/worker thread
connect(clientModel, SIGNAL(error(QString,QString)), this, SLOT(error(QString,QString))); connect(clientModel, SIGNAL(error(QString,QString)), this, SLOT(error(QString,QString)));
@ -453,18 +457,33 @@ void BitcoinGUI::setNumBlocks(int count)
{ {
if(!clientModel) if(!clientModel)
return; return;
int total = clientModel->getNumBlocksOfPeers(); int nTotal = clientModel->getNumBlocksOfPeers();
int nInitTotal = clientModel->getNumBlocksAtStartup();
int nPercentageLeft = 100 - (count / (nTotal / 100));
QString tooltip; QString tooltip;
if(count < total) if(count < nTotal)
{ {
if (clientModel->getStatusBarWarnings() == "") if (clientModel->getStatusBarWarnings() == "")
{ {
progressBarLabel->setVisible(true); progressBarLabel->setVisible(true);
progressBarLabel->setText(tr("Synchronizing with network..."));
progressBar->setVisible(true); progressBar->setVisible(true);
progressBar->setMaximum(total); progressBar->setFormat(tr("%v of %m blocks (%p%)"));
progressBar->setValue(count); progressBar->setAlignment(Qt::AlignCenter);
// display absolute bar if the difference between count and nTotal is > 10%
if (nPercentageLeft > 10)
{
progressBarLabel->setText(tr("Synchronizing with network... (abs. display)"));
progressBar->setMaximum(nTotal);
progressBar->setValue(count);
}
else
{
progressBarLabel->setText(tr("Synchronizing with network... (rel. display)"));
progressBar->setMaximum(nTotal - nInitTotal);
progressBar->setValue(count - nInitTotal);
}
} }
else else
{ {
@ -472,7 +491,7 @@ void BitcoinGUI::setNumBlocks(int count)
progressBarLabel->setVisible(true); progressBarLabel->setVisible(true);
progressBar->setVisible(false); progressBar->setVisible(false);
} }
tooltip = tr("Downloaded %1 of %2 blocks of transaction history.").arg(count).arg(total); tooltip = tr("Downloaded %1 of %2 blocks of transaction history (%3% left).").arg(count).arg(nTotal).arg(nPercentageLeft);
} }
else else
{ {