Fix ThemeXML class as per review comments

Change all references to it

openlp/core/lib/__init__.py

@@ -31,9 +31,8 @@ from serviceitem import ServiceItem
 from toolbar import OpenLPToolbar
 from songxmlhandler import SongXMLBuilder
 from songxmlhandler import SongXMLParser
-from themexmlhandler import ThemeXMLBuilder
-from themexmlhandler import ThemeXMLParser
+from themexmlhandler import ThemeXML
 
 __all__ = ['PluginConfig', 'Plugin', 'SettingsTab', 'MediaManagerItem', 'Event', 'EventType'
            'XmlRootClass', 'ServiceItem', 'Receiver', 'OpenLPToolbar', 'SongXMLBuilder',
-           'SongXMLParser', 'EventManager', 'ThemeXMLBuilder', 'ThemeXMLParser']
+           'SongXMLParser', 'EventManager', 'ThemeXML']

openlp/core/lib/themexmlhandler.py

@@ -24,7 +24,7 @@ For XML Schema see wiki.openlp.org
 from xml.dom.minidom import  Document
 from xml.etree.ElementTree import ElementTree, XML, dump
 
-class ThemeXMLBuilder():
+class ThemeXML():
     def __init__(self):
         # Create the minidom document
         self.theme_xml = Document()
@@ -154,8 +154,7 @@ class ThemeXMLBuilder():
         # Print our newly created XML
         return self.theme_xml.toxml()
 
-class ThemeXMLParser():
-    def __init__(self, xml):
+    def parse(self, xml):
         theme_xml = ElementTree(element=XML(xml))
         iter=theme_xml.getiterator()
         master = u''

openlp/core/ui/thememanager.py

@@ -37,8 +37,7 @@ from openlp.core.lib import Event
 from openlp.core.lib import EventType
 from openlp.core.lib import EventManager
 from openlp.core.lib import OpenLPToolbar
-from openlp.core.lib import ThemeXMLBuilder
-from openlp.core.lib import ThemeXMLParser
+from openlp.core.lib import ThemeXML
 from openlp.core.utils import ConfigHelper
 
 
@@ -265,7 +264,7 @@ class ThemeManager(QWidget):
         log.debug(u'migrateVersion122 %s %s', filename , fullpath)
         t=Theme(xml_data)
 
-        newtheme = ThemeXMLBuilder()
+        newtheme = ThemeXML()
         newtheme.new_document(t.Name)
         if t.BackgroundType == 0:
             newtheme.add_background_solid(str(t.BackgroundParameter1.name()))
@@ -291,7 +290,8 @@ class ThemeManager(QWidget):
 
     def generateImage(self, dir, name, theme_xml):
         log.debug(u'generateImage %s %s ', dir, theme_xml)
-        theme = ThemeXMLParser(theme_xml)
+        theme = ThemeXML()
+        theme.parse(theme_xml)
         #print theme
         size=QtCore.QSize(800,600)
         frame=TstFrame(size)