This repository has been archived by the owner. It is now read-only.
Permalink
Browse files

#5629 Enable activation cancellation dialog

  • Loading branch information...
nlyan committed Sep 29, 2016
1 parent 0d5d7e1 commit 60a4e627795bda1ffb85baa915e695ef1886b5f1
Showing with 13 additions and 1 deletion.
  1. +9 −0 src/gui/src/ActivationDialog.cpp
  2. +3 −0 src/gui/src/ActivationDialog.h
  3. +1 −1 src/gui/src/MainWindow.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();
+ }
+}
@@ -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

Please sign in to comment.