From 783056f7cc0d4ddce71f958de87c0c42d1384af7 Mon Sep 17 00:00:00 2001
From: Andrew Nelless <andrew@symless.com>
Date: Tue, 4 Oct 2016 13:41:27 +0100
Subject: [PATCH] #5629 Ensure setEdition signals main UI

---
 src/gui/src/ActivationDialog.cpp |  5 -----
 src/gui/src/AppConfig.cpp        |  5 ++++-
 src/gui/src/AppConfig.h          |  8 +++++++-
 src/gui/src/MainWindow.cpp       | 17 ++++++++---------
 src/gui/src/MainWindow.h         |  2 +-
 src/gui/src/SettingsDialog.cpp   |  1 -
 src/gui/src/SetupWizard.cpp      |  5 +----
 src/gui/src/SetupWizard.h        |  2 --
 8 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/src/gui/src/ActivationDialog.cpp b/src/gui/src/ActivationDialog.cpp
index e4beeb49..40251019 100644
--- a/src/gui/src/ActivationDialog.cpp
+++ b/src/gui/src/ActivationDialog.cpp
@@ -161,10 +161,5 @@ void ActivationDialog::accept()
 
 	message.information  (this, "Activated!", 
 						  tr("Thanks for activating %1!").arg (getEditionName (edition)));
-	MainWindow& mainWindow = dynamic_cast<MainWindow&>(*this->parent());
-	mainWindow.setEdition(edition);
-	mainWindow.updateLocalFingerprint();
-	mainWindow.saveSettings();
-
 	QDialog::accept();
 }
diff --git a/src/gui/src/AppConfig.cpp b/src/gui/src/AppConfig.cpp
index e6b9b0ed..a6d081f9 100644
--- a/src/gui/src/AppConfig.cpp
+++ b/src/gui/src/AppConfig.cpp
@@ -238,7 +238,10 @@ void AppConfig::setAutoConfigPrompted(bool prompted)
 	m_AutoConfigPrompted = prompted;
 }
 
-void AppConfig::setEdition(int e) { m_Edition = e; }
+void AppConfig::setEdition(int e) {
+	m_Edition = e;
+	emit editionSet (e);
+}
 
 int AppConfig::edition() const { return m_Edition; }
 
diff --git a/src/gui/src/AppConfig.h b/src/gui/src/AppConfig.h
index 5110bf91..3d15ec6e 100644
--- a/src/gui/src/AppConfig.h
+++ b/src/gui/src/AppConfig.h
@@ -20,6 +20,7 @@
 
 #define APPCONFIG_H
 
+#include <QObject>
 #include <QString>
 #include "ElevateMode.h"
 
@@ -47,8 +48,10 @@ enum ProcessMode {
 	Desktop
 };
 
-class AppConfig
+class AppConfig: public QObject
 {
+	Q_OBJECT
+
 	friend class SettingsDialog;
 	friend class MainWindow;
 	friend class SetupWizard;
@@ -144,6 +147,9 @@ class AppConfig
 		static const char m_SynergysName[];
 		static const char m_SynergycName[];
 		static const char m_SynergyLogDir[];
+
+	signals:
+		void editionSet(int);
 };
 
 #endif
diff --git a/src/gui/src/MainWindow.cpp b/src/gui/src/MainWindow.cpp
index f4cab6ef..64271c14 100644
--- a/src/gui/src/MainWindow.cpp
+++ b/src/gui/src/MainWindow.cpp
@@ -138,15 +138,8 @@ MainWindow::MainWindow(QSettings& settings, AppConfig& appConfig) :
 	setEdition(m_AppConfig.edition());
 
 	m_pLabelPadlock->hide();
-
-	if (appConfig.getCryptoEnabled()) {
-		m_pSslCertificate = new SslCertificate(this);
-		m_pSslCertificate->generateCertificate();
-	}
-
-	updateLocalFingerprint();
-
 	connect (this, SIGNAL(windowShown()), this, SLOT(on_windowShown()), Qt::QueuedConnection);
