From e713502df237c75e31cedb19f9378469f34a93a8 Mon Sep 17 00:00:00 2001 From: Andrey Batyiev Date: Thu, 12 Aug 2021 16:31:03 +0300 Subject: [PATCH] =?UTF-8?q?SYNERGY-1027=20When=20clicking=20on=20"Save"=20?= =?UTF-8?q?preferences,=20automatically=20apply=E2=80=A6=20(#7068)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * SYNERGY-1027 When clicking on "Save" preferences, automatically apply all the new settings *Add apply on settings save * SYNERGY-1027 When clicking on "Save" preferences, automatically apply all the new settings *Update changelog * SYENRGY-1027 Update ChangeLog and Version.cmake Co-authored-by: Andrii Batyiev Co-authored-by: Serhii Hadzhilov --- ChangeLog | 8 +++++++- cmake/Version.cmake | 2 +- src/gui/src/MainWindow.cpp | 9 ++++++++- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index f410be7d3..f8c359a93 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,10 @@ -v1.14.1-snapshot +v1.14.2-snapshot +=========== +Enhancements: +- #7068 Add Synergy restart when settings changed +=========== + +v1.14.1-rc =========== Bug fixes: - #7016 Fix script that generates version number diff --git a/cmake/Version.cmake b/cmake/Version.cmake index a598d32f6..c7ce54181 100644 --- a/cmake/Version.cmake +++ b/cmake/Version.cmake @@ -6,7 +6,7 @@ cmake_minimum_required (VERSION 3.4) set (SYNERGY_VERSION_MAJOR 1) set (SYNERGY_VERSION_MINOR 14) -set (SYNERGY_VERSION_PATCH 1) +set (SYNERGY_VERSION_PATCH 2) set (SYNERGY_VERSION_BUILD 1) set (SYNERGY_VERSION_STAGE "snapshot") diff --git a/src/gui/src/MainWindow.cpp b/src/gui/src/MainWindow.cpp index b073298d5..f329aae15 100644 --- a/src/gui/src/MainWindow.cpp +++ b/src/gui/src/MainWindow.cpp @@ -1299,7 +1299,14 @@ void MainWindow::updateAutoConfigWidgets() void MainWindow::on_m_pActionSettings_triggered() { - SettingsDialog(this, appConfig()).exec(); + auto result = SettingsDialog(this, appConfig()).exec(); + if(result == QDialog::Accepted) + { + auto state = synergyState(); + if ((state == synergyConnected) || (state == synergyConnecting) || (state == synergyListening)) { + restartSynergy(); + } + } } void MainWindow::autoAddScreen(const QString name)