"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "src/gui/src/AppConfig.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.

AppConfig.cpp  (synergy-core-1.14.4.37-stable):AppConfig.cpp  (synergy-core-1.14.5.13-stable)
skipping to change at line 82 skipping to change at line 82
"groupServerChecked", "groupServerChecked",
"useExternalConfig", "useExternalConfig",
"configFile", "configFile",
"useInternalConfig", "useInternalConfig",
"groupClientChecked", "groupClientChecked",
"serverHostname", "serverHostname",
"tlsCertPath", "tlsCertPath",
"tlsKeyLength", "tlsKeyLength",
"preventSleep", "preventSleep",
"languageSync", "languageSync",
"invertScrollDirection" "invertScrollDirection",
"eliteBackersUrl"
}; };
static const char* logLevelNames[] = static const char* logLevelNames[] =
{ {
"INFO", "INFO",
"DEBUG", "DEBUG",
"DEBUG1", "DEBUG1",
"DEBUG2" "DEBUG2"
}; };
skipping to change at line 248 skipping to change at line 249
m_LoadFromSystemScope = loadCommonSetting(kLoadSystemSettings, false). toBool(); m_LoadFromSystemScope = loadCommonSetting(kLoadSystemSettings, false). toBool();
m_ServerGroupChecked = loadSetting(kGroupServerCheck, false).toBool() ; m_ServerGroupChecked = loadSetting(kGroupServerCheck, false).toBool() ;
m_UseExternalConfig = loadSetting(kUseExternalConfig, false).toBool( ); m_UseExternalConfig = loadSetting(kUseExternalConfig, false).toBool( );
m_ConfigFile = loadSetting(kConfigFile, QDir::homePath() + "/ " + synergyConfigName).toString(); m_ConfigFile = loadSetting(kConfigFile, QDir::homePath() + "/ " + synergyConfigName).toString();
m_UseInternalConfig = loadSetting(kUseInternalConfig, false).toBool( ); m_UseInternalConfig = loadSetting(kUseInternalConfig, false).toBool( );
m_ClientGroupChecked = loadSetting(kGroupClientCheck, false).toBool() ; m_ClientGroupChecked = loadSetting(kGroupClientCheck, false).toBool() ;
m_ServerHostname = loadSetting(kServerHostname).toString(); m_ServerHostname = loadSetting(kServerHostname).toString();
m_PreventSleep = loadSetting(kPreventSleep, false).toBool(); m_PreventSleep = loadSetting(kPreventSleep, false).toBool();
m_LanguageSync = loadSetting(kLanguageSync, false).toBool(); m_LanguageSync = loadSetting(kLanguageSync, false).toBool();
m_InvertScrollDirection = loadSetting(kInvertScrollDirection, false).toB ool(); m_InvertScrollDirection = loadSetting(kInvertScrollDirection, false).toB ool();
m_eliteBackersUrl = loadCommonSetting(kEliteBackersUrl, "https://a pi2.prod.symless.com/credits/elite-backers").toString();
//only change the serial key if the settings being loaded contains a key //only change the serial key if the settings being loaded contains a key
bool updateSerial = ConfigWriter::make() bool updateSerial = ConfigWriter::make()
->hasSetting(settingName(kLoadSystemSettings),ConfigWriter::kCurrent ); ->hasSetting(settingName(kLoadSystemSettings),ConfigWriter::kCurrent );
//if the setting exists and is not empty //if the setting exists and is not empty
updateSerial = updateSerial && !loadSetting(kSerialKey, "").toString().trimm ed().isEmpty(); updateSerial = updateSerial && !loadSetting(kSerialKey, "").toString().trimm ed().isEmpty();
if (updateSerial) { if (updateSerial) {
m_Serialkey = loadSetting(kSerialKey, "").toString().tri mmed(); m_Serialkey = loadSetting(kSerialKey, "").toString().tri mmed();
m_Edition = static_cast<Edition>(loadSetting(kEditionS etting, kUnregistered).toInt()); m_Edition = static_cast<Edition>(loadSetting(kEditionS etting, kUnregistered).toInt());
skipping to change at line 278 skipping to change at line 280
if (getCryptoEnabled()) { if (getCryptoEnabled()) {
generateCertificate(); generateCertificate();
} }
} }
void AppConfig::saveSettings() void AppConfig::saveSettings()
{ {
setCommonSetting(kWizardLastRun, m_WizardLastRun); setCommonSetting(kWizardLastRun, m_WizardLastRun);
setCommonSetting(kLoadSystemSettings, m_LoadFromSystemScope); setCommonSetting(kLoadSystemSettings, m_LoadFromSystemScope);
setCommonSetting(kGroupClientCheck, m_ClientGroupChecked);
setCommonSetting(kGroupServerCheck, m_ServerGroupChecked);
setCommonSetting(kEliteBackersUrl, m_eliteBackersUrl);
if (isWritable()) { if (isWritable()) {
setSetting(kScreenName, m_ScreenName); setSetting(kScreenName, m_ScreenName);
setSetting(kPort, m_Port); setSetting(kPort, m_Port);
setSetting(kInterfaceSetting, m_Interface); setSetting(kInterfaceSetting, m_Interface);
setSetting(kLogLevel, m_LogLevel); setSetting(kLogLevel, m_LogLevel);
setSetting(kLogToFile, m_LogToFile); setSetting(kLogToFile, m_LogToFile);
setSetting(kLogFilename, m_LogFilename); setSetting(kLogFilename, m_LogFilename);
setSetting(kLanguage, m_Language); setSetting(kLanguage, m_Language);
setSetting(kStartedBefore, m_StartedBefore); setSetting(kStartedBefore, m_StartedBefore);
skipping to change at line 302 skipping to change at line 307
setSetting(kElevateModeSetting, m_ElevateMode == ElevateAlways); setSetting(kElevateModeSetting, m_ElevateMode == ElevateAlways);
setSetting(kElevateModeEnum, static_cast<int>(m_ElevateMode)); setSetting(kElevateModeEnum, static_cast<int>(m_ElevateMode));
setSetting(kEditionSetting, m_Edition); setSetting(kEditionSetting, m_Edition);
setSetting(kCryptoEnabled, m_CryptoEnabled); setSetting(kCryptoEnabled, m_CryptoEnabled);
setSetting(kAutoHide, m_AutoHide); setSetting(kAutoHide, m_AutoHide);
setSetting(kSerialKey, m_Serialkey); setSetting(kSerialKey, m_Serialkey);
setSetting(kLastVersion, m_lastVersion); setSetting(kLastVersion, m_lastVersion);
setSetting(kLastExpireWarningTime, m_LastExpiringWarningTime); setSetting(kLastExpireWarningTime, m_LastExpiringWarningTime);
setSetting(kActivationHasRun, m_ActivationHasRun); setSetting(kActivationHasRun, m_ActivationHasRun);
setSetting(kMinimizeToTray, m_MinimizeToTray); setSetting(kMinimizeToTray, m_MinimizeToTray);
setSetting(kGroupServerCheck, m_ServerGroupChecked);
setSetting(kUseExternalConfig, m_UseExternalConfig); setSetting(kUseExternalConfig, m_UseExternalConfig);
setSetting(kConfigFile, m_ConfigFile); setSetting(kConfigFile, m_ConfigFile);
setSetting(kUseInternalConfig, m_UseInternalConfig); setSetting(kUseInternalConfig, m_UseInternalConfig);
setSetting(kGroupClientCheck, m_ClientGroupChecked);
setSetting(kServerHostname, m_ServerHostname); setSetting(kServerHostname, m_ServerHostname);
setSetting(kPreventSleep, m_PreventSleep); setSetting(kPreventSleep, m_PreventSleep);
setSetting(kLanguageSync, m_LanguageSync); setSetting(kLanguageSync, m_LanguageSync);
setSetting(kInvertScrollDirection, m_InvertScrollDirection); setSetting(kInvertScrollDirection, m_InvertScrollDirection);
} }
m_unsavedChanges = false; m_unsavedChanges = false;
} }
#ifndef SYNERGY_ENTERPRISE #ifndef SYNERGY_ENTERPRISE
skipping to change at line 464 skipping to change at line 467
bool AppConfig::getAutoHide() { return m_AutoHide; } bool AppConfig::getAutoHide() { return m_AutoHide; }
void AppConfig::setMinimizeToTray(bool newValue) { void AppConfig::setMinimizeToTray(bool newValue) {
setSettingModified(m_MinimizeToTray, newValue); setSettingModified(m_MinimizeToTray, newValue);
} }
bool AppConfig::getInvertScrollDirection() const { bool AppConfig::getInvertScrollDirection() const {
return m_InvertScrollDirection; return m_InvertScrollDirection;
} }
void AppConfig::setEliteBackersUrl(const QString& newValue) {
setSettingModified(m_eliteBackersUrl, newValue);
}
const QString& AppConfig::getEliteBackersUrl() const {
return m_eliteBackersUrl;
}
bool AppConfig::getLanguageSync() const { return m_LanguageSync; } bool AppConfig::getLanguageSync() const { return m_LanguageSync; }
void AppConfig::setInvertScrollDirection(bool newValue) { void AppConfig::setInvertScrollDirection(bool newValue) {
setSettingModified(m_InvertScrollDirection, newValue); setSettingModified(m_InvertScrollDirection, newValue);
} }
void AppConfig::setLanguageSync(bool newValue) { void AppConfig::setLanguageSync(bool newValue) {
setSettingModified(m_LanguageSync, newValue); setSettingModified(m_LanguageSync, newValue);
} }
 End of changes. 6 change blocks. 
3 lines changed or deleted 14 lines changed or added

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