aboutsummaryrefslogtreecommitdiff
path: root/init.cpp
diff options
context:
space:
mode:
authors_nakamoto <s_nakamoto@1a98c847-1fd6-4fd8-948a-caf3550aa51b>2010-06-10 23:10:30 +0000
committers_nakamoto <s_nakamoto@1a98c847-1fd6-4fd8-948a-caf3550aa51b>2010-06-10 23:10:30 +0000
commitf93d5f9ffe1e12079e560a735111735924726a06 (patch)
tree0a34330f01acf1a2cd18f5a9f8c36ec29216a3e8 /init.cpp
parent2ca17588327858947590fda78d68cfad79e633bc (diff)
downloadbitcoin-f93d5f9ffe1e12079e560a735111735924726a06.tar.xz
automatically change displayed address whenever it receives anything,v0.2.10
added help and -? for daemon command line rpc commands, only relay addr messages to 5 random nodes to save bandwidth, started setting wtx.fFromMe flag, trickle out tx inventory messages to protect privacy -- version 0.2.10 git-svn-id: https://bitcoin.svn.sourceforge.net/svnroot/bitcoin/trunk@81 1a98c847-1fd6-4fd8-948a-caf3550aa51b
Diffstat (limited to 'init.cpp')
-rw-r--r--init.cpp31
1 files changed, 18 insertions, 13 deletions
diff --git a/init.cpp b/init.cpp
index 833a8a3f0b..ecb1709c11 100644
--- a/init.cpp
+++ b/init.cpp
@@ -339,22 +339,27 @@ bool CMyApp::OnInit2()
if (mapArgs.count("-?") || mapArgs.count("--help"))
{
wxString strUsage = string() +
- _("Usage: bitcoin [options]") + "\t\t\t\t\t\t\n" +
- _("Options:\n") +
- " -gen \t\t " + _("Generate coins\n") +
- " -gen=0 \t\t " + _("Don't generate coins\n") +
- " -min \t\t " + _("Start minimized\n") +
- " -datadir=<dir> \t " + _("Specify data directory\n") +
- " -proxy=<ip:port>\t " + _("Connect through socks4 proxy\n") +
- " -addnode=<ip> \t " + _("Add a node to connect to\n") +
- " -connect=<ip> \t " + _("Connect only to the specified node\n") +
- " -? \t\t " + _("This help message\n");
+ _("Usage:") + "\t\t\t\t\t\t\t\t\t\t\n" +
+ " bitcoin [options] \t" + "\n" +
+ " bitcoin [command] \t" + _("Send command to bitcoin running with -server or -daemon\n") +
+ " bitcoin [command] -? \t" + _("Get help for a command\n") +
+ " bitcoin help \t" + _("List commands\n") +
+ _("Options:\n") +
+ " -gen \t " + _("Generate coins\n") +
+ " -gen=0 \t " + _("Don't generate coins\n") +
+ " -min \t " + _("Start minimized\n") +
+ " -datadir=<dir> \t " + _("Specify data directory\n") +
+ " -proxy=<ip:port>\t " + _("Connect through socks4 proxy\n") +
+ " -addnode=<ip> \t " + _("Add a node to connect to\n") +
+ " -connect=<ip> \t " + _("Connect only to the specified node\n") +
+ " -server \t " + _("Accept command line and JSON-RPC commands\n") +
+ " -daemon \t " + _("Run in the background as a daemon and accept commands\n") +
+ " -? \t " + _("This help message\n");
+
if (fWindows && fGUI)
{
- // Remove spaces, the tabs make the columns line up in the message box
- for (int i = 0; i < 50; i++)
- strUsage.Replace(" \t", "\t");
+ // Tabs make the columns line up in the message box
wxMessageBox(strUsage, "Bitcoin", wxOK);
}
else