Mirrors
/
wownero
mirror of https://git.wownero.com/wownero/wownero.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6058 

88b82bef simplewallet: point to "set help" in the lock screen message (moneromooo-monero)
f19c9f23 util: allow newlines in string to be split (moneromooo-monero)
This commit is contained in:
Alexander Blair 2020-02-28 19:54:37 -08:00
parent f3fddd935f 88b82befc7
commit 8c2939a7cb
No known key found for this signature in database
GPG Key ID: C64552D877C32479
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/common/util.cpp
View File

@ -1239,7 +1239,7 @@ std::string get_nix_version_display_string()
return get_string_prefix_by_width(s, 999999999).second; return get_string_prefix_by_width(s, 999999999).second;
}; };
std::vector<std::pair<std::string, size_t>> split_string_by_width(const std::string &s, size_t columns) std::vector<std::pair<std::string, size_t>> split_line_by_width(const std::string &s, size_t columns)
{ {
std::vector<std::string> words; std::vector<std::string> words;
std::vector<std::pair<std::string, size_t>> lines; std::vector<std::pair<std::string, size_t>> lines;
@ -1279,4 +1279,17 @@ std::string get_nix_version_display_string()
return lines; return lines;
} }
std::vector<std::pair<std::string, size_t>> split_string_by_width(const std::string &s, size_t columns)
{
std::vector<std::string> lines;
std::vector<std::pair<std::string, size_t>> all_lines;
boost::split(lines, s, boost::is_any_of("\n"), boost::token_compress_on);
for (const auto &e: lines)
{
std::vector<std::pair<std::string, size_t>> new_lines = split_line_by_width(e, columns);
for (auto &l: new_lines)
all_lines.push_back(std::move(l));
}
return all_lines;
}
} }

2
src/simplewallet/simplewallet.cpp
View File

@ -6218,7 +6218,7 @@ void simple_wallet::check_for_inactivity_lock(bool user)
m_in_command = true; m_in_command = true;
if (!user) if (!user)
{ {
const std::string speech = tr("I locked your Monero wallet to protect you while you were away"); const std::string speech = tr("I locked your Monero wallet to protect you while you were away\nsee \"help_advanced set\" to configure/disable");
std::vector<std::pair<std::string, size_t>> lines = tools::split_string_by_width(speech, 45); std::vector<std::pair<std::string, size_t>> lines = tools::split_string_by_width(speech, 45);
size_t max_len = 0; size_t max_len = 0;