"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "src/gui/src/SettingsDialog.cpp" between
synergy-core-1.14.4.37-stable.tar.gz and synergy-core-1.14.5.13-stable.tar.gz

About: Synergy is software for sharing one mouse and one keyboard between multiple computers on your desk allowing to seamlessly move the mouse cursor from one screen to another (works on Linux, Windows and Mac OS X). Synergy 1.

SettingsDialog.cpp  (synergy-core-1.14.4.37-stable):SettingsDialog.cpp  (synergy-core-1.14.5.13-stable)
skipping to change at line 158 skipping to change at line 158
m_pLineEditLogFilename->setText(appConfig().logFilename()); m_pLineEditLogFilename->setText(appConfig().logFilename());
setIndexFromItemData(m_pComboLanguage, appConfig().language()); setIndexFromItemData(m_pComboLanguage, appConfig().language());
m_pCheckBoxAutoHide->setChecked(appConfig().getAutoHide()); m_pCheckBoxAutoHide->setChecked(appConfig().getAutoHide());
m_pCheckBoxPreventSleep->setChecked(appConfig().getPreventSleep()); m_pCheckBoxPreventSleep->setChecked(appConfig().getPreventSleep());
m_pCheckBoxMinimizeToTray->setChecked(appConfig().getMinimizeToTray()); m_pCheckBoxMinimizeToTray->setChecked(appConfig().getMinimizeToTray());
m_pLineEditCertificatePath->setText(appConfig().getTLSCertPath()); m_pLineEditCertificatePath->setText(appConfig().getTLSCertPath());
m_pCheckBoxEnableCrypto->setChecked(m_appConfig.getCryptoEnabled()); m_pCheckBoxEnableCrypto->setChecked(m_appConfig.getCryptoEnabled());
m_pCheckBoxLanguageSync->setChecked(m_appConfig.getLanguageSync()); m_pCheckBoxLanguageSync->setChecked(m_appConfig.getLanguageSync());
m_pCheckBoxScrollDirection->setChecked(m_appConfig.getInvertScrollDirection( )); m_pCheckBoxScrollDirection->setChecked(m_appConfig.getInvertScrollDirection( ));
//If the tls file exists test its key length setupSeurity();
if (QFile(appConfig().getTLSCertPath()).exists()) {
updateKeyLengthOnFile(appConfig().getTLSCertPath());
} else {
m_pComboBoxKeyLength->setCurrentIndex(m_pComboBoxKeyLength->findText(app
Config().getTLSKeyLength()));
}
if (m_appConfig.isSystemScoped()) { if (m_appConfig.isSystemScoped()) {
m_pRadioSystemScope->setChecked(true); m_pRadioSystemScope->setChecked(true);
} }
else { else {
m_pRadioUserScope->setChecked(true); m_pRadioUserScope->setChecked(true);
} }
#if defined(Q_OS_WIN) #if defined(Q_OS_WIN)
m_pBonjourWindows = new BonjourWindows(this, m_pMainWindow, m_appConfig); m_pBonjourWindows = new BonjourWindows(this, m_pMainWindow, m_appConfig);
skipping to change at line 189 skipping to change at line 184
#else #else
// elevate checkbox is only useful on ms windows. // elevate checkbox is only useful on ms windows.
m_pLabelElevate->hide(); m_pLabelElevate->hide();
m_pComboElevate->hide(); m_pComboElevate->hide();
// for linux and mac, allow auto config by default // for linux and mac, allow auto config by default
allowAutoConfig(); allowAutoConfig();
#endif #endif
m_pCheckBoxEnableCrypto->setChecked(m_appConfig.getCryptoEnabled());
#if !defined(SYNERGY_ENTERPRISE) && defined(SYNERGY_AUTOCONFIG) #if !defined(SYNERGY_ENTERPRISE) && defined(SYNERGY_AUTOCONFIG)
m_pCheckBoxAutoConfig->setChecked(appConfig().autoConfig()); m_pCheckBoxAutoConfig->setChecked(appConfig().autoConfig());
#else #else
m_pCheckBoxAutoConfig->hide(); m_pCheckBoxAutoConfig->hide();
m_pLabelInstallBonjour->hide(); m_pLabelInstallBonjour->hide();
#endif #endif
} }
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(app
Config().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() void SettingsDialog::allowAutoConfig()
{ {
m_pLabelInstallBonjour->hide(); m_pLabelInstallBonjour->hide();
m_pCheckBoxAutoConfig->setEnabled(true); m_pCheckBoxAutoConfig->setEnabled(true);
m_pCheckBoxAutoConfig->setChecked(m_appConfig.autoConfig()); m_pCheckBoxAutoConfig->setChecked(m_appConfig.autoConfig());
} }
void SettingsDialog::on_m_pCheckBoxLogToFile_stateChanged(int i) void SettingsDialog::on_m_pCheckBoxLogToFile_stateChanged(int i)
{ {
bool checked = i == 2; bool checked = i == 2;
 End of changes. 3 change blocks. 
9 lines changed or deleted 23 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)