sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-25 20:12:57 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

(partial) Merge bitcoin-core/gui#409: Fix window title of wallet loading window

Browse Source 
01bff8f0494ba1c02c087b7186c892785f326fd9 qt: Fix WalletControllerActivity progress dialog title (Shashwat)

Pull request description:

  Throughout the GUI, the title of the window, tells about the purpose of the window. This was not true for the title of wallet loading wallet.
  This PR fixes this issue by renaming the wallet loading window title to 'Open Wallet'

  Changes introduced in this PR (Runned Bitcoin-GUI on signet network)

  |Master|PR|
  |---|---|
  |![Screenshot from 2021-08-24 00-02-18](https://user-images.githubusercontent.com/85434418/130500309-2f0af2c9-55f0-4609-a92b-3156800fa92e.png)|![Screenshot from 2021-09-07 18-19-10](https://user-images.githubusercontent.com/85434418/132351394-1ee4a36c-3ba9-4d1a-a8f3-f17804fb856a.png)|

ACKs for top commit:
  jarolrod:
    ACK 01bff8f
  hebasto:
    ACK 01bff8f0494ba1c02c087b7186c892785f326fd9, tested on Linux Mint 20.2 (Qt 5.12.8).

Tree-SHA512: cd21c40752eb1c0afb5ec61b8a40e900bc3aa05749963f7957ece6024e4957f5bb37e0eb4f95aac488f5e08aea51fe13b023b05d8302a08c88dcc6790410ba64
This commit is contained in:
Hennadii Stepanov 2021-10-06 21:29:46 +03:00 committed by Vijay
parent 49c87e93a6
commit 5a441b38de
No known key found for this signature in database
GPG Key ID: 47820EC166FDF549
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/qt/walletcontroller.cpp
View File

@ -198,11 +198,12 @@ WalletControllerActivity::~WalletControllerActivity()
delete m_progress_dialog; delete m_progress_dialog;
} }
void WalletControllerActivity::showProgressDialog(const QString& label_text) void WalletControllerActivity::showProgressDialog(const QString& title_text, const QString& label_text)
{ {
assert(!m_progress_dialog); assert(!m_progress_dialog);
m_progress_dialog = new QProgressDialog(m_parent_widget); m_progress_dialog = new QProgressDialog(m_parent_widget);
m_progress_dialog->setWindowTitle(title_text);
m_progress_dialog->setLabelText(label_text); m_progress_dialog->setLabelText(label_text);
m_progress_dialog->setRange(0, 0); m_progress_dialog->setRange(0, 0);
m_progress_dialog->setCancelButton(nullptr); m_progress_dialog->setCancelButton(nullptr);
@ -251,7 +252,12 @@ void CreateWalletActivity::askPassphrase()
void CreateWalletActivity::createWallet() void CreateWalletActivity::createWallet()
{ {
showProgressDialog(tr("Creating Wallet <b>%1</b>…").arg(m_create_wallet_dialog->walletName().toHtmlEscaped())); showProgressDialog(
//: Title of window indicating the progress of creation of a new wallet.
tr("Create Wallet"),
/*: Descriptive text of the create wallet progress window which indicates
to the user which wallet is currently being created. */
tr("Creating Wallet <b>%1</b>…").arg(m_create_wallet_dialog->walletName().toHtmlEscaped()));
std::string name = m_create_wallet_dialog->walletName().toStdString(); std::string name = m_create_wallet_dialog->walletName().toStdString();
uint64_t flags = 0; uint64_t flags = 0;
@ -334,7 +340,12 @@ void OpenWalletActivity::open(const std::string& path)
{ {
QString name = path.empty() ? QString("["+tr("default wallet")+"]") : QString::fromStdString(path); QString name = path.empty() ? QString("["+tr("default wallet")+"]") : QString::fromStdString(path);
showProgressDialog(tr("Opening Wallet <b>%1</b>…").arg(name.toHtmlEscaped())); showProgressDialog(
//: Title of window indicating the progress of opening of a wallet.
tr("Open Wallet"),
/*: Descriptive text of the open wallet progress window which indicates
to the user which wallet is currently being opened. */
tr("Opening Wallet <b>%1</b>…").arg(name.toHtmlEscaped()));
QTimer::singleShot(0, worker(), [this, path] { QTimer::singleShot(0, worker(), [this, path] {
std::unique_ptr<interfaces::Wallet> wallet = node().walletLoader().loadWallet(path, m_error_message, m_warning_message); std::unique_ptr<interfaces::Wallet> wallet = node().walletLoader().loadWallet(path, m_error_message, m_warning_message);

2
src/qt/walletcontroller.h
View File

@ -98,7 +98,7 @@ protected:
interfaces::Node& node() const { return m_wallet_controller->m_node; } interfaces::Node& node() const { return m_wallet_controller->m_node; }
QObject* worker() const { return m_wallet_controller->m_activity_worker; } QObject* worker() const { return m_wallet_controller->m_activity_worker; }
void showProgressDialog(const QString& label_text); void showProgressDialog(const QString& title_text, const QString& label_text);
void destroyProgressDialog(); void destroyProgressDialog();
WalletController* const m_wallet_controller; WalletController* const m_wallet_controller;