Use WindowModality for dialogs

diff --git a/src/components.cpp b/src/components.cpp
index 4e02c65fdd4f3fccc20aff068389b376d9dc030e..810c49f2f7d3c764e73041ab4c42438c86234b73 100644 (file)
--- a/src/components.cpp
+++ b/src/components.cpp
@@ -113,4 +113,10 @@ ClickableLabel::~ClickableLabel() = default;
 
 void ClickableLabel::mousePressEvent(QMouseEvent* event) {
     emit clicked();
+}
+
+WindowModalDialog::WindowModalDialog(QWidget *parent)
+    : QDialog(parent)
+{
+    this->setWindowModality(Qt::WindowModal);
 }
\ No newline at end of file

diff --git a/src/components.h b/src/components.h
index eeb380498f5b945f5bd22eb50cca8243a00f6929..6f26014efe1e78ad7dc82b2072dba72d0552f5a2 100644 (file)
--- a/src/components.h
+++ b/src/components.h
@@ -121,4 +121,11 @@ protected:
 
 };
 
+class WindowModalDialog : public QDialog {
+    Q_OBJECT
+
+public:
+    explicit WindowModalDialog(QWidget *parent);
+};
+
 #endif //FEATHER_COMPONENTS_H

diff --git a/src/dialog/AboutDialog.cpp b/src/dialog/AboutDialog.cpp
index 5e8d701bd3bffc7c4a30890fb333e3c857637b0f..82130e2f2a0924810a3c865efca17c876220a0c3 100644 (file)
--- a/src/dialog/AboutDialog.cpp
+++ b/src/dialog/AboutDialog.cpp
@@ -8,7 +8,7 @@
 #include "utils/Utils.h"
 
 AboutDialog::AboutDialog(QWidget *parent)
