Merge #7579: [Qt] show network/chain errors in the GUI

2f32c82 [Qt] show network/chain errors in the GUI (Jonas Schnelli)
This commit is contained in:
Jonas Schnelli 2016-08-25 14:55:22 +02:00 committed by Alexander Block
parent 909945d34d
commit 3fca7e2044

View File

@ -4374,6 +4374,7 @@ std::string GetWarnings(const std::string& strFor)
string strStatusBar; string strStatusBar;
string strRPC; string strRPC;
string strGUI; string strGUI;
const string uiAlertSeperator = "<hr />";
if (!CLIENT_VERSION_IS_RELEASE) { if (!CLIENT_VERSION_IS_RELEASE) {
strStatusBar = "This is a pre-release test build - use at your own risk - do not use for mining or merchant applications"; strStatusBar = "This is a pre-release test build - use at your own risk - do not use for mining or merchant applications";
@ -4387,20 +4388,21 @@ std::string GetWarnings(const std::string& strFor)
if (strMiscWarning != "") if (strMiscWarning != "")
{ {
nPriority = 1000; nPriority = 1000;
strStatusBar = strGUI = strMiscWarning; strStatusBar = strMiscWarning;
strGUI += (strGUI.empty() ? "" : uiAlertSeperator) + strMiscWarning;
} }
if (fLargeWorkForkFound) if (fLargeWorkForkFound)
{ {
nPriority = 2000; nPriority = 2000;
strStatusBar = strRPC = "Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues."; strStatusBar = strRPC = "Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.";
strGUI = _("Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues."); strGUI += strGUI.empty() ? "" : uiAlertSeperator + _("Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.");
} }
else if (fLargeWorkInvalidChainFound) else if (fLargeWorkInvalidChainFound)
{ {
nPriority = 2000; nPriority = 2000;
strStatusBar = strRPC = "Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade."; strStatusBar = strRPC = "Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.";
strGUI = _("Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade."); strGUI += strGUI.empty() ? "" : uiAlertSeperator + _("Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.");
} }
// Alerts // Alerts