Merge pull request #2171 from Diapolo/init
add InitMessage() to noui and use debug.log for GUI
This commit is contained in:
commit
0c16cc73ef
3 changed files with 10 additions and 4 deletions
|
@ -789,7 +789,7 @@ bool AppInit2()
|
|||
nCoinCacheSize = nTotalCache / 300; // coins in memory require around 300 bytes
|
||||
|
||||
uiInterface.InitMessage(_("Loading block index..."));
|
||||
printf("Loading block index...\n");
|
||||
|
||||
nStart = GetTimeMillis();
|
||||
pblocktree = new CBlockTreeDB(nBlockTreeDBCache, false, fReindex);
|
||||
pcoinsdbview = new CCoinsViewDB(nCoinDBCache, false, fReindex);
|
||||
|
@ -848,7 +848,7 @@ bool AppInit2()
|
|||
// ********************************************************* Step 8: load wallet
|
||||
|
||||
uiInterface.InitMessage(_("Loading wallet..."));
|
||||
printf("Loading wallet...\n");
|
||||
|
||||
nStart = GetTimeMillis();
|
||||
bool fFirstRun = true;
|
||||
pwalletMain = new CWallet("wallet.dat");
|
||||
|
@ -946,7 +946,7 @@ bool AppInit2()
|
|||
// ********************************************************* Step 10: load peers
|
||||
|
||||
uiInterface.InitMessage(_("Loading addresses..."));
|
||||
printf("Loading addresses...\n");
|
||||
|
||||
nStart = GetTimeMillis();
|
||||
|
||||
{
|
||||
|
@ -981,7 +981,6 @@ bool AppInit2()
|
|||
// ********************************************************* Step 12: finished
|
||||
|
||||
uiInterface.InitMessage(_("Done loading"));
|
||||
printf("Done loading\n");
|
||||
|
||||
if (!strErrors.str().empty())
|
||||
return InitError(strErrors.str());
|
||||
|
|
|
@ -37,9 +37,15 @@ static bool noui_ThreadSafeAskFee(int64 /*nFeeRequired*/)
|
|||
return true;
|
||||
}
|
||||
|
||||
static void noui_InitMessage(const std::string &message)
|
||||
{
|
||||
printf("init message: %s\n", message.c_str());
|
||||
}
|
||||
|
||||
void noui_connect()
|
||||
{
|
||||
// Connect bitcoind signal handlers
|
||||
uiInterface.ThreadSafeMessageBox.connect(noui_ThreadSafeMessageBox);
|
||||
uiInterface.ThreadSafeAskFee.connect(noui_ThreadSafeAskFee);
|
||||
uiInterface.InitMessage.connect(noui_InitMessage);
|
||||
}
|
||||
|
|
|
@ -86,6 +86,7 @@ static void InitMessage(const std::string &message)
|
|||
splashref->showMessage(QString::fromStdString(message), Qt::AlignBottom|Qt::AlignHCenter, QColor(255,255,200));
|
||||
QApplication::instance()->processEvents();
|
||||
}
|
||||
printf("init message: %s\n", message.c_str());
|
||||
}
|
||||
|
||||
static void QueueShutdown()
|
||||
|
|
Loading…
Reference in a new issue