forked from openlp/openlp
- Fixed bug #789929 (Display Tags cannot be deleted)
bzr-revno: 1595 Fixes: https://launchpad.net/bugs/789929
This commit is contained in:
commit
6c870f7f7f
@ -147,6 +147,7 @@ class DisplayTagForm(QtGui.QDialog, Ui_DisplayTagDialog):
|
|||||||
DisplayTags.remove_html_tag(self.selected)
|
DisplayTags.remove_html_tag(self.selected)
|
||||||
self.selected = -1
|
self.selected = -1
|
||||||
self._resetTable()
|
self._resetTable()
|
||||||
|
self._saveTable()
|
||||||
|
|
||||||
def onSavedPushed(self):
|
def onSavedPushed(self):
|
||||||
"""
|
"""
|
||||||
@ -171,14 +172,19 @@ class DisplayTagForm(QtGui.QDialog, Ui_DisplayTagDialog):
|
|||||||
html[u'end tag'] = u'{/%s}' % tag
|
html[u'end tag'] = u'{/%s}' % tag
|
||||||
self.selected = -1
|
self.selected = -1
|
||||||
self._resetTable()
|
self._resetTable()
|
||||||
temp = []
|
self._saveTable()
|
||||||
|
|
||||||
|
def _saveTable(self):
|
||||||
|
"""
|
||||||
|
Saves all display tags except protected ones.
|
||||||
|
"""
|
||||||
|
tags = []
|
||||||
for tag in DisplayTags.get_html_tags():
|
for tag in DisplayTags.get_html_tags():
|
||||||
if not tag[u'protected']:
|
if not tag[u'protected']:
|
||||||
temp.append(tag)
|
tags.append(tag)
|
||||||
if temp:
|
if tags:
|
||||||
ctemp = cPickle.dumps(temp)
|
|
||||||
QtCore.QSettings().setValue(u'displayTags/html_tags',
|
QtCore.QSettings().setValue(u'displayTags/html_tags',
|
||||||
QtCore.QVariant(ctemp))
|
QtCore.QVariant(cPickle.dumps(tags)))
|
||||||
else:
|
else:
|
||||||
QtCore.QSettings().setValue(u'displayTags/html_tags',
|
QtCore.QSettings().setValue(u'displayTags/html_tags',
|
||||||
QtCore.QVariant(u''))
|
QtCore.QVariant(u''))
|
||||||
|
Loading…
Reference in New Issue
Block a user