Mercurial > hg > bitcoin

changeset 2133:c8a78772bd37 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
modified block DL progressbar to be dynamic and more precise
author Philip Kaufmann <phil.kaufmann@t-online.de>
date Mon, 02 Apr 2012 07:57:54 +0200
parents f8c9f3f82636
children 9c83da616250
files src/qt/bitcoingui.cpp
diffstat 1 files changed, 27 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/src/qt/bitcoingui.cpp
+++ b/src/qt/bitcoingui.cpp
@@ -332,8 +332,12 @@
         setNumConnections(clientModel->getNumConnections());
         connect(clientModel, SIGNAL(numConnectionsChanged(int)), this, SLOT(setNumConnections(int)));
 
-        setNumBlocks(clientModel->getNumBlocks());
-        connect(clientModel, SIGNAL(numBlocksChanged(int)), this, SLOT(setNumBlocks(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)));
+        }
 
         // Report errors from network/worker thread
         connect(clientModel, SIGNAL(error(QString,QString)), this, SLOT(error(QString,QString)));
@@ -453,18 +457,33 @@
 {
     if(!clientModel)
         return;
-    int total = clientModel->getNumBlocksOfPeers();
+    int nTotal = clientModel->getNumBlocksOfPeers();
+    int nInitTotal = clientModel->getNumBlocksAtStartup();
+    int nPercentageLeft = 100 - (count / (nTotal / 100));
     QString tooltip;
 
-    if(count < total)
+    if(count < nTotal)
     {
         if (clientModel->getStatusBarWarnings() == "")
         {
             progressBarLabel->setVisible(true);
-            progressBarLabel->setText(tr("Synchronizing with network..."));
             progressBar->setVisible(true);
-            progressBar->setMaximum(total);
-            progressBar->setValue(count);
+            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);
+            }
+
         }
         else
         {
@@ -472,7 +491,7 @@
             progressBarLabel->setVisible(true);
             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
     {