make simplewallet simple

This commit is contained in:
wowario 2018-05-20 21:56:40 +03:00
parent 016d9aece4
commit 8f8504c76e
No known key found for this signature in database
GPG Key ID: 24DCBE762DE9C111
4 changed files with 41 additions and 9 deletions

View File

@ -1381,8 +1381,9 @@ namespace cryptonote
<< "You can set the level of process detailization through \"set_log <level|categories>\" command," << ENDL << "You can set the level of process detailization through \"set_log <level|categories>\" command," << ENDL
<< "where <level> is between 0 (no details) and 4 (very verbose), or custom category based levels (eg, *:WARNING)." << ENDL << "where <level> is between 0 (no details) and 4 (very verbose), or custom category based levels (eg, *:WARNING)." << ENDL
<< ENDL << ENDL
<< "Use the \"help\" command to see the list of available commands." << ENDL << "Use the \"help\" command to see a simplified list of available commands." << ENDL
<< "Use \"help <command>\" to see a command's documentation." << ENDL << "Use the \"help_advanced\" command to see an advanced list of available commands." << ENDL
<< "Use \"help_advanced <command>\" to see a command's documentation." << ENDL
<< "**********************************************************************" << ENDL); << "**********************************************************************" << ENDL);
m_starter_message_showed = true; m_starter_message_showed = true;
} }

View File

@ -1578,7 +1578,9 @@ skip:
MGINFO_YELLOW(ENDL << "**********************************************************************" << ENDL MGINFO_YELLOW(ENDL << "**********************************************************************" << ENDL
<< "You are now synchronized with the network. You may now start wownero-wallet-cli." << ENDL << "You are now synchronized with the network. You may now start wownero-wallet-cli." << ENDL
<< ENDL << ENDL
<< "Use the \"help\" command to see the list of available commands." << ENDL << "Use the \"help\" command to see a simplified list of available commands." << ENDL
<< "Use the \"help_advanced\" command to see an advanced list of available commands." << ENDL
<< "Use \"help_advanced <command>\" to see a command's documentation." << ENDL
<< "**********************************************************************"); << "**********************************************************************");
m_core.on_synchronized(); m_core.on_synchronized();
} }

View File

@ -1942,6 +1942,28 @@ bool simple_wallet::set_segregation_height(const std::vector<std::string> &args/
} }
bool simple_wallet::help(const std::vector<std::string> &args/* = std::vector<std::string>()*/) bool simple_wallet::help(const std::vector<std::string> &args/* = std::vector<std::string>()*/)
{
success_msg_writer() <<
"Commands:\n" <<
tr(" \"balance\" - Show balance.\n") <<
tr(" \"address\" - Show wallet's address.\n") <<
tr(" \"integrated_address\" - Show receiving address with an integrated payment ID.\n") <<
tr(" \"transfer [address|integrated_address] [amount]\" - Send WOW to an address.\n") <<
tr(" \"show_transfers [in|out|pending|failed|pool]\" - Show transactions.\n") <<
tr(" \"payments [payment ID]\" - Show transaction of a given payment ID.\n") <<
tr(" \"sweep_all [address]\" - Send whole balance to another wallet.\n") <<
tr(" \"seed\" - Show secret 25 words that can be used to recover this wallet.\n") <<
tr(" \"refresh\" - Synchronize wallet with the Wownero network.\n") <<
tr(" \"status\" - Check current status of wallet.\n") <<
tr(" \"version\" - Check software version.\n") <<
tr(" \"help\" - Show simplified help section.\n") <<
tr(" \"help_advanced\" - Show advanced help section.\n") <<
tr(" \"save\" - Save wallet.\n") <<
" \"exit\" - Exit wallet.\n\n";
return true;
}
bool simple_wallet::help_advanced(const std::vector<std::string> &args/* = std::vector<std::string>()*/)
{ {
if(args.empty()) if(args.empty())
{ {
@ -2287,8 +2309,12 @@ simple_wallet::simple_wallet()
tr("Checks whether an output is blackballed")); tr("Checks whether an output is blackballed"));
m_cmd_binder.set_handler("help", m_cmd_binder.set_handler("help",
boost::bind(&simple_wallet::help, this, _1), boost::bind(&simple_wallet::help, this, _1),
tr("help [<command>]"), tr("help"),
tr("Show the help section or the documentation about a <command>.")); tr("Show simplified help section."));
m_cmd_binder.set_handler("help_advanced",
boost::bind(&simple_wallet::help_advanced, this, _1),
tr("help_advanced [<command>]"),
tr("Show the advanced help section or the documentation about a <command>."));
} }
//---------------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------------
bool simple_wallet::set_variable(const std::vector<std::string> &args) bool simple_wallet::set_variable(const std::vector<std::string> &args)
@ -3251,8 +3277,9 @@ bool simple_wallet::new_wallet(const boost::program_options::variables_map& vm,
"**********************************************************************\n" << "**********************************************************************\n" <<
tr("Your wallet has been generated!\n" tr("Your wallet has been generated!\n"
"To start synchronizing with the daemon, use the \"refresh\" command.\n" "To start synchronizing with the daemon, use the \"refresh\" command.\n"
"Use the \"help\" command to see the list of available commands.\n" "Use the \"help\" command to see a simplified list of available commands.\n"
"Use \"help <command>\" to see a command's documentation.\n" "Use the \"help_advanced\" command to see an advanced list of available commands.\n"
"Use \"help_advanced <command>\" to see a command's documentation.\n"
"Always use the \"exit\" command when closing wownero-wallet-cli to save \n" "Always use the \"exit\" command when closing wownero-wallet-cli to save \n"
"your current session's state. Otherwise, you might need to synchronize \n" "your current session's state. Otherwise, you might need to synchronize \n"
"your wallet again (your wallet keys are NOT at risk in any case).\n") "your wallet again (your wallet keys are NOT at risk in any case).\n")
@ -3479,8 +3506,9 @@ bool simple_wallet::open_wallet(const boost::program_options::variables_map& vm)
} }
success_msg_writer() << success_msg_writer() <<
"**********************************************************************\n" << "**********************************************************************\n" <<
tr("Use the \"help\" command to see the list of available commands.\n") << tr("Use the \"help\" command to see a simplified list of available commands.\n") <<
tr("Use \"help <command>\" to see a command's documentation.\n") << tr("Use the \"help_advanced\" command to see an advanced list of available commands.\n") <<
tr("Use \"help_advanced <command>\" to see a command's documentation.\n") <<
"**********************************************************************"; "**********************************************************************";
return true; return true;
} }

View File

@ -137,6 +137,7 @@ namespace cryptonote
bool set_subaddress_lookahead(const std::vector<std::string> &args = std::vector<std::string>()); bool set_subaddress_lookahead(const std::vector<std::string> &args = std::vector<std::string>());
bool set_segregation_height(const std::vector<std::string> &args = std::vector<std::string>()); bool set_segregation_height(const std::vector<std::string> &args = std::vector<std::string>());
bool help(const std::vector<std::string> &args = std::vector<std::string>()); bool help(const std::vector<std::string> &args = std::vector<std::string>());
bool help_advanced(const std::vector<std::string> &args = std::vector<std::string>());
bool start_mining(const std::vector<std::string> &args); bool start_mining(const std::vector<std::string> &args);
bool stop_mining(const std::vector<std::string> &args); bool stop_mining(const std::vector<std::string> &args);
bool set_daemon(const std::vector<std::string> &args); bool set_daemon(const std::vector<std::string> &args);