Browse Source

Fix status bar not displaying Alerts.

pull/1/head
Matt Corallo 11 years ago
parent
commit
7ca47cece7
  1. 2
      src/qt/bitcoin.cpp
  2. 40
      src/qt/bitcoingui.cpp
  3. 2
      src/qt/bitcoingui.h
  4. 5
      src/qt/clientmodel.cpp
  5. 2
      src/qt/clientmodel.h

2
src/qt/bitcoin.cpp

@ -91,6 +91,8 @@ void UIThreadCall(boost::function0<void> fn) @@ -91,6 +91,8 @@ void UIThreadCall(boost::function0<void> fn)
void MainFrameRepaint()
{
if(guiref)
QMetaObject::invokeMethod(guiref, "refreshStatusBar", Qt::QueuedConnection);
}
void InitMessage(const std::string &message)

40
src/qt/bitcoingui.cpp

@ -2,6 +2,7 @@ @@ -2,6 +2,7 @@
* Qt4 bitcoin GUI.
*
* W.J. van der Laan 2011
* The Bitcoin Developers 2011
*/
#include "bitcoingui.h"
#include "transactiontablemodel.h"
@ -417,15 +418,31 @@ void BitcoinGUI::setNumBlocks(int count) @@ -417,15 +418,31 @@ void BitcoinGUI::setNumBlocks(int count)
if(count < total)
{
progressBarLabel->setVisible(true);
progressBar->setVisible(true);
progressBar->setMaximum(total - initTotal);
progressBar->setValue(count - initTotal);
if (clientModel->getStatusBarWarnings() == "")
{
progressBarLabel->setVisible(true);
progressBarLabel->setText(tr("Synchronizing with network..."));
progressBar->setVisible(true);
progressBar->setMaximum(total - initTotal);
progressBar->setValue(count - initTotal);
}
else
{
progressBarLabel->setText(clientModel->getStatusBarWarnings());
progressBarLabel->setVisible(true);
progressBar->setVisible(false);
}
tooltip = tr("Downloaded %1 of %2 blocks of transaction history.").arg(count).arg(total);
}
else
{
progressBarLabel->setVisible(false);
if (clientModel->getStatusBarWarnings() == "")
progressBarLabel->setVisible(false);
else
{
progressBarLabel->setText(clientModel->getStatusBarWarnings());
progressBarLabel->setVisible(true);
}
progressBar->setVisible(false);
tooltip = tr("Downloaded %1 blocks of transaction history.").arg(count);
}
@ -474,6 +491,19 @@ void BitcoinGUI::setNumBlocks(int count) @@ -474,6 +491,19 @@ void BitcoinGUI::setNumBlocks(int count)
progressBar->setToolTip(tooltip);
}
void BitcoinGUI::refreshStatusBar()
{
/* Might display multiple times in the case of multiple alerts
static QString prevStatusBar;
QString newStatusBar = clientModel->getStatusBarWarnings();
if (prevStatusBar != newStatusBar)
{
prevStatusBar = newStatusBar;
error(tr("Network Alert"), newStatusBar);
}*/
setNumBlocks(clientModel->getNumBlocks());
}
void BitcoinGUI::error(const QString &title, const QString &message)
{
// Report errors from network/worker thread

2
src/qt/bitcoingui.h

@ -108,6 +108,8 @@ public slots: @@ -108,6 +108,8 @@ public slots:
@see WalletModel::EncryptionStatus
*/
void setEncryptionStatus(int status);
/** Set the status bar text if there are any warnings (removes sync progress bar if applicable) */
void refreshStatusBar();
/** Notify the user of an error in the network or transaction handling code. */
void error(const QString &title, const QString &message);

5
src/qt/clientmodel.cpp

@ -72,6 +72,11 @@ int ClientModel::getNumBlocksOfPeers() const @@ -72,6 +72,11 @@ int ClientModel::getNumBlocksOfPeers() const
return GetNumBlocksOfPeers();
}
QString ClientModel::getStatusBarWarnings() const
{
return QString::fromStdString(GetWarnings("statusbar"));
}
OptionsModel *ClientModel::getOptionsModel()
{
return optionsModel;

2
src/qt/clientmodel.h

@ -33,6 +33,8 @@ public: @@ -33,6 +33,8 @@ public:
bool inInitialBlockDownload() const;
//! Return conservative estimate of total number of blocks, or 0 if unknown
int getNumBlocksOfPeers() const;
//! Return warnings to be displayed in status bar
QString getStatusBarWarnings() const;
QString formatFullVersion() const;

Loading…
Cancel
Save