Merge remote-tracking branch 'origin/v4.7.0-rc' into v4.7.0-rc

navcoin · Jul 14, 2019 · 2b13cc9 · 2b13cc9
2 parents 3d6fea6 + ca4eaef
commit 2b13cc9
Show file tree

Hide file tree

Showing 53 changed files with 56 additions and 1 deletion.
diff --git a/src/init.cpp b/src/init.cpp
@@ -516,6 +516,7 @@ std::string HelpMessage(HelpMessageMode mode)
                                                                  CURRENCY_UNIT));
     strUsage += HelpMessageOpt("-maxtxfee=<amt>", strprintf(_("Maximum total fees (in %s) to use in a single wallet transaction or raw transaction; setting this too low may abort large transactions"),
                                                             CURRENCY_UNIT));
+    strUsage += HelpMessageOpt("-print", _("Send trace/debug info to console instead of debug.log file"));
     strUsage += HelpMessageOpt("-printtoconsole", _("Send trace/debug info to console instead of debug.log file"));
     if (showDebug)
     {
@@ -874,7 +875,7 @@ static std::string ResolveErrMsg(const char * const optname, const std::string&
 
 void InitLogging()
 {
-    fPrintToConsole = GetBoolArg("-printtoconsole", false);
+    fPrintToConsole = GetBoolArg("-print", GetBoolArg("-printtoconsole", false));
     fLogTimestamps = GetBoolArg("-logtimestamps", DEFAULT_LOGTIMESTAMPS);
     fLogTimeMicros = GetBoolArg("-logtimemicros", DEFAULT_LOGTIMEMICROS);
     fLogIPs = GetBoolArg("-logips", DEFAULT_LOGIPS);

diff --git a/src/qt/res/icons/vector/about.svg b/src/qt/res/icons/vector/about.svg
diff --git a/src/qt/res/icons/vector/add.svg b/src/qt/res/icons/vector/add.svg
diff --git a/src/qt/res/icons/vector/address-book.svg b/src/qt/res/icons/vector/address-book.svg
diff --git a/src/qt/res/icons/vector/chevron.svg b/src/qt/res/icons/vector/chevron.svg
diff --git a/src/qt/res/icons/vector/clock1.svg b/src/qt/res/icons/vector/clock1.svg
diff --git a/src/qt/res/icons/vector/clock2.svg b/src/qt/res/icons/vector/clock2.svg
diff --git a/src/qt/res/icons/vector/clock3.svg b/src/qt/res/icons/vector/clock3.svg
diff --git a/src/qt/res/icons/vector/clock4.svg b/src/qt/res/icons/vector/clock4.svg
diff --git a/src/qt/res/icons/vector/clock5.svg b/src/qt/res/icons/vector/clock5.svg
diff --git a/src/qt/res/icons/vector/configure.svg b/src/qt/res/icons/vector/configure.svg
diff --git a/src/qt/res/icons/vector/connect0.svg b/src/qt/res/icons/vector/connect0.svg
diff --git a/src/qt/res/icons/vector/connect1.svg b/src/qt/res/icons/vector/connect1.svg