#5629 Enable activation cancellation dialog

symless · Sep 29, 2016 · 60a4e62 · 60a4e62
1 parent 0d5d7e1
commit 60a4e62
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/src/gui/src/ActivationDialog.cpp b/src/gui/src/ActivationDialog.cpp
@@ -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();
+	}
+}
diff --git a/src/gui/src/ActivationDialog.h b/src/gui/src/ActivationDialog.h
@@ -14,6 +14,9 @@ class ActivationDialog : public QDialog
 public:
 	explicit ActivationDialog(QWidget *parent = 0);
 	~ActivationDialog();
+
+public slots:
+	void reject();
 
 private:
 	Ui::ActivationDialog *ui;

diff --git a/src/gui/src/MainWindow.cpp b/src/gui/src/MainWindow.cpp
@@ -1154,7 +1154,7 @@ void MainWindow::on_m_pActionWizard_triggered()
 
 void MainWindow::on_m_pActivate_triggered()
 {
-	ActivationDialog activationDialog;
+	ActivationDialog activationDialog (this);
 	activationDialog.exec();
 }