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

Fix - do not save temporary key by formatting tags into openlp configuration

Browse Source
This commit is contained in:
Martin Zibricky 2011-09-22 22:30:15 +02:00
parent 8b6887036b
commit 354bec8b33
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -56,7 +56,7 @@ class FormattingTags(object):
Resets the html_expands list. Resets the html_expands list.
""" """
temporary_tags = [tag for tag in FormattingTags.html_expands temporary_tags = [tag for tag in FormattingTags.html_expands
if tag[u'temporary']] if tag.get(u'temporary')]
FormattingTags.html_expands = [] FormattingTags.html_expands = []
base_tags = [] base_tags = []
# Append the base tags. # Append the base tags.
@ -148,8 +148,12 @@ class FormattingTags(object):
""" """
tags = [] tags = []
for tag in FormattingTags.html_expands: for tag in FormattingTags.html_expands:
if not tag[u'protected'] and not tag[u'temporary']: if not tag[u'protected'] and not tag.get(u'temporary'):
tags.append(tag) tags.append(tag)
# Remove key 'temporary' from tags. It is not needed to be saved.
for tag in tags:
if u'temporary' in tag:
del tag[u'temporary']
# 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''))

2
openlp/core/ui/formattingtagform.py
View File

@ -177,7 +177,7 @@ class FormattingTagForm(QtGui.QDialog, Ui_FormattingTagDialog):
QtGui.QTableWidgetItem(html[u'start html'])) QtGui.QTableWidgetItem(html[u'start html']))
self.tagTableWidget.setItem(linenumber, 3, self.tagTableWidget.setItem(linenumber, 3,
QtGui.QTableWidgetItem(html[u'end html'])) QtGui.QTableWidgetItem(html[u'end html']))
# Tags saved prior to 1.9.7 do not have this key. # Permanent (persistent) tags do not have this key.
if u'temporary' not in html: if u'temporary' not in html:
html[u'temporary'] = False html[u'temporary'] = False
self.tagTableWidget.resizeRowsToContents() self.tagTableWidget.resizeRowsToContents()

5
openlp/plugins/songs/lib/xml.py
View File

@ -562,8 +562,11 @@ class OpenLyrics(object):
# Some tags have only start html e.g. {br} # Some tags have only start html e.g. {br}
u'end html': tag.close.text if hasattr(tag, 'close') else u'', u'end html': tag.close.text if hasattr(tag, 'close') else u'',
u'protected': False, u'protected': False,
u'temporary': temporary
} }
# Add 'temporary' key in case the formatting tag should not be
# saved otherwise it is supposed that formatting tag is permanent.
if temporary:
openlp_tag[u'temporary'] = temporary
found_tags.append(openlp_tag) found_tags.append(openlp_tag)
existing_tag_ids = [tag[u'start tag'] existing_tag_ids = [tag[u'start tag']
for tag in FormattingTags.get_html_tags()] for tag in FormattingTags.get_html_tags()]