-        : QDialog(parent)
+        : WindowModalDialog(parent)
         , ui(new Ui::AboutDialog)
 {
     ui->setupUi(this);

diff --git a/src/dialog/AboutDialog.h b/src/dialog/AboutDialog.h
index 2f2e404b3be9bf26d713cb77da29c67264e143d0..4dcc8a2b61a362078f9f019a6a54af421ee350d4 100644 (file)
--- a/src/dialog/AboutDialog.h
+++ b/src/dialog/AboutDialog.h
@@ -7,11 +7,13 @@
 #include <QDialog>
 #include <QStringListModel>
 
+#include "components.h"
+
 namespace Ui {
     class AboutDialog;
 }
 
-class AboutDialog : public QDialog
+class AboutDialog : public WindowModalDialog
 {
 Q_OBJECT
 

diff --git a/src/dialog/AccountSwitcherDialog.cpp b/src/dialog/AccountSwitcherDialog.cpp
index ee1e10e8b0c1caaaacb16395a9b3ed01d11b396a..9a0061310b97c9fcc2dd80aaeae8b80e884a0feb 100644 (file)
--- a/src/dialog/AccountSwitcherDialog.cpp
+++ b/src/dialog/AccountSwitcherDialog.cpp
@@ -11,7 +11,7 @@
 #include "utils/Icons.h"
 
 AccountSwitcherDialog::AccountSwitcherDialog(QSharedPointer<AppContext> ctx, QWidget *parent)
-    : QDialog(parent)
+    : WindowModalDialog(parent)
     , ui(new Ui::AccountSwitcherDialog)
     , m_ctx(std::move(ctx))
     , m_model(m_ctx->wallet->subaddressAccountModel())
@@ -25,6 +25,8 @@ AccountSwitcherDialog::AccountSwitcherDialog(QSharedPointer<AppContext> ctx, QWi
     ui->label_totalBalance->setFont(ModelUtils::getMonospaceFont());
     ui->label_totalBalance->setText(WalletManager::displayAmount(m_ctx->wallet->balanceAll()));
 
+    this->setWindowModality(Qt::WindowModal);
+
     ui->accounts->setModel(m_proxyModel);
     ui->accounts->setContextMenuPolicy(Qt::CustomContextMenu);
     ui->accounts->setSelectionMode(QAbstractItemView::SingleSelection);

diff --git a/src/dialog/AccountSwitcherDialog.h b/src/dialog/AccountSwitcherDialog.h
index 08c15be03b69d3ea8939d535a186e113e32fedae..e31f419f75ed2dffdb3728ac16bf97eb65bfcb6d 100644 (file)
--- a/src/dialog/AccountSwitcherDialog.h
+++ b/src/dialog/AccountSwitcherDialog.h
@@ -7,13 +7,14 @@
 #include <QDialog>
 
 #include "appcontext.h"
+#include "components.h"
 #include "model/SubaddressAccountModel.h"
 
 namespace Ui {
     class AccountSwitcherDialog;
 }
 
-class AccountSwitcherDialog : public QDialog
+class AccountSwitcherDialog : public WindowModalDialog
 {
     Q_OBJECT
 

diff --git a/src/dialog/BalanceDialog.cpp b/src/dialog/BalanceDialog.cpp
index 7c4900071696c60e435cd8fc6519063a1063238d..2fab5676e4ae44c2ac85eb456596a1cf4759eb47 100644 (file)
--- a/src/dialog/BalanceDialog.cpp
+++ b/src/dialog/BalanceDialog.cpp
@@ -8,7 +8,7 @@
 #include "model/ModelUtils.h"
 
 BalanceDialog::BalanceDialog(QWidget *parent, Wallet *wallet)
-        : QDialog(parent)
+        : WindowModalDialog(parent)
         , ui(new Ui::BalanceDialog)
 {
     ui->setupUi(this);

diff --git a/src/dialog/BalanceDialog.h b/src/dialog/BalanceDialog.h
index 1880ae9f1a86a3f8740d620db8e697178553c2ca..8c32c2e19c2a975ac42187249f833d8818109420 100644 (file)
--- a/src/dialog/BalanceDialog.h
+++ b/src/dialog/BalanceDialog.h
@@ -6,13 +6,14 @@
 
 #include <QDialog>
 
+#include "components.h"
 #include "libwalletqt/Wallet.h"
 
 namespace Ui {
     class BalanceDialog;
 }
 
-class BalanceDialog : public QDialog
+class BalanceDialog : public WindowModalDialog
 {
     Q_OBJECT
 

diff --git a/src/dialog/CalcConfigDialog.cpp b/src/dialog/CalcConfigDialog.cpp
index caafb94106ec8447d4d2e3c4db15472cd3a3b848..7bf7a0798a84004aec6267c982a845f7687979b3 100644 (file)
--- a/src/dialog/CalcConfigDialog.cpp
+++ b/src/dialog/CalcConfigDialog.cpp
@@ -8,7 +8,7 @@
 #include "utils/config.h"
 
 CalcConfigDialog::CalcConfigDialog(QWidget *parent)
-        : QDialog(parent)
+        : WindowModalDialog(parent)
         , ui(new Ui::CalcConfigDialog)
 {
     ui->setupUi(this);

diff --git a/src/dialog/CalcConfigDialog.h b/src/dialog/CalcConfigDialog.h
index 37f7a2d2c44304cac0dc0d6d60058b3236fddf3c..5209bd1c5b893ffc69ff4c365fb3468e34171fc0 100644 (file)
--- a/src/dialog/CalcConfigDialog.h
+++ b/src/dialog/CalcConfigDialog.h
@@ -7,11 +7,13 @@
 #include <QDialog>
 #include <QListWidget>
 
+#include "components.h"
+
 namespace Ui {
     class CalcConfigDialog;
 }
 
-class CalcConfigDialog : public QDialog
+class CalcConfigDialog : public WindowModalDialog
 {
     Q_OBJECT
 

diff --git a/src/dialog/ContactsDialog.cpp b/src/dialog/ContactsDialog.cpp
index 439208d6f079aaa895eba61397cf85f37ef6ee54..381f66c7f8a6c380935f3e55126624b39e1da1a4 100644 (file)
--- a/src/dialog/ContactsDialog.cpp
+++ b/src/dialog/ContactsDialog.cpp
@@ -5,7 +5,7 @@
 #include "ContactsDialog.h"
 
 ContactsDialog::ContactsDialog(QWidget *parent, const QString &address, const QString &name)
-        : QDialog(parent)
+        : WindowModalDialog(parent)
         , ui(new Ui::ContactsDialog)
 {
     ui->setupUi(this);

diff --git a/src/dialog/ContactsDialog.h b/src/dialog/ContactsDialog.h
index 03b81c4e45a3ed061a104df702f6f5acd3feb831..f0a74bc477e0dce790141ebe663d115db3b1747b 100644 (file)
--- a/src/dialog/ContactsDialog.h
+++ b/src/dialog/ContactsDialog.h
@@ -6,11 +6,13 @@
 
 #include <QDialog>
 
+#include "components.h"
+
 namespace Ui {
     class ContactsDialog;
 }
 
-class ContactsDialog : public QDialog
+class ContactsDialog : public WindowModalDialog
 {
     Q_OBJECT
 

diff --git a/src/dialog/DebugInfoDialog.cpp b/src/dialog/DebugInfoDialog.cpp
index 07fcc8b5bbad7bc72eaa45be46270decaf69f070..c77f2963cca8c765de879ccc0f361b4df5fad198 100644 (file)
--- a/src/dialog/DebugInfoDialog.cpp
+++ b/src/dialog/DebugInfoDialog.cpp
@@ -11,7 +11,7 @@
 #include "utils/WebsocketNotifier.h"
 
 DebugInfoDialog::DebugInfoDialog(QSharedPointer<AppContext> ctx, QWidget *parent)
-        : QDialog(parent)
+        : WindowModalDialog(parent)
         , ui(new Ui::DebugInfoDialog)
         , m_ctx(std::move(ctx))
 {

diff --git a/src/dialog/DebugInfoDialog.h b/src/dialog/DebugInfoDialog.h
index d2fbc83f7ca7f347b5373e8ab1eba67073ad3737..d94493e016524f52efafd8609ae0065a50848e69 100644 (file)
--- a/src/dialog/DebugInfoDialog.h
+++ b/src/dialog/DebugInfoDialog.h
@@ -7,13 +7,14 @@
 #include <QDialog>
 
 #include "appcontext.h"
+#include "components.h"
 #include "libwalletqt/Wallet.h"
 
 namespace Ui {
     class DebugInfoDialog;
 }
 
-class DebugInfoDialog : public QDialog
+class DebugInfoDialog : public WindowModalDialog
 {
     Q_OBJECT
 

diff --git a/src/dialog/InfoDialog.cpp b/src/dialog/InfoDialog.cpp
index 976d96cd6c65e7bdb5caceec7ab12d171da8ba9e..2de636db45c87eb5cbfb492cb40238aa0f4989d0 100644 (file)
--- a/src/dialog/InfoDialog.cpp
+++ b/src/dialog/InfoDialog.cpp
@@ -5,7 +5,7 @@
 #include "ui_InfoDialog.h"
 
 InfoDialog::InfoDialog(QWidget *parent, const QString &title, const QString &infoData)
-        : QDialog(parent)
+        : WindowModalDialog(parent)
         , ui(new Ui::InfoDialog)
 {
     ui->setupUi(this);

diff --git a/src/dialog/InfoDialog.h b/src/dialog/InfoDialog.h
index fa18b5b4344cc3b8f30db4891a52fea8431a6b89..a334828305ed16668948ed6c8d7034840f3a4ee5 100644 (file)
--- a/src/dialog/InfoDialog.h
+++ b/src/dialog/InfoDialog.h
@@ -6,11 +6,13 @@
 
 #include <QDialog>
 
+#include "components.h"
+
 namespace Ui {
     class InfoDialog;
 }
 
-class InfoDialog : public QDialog
+class InfoDialog : public WindowModalDialog
 {
     Q_OBJECT
 

diff --git a/src/dialog/KeysDialog.cpp b/src/dialog/KeysDialog.cpp
index 7fe362d840b424cab3edb78333285d919e645ae5..12af0e3a301cfdc9e303abe559dd17bb8aefacd7 100644 (file)
--- a/src/dialog/KeysDialog.cpp
+++ b/src/dialog/KeysDialog.cpp
@@ -5,7 +5,7 @@
 #include "ui_KeysDialog.h"
 
 KeysDialog::KeysDialog(QSharedPointer<AppContext> ctx, QWidget *parent)
-    : QDialog(parent)
+    : WindowModalDialog(parent)
     , ui(new Ui::KeysDialog)
 {
     ui->setupUi(this);

diff --git a/src/dialog/KeysDialog.h b/src/dialog/KeysDialog.h
index 5684075c8c784967a3d2bc87fa69c5f671e4af2c..bb08c49459fe2a36b3c6316ecc48abb051e752f0 100644 (file)
--- a/src/dialog/KeysDialog.h
+++ b/src/dialog/KeysDialog.h
@@ -7,12 +7,13 @@
 #include <QDialog>
 
 #include "appcontext.h"
+#include "components.h"
 
 namespace Ui {
     class KeysDialog;
 }
 
-class KeysDialog : public QDialog
+class KeysDialog : public WindowModalDialog
 {
 Q_OBJECT
 

diff --git a/src/dialog/LocalMoneroInfoDialog.cpp b/src/dialog/LocalMoneroInfoDialog.cpp
index d3df1a7fd7670d9a04e2008f0e639c1e38b4aa93..f6f1b36eacec22a0be4a01c25ed7f447d185eda6 100644 (file)
--- a/src/dialog/LocalMoneroInfoDialog.cpp
+++ b/src/dialog/LocalMoneroInfoDialog.cpp
@@ -8,7 +8,7 @@
 #include "utils/Utils.h"
 
 LocalMoneroInfoDialog::LocalMoneroInfoDialog(QWidget *parent, LocalMoneroModel *model, int row)
-        : QDialog(parent)
+        : WindowModalDialog(parent)
         , ui(new Ui::LocalMoneroInfoDialog)
         , m_model(model)
         , m_row(row)

diff --git a/src/dialog/LocalMoneroInfoDialog.h b/src/dialog/LocalMoneroInfoDialog.h
index e5f6cd11528cf17fc149ac0e031f8ca389586819..273bafc44e4c53f0ddcbaa13719ed019e24e8cc6 100644 (file)
--- a/src/dialog/LocalMoneroInfoDialog.h
+++ b/src/dialog/LocalMoneroInfoDialog.h
@@ -7,13 +7,14 @@
 #include <QDialog>
 #include <QLabel>
 
+#include "components.h"
 #include "model/LocalMoneroModel.h"
 
 namespace Ui {
     class LocalMoneroInfoDialog;
 }
 
-class LocalMoneroInfoDialog : public QDialog
+class LocalMoneroInfoDialog : public WindowModalDialog
 {
     Q_OBJECT
 

diff --git a/src/dialog/OutputInfoDialog.cpp b/src/dialog/OutputInfoDialog.cpp
index 772d1fb46b5cac4bf32443b90be93ec89b81bb63..4ab953b6d9710260314d034e699e73eacd28040e 100644 (file)
--- a/src/dialog/OutputInfoDialog.cpp
+++ b/src/dialog/OutputInfoDialog.cpp
@@ -8,7 +8,7 @@
 #include "utils/Utils.h"
 
 OutputInfoDialog::OutputInfoDialog(CoinsInfo *cInfo, QWidget *parent)
-        : QDialog(parent)
+        : WindowModalDialog(parent)
         , ui(new Ui::OutputInfoDialog)
 {
     ui->setupUi(this);

diff --git a/src/dialog/OutputInfoDialog.h b/src/dialog/OutputInfoDialog.h
index 18dd39cc98e9229cf6c7995345300f959fb5632b..c0eb49a1fc9f5e187bb40a45a64f8eaf30a1c56b 100644 (file)
--- a/src/dialog/OutputInfoDialog.h
+++ b/src/dialog/OutputInfoDialog.h
@@ -6,6 +6,7 @@
 
 #include <QDialog>
 
+#include "components.h"
 #include "libwalletqt/Coins.h"
 #include "libwalletqt/CoinsInfo.h"
 
@@ -13,7 +14,7 @@ namespace Ui {
     class OutputInfoDialog;
 }
 
-class OutputInfoDialog : public QDialog
+class OutputInfoDialog : public WindowModalDialog
 {
 Q_OBJECT
 

diff --git a/src/dialog/OutputSweepDialog.cpp b/src/dialog/OutputSweepDialog.cpp
index 7c7d2fbc0067cb623404962bd89a9ec3ed41172f..3883676c30382823a4c1c48568b788eda3b9522a 100644 (file)
--- a/src/dialog/OutputSweepDialog.cpp
+++ b/src/dialog/OutputSweepDialog.cpp
@@ -7,7 +7,7 @@
 #include "libwalletqt/WalletManager.h"
 
 OutputSweepDialog::OutputSweepDialog(QWidget *parent, quint64 amount)
-        : QDialog(parent)
+        : WindowModalDialog(parent)
         , ui(new Ui::OutputSweepDialog)
         , m_amount(amount)
 {

diff --git a/src/dialog/OutputSweepDialog.h b/src/dialog/OutputSweepDialog.h
index 4b565fb49eb7194a7dbe457873a0d6d389be201b..8c5e6b54d23d76d5c4e3591cfe0d83d671bfad2b 100644 (file)
--- a/src/dialog/OutputSweepDialog.h
+++ b/src/dialog/OutputSweepDialog.h
@@ -6,13 +6,14 @@
 
 #include <QDialog>
 
+#include "components.h"
 #include "libwalletqt/CoinsInfo.h"
 
 namespace Ui {
     class OutputSweepDialog;
 }
 
-class OutputSweepDialog : public QDialog
+class OutputSweepDialog : public WindowModalDialog
 {
 Q_OBJECT
 

diff --git a/src/dialog/PasswordChangeDialog.cpp b/src/dialog/PasswordChangeDialog.cpp
index 14c5e9d05931275a40bd0421a40ddc45fddb1284..d7e1386fe80f41da99436526eb8aaebb2f0b5f9b 100644 (file)
--- a/src/dialog/PasswordChangeDialog.cpp
+++ b/src/dialog/PasswordChangeDialog.cpp
@@ -7,7 +7,7 @@
 #include <QMessageBox>
 
 PasswordChangeDialog::PasswordChangeDialog(QWidget *parent, Wallet *wallet)
-        : QDialog(parent)
+        : WindowModalDialog(parent)
         , ui(new Ui::PasswordChangeDialog)
         , m_wallet(wallet)
 {

diff --git a/src/dialog/PasswordChangeDialog.h b/src/dialog/PasswordChangeDialog.h
index 7fc91e03773c07a368d903b4973c6265def4c6c2..d39ec6b6d1f8eb92d23470f6ce7e4c7e056af1d9 100644 (file)
--- a/src/dialog/PasswordChangeDialog.h
+++ b/src/dialog/PasswordChangeDialog.h
@@ -6,13 +6,14 @@
 
 #include <QDialog>
 
+#include "components.h"
 #include "libwalletqt/Wallet.h"
 
 namespace Ui {
     class PasswordChangeDialog;
 }
 
-class PasswordChangeDialog : public QDialog
+class PasswordChangeDialog : public WindowModalDialog
 {
 Q_OBJECT
 

diff --git a/src/dialog/PasswordDialog.cpp b/src/dialog/PasswordDialog.cpp
index d4e0e4af81baf24ed5e3b0167028ea77379606c2..5a49b59a108ed07869f01052734f6ef8c7e34536 100644 (file)
--- a/src/dialog/PasswordDialog.cpp
+++ b/src/dialog/PasswordDialog.cpp
@@ -7,7 +7,7 @@
 #include "utils/Icons.h"
 
 PasswordDialog::PasswordDialog(const QString &walletName, bool incorrectPassword, QWidget *parent)
-        : QDialog(parent)
+        : WindowModalDialog(parent)
         , ui(new Ui::PasswordDialog)
 {
     ui->setupUi(this);

diff --git a/src/dialog/PasswordDialog.h b/src/dialog/PasswordDialog.h
index 544331f42038d39c00711de2770a9d392f8ae61e..7afc5b0ca1dffb645f630ca9f2f8dd12074a5d37 100644 (file)
--- a/src/dialog/PasswordDialog.h
+++ b/src/dialog/PasswordDialog.h
@@ -6,11 +6,13 @@
 
 #include <QDialog>
 
+#include "components.h"
+
 namespace Ui {
     class PasswordDialog;
 }
 
-class PasswordDialog : public QDialog
+class PasswordDialog : public WindowModalDialog
 {
 Q_OBJECT
 

diff --git a/src/dialog/PaymentRequestDialog.cpp b/src/dialog/PaymentRequestDialog.cpp
index 4cf38eeed9e79d7fb776a974b783e2fe871262bb..dfac97bea2aa14c186f674d467516e63d8fc5e54 100644 (file)
--- a/src/dialog/PaymentRequestDialog.cpp
+++ b/src/dialog/PaymentRequestDialog.cpp
@@ -12,7 +12,7 @@
 #include "WalletManager.h"
 
 PaymentRequestDialog::PaymentRequestDialog(QWidget *parent, QSharedPointer<AppContext> ctx, QString address)
-    : QDialog(parent)
+    : WindowModalDialog(parent)
     , ui(new Ui::PaymentRequestDialog)
     , m_ctx(std::move(ctx))
     , m_address(std::move(address))

diff --git a/src/dialog/PaymentRequestDialog.h b/src/dialog/PaymentRequestDialog.h
index c109d0a3ab7a1d07cba7cccdf77e24618fadfb9e..ca8274c7971155b0e1acc1019eb77d96fc8ea4fb 100644 (file)
--- a/src/dialog/PaymentRequestDialog.h
+++ b/src/dialog/PaymentRequestDialog.h
@@ -7,13 +7,14 @@
 #include <QDialog>
 
 #include "appcontext.h"
+#include "components.h"
 #include "qrcode/QrCode.h"
 
 namespace Ui {
     class PaymentRequestDialog;
 }
 
-class PaymentRequestDialog : public QDialog
+class PaymentRequestDialog : public WindowModalDialog
 {
     Q_OBJECT
 

diff --git a/src/dialog/QrCodeDialog.cpp b/src/dialog/QrCodeDialog.cpp
index 4b1c7cf01f2975c595d4386b08980280e3dc7da1..41ca49cc119d82d99ea2362c2edbeef7f672f30f 100644 (file)
--- a/src/dialog/QrCodeDialog.cpp
+++ b/src/dialog/QrCodeDialog.cpp
@@ -9,7 +9,7 @@
 #include <QMessageBox>
 
 QrCodeDialog::QrCodeDialog(QWidget *parent, QrCode *qrCode, const QString &title)
-        : QDialog(parent)
+        : WindowModalDialog(parent)
         , ui(new Ui::QrCodeDialog)
 {
     ui->setupUi(this);

diff --git a/src/dialog/QrCodeDialog.h b/src/dialog/QrCodeDialog.h
index 706b120b47f32a383ecb04fb27cbf144c78d877f..78d7dc30a8fd2b0a5a34120ee0c227de2c3110c5 100644 (file)
--- a/src/dialog/QrCodeDialog.h
+++ b/src/dialog/QrCodeDialog.h
@@ -6,6 +6,7 @@
 
 #include <QDialog>
 
+#include "components.h"
 #include "qrcode/QrCode.h"
 #include "widgets/QrCodeWidget.h"
 
@@ -13,7 +14,7 @@ namespace Ui {
     class QrCodeDialog;
 }
 
-class QrCodeDialog : public QDialog
+class QrCodeDialog : public WindowModalDialog
 {
 Q_OBJECT
 

diff --git a/src/dialog/RestoreHeightDialog.cpp b/src/dialog/RestoreHeightDialog.cpp
index ca7cfda878657316f8d74b0c1727b0d2db1db45a..5a4045c2a7f5b05a312e033744779102d8d480d7 100644 (file)
--- a/src/dialog/RestoreHeightDialog.cpp
+++ b/src/dialog/RestoreHeightDialog.cpp
@@ -8,7 +8,7 @@
 #include <QDialogButtonBox>
 
 RestoreHeightDialog::RestoreHeightDialog(QWidget *parent, quint64 currentRestoreHeight)
-    : QDialog(parent)
+    : WindowModalDialog(parent)
     , m_restoreHeightWidget(new RestoreHeightWidget(this))
 {
     auto *layout = new QVBoxLayout(this);

diff --git a/src/dialog/RestoreHeightDialog.h b/src/dialog/RestoreHeightDialog.h
index 88cad2c86475265cab6d7f4e19e04541663013f9..711882b13c087a303534f5c66a5917cc20a197cd 100644 (file)
--- a/src/dialog/RestoreHeightDialog.h
+++ b/src/dialog/RestoreHeightDialog.h
@@ -6,9 +6,10 @@
 
 #include <QDialog>
 
+#include "components.h"
 #include "widgets/RestoreHeightWidget.h"
 
-class RestoreHeightDialog : public QDialog
+class RestoreHeightDialog : public WindowModalDialog
 {
 Q_OBJECT
 

diff --git a/src/dialog/SeedDialog.cpp b/src/dialog/SeedDialog.cpp
index 9153b2a5b199844cd044f330e38a8cadf0e981c3..cc09e05fbb3a5d8fc4d36839a3a6faa2d30ce881 100644 (file)
--- a/src/dialog/SeedDialog.cpp
+++ b/src/dialog/SeedDialog.cpp
@@ -7,7 +7,7 @@
 #include "constants.h"
 
 SeedDialog::SeedDialog(QSharedPointer<AppContext> ctx, QWidget *parent)
-    : QDialog(parent)
+    : WindowModalDialog(parent)
     , ui(new Ui::SeedDialog)
     , m_ctx(std::move(ctx))
 {

diff --git a/src/dialog/SeedDialog.h b/src/dialog/SeedDialog.h
index a0398bd42cb70989222003f3bcd8294200063c57..7cc656ffcb4242451e2c0c53c0bdd727700787c2 100644 (file)
--- a/src/dialog/SeedDialog.h
+++ b/src/dialog/SeedDialog.h
@@ -7,12 +7,13 @@
 #include <QDialog>
 
 #include "appcontext.h"
+#include "components.h"
 
 namespace Ui {
     class SeedDialog;
 }
 
-class SeedDialog : public QDialog
+class SeedDialog : public WindowModalDialog
 {
 Q_OBJECT
 

diff --git a/src/dialog/SignVerifyDialog.cpp b/src/dialog/SignVerifyDialog.cpp
index 490aa5669510d68bc5e94e0bdf868c15d2a783e9..f65df4c5702431813aeb4c9ffe90c29fef1047f9 100644 (file)
--- a/src/dialog/SignVerifyDialog.cpp
+++ b/src/dialog/SignVerifyDialog.cpp
@@ -9,7 +9,7 @@
 #include "utils/Utils.h"
 
 SignVerifyDialog::SignVerifyDialog(Wallet *wallet, QWidget *parent)
-        : QDialog(parent)
+        : WindowModalDialog(parent)
         , ui(new Ui::SignVerifyDialog)
         , m_wallet(wallet)
 {

diff --git a/src/dialog/SignVerifyDialog.h b/src/dialog/SignVerifyDialog.h
index d7819f61a06707dbc8981a7d3e536a32eb6e36a3..18ad34a6ca80414a6798856a34bbee7f2e008526 100644 (file)
--- a/src/dialog/SignVerifyDialog.h
+++ b/src/dialog/SignVerifyDialog.h
@@ -6,13 +6,14 @@
 
 #include <QDialog>
 
+#include "components.h"
 #include "libwalletqt/Wallet.h"
 
 namespace Ui {
     class SignVerifyDialog;
 }
 
-class SignVerifyDialog : public QDialog
+class SignVerifyDialog : public WindowModalDialog
 {
 Q_OBJECT
 

diff --git a/src/dialog/SplashDialog.cpp b/src/dialog/SplashDialog.cpp
index ba0bc5c2b03088cf0b85ed39e28ef87141a22364..7f2e9d2c0c75469fcf7cb6dc9474c5bf3468e6c0 100644 (file)
--- a/src/dialog/SplashDialog.cpp
+++ b/src/dialog/SplashDialog.cpp
@@ -7,7 +7,7 @@
 #include "utils/Icons.h"
 
 SplashDialog::SplashDialog(QWidget *parent)
-        : QDialog(parent)
+        : WindowModalDialog(parent)
         , ui(new Ui::SplashDialog)
 {
     ui->setupUi(this);

diff --git a/src/dialog/SplashDialog.h b/src/dialog/SplashDialog.h
index 7341b7df0ec25ba3312d817df781457006fb8331..8f772a8db82ce9769faf6141a90970444c50676d 100644 (file)
--- a/src/dialog/SplashDialog.h
+++ b/src/dialog/SplashDialog.h
@@ -6,11 +6,13 @@
 
 #include <QDialog>
 
+#include "components.h"
+
 namespace Ui {
     class SplashDialog;
 }
 
-class SplashDialog : public QDialog
+class SplashDialog : public WindowModalDialog
 {
 Q_OBJECT
 

diff --git a/src/dialog/TxBroadcastDialog.cpp b/src/dialog/TxBroadcastDialog.cpp
index 58223db1c5e95d5f64e6f3d8374cff4763e6d086..1258522128ac93a3084da5e03eaf7439acaa2e9f 100644 (file)
--- a/src/dialog/TxBroadcastDialog.cpp
+++ b/src/dialog/TxBroadcastDialog.cpp
@@ -9,7 +9,7 @@
 #include "utils/NetworkManager.h"
 
 TxBroadcastDialog::TxBroadcastDialog(QWidget *parent, QSharedPointer<AppContext> ctx, const QString &transactionHex)
-        : QDialog(parent)
+        : WindowModalDialog(parent)
         , ui(new Ui::TxBroadcastDialog)
         , m_ctx(std::move(ctx))
 {

diff --git a/src/dialog/TxBroadcastDialog.h b/src/dialog/TxBroadcastDialog.h
index 944d463d2a65b173525df06135b431b30479089d..98f4e1944b1bb3bc86570ac354190d561cb06aa5 100644 (file)
--- a/src/dialog/TxBroadcastDialog.h
+++ b/src/dialog/TxBroadcastDialog.h
@@ -7,13 +7,14 @@
 #include <QDialog>
 
 #include "appcontext.h"
+#include "components.h"
 #include "utils/daemonrpc.h"
 
 namespace Ui {
     class TxBroadcastDialog;
 }
 
-class TxBroadcastDialog : public QDialog
+class TxBroadcastDialog : public WindowModalDialog
 {
     Q_OBJECT
 

diff --git a/src/dialog/TxConfAdvDialog.cpp b/src/dialog/TxConfAdvDialog.cpp
index 3ddb412fc78824dde02bfe73b5479d16bb991e4b..db3b230b20dee71f086a07b1969def8f71ebffb1 100644 (file)
--- a/src/dialog/TxConfAdvDialog.cpp
+++ b/src/dialog/TxConfAdvDialog.cpp
@@ -14,7 +14,7 @@
 #include "qrcode/QrCode.h"
 
 TxConfAdvDialog::TxConfAdvDialog(QSharedPointer<AppContext> ctx, const QString &description, QWidget *parent)
-    : QDialog(parent)
+    : WindowModalDialog(parent)
     , ui(new Ui::TxConfAdvDialog)
     , m_ctx(std::move(ctx))
     , m_exportUnsignedMenu(new QMenu(this))

diff --git a/src/dialog/TxConfAdvDialog.h b/src/dialog/TxConfAdvDialog.h
index c4df71618d719d8cf546ec332b1a7e3c4b3d075e..a0e50699055959f492e09c127468ef5154805a0f 100644 (file)
--- a/src/dialog/TxConfAdvDialog.h
+++ b/src/dialog/TxConfAdvDialog.h
@@ -10,13 +10,14 @@
 #include <QTextCharFormat>
 
 #include "appcontext.h"
+#include "components.h"
 #include "libwalletqt/PendingTransaction.h"
 
 namespace Ui {
     class TxConfAdvDialog;
 }
 
-class TxConfAdvDialog : public QDialog
+class TxConfAdvDialog : public WindowModalDialog
 {
 Q_OBJECT
 

diff --git a/src/dialog/TxConfDialog.cpp b/src/dialog/TxConfDialog.cpp
index 5cb27767678f6c76f92977fe18388993dbd2fa47..9db850923b6614e266631238250fb351b8565082 100644 (file)
--- a/src/dialog/TxConfDialog.cpp
+++ b/src/dialog/TxConfDialog.cpp
@@ -13,7 +13,7 @@
 #include "utils/ColorScheme.h"
 
 TxConfDialog::TxConfDialog(QSharedPointer<AppContext> ctx, PendingTransaction *tx, const QString &address, const QString &description, QWidget *parent)
-        : QDialog(parent)
+        : WindowModalDialog(parent)
         , ui(new Ui::TxConfDialog)
         , m_ctx(std::move(ctx))
         , m_tx(tx)

diff --git a/src/dialog/TxConfDialog.h b/src/dialog/TxConfDialog.h
index 4d2ab87791f6d13c957cf2f20044921e0dc476a7..0fd5cf4db54faa65e836a619f0d0542a5c13e677 100644 (file)
--- a/src/dialog/TxConfDialog.h
+++ b/src/dialog/TxConfDialog.h
@@ -7,6 +7,7 @@
 #include <QDialog>
 
 #include "appcontext.h"
+#include "components.h"
 #include "libwalletqt/PendingTransaction.h"
 #include "libwalletqt/WalletManager.h"
 
@@ -14,7 +15,7 @@ namespace Ui {
     class TxConfDialog;
 }
 
-class TxConfDialog : public QDialog
+class TxConfDialog : public WindowModalDialog
 {
 Q_OBJECT
 

diff --git a/src/dialog/TxImportDialog.cpp b/src/dialog/TxImportDialog.cpp
index 2a00bcc7025433a8fa77a2e8e123ae0121fefb3b..56645ad5c1dfcb55a8740cec2e7b8c5814b5c64a 100644 (file)
--- a/src/dialog/TxImportDialog.cpp
+++ b/src/dialog/TxImportDialog.cpp
@@ -9,7 +9,7 @@
 #include "utils/NetworkManager.h"
 
 TxImportDialog::TxImportDialog(QWidget *parent, QSharedPointer<AppContext> ctx)
-        : QDialog(parent)
+        : WindowModalDialog(parent)
         , ui(new Ui::TxImportDialog)
         , m_ctx(std::move(ctx))
         , m_loadTimer(new QTimer(this))

diff --git a/src/dialog/TxImportDialog.h b/src/dialog/TxImportDialog.h
index 4919252754332ca54e7ea77cbfc265492270dcdc..4e5f5a85448f195dc8fd679db6b0e2b1c243fd24 100644 (file)
--- a/src/dialog/TxImportDialog.h
+++ b/src/dialog/TxImportDialog.h
@@ -7,13 +7,14 @@
 #include <QDialog>
 
 #include "appcontext.h"
+#include "components.h"
 #include "utils/daemonrpc.h"
 
 namespace Ui {
     class TxImportDialog;
 }
 
-class TxImportDialog : public QDialog
+class TxImportDialog : public WindowModalDialog
 {
 Q_OBJECT
 

diff --git a/src/dialog/TxProofDialog.cpp b/src/dialog/TxProofDialog.cpp
index 9299c4d5ac6cff4e947620741a9ef0c4a2341e2f..e3ac45222842e97fe5c75beeec90ae814d1ae827 100644 (file)
--- a/src/dialog/TxProofDialog.cpp
+++ b/src/dialog/TxProofDialog.cpp
@@ -11,7 +11,7 @@
 #include "utils/Utils.h"
 
 TxProofDialog::TxProofDialog(QWidget *parent, QSharedPointer<AppContext> ctx, TransactionInfo *txInfo)
-    : QDialog(parent)
+    : WindowModalDialog(parent)
     , ui(new Ui::TxProofDialog)
     , m_ctx(std::move(ctx))
 {

diff --git a/src/dialog/TxProofDialog.h b/src/dialog/TxProofDialog.h
index ba47a57f0760cd310445e8f22cf8d05bf69857b2..7c1a84f56660ec2c7ec3b3ee34d1e25d631ac886 100644 (file)
--- a/src/dialog/TxProofDialog.h
+++ b/src/dialog/TxProofDialog.h
@@ -7,13 +7,14 @@
 #include <QDialog>
 
 #include "appcontext.h"
+#include "components.h"
 #include "libwalletqt/TransactionInfo.h"
 
 namespace Ui {
     class TxProofDialog;
 }
 
-class TxProofDialog : public QDialog
+class TxProofDialog : public WindowModalDialog
 {
     Q_OBJECT
 

diff --git a/src/dialog/VerifyProofDialog.cpp b/src/dialog/VerifyProofDialog.cpp
index d696f8f684edeeec45ddf4577697537ddf79e6e8..f27aa027893ec66e66bfea00fc288e2a7d9a2020 100644 (file)
--- a/src/dialog/VerifyProofDialog.cpp
+++ b/src/dialog/VerifyProofDialog.cpp
@@ -11,7 +11,7 @@
 #include "utils/Utils.h"
 
 VerifyProofDialog::VerifyProofDialog(Wallet *wallet, QWidget *parent)
-        : QDialog(parent)
+        : WindowModalDialog(parent)
         , ui(new Ui::VerifyProofDialog)
         , m_wallet(wallet)
 {

diff --git a/src/dialog/VerifyProofDialog.h b/src/dialog/VerifyProofDialog.h
index 8c538eb67b892e048ef0b6e0c5c71dcfb67b5d1f..4d9f3ab4b4b4f36f14bd31c957d563a91281c102 100644 (file)
--- a/src/dialog/VerifyProofDialog.h
+++ b/src/dialog/VerifyProofDialog.h
@@ -7,13 +7,14 @@
 #include <QDialog>
 #include <QIcon>
 
+#include "components.h"
 #include "libwalletqt/Wallet.h"
 
 namespace Ui {
     class VerifyProofDialog;
 }
 
-class VerifyProofDialog : public QDialog
+class VerifyProofDialog : public WindowModalDialog
 {
 Q_OBJECT
 

diff --git a/src/dialog/ViewOnlyDialog.cpp b/src/dialog/ViewOnlyDialog.cpp
index a031a1a2611b2b400658818fd4510a1d2fab0efa..d1251cc5e1fa3c21086e667b4a1fa37267950363 100644 (file)
--- a/src/dialog/ViewOnlyDialog.cpp
+++ b/src/dialog/ViewOnlyDialog.cpp
@@ -9,7 +9,7 @@
 #include <QMessageBox>
 
 ViewOnlyDialog::ViewOnlyDialog(QSharedPointer<AppContext> ctx, QWidget *parent)
-    : QDialog(parent)
+    : WindowModalDialog(parent)
     , ui(new Ui::ViewOnlyDialog)
     , m_ctx(std::move(ctx))
 {

diff --git a/src/dialog/ViewOnlyDialog.h b/src/dialog/ViewOnlyDialog.h
index 3cb99429069b429a7bd86823adb8d72a21b1d5a8..8f137a8f249f9913c470d434cbd9a891369007dc 100644 (file)
--- a/src/dialog/ViewOnlyDialog.h
+++ b/src/dialog/ViewOnlyDialog.h
@@ -7,12 +7,13 @@
 #include <QDialog>
 
 #include "appcontext.h"
+#include "components.h"
 
 namespace Ui {
     class ViewOnlyDialog;
 }
 
-class ViewOnlyDialog : public QDialog
+class ViewOnlyDialog : public WindowModalDialog
 {
 Q_OBJECT
 

diff --git a/src/dialog/WalletCacheDebugDialog.cpp b/src/dialog/WalletCacheDebugDialog.cpp
index f2547ee2d5b1f345c5cde98028b06aa71a96286c..2805c1ca374b15c501da64a4303750f2c579dcc0 100644 (file)
--- a/src/dialog/WalletCacheDebugDialog.cpp
+++ b/src/dialog/WalletCacheDebugDialog.cpp
@@ -9,7 +9,7 @@
 #include "model/ModelUtils.h"
 
 WalletCacheDebugDialog::WalletCacheDebugDialog(QSharedPointer<AppContext> ctx, QWidget *parent)
-        : QDialog(parent)
+        : WindowModalDialog(parent)
         , ui(new Ui::WalletCacheDebugDialog)
         , m_ctx(std::move(ctx))
 {

diff --git a/src/dialog/WalletCacheDebugDialog.h b/src/dialog/WalletCacheDebugDialog.h
index 0b8f076832b2e120898efbd088c7a887f2c609b1..5778814c83efb91f3d428b7412a75db5cf8ae89c 100644 (file)
--- a/src/dialog/WalletCacheDebugDialog.h
+++ b/src/dialog/WalletCacheDebugDialog.h
@@ -7,12 +7,13 @@
 #include <QDialog>
 
 #include "appcontext.h"
+#include "components.h"
 
 namespace Ui {
     class WalletCacheDebugDialog;
 }
 
-class WalletCacheDebugDialog : public QDialog
+class WalletCacheDebugDialog : public WindowModalDialog
 {
 Q_OBJECT
 

diff --git a/src/dialog/WalletInfoDialog.cpp b/src/dialog/WalletInfoDialog.cpp
index fac1766b692c43654875db91955388e4bd7f0d41..bcf8f77ddbb38c7cc3e0fc09869fcb0a4a8168d2 100644 (file)
--- a/src/dialog/WalletInfoDialog.cpp
+++ b/src/dialog/WalletInfoDialog.cpp
@@ -7,7 +7,7 @@
 #include <QDesktopServices>
 
 WalletInfoDialog::WalletInfoDialog(QSharedPointer<AppContext> ctx, QWidget *parent)
-    : QDialog(parent)
+    : WindowModalDialog(parent)
     , ui(new Ui::WalletInfoDialog)
     , m_ctx(std::move(ctx))
 {

diff --git a/src/dialog/WalletInfoDialog.h b/src/dialog/WalletInfoDialog.h
index 9ab4c25d9be2a32f9906bf367f71020dd7b419f3..1c77e7484ef58aed1bba5c01891df20af7eda037 100644 (file)
--- a/src/dialog/WalletInfoDialog.h
+++ b/src/dialog/WalletInfoDialog.h
@@ -7,12 +7,13 @@
 #include <QDialog>
 
 #include "appcontext.h"
+#include "components.h"
 
 namespace Ui {
     class WalletInfoDialog;
 }
 
-class WalletInfoDialog : public QDialog
+class WalletInfoDialog : public WindowModalDialog
 {
 Q_OBJECT