diff --git a/.eric4project/openlp.org 2.0.e4q b/.eric4project/openlp.org 2.0.e4q
index 3d7ff38a7..232a20c97 100644
--- a/.eric4project/openlp.org 2.0.e4q
+++ b/.eric4project/openlp.org 2.0.e4q
@@ -1,7 +1,7 @@
-
+
\ No newline at end of file
diff --git a/.eric4project/openlp.org 2.0.e4t b/.eric4project/openlp.org 2.0.e4t
index 496ff761b..9b1d596aa 100644
--- a/.eric4project/openlp.org 2.0.e4t
+++ b/.eric4project/openlp.org 2.0.e4t
@@ -1,7 +1,7 @@
-
+
TODO: what is the tags for bridge, pre-chorus?
diff --git a/openlp.org 2.0.e4p b/openlp.org 2.0.e4p
index 1925611ff..cdf509581 100644
--- a/openlp.org 2.0.e4p
+++ b/openlp.org 2.0.e4p
@@ -1,7 +1,7 @@
-
+
en
@@ -152,11 +152,7 @@
openlp/plugins/custom/lib/manager.py
openlp/plugins/images/lib/mediaitem.py
openlp/plugins/songs/lib/mediaitem.py
- resources/forms/Ui_editsongdialog.py
- resources/forms/Ui_editversedialog.py
- resources/forms/Ui_settings.py
- resources/forms/Ui_authorsdialog.py
- resources/forms/Ui_songbookdialog.py
+ xml1.py
diff --git a/openlp/plugins/custom/lib/__init__.py b/openlp/plugins/custom/lib/__init__.py
index 3c05de4b3..19aadc47c 100644
--- a/openlp/plugins/custom/lib/__init__.py
+++ b/openlp/plugins/custom/lib/__init__.py
@@ -18,10 +18,10 @@ this program; if not, write to the Free Software Foundation, Inc., 59 Temple
Place, Suite 330, Boston, MA 02111-1307 USA
"""
+from textlistdata import TextListData
from manager import CustomManager
from customtab import CustomTab
from mediaitem import CustomMediaItem
-from textlistdata import TextListData
__all__ = ['CustomManager', 'CustomTab', 'CustomMediaItem', 'TextListData']
diff --git a/xml1.py b/xml1.py
index f0aee84eb..5406451d1 100644
--- a/xml1.py
+++ b/xml1.py
@@ -1,4 +1,4 @@
-from xml.dom.minidom import Document
+from xml.dom.minidom import Document
from xml.etree.ElementTree import ElementTree, XML, dump
"""
@@ -13,67 +13,67 @@ from xml.etree.ElementTree import ElementTree, XML, dump
"""
class SongXMLBuilder():
def __init__(self):
- # Create the minidom document
+ # Create the minidom document
self.song_xml = Document()
-
+
def new_document(self):
# Create the base element
- self.song = self.song_xml.createElement("song")
+ self.song = self.song_xml.createElement(u'song')
self.song_xml.appendChild(self.song)
- self.song.setAttribute("version", "1.0")
-
+ self.song.setAttribute(u'version', u'1.0')
+
def add_lyrics_to_song(self):
# Create the main element
- self.lyrics = self.song_xml.createElement("lyrics")
- self.lyrics.setAttribute("language", "en")
+ self.lyrics = self.song_xml.createElement(u'lyrics')
+ self.lyrics.setAttribute(u'language', u'en')
self.song.appendChild(self.lyrics)
-
- def add_verse_to_lyrics(self, type, number, content):
+
+ def add_verse_to_lyrics(self, type, label, content):
"""
type - type of verse (Chorus, Verse , Bridge, Custom etc
- number - number of item eg verse 1
+ label - label of item eg verse 1
content - the text to be stored
"""
- verse = self.song_xml.createElement("verse")
- verse.setAttribute("type", type)
- verse.setAttribute('label', number)
+ verse = self.song_xml.createElement(u'verse')
+ verse.setAttribute(u'type', type)
+ verse.setAttribute(u'label', label)
self.lyrics.appendChild(verse)
-
+
# add data as a CDATA section
cds = self.song_xml.createCDATASection(content)
verse.appendChild(cds)
-
+
def dump_xml(self):
# Debugging aid to see what we have
- print self.song_xml.toprettyxml(indent=" ")
-
+ print self.song_xml.toprettyxml(indent=u' ')
+
def extract_xml(self):
# Print our newly created XML
return self.song_xml.toxml()
-
+
class SongXMLParser():
def __init__(self, xml):
self.song_xml = ElementTree(element=XML(xml))
-
+
def get_verses(self):
#return a list of verse's and attributes
iter=self.song_xml.getiterator()
verse_list = []
- for element in iter:
- if element.tag == 'verse':
+ for element in iter:
+ if element.tag == u'verse':
verse_list.append([element.attrib, element.text])
return verse_list
-
+
def dump_xml(self):
# Debugging aid to see what we have
print dump(self.song_xml)
-if __name__=="__main__":
+if __name__ == '__main__':
sxml=SongXMLBuilder()
sxml.new_document()
sxml.add_lyrics_to_song()
sxml.add_verse_to_lyrics(u'chorus', u'1', u'The is\n is \nsome\n text')
- sxml.add_verse_to_lyrics(u'verse', u'2', u'The is\n is \nmore\n text')
+ sxml.add_verse_to_lyrics(u'verse', u'2', u'The is\n is \nmore\n text')
sxml.dump_xml()
x1 = sxml.extract_xml()
print x1
@@ -81,6 +81,3 @@ if __name__=="__main__":
spra=SongXMLParser(x1)
vl = spra.get_verses()
print vl
-
-
-