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:
commit
0606f95b1e
1 changed files with 5 additions and 3 deletions
|
@ -4633,6 +4633,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";
|
||||||
|
@ -4645,18 +4646,19 @@ std::string GetWarnings(const std::string& strFor)
|
||||||
// Misc warnings like out of disk space and clock is wrong
|
// Misc warnings like out of disk space and clock is wrong
|
||||||
if (strMiscWarning != "")
|
if (strMiscWarning != "")
|
||||||
{
|
{
|
||||||
strStatusBar = strGUI = strMiscWarning;
|
strStatusBar = strMiscWarning;
|
||||||
|
strGUI += (strGUI.empty() ? "" : uiAlertSeperator) + strMiscWarning;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (fLargeWorkForkFound)
|
if (fLargeWorkForkFound)
|
||||||
{
|
{
|
||||||
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)
|
||||||
{
|
{
|
||||||
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.");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (strFor == "gui")
|
if (strFor == "gui")
|
||||||
|
|
Loading…
Reference in a new issue