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

added docs

Browse Source
This commit is contained in:
Andreas Preikschat 2013-01-11 19:55:42 +01:00
parent 725bd7dcf6
commit 4e2f673655
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openlp/core/lib/settings.py
View File

@ -206,7 +206,10 @@ class Settings(QtCore.QSettings):
@staticmethod @staticmethod
def extendDefaultSettings(defaultValues): def extendDefaultSettings(defaultValues):
""" """
Static method to merge the given ``defaultValues`` with the ``Settings.__default_settings__``.
``defaultValues``
A dict with setting keys and their default values.
""" """
Settings.__default_settings__ = dict(defaultValues.items() + Settings.__default_settings__.items()) Settings.__default_settings__ = dict(defaultValues.items() + Settings.__default_settings__.items())
@ -236,6 +239,7 @@ class Settings(QtCore.QSettings):
The key to return the value from. The key to return the value from.
""" """
try: try:
# if group() is empty the group has been specified together with the key.
if self.group(): if self.group():
defaultValue = Settings.__default_settings__[self.group() + u'/' + key] defaultValue = Settings.__default_settings__[self.group() + u'/' + key]
else: else: