smw/deskflow
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SYNERGY-1027 When clicking on "Save" preferences, automatically apply… (#7068)

Browse source 
* 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 <andrii-external@symless.com>
Co-authored-by: Serhii Hadzhilov <serhii-external@symless.com>
This commit is contained in:
Andrey Batyiev 2021-08-12 16:31:03 +03:00 committed by GitHub
parent 28dcd34251
commit e713502df2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -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: Bug fixes:
- #7016 Fix script that generates version number - #7016 Fix script that generates version number

2
cmake/Version.cmake
View file

@ -6,7 +6,7 @@ cmake_minimum_required (VERSION 3.4)
set (SYNERGY_VERSION_MAJOR 1) set (SYNERGY_VERSION_MAJOR 1)
set (SYNERGY_VERSION_MINOR 14) set (SYNERGY_VERSION_MINOR 14)
set (SYNERGY_VERSION_PATCH 1) set (SYNERGY_VERSION_PATCH 2)
set (SYNERGY_VERSION_BUILD 1) set (SYNERGY_VERSION_BUILD 1)
set (SYNERGY_VERSION_STAGE "snapshot") set (SYNERGY_VERSION_STAGE "snapshot")

9
src/gui/src/MainWindow.cpp
View file

@ -1299,7 +1299,14 @@ void MainWindow::updateAutoConfigWidgets()
void MainWindow::on_m_pActionSettings_triggered() 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) void MainWindow::autoAddScreen(const QString name)