forked from openlp/openlp
Headr668
This commit is contained in:
commit
7a1f2ee855
@ -134,7 +134,8 @@ class SongXMLParser(object):
|
|||||||
The XML of the song to be parsed.
|
The XML of the song to be parsed.
|
||||||
"""
|
"""
|
||||||
try:
|
try:
|
||||||
self.song_xml = ElementTree(element=XML(xml))
|
self.song_xml = ElementTree(
|
||||||
|
element=XML(unicode(xml).encode('unicode-escape')))
|
||||||
except:
|
except:
|
||||||
log.exception(u'Invalid xml %s', xml)
|
log.exception(u'Invalid xml %s', xml)
|
||||||
|
|
||||||
@ -147,7 +148,8 @@ class SongXMLParser(object):
|
|||||||
verse_list = []
|
verse_list = []
|
||||||
for element in iter:
|
for element in iter:
|
||||||
if element.tag == u'verse':
|
if element.tag == u'verse':
|
||||||
verse_list.append([element.attrib, element.text])
|
verse_list.append([element.attrib,
|
||||||
|
unicode(element.text).decode('unicode-escape')])
|
||||||
return verse_list
|
return verse_list
|
||||||
|
|
||||||
def dump_xml(self):
|
def dump_xml(self):
|
||||||
|
@ -30,7 +30,7 @@ from xml.etree.ElementTree import ElementTree, XML
|
|||||||
from openlp.core.lib import str_to_bool
|
from openlp.core.lib import str_to_bool
|
||||||
|
|
||||||
blankthemexml=\
|
blankthemexml=\
|
||||||
'''<?xml version="1.0" encoding="iso-8859-1"?>
|
'''<?xml version="1.0" encoding="utf-8"?>
|
||||||
<theme version="1.0">
|
<theme version="1.0">
|
||||||
<name>BlankStyle</name>
|
<name>BlankStyle</name>
|
||||||
<background mode="transparent"/>
|
<background mode="transparent"/>
|
||||||
@ -348,6 +348,7 @@ class ThemeXML(object):
|
|||||||
iter = theme_xml.getiterator()
|
iter = theme_xml.getiterator()
|
||||||
master = u''
|
master = u''
|
||||||
for element in iter:
|
for element in iter:
|
||||||
|
element.text = unicode(element.text).decode('unicode-escape')
|
||||||
if len(element.getchildren()) > 0:
|
if len(element.getchildren()) > 0:
|
||||||
master = element.tag + u'_'
|
master = element.tag + u'_'
|
||||||
else:
|
else:
|
||||||
|
@ -126,7 +126,7 @@ class AmendThemeForm(QtGui.QDialog, Ui_AmendThemeDialog):
|
|||||||
def accept(self):
|
def accept(self):
|
||||||
new_theme = ThemeXML()
|
new_theme = ThemeXML()
|
||||||
theme_name = unicode(self.ThemeNameEdit.displayText())
|
theme_name = unicode(self.ThemeNameEdit.displayText())
|
||||||
new_theme.new_document(theme_name)
|
new_theme.new_document(theme_name.encode('unicode-escape'))
|
||||||
save_from = None
|
save_from = None
|
||||||
save_to = None
|
save_to = None
|
||||||
if self.theme.background_mode == u'transparent':
|
if self.theme.background_mode == u'transparent':
|
||||||
@ -144,7 +144,7 @@ class AmendThemeForm(QtGui.QDialog, Ui_AmendThemeDialog):
|
|||||||
(path, filename) = \
|
(path, filename) = \
|
||||||
os.path.split(unicode(self.theme.background_filename))
|
os.path.split(unicode(self.theme.background_filename))
|
||||||
new_theme.add_background_image(filename)
|
new_theme.add_background_image(filename)
|
||||||
save_to= os.path.join(self.path, theme_name, filename )
|
save_to = os.path.join(self.path, theme_name, filename)
|
||||||
save_from = self.theme.background_filename
|
save_from = self.theme.background_filename
|
||||||
|
|
||||||
new_theme.add_font(unicode(self.theme.font_main_name),
|
new_theme.add_font(unicode(self.theme.font_main_name),
|
||||||
|
@ -29,7 +29,7 @@ import time
|
|||||||
from PyQt4 import QtCore, QtGui
|
from PyQt4 import QtCore, QtGui
|
||||||
from PyQt4.phonon import Phonon
|
from PyQt4.phonon import Phonon
|
||||||
|
|
||||||
from openlp.core.lib import Receiver, str_to_bool
|
from openlp.core.lib import Receiver
|
||||||
|
|
||||||
class DisplayWidget(QtGui.QWidget):
|
class DisplayWidget(QtGui.QWidget):
|
||||||
"""
|
"""
|
||||||
|
@ -679,7 +679,8 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
|
|||||||
self.setWindowTitle(title)
|
self.setWindowTitle(title)
|
||||||
|
|
||||||
def defaultThemeChanged(self, theme):
|
def defaultThemeChanged(self, theme):
|
||||||
self.DefaultThemeLabel.setText(self.defaultThemeText + theme)
|
self.DefaultThemeLabel.setText(
|
||||||
|
u'%s %s' % (self.defaultThemeText, theme))
|
||||||
|
|
||||||
def toggleMediaManager(self, visible):
|
def toggleMediaManager(self, visible):
|
||||||
if self.MediaManagerDock.isVisible() != visible:
|
if self.MediaManagerDock.isVisible() != visible:
|
||||||
|
@ -291,7 +291,7 @@ class SongMediaItem(MediaManagerItem):
|
|||||||
service_item.editId = item_id
|
service_item.editId = item_id
|
||||||
service_item.verse_order = song.verse_order
|
service_item.verse_order = song.verse_order
|
||||||
if song.lyrics.startswith(u'<?xml version='):
|
if song.lyrics.startswith(u'<?xml version='):
|
||||||
songXML=SongXMLParser(song.lyrics)
|
songXML = SongXMLParser(song.lyrics)
|
||||||
verseList = songXML.get_verses()
|
verseList = songXML.get_verses()
|
||||||
for verse in verseList:
|
for verse in verseList:
|
||||||
if verse[1]:
|
if verse[1]:
|
||||||
|
@ -1 +1 @@
|
|||||||
1.9.0-667
|
1.9.0-668
|
||||||
|
Loading…
Reference in New Issue
Block a user