diff --git a/src/cryptonote_core/cryptonote_core.cpp b/src/cryptonote_core/cryptonote_core.cpp index e4a4cb2f1..f61592487 100644 --- a/src/cryptonote_core/cryptonote_core.cpp +++ b/src/cryptonote_core/cryptonote_core.cpp @@ -1381,8 +1381,9 @@ namespace cryptonote << "You can set the level of process detailization through \"set_log \" command," << ENDL << "where is between 0 (no details) and 4 (very verbose), or custom category based levels (eg, *:WARNING)." << ENDL << ENDL - << "Use the \"help\" command to see the list of available commands." << ENDL - << "Use \"help \" to see a command's documentation." << 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 \" to see a command's documentation." << ENDL << "**********************************************************************" << ENDL); m_starter_message_showed = true; } diff --git a/src/cryptonote_protocol/cryptonote_protocol_handler.inl b/src/cryptonote_protocol/cryptonote_protocol_handler.inl index a6064970d..21f0c03b1 100644 --- a/src/cryptonote_protocol/cryptonote_protocol_handler.inl +++ b/src/cryptonote_protocol/cryptonote_protocol_handler.inl @@ -1578,7 +1578,9 @@ skip: MGINFO_YELLOW(ENDL << "**********************************************************************" << ENDL << "You are now synchronized with the network. You may now start wownero-wallet-cli." << 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 \" to see a command's documentation." << ENDL << "**********************************************************************"); m_core.on_synchronized(); } diff --git a/src/simplewallet/simplewallet.cpp b/src/simplewallet/simplewallet.cpp index 1af82455d..c66ad827c 100755 --- a/src/simplewallet/simplewallet.cpp +++ b/src/simplewallet/simplewallet.cpp @@ -1942,6 +1942,28 @@ bool simple_wallet::set_segregation_height(const std::vector &args/ } bool simple_wallet::help(const std::vector &args/* = std::vector()*/) +{ + 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 &args/* = std::vector()*/) { if(args.empty()) { @@ -2287,8 +2309,12 @@ simple_wallet::simple_wallet() tr("Checks whether an output is blackballed")); m_cmd_binder.set_handler("help", boost::bind(&simple_wallet::help, this, _1), - tr("help []"), - tr("Show the help section or the documentation about a .")); + tr("help"), + tr("Show simplified help section.")); + m_cmd_binder.set_handler("help_advanced", + boost::bind(&simple_wallet::help_advanced, this, _1), + tr("help_advanced []"), + tr("Show the advanced help section or the documentation about a .")); } //---------------------------------------------------------------------------------------------------- bool simple_wallet::set_variable(const std::vector &args) @@ -3251,8 +3277,9 @@ bool simple_wallet::new_wallet(const boost::program_options::variables_map& vm, "**********************************************************************\n" << tr("Your wallet has been generated!\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 \"help \" to see a command's documentation.\n" + "Use the \"help\" command to see a simplified list of available commands.\n" + "Use the \"help_advanced\" command to see an advanced list of available commands.\n" + "Use \"help_advanced \" to see a command's documentation.\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 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() << "**********************************************************************\n" << - tr("Use the \"help\" command to see the list of available commands.\n") << - tr("Use \"help \" to see a command's documentation.\n") << + tr("Use the \"help\" command to see a simplified list of available commands.\n") << + tr("Use the \"help_advanced\" command to see an advanced list of available commands.\n") << + tr("Use \"help_advanced \" to see a command's documentation.\n") << "**********************************************************************"; return true; } diff --git a/src/simplewallet/simplewallet.h b/src/simplewallet/simplewallet.h index c42dc6560..7a2e54a10 100644 --- a/src/simplewallet/simplewallet.h +++ b/src/simplewallet/simplewallet.h @@ -137,6 +137,7 @@ namespace cryptonote bool set_subaddress_lookahead(const std::vector &args = std::vector()); bool set_segregation_height(const std::vector &args = std::vector()); bool help(const std::vector &args = std::vector()); + bool help_advanced(const std::vector &args = std::vector()); bool start_mining(const std::vector &args); bool stop_mining(const std::vector &args); bool set_daemon(const std::vector &args);