From c82fd15f56ab4758f5d2e4525b3ddf52cb31427f Mon Sep 17 00:00:00 2001 From: Shryder Date: Sat, 4 Sep 2021 15:11:58 +0100 Subject: [PATCH 1/2] Replace "pending" with "receivable"/"ready to receive" in QT wallet (#3411) --- nano/qt/qt.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/nano/qt/qt.cpp b/nano/qt/qt.cpp index d0a91e87f9..b307160f03 100644 --- a/nano/qt/qt.cpp +++ b/nano/qt/qt.cpp @@ -115,7 +115,7 @@ void nano_qt::self_pane::set_balance_text (std::pairsetText (QString (final_text.c_str ())); } @@ -272,7 +272,7 @@ void nano_qt::accounts::refresh_wallet_balance () auto final_text (std::string ("Balance: ") + wallet.format_balance (balance)); if (!pending.is_zero ()) { - final_text += "\nPending: " + wallet.format_balance (pending); + final_text += "\nReady to receive: " + wallet.format_balance (pending); } wallet_balance_label->setText (QString (final_text.c_str ())); this->wallet.node.workers.add_timed_task (std::chrono::steady_clock::now () + std::chrono::seconds (60), [this] () { @@ -778,7 +778,7 @@ nano_qt::account_viewer::account_viewer (nano_qt::wallet & wallet_a) : auto final_text (std::string ("Balance (NANO): ") + wallet.format_balance (balance.first)); if (!balance.second.is_zero ()) { - final_text += "\nPending: " + wallet.format_balance (balance.second); + final_text += "\nReady to receive: " + wallet.format_balance (balance.second); } balance_label->setText (QString (final_text.c_str ())); } @@ -1919,7 +1919,7 @@ nano_qt::advanced_actions::advanced_actions (nano_qt::wallet & wallet_a) : }); bootstrap->setToolTip ("Multi-connection bootstrap to random peers"); - search_for_receivables->setToolTip ("Search for pending blocks"); + search_for_receivables->setToolTip ("Search for ready to receive blocks"); create_block->setToolTip ("Create block in JSON format"); enter_block->setToolTip ("Enter block in JSON format"); } @@ -2364,7 +2364,7 @@ void nano_qt::block_creation::create_receive () else { show_label_error (*status); - status->setText ("Source block is not pending to receive"); + status->setText ("Source block is not ready to be received"); } } else @@ -2529,7 +2529,7 @@ void nano_qt::block_creation::create_open () else { show_label_error (*status); - status->setText ("Source block is not pending to receive"); + status->setText ("Source block is not ready to be received"); } } else From 493ef2e4a60d62700ab9fdf3f54ca0309e77b947 Mon Sep 17 00:00:00 2001 From: Shryder Date: Tue, 28 Sep 2021 15:57:48 +0100 Subject: [PATCH 2/2] Change wording for a QT tooltip --- nano/qt/qt.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nano/qt/qt.cpp b/nano/qt/qt.cpp index b307160f03..c91404d970 100644 --- a/nano/qt/qt.cpp +++ b/nano/qt/qt.cpp @@ -1919,7 +1919,7 @@ nano_qt::advanced_actions::advanced_actions (nano_qt::wallet & wallet_a) : }); bootstrap->setToolTip ("Multi-connection bootstrap to random peers"); - search_for_receivables->setToolTip ("Search for ready to receive blocks"); + search_for_receivables->setToolTip ("Search for ready to be received blocks"); create_block->setToolTip ("Create block in JSON format"); enter_block->setToolTip ("Enter block in JSON format"); }