Permalink
Browse files
#5629 Enable activation cancellation dialog
- Loading branch information...
|
|
@@ -1,5 +1,6 @@ |
|
|
#include "ActivationDialog.h"
|
|
|
#include "ui_ActivationDialog.h"
|
|
|
+#include "CancelActivationDialog.h"
|
|
|
|
|
|
ActivationDialog::ActivationDialog(QWidget *parent) :
|
|
|
QDialog(parent),
|
|
|
@@ -12,3 +13,11 @@ ActivationDialog::~ActivationDialog() |
|
|
{
|
|
|
delete ui;
|
|
|
}
|
|
|
+
|
|
|
+void ActivationDialog::reject()
|
|
|
+{
|
|
|
+ CancelActivationDialog cancelActivationDialog(this);
|
|
|
+ if (QDialog::Accepted == cancelActivationDialog.exec()) {
|
|
|
+ QDialog::reject();
|
|
|
+ }
|
|
|
+}
|
|
|
@@ -14,6 +14,9 @@ class ActivationDialog : public QDialog |
|
|
public:
|
|
|
explicit ActivationDialog(QWidget *parent = 0);
|
|
|
~ActivationDialog();
|
|
|
+
|
|
|
+public slots:
|
|
|
+ void reject();
|
|
|
|
|
|
private:
|
|
|
Ui::ActivationDialog *ui;
|
|
|
|
|
|
@@ -1154,7 +1154,7 @@ void MainWindow::on_m_pActionWizard_triggered() |
|
|
|
|
|
void MainWindow::on_m_pActivate_triggered()
|
|
|
{
|
|
|
- ActivationDialog activationDialog;
|
|
|
+ ActivationDialog activationDialog (this);
|
|
|
activationDialog.exec();
|
|
|
}
|
|
|
|
|
|
|
0 comments on commit
60a4e62