mirror of
https://github.com/dashpay/dash.git
synced 2024-12-25 12:02:48 +01:00
93f168eee3
f724f31401b963c75bd64f5e2c5b9d9561a9a9dd Make AbortNode() aware of MSG_NOPREFIX flag (Hennadii Stepanov) 96fd4ee02f6c3be21cade729b95a85c60634b0f8 Add MSG_NOPREFIX flag for user messages (Hennadii Stepanov) f0641f274ffe94fbe7cae43c07a9373013739df2 Prepend the error/warning prefix for GUI messages (Hennadii Stepanov) Pull request description: The "Error" prefix/title is set already in the next functions: - `noui_ThreadSafeMessageBox()`2068f089c8/src/noui.cpp (L17)- `ThreadSafeMessageBox()`a720a98301/src/qt/bitcoingui.cpp (L1351)Currently on master:  With this PR:  ACKs for top commit: laanwj: concept and code-review ACK f724f31401b963c75bd64f5e2c5b9d9561a9a9dd Tree-SHA512: 218a179b81cc2ac64239d833c02b4c4d4da9b976728a2dcd645966726c4c660b6f1fe43aa28f33d1cb566785a4329e7f93bf5a502bf202316db79d2ff5fce0f8
102 lines
3.3 KiB
C++
102 lines
3.3 KiB
C++
// Copyright (c) 2010 Satoshi Nakamoto
|
|
// Copyright (c) 2009-2014 The Bitcoin Core developers
|
|
// Copyright (c) 2014-2020 The Dash Core developers
|
|
// Distributed under the MIT software license, see the accompanying
|
|
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
|
|
|
#include <noui.h>
|
|
|
|
#include <ui_interface.h>
|
|
#include <util/system.h>
|
|
|
|
#include <cstdio>
|
|
#include <stdint.h>
|
|
#include <string>
|
|
|
|
#include <boost/signals2/connection.hpp>
|
|
#include <boost/signals2/signal.hpp>
|
|
|
|
/** Store connections so we can disconnect them when suppressing output */
|
|
boost::signals2::connection noui_ThreadSafeMessageBoxConn;
|
|
boost::signals2::connection noui_ThreadSafeQuestionConn;
|
|
boost::signals2::connection noui_InitMessageConn;
|
|
|
|
bool noui_ThreadSafeMessageBox(const std::string& message, const std::string& caption, unsigned int style)
|
|
{
|
|
bool fSecure = style & CClientUIInterface::SECURE;
|
|
style &= ~CClientUIInterface::SECURE;
|
|
bool prefix = !(style & CClientUIInterface::MSG_NOPREFIX);
|
|
style &= ~CClientUIInterface::MSG_NOPREFIX;
|
|
|
|
std::string strCaption;
|
|
if (prefix) {
|
|
switch (style) {
|
|
case CClientUIInterface::MSG_ERROR:
|
|
strCaption = "Error: ";
|
|
break;
|
|
case CClientUIInterface::MSG_WARNING:
|
|
strCaption = "Warning: ";
|
|
break;
|
|
case CClientUIInterface::MSG_INFORMATION:
|
|
strCaption = "Information: ";
|
|
break;
|
|
default:
|
|
strCaption = caption + ": "; // Use supplied caption (can be empty)
|
|
}
|
|
}
|
|
|
|
if (!fSecure) {
|
|
LogPrintf("%s%s\n", strCaption, message);
|
|
}
|
|
tfm::format(std::cerr, "%s%s\n", strCaption.c_str(), message.c_str());
|
|
return false;
|
|
}
|
|
|
|
bool noui_ThreadSafeQuestion(const std::string& /* ignored interactive message */, const std::string& message, const std::string& caption, unsigned int style)
|
|
{
|
|
return noui_ThreadSafeMessageBox(message, caption, style);
|
|
}
|
|
|
|
void noui_InitMessage(const std::string& message)
|
|
{
|
|
LogPrintf("init message: %s\n", message);
|
|
}
|
|
|
|
void noui_connect()
|
|
{
|
|
noui_ThreadSafeMessageBoxConn = uiInterface.ThreadSafeMessageBox_connect(noui_ThreadSafeMessageBox);
|
|
noui_ThreadSafeQuestionConn = uiInterface.ThreadSafeQuestion_connect(noui_ThreadSafeQuestion);
|
|
noui_InitMessageConn = uiInterface.InitMessage_connect(noui_InitMessage);
|
|
}
|
|
|
|
bool noui_ThreadSafeMessageBoxSuppressed(const std::string& message, const std::string& caption, unsigned int style)
|
|
{
|
|
return false;
|
|
}
|
|
|
|
bool noui_ThreadSafeQuestionSuppressed(const std::string& /* ignored interactive message */, const std::string& message, const std::string& caption, unsigned int style)
|
|
{
|
|
return false;
|
|
}
|
|
|
|
void noui_InitMessageSuppressed(const std::string& message)
|
|
{
|
|
}
|
|
|
|
void noui_suppress()
|
|
{
|
|
noui_ThreadSafeMessageBoxConn.disconnect();
|
|
noui_ThreadSafeQuestionConn.disconnect();
|
|
noui_InitMessageConn.disconnect();
|
|
noui_ThreadSafeMessageBoxConn = uiInterface.ThreadSafeMessageBox_connect(noui_ThreadSafeMessageBoxSuppressed);
|
|
noui_ThreadSafeQuestionConn = uiInterface.ThreadSafeQuestion_connect(noui_ThreadSafeQuestionSuppressed);
|
|
noui_InitMessageConn = uiInterface.InitMessage_connect(noui_InitMessageSuppressed);
|
|
}
|
|
|
|
void noui_reconnect()
|
|
{
|
|
noui_ThreadSafeMessageBoxConn.disconnect();
|
|
noui_ThreadSafeQuestionConn.disconnect();
|
|
noui_InitMessageConn.disconnect();
|
|
noui_connect();
|
|
} |