+	connect (&m_AppConfig, SIGNAL(editionSet(int)), this, SLOT(setEdition(int)), Qt::QueuedConnection);
 }
 
 MainWindow::~MainWindow()
@@ -1034,11 +1027,17 @@ void MainWindow::serverDetected(const QString name)
 void MainWindow::setEdition(int edition)
 {
 	setWindowTitle(getEditionName(edition));
+	if (m_AppConfig.getCryptoEnabled()) {
+		m_pSslCertificate = new SslCertificate(this);
+		m_pSslCertificate->generateCertificate();
+	}
+	updateLocalFingerprint();
+	saveSettings();
 }
 
 void MainWindow::updateLocalFingerprint()
 {
-	if (Fingerprint::local().fileExists()) {
+	if (m_AppConfig.getCryptoEnabled() && Fingerprint::local().fileExists()) {
 		m_pLabelFingerprint->setVisible(true);
 		m_pLabelLocalFingerprint->setVisible(true);
 		m_pLabelLocalFingerprint->setText(Fingerprint::local().readFirst());
diff --git a/src/gui/src/MainWindow.h b/src/gui/src/MainWindow.h
index b71d8a00..2f0b2c5b 100644
--- a/src/gui/src/MainWindow.h
+++ b/src/gui/src/MainWindow.h
@@ -115,10 +115,10 @@ class MainWindow : public QMainWindow, public Ui::MainWindowBase
 		void autoAddScreen(const QString name);
 		void updateZeroconfService();
 		void serverDetected(const QString name);
-		void setEdition(int edition);
 		void updateLocalFingerprint();
 
 	public slots:
+		void setEdition(int edition);
 		void appendLogRaw(const QString& text);
 		void appendLogInfo(const QString& text);
 		void appendLogDebug(const QString& text);
diff --git a/src/gui/src/SettingsDialog.cpp b/src/gui/src/SettingsDialog.cpp
index 14cd1fc7..813eac36 100644
--- a/src/gui/src/SettingsDialog.cpp
+++ b/src/gui/src/SettingsDialog.cpp
@@ -151,6 +151,5 @@ void SettingsDialog::on_m_pCheckBoxEnableCrypto_toggled(bool checked)
 		sslCertificate.generateCertificate();
 		MainWindow& mainWindow = dynamic_cast<MainWindow&> (*this->parent());
 		mainWindow.updateLocalFingerprint();
-		mainWindow.saveSettings();
 	}
 }
diff --git a/src/gui/src/SetupWizard.cpp b/src/gui/src/SetupWizard.cpp
index a9dab840..b4e6ab3a 100644
--- a/src/gui/src/SetupWizard.cpp
+++ b/src/gui/src/SetupWizard.cpp
@@ -28,9 +28,7 @@
 
 SetupWizard::SetupWizard(MainWindow& mainWindow, bool startMain) :
 	m_MainWindow(mainWindow),
-	m_StartMain(startMain),
-	m_Edition(Unregistered),
-	m_LoginAttemps(0)
+	m_StartMain(startMain)
 {
 	setupUi(this);
 
@@ -141,7 +139,6 @@ void SetupWizard::reject()
 
 	if (m_StartMain)
 	{
-		m_MainWindow.setEdition(m_Edition);
 		m_MainWindow.open();
 	}
 
diff --git a/src/gui/src/SetupWizard.h b/src/gui/src/SetupWizard.h
index a1fde149..009939b2 100644
--- a/src/gui/src/SetupWizard.h
+++ b/src/gui/src/SetupWizard.h
@@ -47,8 +47,6 @@ private:
 	MainWindow& m_MainWindow;
 	bool m_StartMain;
 	SynergyLocale m_Locale;
-	int m_Edition;
-	int m_LoginAttemps;
 
 private slots:
 	void on_m_pComboLanguage_currentIndexChanged(int index);