Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

In UI, handle cases in which the last received block was generated in…

… the future (secs<0)

Fixes #874.
  • Loading branch information...
commit 71ba9abba6f5583a661b514b8d2eb1909e8c0ab5 1 parent f7b8f82
@laanwj authored
Showing with 11 additions and 4 deletions.
  1. +11 −4 src/qt/bitcoingui.cpp
View
15 src/qt/bitcoingui.cpp
@@ -505,7 +505,11 @@ void BitcoinGUI::setNumBlocks(int count)
QString text;
// Represent time from last generated block in human readable text
- if(secs < 60)
+ if(secs <= 0)
+ {
+ // Fully up to date. Leave text empty.
+ }
+ else if(secs < 60)
{
text = tr("%n second(s) ago","",secs);
}
@@ -525,7 +529,7 @@ void BitcoinGUI::setNumBlocks(int count)
// Set icon state: spinning if catching up, tick otherwise
if(secs < 30*60)
{
- tooltip = tr("Up to date") + QString("\n") + tooltip;
+ tooltip = tr("Up to date") + QString(".\n") + tooltip;
labelBlocksIcon->setPixmap(QIcon(":/icons/synced").pixmap(STATUSBAR_ICONSIZE,STATUSBAR_ICONSIZE));
}
else
@@ -535,8 +539,11 @@ void BitcoinGUI::setNumBlocks(int count)
syncIconMovie->start();
}
- tooltip += QString("\n");
- tooltip += tr("Last received block was generated %1.").arg(text);
+ if(!text.isEmpty())
+ {
+ tooltip += QString("\n");
+ tooltip += tr("Last received block was generated %1.").arg(text);
+ }
labelBlocksIcon->setToolTip(tooltip);
progressBarLabel->setToolTip(tooltip);
Please sign in to comment.
Something went wrong with that request. Please try again.