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

No silly name abbreviations anymore.

This commit is contained in:
Mattias Põldaru 2011-12-13 12:58:33 +02:00
parent e70ca4fa06
commit 9f5c0645aa
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
openlp/core/lib/formattingtags.py
View File

@ -157,9 +157,9 @@ class FormattingTags(object):
# It is not needed to be saved. # It is not needed to be saved.
if u'temporary' in tag: if u'temporary' in tag:
del tag[u'temporary'] del tag[u'temporary']
for e in tag: for element in tag:
if isinstance(tag[e], unicode): if isinstance(tag[element], unicode):
tag[e] = tag[e].encode('utf8') tag[element] = tag[element].encode('utf8')
# Formatting Tags were also known as display tags. # Formatting Tags were also known as display tags.
QtCore.QSettings().setValue(u'displayTags/html_tags', QtCore.QSettings().setValue(u'displayTags/html_tags',
QtCore.QVariant(cPickle.dumps(tags) if tags else u'')) QtCore.QVariant(cPickle.dumps(tags) if tags else u''))
@ -181,9 +181,9 @@ class FormattingTags(object):
if user_expands_string: if user_expands_string:
user_tags = cPickle.loads(user_expands_string) user_tags = cPickle.loads(user_expands_string)
for tag in user_tags: for tag in user_tags:
for e in tag: for element in tag:
if isinstance(tag[e], str): if isinstance(tag[element], str):
tag[e] = tag[e].decode('utf8') tag[element] = tag[element].decode('utf8')
# If we have some user ones added them as well # If we have some user ones added them as well
FormattingTags.add_html_tags(user_tags) FormattingTags.add_html_tags(user_tags)