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

fixed bug caused by merge

Browse Source
This commit is contained in:
Andreas Preikschat 2012-12-27 17:46:27 +01:00
parent f1bdcec79d
commit cbd22b7141
3 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
openlp/core/lib/__init__.py
View File

@ -136,6 +136,9 @@ class Settings(QtCore.QSettings):
**Note**, this method only converts a few types and might need to be **Note**, this method only converts a few types and might need to be
extended if a certain type is missing! extended if a certain type is missing!
""" """
# Check for none as u'' is passed as default and is valid!
if defaultValue is None and not super(Settings, self).contains(key):
return None
setting = super(Settings, self).value(key, defaultValue) setting = super(Settings, self).value(key, defaultValue)
# An empty list saved to the settings results in a None type being # An empty list saved to the settings results in a None type being
# returned. # returned.

5
openlp/core/ui/mainwindow.py
View File

@ -1075,8 +1075,9 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
export_settings.endGroup() export_settings.endGroup()
# Write all the sections and keys. # Write all the sections and keys.
for section_key in keys: for section_key in keys:
key_value = settings.value(section_key) key_value = settings.value(section_key, None)
export_settings.setValue(section_key, key_value) if key_value is not None:
export_settings.setValue(section_key, key_value)
export_settings.sync() export_settings.sync()
# Temp CONF file has been written. Blanks in keys are now '%20'. # Temp CONF file has been written. Blanks in keys are now '%20'.
# Read the temp file and output the user's CONF file with blanks to # Read the temp file and output the user's CONF file with blanks to

13
openlp/plugins/songs/lib/__init__.py
View File

@ -41,7 +41,7 @@ PATTERN = re.compile(r"\\([a-z]{1,32})(-?\d{1,10})?[ ]?|\\'"
r"([0-9a-f]{2})|\\([^a-z])|([{}])|[\r\n]+|(.)", re.I) r"([0-9a-f]{2})|\\([^a-z])|([{}])|[\r\n]+|(.)", re.I)
# RTF control words which specify a "destination" to be ignored. # RTF control words which specify a "destination" to be ignored.
DESTINATIONS = frozenset(( DESTINATIONS = frozenset((
u'aftncn', u'aftnsep', u'aftnsepc', u'annotation', u'atnauthor', u'aftncn', u'aftnsep', u'aftnsepc', u'annotation', u'atnauthor',
u'atndate', u'atnicn', u'atnid', u'atnparent', u'atnref', u'atntime', u'atndate', u'atnicn', u'atnid', u'atnparent', u'atnref', u'atntime',
u'atrfend', u'atrfstart', u'author', u'background', u'bkmkend', u'atrfend', u'atrfstart', u'author', u'background', u'bkmkend',
u'bkmkstart', u'blipuid', u'buptim', u'category', u'bkmkstart', u'blipuid', u'buptim', u'category',
@ -579,7 +579,7 @@ def strip_rtf(text, default_encoding=None):
failed = False failed = False
while True: while True:
try: try:
encoding, default_encoding = get_encoding(font, encoding, default_encoding = get_encoding(font,
font_table, default_encoding, failed=failed) font_table, default_encoding, failed=failed)
out.append(chr(charcode).decode(encoding)) out.append(chr(charcode).decode(encoding))
except UnicodeDecodeError: except UnicodeDecodeError:
@ -594,6 +594,7 @@ def strip_rtf(text, default_encoding=None):
text = u''.join(out) text = u''.join(out)
return text, default_encoding return text, default_encoding
def natcmp(a, b): def natcmp(a, b):
""" """
Natural string comparison which mimics the behaviour of Python's internal Natural string comparison which mimics the behaviour of Python's internal
@ -604,9 +605,9 @@ def natcmp(a, b):
if isinstance(key, int) and isinstance(b[i], int): if isinstance(key, int) and isinstance(b[i], int):
result = cmp(key, b[i]) result = cmp(key, b[i])
elif isinstance(key, int) and not isinstance(b[i], int): elif isinstance(key, int) and not isinstance(b[i], int):
result = locale_direct_compare(QtCore.QString(str(key)), b[i]) result = locale_direct_compare(str(key), b[i])
elif not isinstance(key, int) and isinstance(b[i], int): elif not isinstance(key, int) and isinstance(b[i], int):
result = locale_direct_compare(key, QtCore.QString(str(b[i]))) result = locale_direct_compare(key, str(b[i]))
else: else:
result = locale_direct_compare(key, b[i]) result = locale_direct_compare(key, b[i])
if result != 0: if result != 0:
@ -620,9 +621,9 @@ def natcmp(a, b):
if isinstance(a[i], int) and isinstance(key, int): if isinstance(a[i], int) and isinstance(key, int):
result = cmp(a[i], key) result = cmp(a[i], key)
elif isinstance(a[i], int) and not isinstance(key, int): elif isinstance(a[i], int) and not isinstance(key, int):
result = locale_direct_compare(QtCore.QString(str(a[i])), key) result = locale_direct_compare(str(a[i]), key)
elif not isinstance(a[i], int) and isinstance(key, int): elif not isinstance(a[i], int) and isinstance(key, int):
result = locale_direct_compare(a[i], QtCore.QString(str(key))) result = locale_direct_compare(a[i], str(key))
else: else:
result = locale_direct_compare(a[i], key) result = locale_direct_compare(a[i], key)
if result != 0: if result != 0: