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

#6538 Fixed missing setting and added function to remove repetitions

Browse source
This commit is contained in:
Jamie Newbon 2020-02-27 00:40:58 +00:00
parent d4ae9faad0
commit 691019c6b5
2 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/gui/src/AppConfig.cpp
View file

@ -61,11 +61,10 @@ const char* AppConfig::m_SynergySettingsName[] = {
"lastExpiringWarningTime", "lastExpiringWarningTime",
"activationHasRun", "activationHasRun",
"minimizeToTray", "minimizeToTray",
"ActivateEmail",
"loadFromSystemScope" "loadFromSystemScope"
}; };
static const char* logLevelNames[] = static const char* logLevelNames[] =
{ {
"INFO", "INFO",
@ -251,6 +250,7 @@ void AppConfig::saveSettings()
setSetting(LastExpireWarningTime, m_LastExpiringWarningTime); setSetting(LastExpireWarningTime, m_LastExpiringWarningTime);
setSetting(ActivationHasRun, m_ActivationHasRun); setSetting(ActivationHasRun, m_ActivationHasRun);
setSetting(MinimizeToTray, m_MinimizeToTray); setSetting(MinimizeToTray, m_MinimizeToTray);
setSetting(LoadSystemSettings, m_LoadFromSystemScope);
settings().sync(); settings().sync();
} }
@ -383,7 +383,7 @@ QVariant AppConfig::loadSetting(AppConfig::Setting name, const QVariant& default
} }
AppConfig::SaveChoice AppConfig::checkGlobalSave() { AppConfig::SaveChoice AppConfig::checkGlobalSave() {
if (settings().scope() == QSettings::Scope::SystemScope) { if (isSystemScoped()) {
QMessageBox query; QMessageBox query;
query.setWindowTitle(tr("Save global settings.")); query.setWindowTitle(tr("Save global settings."));
@ -423,14 +423,14 @@ void AppConfig::switchToGlobal(bool global) {
} }
void AppConfig::setLoadFromSystemScope(bool value) { void AppConfig::setLoadFromSystemScope(bool value) {
if (value && settings().scope() == QSettings::UserScope) if (value && !isSystemScoped())
{ {
m_LoadFromSystemScope = value; m_LoadFromSystemScope = value;
saveSettings(); //Save user prefs saveSettings(); //Save user prefs
switchToGlobal(); //Switch the the System Scope switchToGlobal(); //Switch the the System Scope
loadSettings(); //Load the settings. loadSettings(); //Load the settings.
} }
else if (!value && settings().scope() == QSettings::SystemScope) else if (!value && isSystemScoped())
{ {
switchToGlobal(false); // Switch to UserScope switchToGlobal(false); // Switch to UserScope
loadSettings(true); // Load user settings ignoring System scope setting loadSettings(true); // Load user settings ignoring System scope setting
@ -438,3 +438,7 @@ void AppConfig::setLoadFromSystemScope(bool value) {
saveSettings(); // Save user prefs saveSettings(); // Save user prefs
} }
} }
bool AppConfig::isSystemScoped() const {
return m_pSettings->scope() == QSettings::SystemScope;
}

2
src/gui/src/AppConfig.h
View file

@ -75,6 +75,8 @@ class AppConfig: public QObject
/// @return The scoped setting currently selected /// @return The scoped setting currently selected
QSettings& settings(); QSettings& settings();
bool isSystemScoped() const;
const QString& screenName() const; const QString& screenName() const;
int port() const; int port() const;
const QString& networkInterface() const; const QString& networkInterface() const;