highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-07-08 09:21:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

gui: Delete progress dialog instead of hidding it

Browse Source
This commit is contained in:
João Barbosa
2020-03-30 11:41:20 +01:00
parent ee9e88ba27
commit 9eefc6e92f
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/qt/walletcontroller.cpp
View File

@ -166,6 +166,7 @@ WalletControllerActivity::~WalletControllerActivity()
void WalletControllerActivity::showProgressDialog(const QString& label_text) void WalletControllerActivity::showProgressDialog(const QString& label_text)
{ {
assert(!m_progress_dialog);
m_progress_dialog = new QProgressDialog(m_parent_widget); m_progress_dialog = new QProgressDialog(m_parent_widget);
m_progress_dialog->setLabelText(label_text); m_progress_dialog->setLabelText(label_text);
@ -175,6 +176,13 @@ void WalletControllerActivity::showProgressDialog(const QString& label_text)
GUIUtil::PolishProgressDialog(m_progress_dialog); GUIUtil::PolishProgressDialog(m_progress_dialog);
} }
void WalletControllerActivity::destroyProgressDialog()
{
assert(m_progress_dialog);
delete m_progress_dialog;
m_progress_dialog = nullptr;
}
CreateWalletActivity::CreateWalletActivity(WalletController* wallet_controller, QWidget* parent_widget) CreateWalletActivity::CreateWalletActivity(WalletController* wallet_controller, QWidget* parent_widget)
: WalletControllerActivity(wallet_controller, parent_widget) : WalletControllerActivity(wallet_controller, parent_widget)
{ {
@ -229,7 +237,7 @@ void CreateWalletActivity::createWallet()
void CreateWalletActivity::finish() void CreateWalletActivity::finish()
{ {
m_progress_dialog->hide(); destroyProgressDialog();
if (!m_error_message.empty()) { if (!m_error_message.empty()) {
QMessageBox::critical(m_parent_widget, tr("Create wallet failed"), QString::fromStdString(m_error_message)); QMessageBox::critical(m_parent_widget, tr("Create wallet failed"), QString::fromStdString(m_error_message));
@ -270,7 +278,7 @@ OpenWalletActivity::OpenWalletActivity(WalletController* wallet_controller, QWid
void OpenWalletActivity::finish() void OpenWalletActivity::finish()
{ {
m_progress_dialog->hide(); destroyProgressDialog();
if (!m_error_message.empty()) { if (!m_error_message.empty()) {
QMessageBox::critical(m_parent_widget, tr("Open wallet failed"), QString::fromStdString(m_error_message)); QMessageBox::critical(m_parent_widget, tr("Open wallet failed"), QString::fromStdString(m_error_message));

1
src/qt/walletcontroller.h
View File

@ -96,6 +96,7 @@ protected:
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& label_text);
void destroyProgressDialog();
WalletController* const m_wallet_controller; WalletController* const m_wallet_controller;
QWidget* const m_parent_widget; QWidget* const m_parent_widget;