Merge pull request #2747

37e1fd94 simplewallet: mark the active account in print_accounts (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2017-11-14 15:32:29 +02:00
commit 1e874186b3
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD

View File

@ -4842,10 +4842,11 @@ bool simple_wallet::account(const std::vector<std::string> &args/* = std::vector
//---------------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------------
void simple_wallet::print_accounts() void simple_wallet::print_accounts()
{ {
success_msg_writer() << boost::format("%15s %21s %21s %21s") % tr("Account") % tr("Balance") % tr("Unlocked balance") % tr("Label"); success_msg_writer() << boost::format(" %15s %21s %21s %21s") % tr("Account") % tr("Balance") % tr("Unlocked balance") % tr("Label");
for (uint32_t account_index = 0; account_index < m_wallet->get_num_subaddress_accounts(); ++account_index) for (uint32_t account_index = 0; account_index < m_wallet->get_num_subaddress_accounts(); ++account_index)
{ {
success_msg_writer() << boost::format(tr("%8u %6s %21s %21s %21s")) success_msg_writer() << boost::format(tr(" %c%8u %6s %21s %21s %21s"))
% (m_current_subaddress_account == account_index ? '*' : ' ')
% account_index % account_index
% m_wallet->get_subaddress_as_str({account_index, 0}).substr(0, 6) % m_wallet->get_subaddress_as_str({account_index, 0}).substr(0, 6)
% print_money(m_wallet->balance(account_index)) % print_money(m_wallet->balance(account_index))