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

test theme, alttheme -> our theme

Browse Source
This commit is contained in:
Martin Thompson 2010-07-07 21:17:58 +01:00
parent 860d3e2923
commit b04c93e9a7
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openlp/plugins/songs/lib/lyrics_xml.py
View File

@ -77,7 +77,7 @@ class SongXMLBuilder(object):
The actual text of the verse to be stored. The actual text of the verse to be stored.
""" """
# log.debug(u'add_verse_to_lyrics %s, %s\n%s' % (type, number, content)) # log.debug(u'add_verse_to_lyrics %s, %s\n%s' % (type, number, content))
verse = etree.Element(u'verse', type=type, label=number) verse = etree.Element(u'verse', type=unicode(type), label=unicode(number))
verse.text = etree.CDATA(content) verse.text = etree.CDATA(content)
self.lyrics.append(verse) self.lyrics.append(verse)

16
openlp/plugins/songs/lib/songimport.py
View File

@ -51,8 +51,8 @@ class SongImport(object):
self.alternate_title = u'' self.alternate_title = u''
self.copyright = u'' self.copyright = u''
self.comment = u'' self.comment = u''
self.theme_name = u'' self.theme = u''
self.ccli_number = u'' self.song_cclino = u''
self.authors = [] self.authors = []
self.topics = [] self.topics = []
self.song_book_name = u'' self.song_book_name = u''
@ -303,8 +303,8 @@ class SongImport(object):
song.verse_order = u' '.join(self.verse_order_list) song.verse_order = u' '.join(self.verse_order_list)
song.copyright = self.copyright song.copyright = self.copyright
song.comment = self.comment song.comment = self.comment
song.theme_name = self.theme_name song.theme = self.theme
song.ccli_number = self.ccli_number song.song_cclino = self.song_cclino
for authortext in self.authors: for authortext in self.authors:
author = self.manager.get_object_filtered(Author, author = self.manager.get_object_filtered(Author,
Author.display_name == authortext) Author.display_name == authortext)
@ -358,7 +358,7 @@ class SongImport(object):
print u'TOPIC: ' + topictext print u'TOPIC: ' + topictext
if self.comment: if self.comment:
print u'COMMENT: ' + self.comment print u'COMMENT: ' + self.comment
if self.theme_name: if self.theme:
print u'THEME: ' + self.theme_name print u'THEME: ' + self.theme
if self.ccli_number: if self.song_cclino:
print u'CCLI: ' + self.ccli_number print u'CCLI: ' + self.song_cclino