Permalink
Browse files

Update for 53c1670

  • Loading branch information...
Tranz5 committed Oct 16, 2014
1 parent 53c1670 commit fa9a1769ed70e6feba34f286c2230325ed215341
Showing with 3 additions and 15 deletions.
  1. +1 −0 src/net.cpp
  2. +1 −14 src/qt/bitcoingui.cpp
  3. +1 −1 src/qt/guiconstants.h
@@ -1096,6 +1096,7 @@ void ThreadSocketHandler2(void* parg)
BOOST_FOREACH(CNode* pnode, vNodesCopy)
pnode->Release();
}
MilliSleep(10);
}
}
@@ -797,20 +797,10 @@ void BitcoinGUI::setNumBlocks(int count, int nTotalBlocks)
// Prevent orphan statusbar messages (e.g. hover Quit in main menu, wait until chain-sync starts -> garbelled text)
statusBar()->clearMessage();
// don't show / hide progress bar and its label if we have no connection to the network
enum BlockSource blockSource = clientModel ? clientModel->getBlockSource() : BLOCK_SOURCE_NONE;
if (blockSource == BLOCK_SOURCE_NONE || (blockSource == BLOCK_SOURCE_NETWORK && clientModel->getNumConnections() == 0))
{
progressBarLabel->setVisible(false);
progressBar->setVisible(false);
return;
}
bool fShowStatusBar = false;
QString tooltip;
QString importText;
switch (blockSource) {
case BLOCK_SOURCE_NONE:
case BLOCK_SOURCE_NETWORK:
@@ -858,7 +848,6 @@ void BitcoinGUI::setNumBlocks(int count, int nTotalBlocks)
progressBar->setMaximum(totalSecs);
progressBar->setValue(totalSecs - secs);
progressBar->setVisible(true);
fShowStatusBar = true;
tooltip = tr("Catching up...") + QString("<br>") + tooltip;
labelBlocksIcon->setMovie(syncIconMovie);
@@ -880,8 +869,6 @@ void BitcoinGUI::setNumBlocks(int count, int nTotalBlocks)
labelBlocksIcon->setToolTip(tooltip);
progressBarLabel->setToolTip(tooltip);
progressBar->setToolTip(tooltip);
statusBar()->setVisible(fShowStatusBar);
}
void BitcoinGUI::message(const QString &title, const QString &message, unsigned int style, const QString &detail)
@@ -2,7 +2,7 @@
#define GUICONSTANTS_H
/* Milliseconds between model updates */
static const int MODEL_UPDATE_DELAY = 250;
static const int MODEL_UPDATE_DELAY = 100;
/* AskPassphraseDialog -- Maximum passphrase length */
static const int MAX_PASSPHRASE_SIZE = 1024;

0 comments on commit fa9a176

Please sign in to comment.