raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

Revert wrong changes to settings.py

Browse Source
This commit is contained in:
Tomas Groth 2014-03-19 19:16:03 +01:00
parent 991661b169
commit 6e46fd6a2a
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
openlp/core/common/settings.py
View File

@ -385,7 +385,7 @@ class Settings(QtCore.QSettings):
""" """
if self.group(): if self.group():
key = self.group() + '/' + key key = self.group() + '/' + key
return Settings.__default_settings__.get(key, '') return Settings.__default_settings__[key]
def remove_obsolete_settings(self): def remove_obsolete_settings(self):
""" """
@ -422,9 +422,9 @@ class Settings(QtCore.QSettings):
""" """
# if group() is not empty the group has not been specified together with the key. # if group() is not empty the group has not been specified together with the key.
if self.group(): if self.group():
default_value = Settings.__default_settings__.get(self.group() + '/' + key, '') default_value = Settings.__default_settings__[self.group() + '/' + key]
else: else:
default_value = Settings.__default_settings__.get(key, '') default_value = Settings.__default_settings__[key]
setting = super(Settings, self).value(key, default_value) setting = super(Settings, self).value(key, default_value)
return self._convert_value(setting, default_value) return self._convert_value(setting, default_value)