#5657 Rename edition to activeLicense. WSFs

src/gui/src/ActivationDialog.cpp

@@ -14,67 +14,67 @@
 #include <QThread>
 #include <iostream>
 
-ActivationDialog::ActivationDialog(QWidget* parent, AppConfig& appConfig, 
-								   SubscriptionManager& subscriptionManager) :
-	QDialog(parent),
-	ui(new Ui::ActivationDialog),
-	m_appConfig(&appConfig),
-	m_subscriptionManager (&subscriptionManager)
+ActivationDialog::ActivationDialog(QWidget* parent, AppConfig& appConfig,
+                                   SubscriptionManager& subscriptionManager) :
+    QDialog(parent),
+    ui(new Ui::ActivationDialog),
+    m_appConfig(&appConfig),
+    m_subscriptionManager (&subscriptionManager)
 {
-	ui->setupUi(this);
-	refreshSerialKey();
+    ui->setupUi(this);
+    refreshSerialKey();
 }
 
 void ActivationDialog::refreshSerialKey()
 {
-	ui->m_pTextEditSerialKey->setText(m_appConfig->serialKey());
-	ui->m_pTextEditSerialKey->setFocus();
-	ui->m_pTextEditSerialKey->moveCursor(QTextCursor::End);	
+    ui->m_pTextEditSerialKey->setText(m_appConfig->serialKey());
+    ui->m_pTextEditSerialKey->setFocus();
+    ui->m_pTextEditSerialKey->moveCursor(QTextCursor::End);
 }
 
 ActivationDialog::~ActivationDialog()
 {
-	delete ui;
+    delete ui;
 }
 
 void ActivationDialog::reject()
 {
-	if (m_subscriptionManager->edition() == Edition::kUnregistered) {
-		CancelActivationDialog cancelActivationDialog(this);
-		if (QDialog::Accepted == cancelActivationDialog.exec()) {
-			m_subscriptionManager->skipActivation();
-			m_appConfig->activationHasRun(true);
-			m_appConfig->saveSettings();
-		}
-	}
-	QDialog::reject();
+    if (m_subscriptionManager->activeLicense() == Edition::kUnregistered) {
+        CancelActivationDialog cancelActivationDialog(this);
+        if (QDialog::Accepted == cancelActivationDialog.exec()) {
+            m_subscriptionManager->skipActivation();
+            m_appConfig->activationHasRun(true);
+            m_appConfig->saveSettings();
+        }
+    }
+    QDialog::reject();
 }
 
 void ActivationDialog::accept()
 {
-	QMessageBox message;
-	QString error;
-	
-	m_appConfig->activationHasRun(true);
-	m_appConfig->saveSettings();
+    QMessageBox message;
+    QString error;
 
-	try {
-		QString serialKey = ui->m_pTextEditSerialKey->toPlainText();
-		m_subscriptionManager->setSerialKey(serialKey);
-	}
-	catch (std::exception& e) {
-		message.critical(this, "Unknown Error",
-			tr("An error occurred while trying to activate Synergy. "
-				"Please contact the helpdesk, and provide the "
-				"following details.\n\n%1").arg(e.what()));
-		refreshSerialKey();
-		return;
-	}
+    m_appConfig->activationHasRun(true);
+    m_appConfig->saveSettings();
 
-	if (m_subscriptionManager->edition() != Edition::kUnregistered) {
-		message.information(this, "Activated!",
-					tr("Thanks for activating %1!").arg
-							(getEditionName(m_subscriptionManager->edition())));
-	}
-	QDialog::accept();
+    try {
+        QString serialKey = ui->m_pTextEditSerialKey->toPlainText();
+        m_subscriptionManager->setSerialKey(serialKey);
+    }
+    catch (std::exception& e) {
+        message.critical(this, "Unknown Error",
+            tr("An error occurred while trying to activate Synergy. "
+                "Please contact the helpdesk, and provide the "
+                "following details.\n\n%1").arg(e.what()));
+        refreshSerialKey();
+        return;
+    }
+
+    if (m_subscriptionManager->activeLicense() != Edition::kUnregistered) {
+        message.information(this, "Activated!",
+                    tr("Thanks for activating %1!").arg
+                            (getEditionName(m_subscriptionManager->activeLicense())));
+    }
+    QDialog::accept();
 }