Skip to content

gui: show wallet name in progress messages #939

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ShauryaaSharma wants to merge 1 commit into
base: master
Choose a base branch
from
Open

gui: show wallet name in progress messages #939

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/qt/walletcontroller.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,6 +375,8 @@ LoadWalletsActivity::LoadWalletsActivity(WalletController* wallet_controller, QW

void LoadWalletsActivity::load(bool show_loading_minimized)
{
// No specific wallet name is shown here because multiple wallets may be
// loaded simultaneously when syncing the GUI with the node's wallet list.
showProgressDialog(
//: Title of progress window which is displayed when wallets are being loaded.
tr("Load Wallets"),
Expand Down
6 changes: 3 additions & 3 deletions src/wallet/wallet.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ std::shared_ptr<CWallet> LoadWalletInternal(WalletContext& context, const std::s
return nullptr;
}

context.chain->initMessage(_("Loading wallet…"));
context.chain->initMessage(strprintf("[%s] %s", name.empty() ? std::string{_("default wallet")} : name, _("Loading wallet…")));
std::shared_ptr<CWallet> wallet = CWallet::LoadExisting(context, name, std::move(database), error, warnings);
if (!wallet) {
error = Untranslated("Wallet loading failed.") + Untranslated(" ") + error;
Expand Down Expand Up @@ -416,7 +416,7 @@ std::shared_ptr<CWallet> CreateWallet(WalletContext& context, const std::string&
}

// Make the wallet
context.chain->initMessage(_("Creating wallet…"));
context.chain->initMessage(strprintf("[%s] %s", name, _("Creating wallet…")));
std::shared_ptr<CWallet> wallet = CWallet::CreateNew(context, name, std::move(database), wallet_creation_flags, born_encrypted, error, warnings);
if (!wallet) {
error = Untranslated("Wallet creation failed.") + Untranslated(" ") + error;
Expand Down Expand Up @@ -3288,7 +3288,7 @@ bool CWallet::AttachChain(const std::shared_ptr<CWallet>& walletInstance, interf
}
}

chain.initMessage(_("Rescanning…"));
chain.initMessage(strprintf("[%s] %s", walletInstance->DisplayName(), _("Rescanning…")));
walletInstance->WalletLogPrintf("Rescanning last %i blocks (from block %i)...\n", *tip_height - rescan_height, rescan_height);

{
Expand Down