diff options
| -rw-r--r-- | application/dialogs/NewInstanceDialog.cpp | 26 | ||||
| -rw-r--r-- | application/dialogs/NewInstanceDialog.h | 8 |
2 files changed, 18 insertions, 16 deletions
diff --git a/application/dialogs/NewInstanceDialog.cpp b/application/dialogs/NewInstanceDialog.cpp index 218d5e8e..b95f192f 100644 --- a/application/dialogs/NewInstanceDialog.cpp +++ b/application/dialogs/NewInstanceDialog.cpp @@ -81,7 +81,7 @@ NewInstanceDialog::NewInstanceDialog(const QString & initialGroup, const QString importPage->setUrl(url); } - connect(m_buttons->button(QDialogButtonBox::Ok), &QPushButton::clicked, this, &QDialog::accept); + connect(m_buttons->button(QDialogButtonBox::Ok), &QPushButton::clicked, this, &NewInstanceDialog::accept); connect(m_buttons->button(QDialogButtonBox::Help), &QPushButton::clicked, m_container, &PageContainer::help); updateDialogState(); @@ -90,6 +90,18 @@ NewInstanceDialog::NewInstanceDialog(const QString & initialGroup, const QString } +void NewInstanceDialog::reject() +{ + MMC->settings()->set("NewInstanceGeometry", saveGeometry().toBase64()); + QDialog::reject(); +} + +void NewInstanceDialog::accept() +{ + MMC->settings()->set("NewInstanceGeometry", saveGeometry().toBase64()); + QDialog::accept(); +} + QList<BasePage *> NewInstanceDialog::getPages() { importPage = new ImportPage(this); @@ -178,15 +190,3 @@ void NewInstanceDialog::on_instNameTextBox_textChanged(const QString &arg1) { updateDialogState(); } - -void NewInstanceDialog::closeEvent(QCloseEvent* event) -{ - qDebug() << "New instance dialog close requested"; - if (m_container->prepareToClose()) - { - qDebug() << "New instance dialog close approved"; - MMC->settings()->set("NewInstanceGeometry", saveGeometry().toBase64()); - qDebug() << "New instance dialog geometry saved"; - QDialog::closeEvent(event); - } -} diff --git a/application/dialogs/NewInstanceDialog.h b/application/dialogs/NewInstanceDialog.h index ca134d32..9d7cab01 100644 --- a/application/dialogs/NewInstanceDialog.h +++ b/application/dialogs/NewInstanceDialog.h @@ -50,11 +50,13 @@ public: QString instGroup() const; QString iconKey() const; -private -slots: +public slots: + void accept() override; + void reject() override; + +private slots: void on_iconButton_clicked(); void on_instNameTextBox_textChanged(const QString &arg1); - virtual void closeEvent(QCloseEvent *event); private: Ui::NewInstanceDialog *ui = nullptr; |