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

SYNERGY1-963 Remove TLS unused options from the GUI on Synergy Client (#7182)

Browse source 
* SYNERGY1-963 Remove TLS unused options from the GUI on Synergy Client

* SYNERGY1-983 Update ChangeLog.txt
This commit is contained in:
Serhii Hadzhilov 2022-06-01 15:36:44 +03:00 committed by GitHub
parent 1b346c4cb0
commit 31c6e99258
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 35 additions and 11 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.4-snapshot
v1.14.5-snapshot
===========
Bug fixes:
- #7182 Remove unused TLS options from the GUI on Synergy Client
===========
v1.14.4-rc
===========
Enhancements:
- #7143 Add ability to stop synergy on the login screen

2
cmake/Version.cmake
View file

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

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

@ -1479,6 +1479,7 @@ void MainWindow::updateScreenName()
void MainWindow::enableServer(bool enable)
{
m_AppConfig->setServerGroupChecked(enable);
m_pRadioGroupServer->setChecked(enable);
if (enable)
@ -1498,6 +1499,7 @@ void MainWindow::enableServer(bool enable)
void MainWindow::enableClient(bool enable)
{
m_AppConfig->setClientGroupChecked(enable);
m_pRadioGroupClient->setChecked(enable);
if (enable)

31
src/gui/src/SettingsDialog.cpp
View file

@ -155,13 +155,7 @@ void SettingsDialog::loadFromConfig() {
m_pCheckBoxLanguageSync->setChecked(m_appConfig.getLanguageSync());
m_pCheckBoxScrollDirection->setChecked(m_appConfig.getInvertScrollDirection());
//If the tls file exists test its key length
if (QFile(appConfig().getTLSCertPath()).exists()) {
updateKeyLengthOnFile(appConfig().getTLSCertPath());
} else {
m_pComboBoxKeyLength->setCurrentIndex(m_pComboBoxKeyLength->findText(appConfig().getTLSKeyLength()));
}
setupSeurity();
if (m_appConfig.isSystemScoped()) {
m_pRadioSystemScope->setChecked(true);
@ -187,8 +181,6 @@ void SettingsDialog::loadFromConfig() {
allowAutoConfig();
#endif
m_pCheckBoxEnableCrypto->setChecked(m_appConfig.getCryptoEnabled());
#if !defined(SYNERGY_ENTERPRISE) && defined(SYNERGY_AUTOCONFIG)
m_pCheckBoxAutoConfig->setChecked(appConfig().autoConfig());
#else
@ -198,6 +190,27 @@ void SettingsDialog::loadFromConfig() {
}
void SettingsDialog::setupSeurity()
{
//If the tls file exists test its key length
if (QFile(appConfig().getTLSCertPath()).exists()) {
updateKeyLengthOnFile(appConfig().getTLSCertPath());
} else {
m_pComboBoxKeyLength->setCurrentIndex(m_pComboBoxKeyLength->findText(appConfig().getTLSKeyLength()));
}
m_pCheckBoxEnableCrypto->setChecked(m_appConfig.getCryptoEnabled());
if (appConfig().getClientGroupChecked()) {
m_pLabelKeyLength->hide();
m_pComboBoxKeyLength->hide();
m_pLabelCertificate->hide();
m_pLineEditCertificatePath->hide();
m_pPushButtonBrowseCert->hide();
m_pPushButtonRegenCert->hide();
}
}
void SettingsDialog::allowAutoConfig()
{
m_pLabelInstallBonjour->hide();

3
src/gui/src/SettingsDialog.h
View file

@ -64,6 +64,9 @@ class SettingsDialog : public QDialog, public Ui::SettingsDialogBase
/// @brief Enables\disables all controls.
void enableControls(bool enabled);
/// @brief This method setups security section in setting
void setupSeurity();
private:
MainWindow* m_pMainWindow;
AppConfig& m_appConfig;