X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=src%2Finit.cpp;h=b701e90e918f1c2aca00ce5bf2a250f69d3d4a49;hb=972060ce0e9746c979ce0ddeeb997121414c1d58;hp=22f34aa7550e0ab823dd02d4d78b00c1be7e3438;hpb=2e5a781c644f09c259ad24c83c1444e882eab819;p=novacoin.git
diff --git a/src/init.cpp b/src/init.cpp
index 22f34aa..b701e90 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -187,6 +187,7 @@ bool AppInit2(int argc, char* argv[])
" -gen \t\t " + _("Generate coins") + "\n" +
" -gen=0 \t\t " + _("Don't generate coins") + "\n" +
" -min \t\t " + _("Start minimized") + "\n" +
+ " -splash \t\t " + _("Show splash screen on startup (default: 1)") + "\n" +
" -datadir=
\t\t " + _("Specify data directory") + "\n" +
" -timeout= \t " + _("Specify connection timeout (in milliseconds)") + "\n" +
" -proxy= \t " + _("Connect through socks4 proxy") + "\n" +
@@ -197,6 +198,9 @@ bool AppInit2(int argc, char* argv[])
" -connect= \t\t " + _("Connect only to the specified node") + "\n" +
" -irc \t " + _("Find peers using internet relay chat (default: 0)") + "\n" +
" -listen \t " + _("Accept connections from outside (default: 1)") + "\n" +
+#ifdef QT_GUI
+ " -lang= \t\t " + _("Set language, for example \"de_DE\" (default: system locale)") + "\n" +
+#endif
" -dnsseed \t " + _("Find peers using DNS lookup (default: 1)") + "\n" +
" -banscore= \t " + _("Threshold for disconnecting misbehaving peers (default: 100)") + "\n" +
" -bantime= \t " + _("Number of seconds to keep misbehaving peers from reconnecting (default: 86400)") + "\n" +
@@ -210,10 +214,10 @@ bool AppInit2(int argc, char* argv[])
#endif
#endif
" -paytxfee= \t " + _("Fee per KB to add to transactions you send") + "\n" +
-#ifdef GUI
+#ifdef QT_GUI
" -server \t\t " + _("Accept command line and JSON-RPC commands") + "\n" +
#endif
-#ifndef WIN32
+#if !defined(WIN32) && !defined(QT_GUI)
" -daemon \t\t " + _("Run in the background as a daemon and accept commands") + "\n" +
#endif
" -testnet \t\t " + _("Use the test network") + "\n" +
@@ -246,14 +250,24 @@ bool AppInit2(int argc, char* argv[])
// Remove tabs
strUsage.erase(std::remove(strUsage.begin(), strUsage.end(), '\t'), strUsage.end());
+#if defined(QT_GUI) && defined(WIN32)
+ // On windows, show a message box, as there is no stderr
+ wxMessageBox(strUsage, "Usage");
+#else
fprintf(stderr, "%s", strUsage.c_str());
+#endif
return false;
}
fTestNet = GetBoolArg("-testnet");
+ if (fTestNet)
+ {
+ SoftSetBoolArg("-irc", true);
+ }
+
fDebug = GetBoolArg("-debug");
-#ifndef WIN32
+#if !defined(WIN32) && !defined(QT_GUI)
fDaemon = GetBoolArg("-daemon");
#else
fDaemon = false;
@@ -284,7 +298,7 @@ bool AppInit2(int argc, char* argv[])
}
#endif
-#ifndef WIN32
+#if !defined(WIN32) && !defined(QT_GUI)
if (fDaemon)
{
// Daemonize
@@ -459,8 +473,6 @@ bool AppInit2(int argc, char* argv[])
return false;
}
- fGenerateBitcoins = GetBoolArg("-gen");
-
if (mapArgs.count("-proxy"))
{
fUseProxy = true;
@@ -506,13 +518,6 @@ bool AppInit2(int argc, char* argv[])
COINBASE_FLAGS << std::vector(pszP2SH, pszP2SH+strlen(pszP2SH));
}
- // Command-line args override in-wallet settings:
-#if USE_UPNP
- fUseUPnP = GetBoolArg("-upnp", true);
-#else
- fUseUPnP = GetBoolArg("-upnp", false);
-#endif
-
if (!fNoListen)
{
std::string strError;