diff --git a/debian/changelog b/debian/changelog index 8867605..cd10e2b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +lubuntu-installer-prompt (24.04.3) noble; urgency=medium + + * Don't let people close modal windows so they don't accidentally confuse + the prompt and mess up their system. + + -- Aaron Rainbolt Mon, 11 Mar 2024 18:14:21 -0500 + lubuntu-installer-prompt (24.04.2) noble; urgency=medium * Remove a spurious d/source/options file resulting in the whole Git repo diff --git a/src/connectionprogressdialog.cpp b/src/connectionprogressdialog.cpp index 6d5fe8c..6c050b9 100644 --- a/src/connectionprogressdialog.cpp +++ b/src/connectionprogressdialog.cpp @@ -1,6 +1,8 @@ #include "connectionprogressdialog.h" #include "ui_connectionprogressdialog.h" +#include + ConnectionProgressDialog::ConnectionProgressDialog(QWidget *parent) : QDialog(parent), ui(new Ui::ConnectionProgressDialog) @@ -17,3 +19,8 @@ void ConnectionProgressDialog::setNetworkName(QString name) { ui->label->setText(tr("Connecting to %1...").arg(name)); } + +void ConnectionProgressDialog::closeEvent(QCloseEvent *event) +{ + event->ignore(); +} diff --git a/src/connectionprogressdialog.h b/src/connectionprogressdialog.h index 98cd4ba..6e1d433 100644 --- a/src/connectionprogressdialog.h +++ b/src/connectionprogressdialog.h @@ -16,6 +16,9 @@ public: ~ConnectionProgressDialog(); void setNetworkName(QString name); +protected slots: + void closeEvent(QCloseEvent *event) override; + private: Ui::ConnectionProgressDialog *ui; }; diff --git a/src/languagechangedialog.cpp b/src/languagechangedialog.cpp index dff2b47..6cefdb9 100644 --- a/src/languagechangedialog.cpp +++ b/src/languagechangedialog.cpp @@ -1,6 +1,8 @@ #include "languagechangedialog.h" #include "ui_languagechangedialog.h" +#include + LanguageChangeDialog::LanguageChangeDialog(QWidget *parent) : QDialog(parent), ui(new Ui::LanguageChangeDialog) @@ -12,3 +14,8 @@ LanguageChangeDialog::~LanguageChangeDialog() { delete ui; } + +void LanguageChangeDialog::closeEvent(QCloseEvent *event) +{ + event->ignore(); +} diff --git a/src/languagechangedialog.h b/src/languagechangedialog.h index 59aa510..77e011d 100644 --- a/src/languagechangedialog.h +++ b/src/languagechangedialog.h @@ -15,6 +15,9 @@ public: explicit LanguageChangeDialog(QWidget *parent = nullptr); ~LanguageChangeDialog(); +protected slots: + void closeEvent(QCloseEvent *event) override; + private: Ui::LanguageChangeDialog *ui; }; diff --git a/src/wifipassworddialog.cpp b/src/wifipassworddialog.cpp index 9b49e14..743a3db 100644 --- a/src/wifipassworddialog.cpp +++ b/src/wifipassworddialog.cpp @@ -1,11 +1,14 @@ #include "wifipassworddialog.h" #include "ui_wifipassworddialog.h" +#include + WifiPasswordDialog::WifiPasswordDialog(QString ssid, QWidget *parent) : QDialog(parent), ui(new Ui::WifiPasswordDialog) { ui->setupUi(this); + ui->wifiLabel->setText(tr("Enter password for %1:").arg(ssid)); connect(ui->connectButton, &QPushButton::clicked, this, &WifiPasswordDialog::onConnectClicked); } @@ -25,3 +28,8 @@ QString WifiPasswordDialog::getPassword() { return password; } + +void WifiPasswordDialog::closeEvent(QCloseEvent *event) +{ + event->ignore(); +} diff --git a/src/wifipassworddialog.h b/src/wifipassworddialog.h index b8c5110..691728c 100644 --- a/src/wifipassworddialog.h +++ b/src/wifipassworddialog.h @@ -16,6 +16,9 @@ public: ~WifiPasswordDialog(); QString getPassword(); +protected slots: + void closeEvent(QCloseEvent *event) override; + private slots: void onConnectClicked();