Mercurial > hg > bitcoin

changeset 1195:a2e4d7598a5a draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix "Last received block was generated Up to date"
author Wladimir J. van der Laan <laanwj@gmail.com>
date Mon, 18 Jul 2011 06:55:05 +0200
parents 2b80b48286fb
children 9f1d168ffa13
files src/qt/bitcoingui.cpp
diffstat 1 files changed, 14 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/src/qt/bitcoingui.cpp
+++ b/src/qt/bitcoingui.cpp
@@ -334,13 +334,11 @@
     QDateTime lastBlockDate = clientModel->getLastBlockDate();
     int secs = lastBlockDate.secsTo(now);
     QString text;
-    bool spinning = true;
 
-    // "Up to date" icon, and outdated icon
-    if(secs < 30*60)
+    // Represent time from last generated block in human readable text
+    if(secs < 60)
     {
-        text = "Up to date";
-        spinning = false;
+        text = tr("%n second(s) ago","",secs);
     }
     else if(secs < 60*60)
     {
@@ -354,6 +352,16 @@
     {
         text = tr("%n day(s) ago","",secs/(60*60*24));
     }
+
+    // In the label we want to be less specific
+    QString labelText = text;
+    bool spinning = true;
+    if(secs < 30*60)
+    {
+        labelText = "Up to date";
+        spinning = false;
+    }
+
     tooltip += QString("\n");
     tooltip += tr("Last received block was generated %1.").arg(text);
 
@@ -366,7 +374,7 @@
     {
         labelBlocksIcon->setPixmap(QIcon(":/icons/synced").pixmap(16,16));
     }
-    labelBlocks->setText(text);
+    labelBlocks->setText(labelText);
 
     labelBlocksIcon->setToolTip(tooltip);
     labelBlocks->setToolTip(tooltip);