From fdd09d0f5dcc0f16a43c1285ea05da62ca59b929 Mon Sep 17 00:00:00 2001 From: Jamie Newbon Date: Wed, 1 Apr 2020 10:21:33 +0100 Subject: [PATCH] #6587 Added signal when auto config is changed to update UI --- src/gui/src/AppConfig.cpp | 1 + src/gui/src/AppConfig.h | 1 + src/gui/src/MainWindow.cpp | 12 ++++++++++++ src/gui/src/MainWindow.h | 3 +++ 4 files changed, 17 insertions(+) diff --git a/src/gui/src/AppConfig.cpp b/src/gui/src/AppConfig.cpp index 7613b3c60f..dbd297c659 100644 --- a/src/gui/src/AppConfig.cpp +++ b/src/gui/src/AppConfig.cpp @@ -244,6 +244,7 @@ void AppConfig::setElevateMode(ElevateMode em) { m_ElevateMode = em; } void AppConfig::setAutoConfig(bool autoConfig) { m_AutoConfig = autoConfig; + emit zeroConfToggled(); } void AppConfig::setAutoConfigServer(QString autoConfigServer) diff --git a/src/gui/src/AppConfig.h b/src/gui/src/AppConfig.h index 7e075e62b3..5ca0b36488 100644 --- a/src/gui/src/AppConfig.h +++ b/src/gui/src/AppConfig.h @@ -161,6 +161,7 @@ protected: signals: void sslToggled(bool enabled); + void zeroConfToggled(); }; #endif diff --git a/src/gui/src/MainWindow.cpp b/src/gui/src/MainWindow.cpp index 001aa43885..2a2eb3a2c8 100644 --- a/src/gui/src/MainWindow.cpp +++ b/src/gui/src/MainWindow.cpp @@ -181,6 +181,9 @@ MainWindow::MainWindow (QSettings& settings, AppConfig& appConfig, connect (m_AppConfig, SIGNAL(sslToggled(bool)), this, SLOT(sslToggled(bool)), Qt::QueuedConnection); + connect (m_AppConfig, SIGNAL(zeroConfToggled()), + this, SLOT(zeroConfToggled()), Qt::QueuedConnection); + #ifdef SYNERGY_ENTERPRISE setWindowTitle ("Synergy 1 Enterprise"); #else @@ -355,6 +358,15 @@ void MainWindow::saveSettings() settings().sync(); } +void MainWindow::zeroConfToggled() { +#ifndef SYNERGY_ENTERPRISE + updateZeroconfService(); + + addZeroconfServer(m_AppConfig->autoConfigServer()); + + updateAutoConfigWidgets(); +#endif +} void MainWindow::setIcon(qSynergyState state) { QIcon icon; diff --git a/src/gui/src/MainWindow.h b/src/gui/src/MainWindow.h index dc2212a76a..92d7d2abc8 100644 --- a/src/gui/src/MainWindow.h +++ b/src/gui/src/MainWindow.h @@ -160,6 +160,9 @@ public slots: void updateFound(const QString& version); void saveSettings(); + /// @brief Receives the signal that the auto config option has changed + void zeroConfToggled(); + protected: QSettings& settings() { return m_Settings; } AppConfig& appConfig() { return *m_AppConfig; }