diff options
author | Philip Kaufmann <phil.kaufmann@t-online.de> | 2012-04-02 10:18:51 +0200 |
---|---|---|
committer | Philip Kaufmann <phil.kaufmann@t-online.de> | 2012-04-02 23:48:22 +0200 |
commit | 068ed1e8384dd0e12ef68c0dc91c7064b6aae8ec (patch) | |
tree | fbb876ba4c8e5f73c79b91acf429f6750c921eb0 /src/qt/bitcoingui.cpp | |
parent | 9ceae8acea658d3e9d6bfe851e0d904c191c6f81 (diff) | |
download | bitcoin-068ed1e8384dd0e12ef68c0dc91c7064b6aae8ec.tar.xz |
removed relative progressbar display and moved re-worked network detection code to setNumBlocks()
Diffstat (limited to 'src/qt/bitcoingui.cpp')
-rw-r--r-- | src/qt/bitcoingui.cpp | 35 |
1 files changed, 13 insertions, 22 deletions
diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp index 464fb8c482..c8294cfe3d 100644 --- a/src/qt/bitcoingui.cpp +++ b/src/qt/bitcoingui.cpp @@ -332,12 +332,8 @@ void BitcoinGUI::setClientModel(ClientModel *clientModel) setNumConnections(clientModel->getNumConnections()); connect(clientModel, SIGNAL(numConnectionsChanged(int)), this, SLOT(setNumConnections(int))); - // don't display the sync. message, if we are not connected to the network - if (clientModel->getNumConnections() > 0) - { - setNumBlocks(clientModel->getNumBlocks()); - connect(clientModel, SIGNAL(numBlocksChanged(int)), this, SLOT(setNumBlocks(int))); - } + setNumBlocks(clientModel->getNumBlocks()); + connect(clientModel, SIGNAL(numBlocksChanged(int)), this, SLOT(setNumBlocks(int))); // Report errors from network/worker thread connect(clientModel, SIGNAL(error(QString,QString)), this, SLOT(error(QString,QString))); @@ -455,10 +451,16 @@ void BitcoinGUI::setNumConnections(int count) void BitcoinGUI::setNumBlocks(int count) { - if(!clientModel) + // don't show / hide progressBar and it's label if we have no connection(s) to the network + if (!clientModel || clientModel->getNumConnections() == 0) + { + progressBarLabel->setVisible(false); + progressBar->setVisible(false); + return; + } + int nTotal = clientModel->getNumBlocksOfPeers(); - int nInitTotal = clientModel->getNumBlocksAtStartup(); int nPercentageLeft = 100 - (count / (nTotal / 100)); QString tooltip; @@ -467,23 +469,12 @@ void BitcoinGUI::setNumBlocks(int count) if (clientModel->getStatusBarWarnings() == "") { progressBarLabel->setVisible(true); + progressBarLabel->setText(tr("Synchronizing with network...")); progressBar->setVisible(true); progressBar->setFormat(tr("%v of %m blocks (%p%)")); 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); - } - + progressBar->setMaximum(nTotal); + progressBar->setValue(count); } else { |