Merge pull request #143 from wowario/simple

make simplewallet simple

src/cryptonote_core/cryptonote_core.cpp

@@ -1524,8 +1524,9 @@ namespace cryptonote
         << "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
         << 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);
       m_starter_message_showed = true;
     }

src/cryptonote_protocol/cryptonote_protocol_handler.inl

@@ -1594,7 +1594,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 <command>\" to see a command's documentation." << ENDL
         << "**********************************************************************");
       m_core.on_synchronized();
     }

src/simplewallet/simplewallet.cpp

@@ -2415,6 +2415,27 @@ bool simple_wallet::set_device_name(const std::vector<std::string> &args/* = std
 }
 
 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 new\" - Create new subaddress.\n") <<
+  tr("  \"address all\" - Show all addresses.\n") <<  
+  tr("  \"transfer [address] [amount]\" - Send WOW to an address.\n") <<
+  tr("  \"show_transfers [in|out|pending|failed|pool]\" - Show transactions.\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())
   {
@@ -2877,8 +2898,12 @@ simple_wallet::simple_wallet()
                            tr("Returns version information"));
   m_cmd_binder.set_handler("help",
                            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)
@@ -3912,8 +3937,9 @@ boost::optional<epee::wipeable_string> simple_wallet::new_wallet(const boost::pr
     "**********************************************************************\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 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"
     "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")
@@ -4166,8 +4192,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 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;
 }

src/simplewallet/simplewallet.h

@@ -144,6 +144,7 @@ namespace cryptonote
     bool set_ignore_fractional_outputs(const std::vector<std::string> &args = std::vector<std::string>());
     bool set_device_name(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 stop_mining(const std::vector<std::string> &args);
     bool set_daemon(const std::vector<std::string> &args);