diff --git a/src/gui/src/SettingsDialog.cpp b/src/gui/src/SettingsDialog.cpp index 87af94aa2f..5bfc04a44c 100644 --- a/src/gui/src/SettingsDialog.cpp +++ b/src/gui/src/SettingsDialog.cpp @@ -174,17 +174,14 @@ void SettingsDialog::loadFromConfig() { #endif m_pCheckBoxEnableCrypto->setChecked(m_appConfig.getCryptoEnabled()); - m_pGroupBoxTLS->setVisible(m_appConfig.getCryptoEnabled()); #ifdef SYNERGY_ENTERPRISE m_pCheckBoxEnableCrypto->setEnabled(true); - m_pLabelProUpgrade->hide(); #else m_pCheckBoxEnableCrypto->setEnabled(m_appConfig.isCryptoAvailable()); - m_pLabelProUpgrade->setVisible(!m_appConfig.isCryptoAvailable()); #endif diff --git a/src/gui/src/SettingsDialogBase.ui b/src/gui/src/SettingsDialogBase.ui index decf915a44..d2d438d555 100644 --- a/src/gui/src/SettingsDialogBase.ui +++ b/src/gui/src/SettingsDialogBase.ui @@ -7,7 +7,7 @@ 0 0 400 - 909 + 708 @@ -29,6 +29,352 @@ 11 + + + + true + + + + 0 + 0 + + + + + true + + + + QGroupBox::title { + left: 0px; + top: -2px; +} + + + Security + + + + 2 + + + 9 + + + 6 + + + 9 + + + 3 + + + + + 0 + + + + + false + + + Enable &TLS encryption + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Key length + + + + + + + 1024 + + + + 1024 + + + + + 2048 + + + + + 4096 + + + + + + + + + + 0 + + + + + Certificate + + + + + + + Qt::Horizontal + + + QSizePolicy::Minimum + + + + 30 + 20 + + + + + + + + + + + Browse + + + + + + + + + 0 + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Regenerate cert + + + + + + + + + + + + + 75 + true + + + + To edit settings for all users, Admin privileges are required. + + + + + + + + 0 + 0 + + + + + true + + + + Logging + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + false + + + + + + + 75 + 0 + + + + &Logging level: + + + m_pComboLogLevel + + + + + + + + Info + + + + + Debug + + + + + Debug1 + + + + + Debug2 + + + + + + + + Log to file: + + + + + + + false + + + + + + + false + + + Browse... + + + + + + + + + + Qt::Vertical + + + QSizePolicy::Minimum + + + + 20 + 10 + + + + + + + + Qt::Horizontal + + + QDialogButtonBox::Cancel|QDialogButtonBox::Save + + + + + + + Qt::Vertical + + + QSizePolicy::MinimumExpanding + + + + 20 + 10 + + + + + + + + + true + + + + Use &settings profile from: + + + + + + All users + + + true + + + + + + + Current user + + + + + + @@ -77,6 +423,9 @@ 13 + + 9 + 6 @@ -264,375 +613,6 @@ font-weight: bold; - - - - - 0 - 0 - - - - - true - - - - Logging - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - false - - - - - - - 75 - 0 - - - - &Logging level: - - - m_pComboLogLevel - - - - - - - - Info - - - - - Debug - - - - - Debug1 - - - - - Debug2 - - - - - - - - Log to file: - - - - - - - false - - - - - - - false - - - Browse... - - - - - - - - - - - 75 - true - - - - To edit settings for all users, Admin privileges are required. - - - - - - - Qt::Vertical - - - QSizePolicy::Minimum - - - - 20 - 10 - - - - - - - - Qt::Vertical - - - QSizePolicy::Minimum - - - - 20 - 10 - - - - - - - - Qt::Vertical - - - QSizePolicy::MinimumExpanding - - - - 20 - 10 - - - - - - - - true - - - - 0 - 0 - - - - - true - - - - &Network - - - - 2 - - - 12 - - - 2 - - - 12 - - - - - 0 - - - 12 - - - - - <html><head/><body><p><a href="https://symless.com/account?source=gui&amp;intent=upgrade"><span style=" text-decoration: underline; color:#007af4;">Upgrade to Pro</span></a></p></body></html> - - - Qt::RichText - - - true - - - - - - - <html><head/><body><p><a href="#"><span style=" text-decoration: underline; color:#007af4;">Install Bonjour</span></a></p></body></html> - - - Qt::RichText - - - - - - - false - - - - 0 - 0 - - - - Enable Auto Config - - - - - - - false - - - Enable &TLS Encryption - - - - - - - - - - - - Qt::Horizontal - - - QDialogButtonBox::Cancel|QDialogButtonBox::Save - - - - - - - - true - - - - TLS/SSL Settings - - - - - - - - - Key length - - - - - - - Certificate Path - - - - - - - Browse - - - - - - - 1024 - - - - 1024 - - - - - 2048 - - - - - 4096 - - - - - - - - Regenerate Cert - - - - - - - - - - Qt::Vertical - - - QSizePolicy::Minimum - - - - 20 - 10 - - - - - - - - - true - - - - Use &settings profile from: - - - - - - All users - - - true - - - - - - - Current user - - - - - - @@ -649,17 +629,76 @@ font-weight: bold; + + + + Qt::Vertical + + + QSizePolicy::Minimum + + + + 20 + 8 + + + + + + + + 0 + + + 1 + + + 0 + + + 6 + + + + + false + + + + 0 + 0 + + + + Enable Auto Config + + + + + + + + 0 + 0 + + + + <html><head/><body><p><a href="#"><span style=" text-decoration: underline; color:#007af4;">Install Bonjour</span></a></p></body></html> + + + Qt::RichText + + + + + m_pRadioSystemScope m_pRadioUserScope m_pCheckBoxAutoConfig - m_pCheckBoxEnableCrypto - m_pComboBoxKeyLength - m_pLineEditCertificatePath - m_pPushButtonBrowseCert - m_pPushButtonRegenCert m_pComboLogLevel m_pCheckBoxLogToFile m_pLineEditLogFilename @@ -699,21 +738,5 @@ font-weight: bold; - - m_pCheckBoxEnableCrypto - toggled(bool) - m_pGroupBoxTLS - setVisible(bool) - - - 100 - 413 - - - 188 - 508 - - -