From 3447c7fed617e32d36a2b72c4b9a4eac6122c45d Mon Sep 17 00:00:00 2001
From: Jon Tibble <meths@btinternet.com>
Date: Fri, 2 Jul 2010 15:57:48 +0100
Subject: [PATCH 01/21] XML: Start refactoring

---
 documentation/source/core/lib.rst   |   6 --
 openlp/core/lib/__init__.py         |   1 -
 openlp/core/lib/xmlrootclass.py     | 104 ----------------------------
 openlp/plugins/songs/lib/songxml.py |  79 +++++++++++++++++++--
 4 files changed, 72 insertions(+), 118 deletions(-)
 delete mode 100644 openlp/core/lib/xmlrootclass.py

diff --git a/documentation/source/core/lib.rst b/documentation/source/core/lib.rst
index 12c7b702c..dd90b24a9 100644
--- a/documentation/source/core/lib.rst
+++ b/documentation/source/core/lib.rst
@@ -84,9 +84,3 @@
 .. autoclass:: openlp.core.lib.toolbar.OpenLPToolbar
    :members:
 
-:mod:`XmlRootClass`
--------------------
-
-.. autoclass:: openlp.core.lib.xmlrootclass.XmlRootClass
-   :members:
-
diff --git a/openlp/core/lib/__init__.py b/openlp/core/lib/__init__.py
index d6f805c98..5a4725c80 100644
--- a/openlp/core/lib/__init__.py
+++ b/openlp/core/lib/__init__.py
@@ -216,7 +216,6 @@ from settingsmanager import SettingsManager
 from plugin import PluginStatus, Plugin
 from pluginmanager import PluginManager
 from settingstab import SettingsTab
-from xmlrootclass import XmlRootClass
 from serviceitem import ServiceItem
 from serviceitem import ServiceItemType
 from serviceitem import ItemCapabilities
diff --git a/openlp/core/lib/xmlrootclass.py b/openlp/core/lib/xmlrootclass.py
deleted file mode 100644
index 1ea1d41a2..000000000
--- a/openlp/core/lib/xmlrootclass.py
+++ /dev/null
@@ -1,104 +0,0 @@
-# -*- coding: utf-8 -*-
-# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4
-
-###############################################################################
-# OpenLP - Open Source Lyrics Projection                                      #
-# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman                                        #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin      #
-# Thompson, Jon Tibble, Carsten Tinggaard                                     #
-# --------------------------------------------------------------------------- #
-# This program is free software; you can redistribute it and/or modify it     #
-# under the terms of the GNU General Public License as published by the Free  #
-# Software Foundation; version 2 of the License.                              #
-#                                                                             #
-# This program is distributed in the hope that it will be useful, but WITHOUT #
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or       #
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for    #
-# more details.                                                               #
-#                                                                             #
-# You should have received a copy of the GNU General Public License along     #
-# with this program; if not, write to the Free Software Foundation, Inc., 59  #
-# Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
-###############################################################################
-
-import os
-import sys
-
-from xml.etree.ElementTree import ElementTree, XML
-
-sys.path.append(os.path.abspath(os.path.join(u'.', u'..', u'..')))
-
-class XmlRootClass(object):
-    """
-    Root class for themes, songs etc
-
-    This class provides interface for parsing xml files into object attributes.
-
-    If you overload this class and provide a function called `post_tag_hook`,
-    it will be called thusly for each `tag, value` pair::
-
-        (element.tag, val) = self.post_tag_hook(element.tag, val)
-    """
-    def _set_from_xml(self, xml, root_tag):
-        """
-        Set song properties from given xml content.
-
-        ``xml``
-            Formatted xml tags and values.
-        ``root_tag``
-            The root tag of the xml.
-        """
-        root = ElementTree(element=XML(xml))
-        xml_iter = root.getiterator()
-        for element in xml_iter:
-            if element.tag != root_tag:
-                text = element.text
-                if text is None:
-                    val = text
-                elif isinstance(text, basestring):
-                    # Strings need special handling to sort the colours out
-                    if text[0] == u'$':
-                        # This might be a hex number, let's try to convert it.
-                        try:
-                            val = int(text[1:], 16)
-                        except ValueError:
-                            pass
-                    else:
-                        # Let's just see if it's a integer.
-                        try:
-                            val = int(text)
-                        except ValueError:
-                            # Ok, it seems to be a string.
-                            val = text
-                    if hasattr(self, u'post_tag_hook'):
-                        (element.tag, val) = \
-                            self.post_tag_hook(element.tag, val)
-                setattr(self, element.tag, val)
-
-    def __str__(self):
-        """
-        Return string with all public attributes
-
-        The string is formatted with one attribute per line
-        If the string is split on newline then the length of the
-        list is equal to the number of attributes
-        """
-        attributes = []
-        for attrib in dir(self):
-            if not attrib.startswith(u'_'):
-                attributes.append(
-                    u'%30s : %s' % (attrib, getattr(self, attrib)))
-        return u'\n'.join(attributes)
-
-    def _get_as_string(self):
-        """
-        Return one string with all public attributes
-        """
-        result = u''
-        for attrib in dir(self):
-            if not attrib.startswith(u'_'):
-                result += u'_%s_' % getattr(self, attrib)
-        return result
-
diff --git a/openlp/plugins/songs/lib/songxml.py b/openlp/plugins/songs/lib/songxml.py
index 2f13e5f60..c4683533d 100644
--- a/openlp/plugins/songs/lib/songxml.py
+++ b/openlp/plugins/songs/lib/songxml.py
@@ -28,10 +28,12 @@ import sys
 import os
 
 from types import ListType
+from xml.etree.ElementTree import ElementTree, XML
 
-sys.path.append(os.path.abspath(u'./../../../..'))
+# Do we need these two lines?
+#sys.path.append(os.path.abspath(u'./../../../..'))
+#sys.path.append(os.path.abspath(os.path.join(u'.', u'..', u'..')))
 
-from openlp.core.lib import XmlRootClass
 
 log = logging.getLogger(__name__)
 
@@ -74,14 +76,77 @@ _BLANK_OPENSONG_XML = \
 </song>
 '''
 
-class _OpenSong(XmlRootClass):
-    """Class for import of OpenSong"""
-
+class _OpenSong(object):
+    """
+    Class for import of OpenSong
+    """
     def __init__(self, xmlContent = None):
-        """Initialize from given xml content"""
-        super(_OpenSong, self).__init__()
+        """
+        Initialize from given xml content
+        """
         self.from_buffer(xmlContent)
 
+    def _set_from_xml(self, xml, root_tag):
+        """
+        Set song properties from given xml content.
+
+        ``xml``
+            Formatted xml tags and values.
+        ``root_tag``
+            The root tag of the xml.
+        """
+        root = ElementTree(element=XML(xml))
+        xml_iter = root.getiterator()
+        for element in xml_iter:
+            if element.tag != root_tag:
+                text = element.text
+                if text is None:
+                    val = text
+                elif isinstance(text, basestring):
+                    # Strings need special handling to sort the colours out
+                    if text[0] == u'$':
+                        # This might be a hex number, let's try to convert it.
+                        try:
+                            val = int(text[1:], 16)
+                        except ValueError:
+                            pass
+                    else:
+                        # Let's just see if it's a integer.
+                        try:
+                            val = int(text)
+                        except ValueError:
+                            # Ok, it seems to be a string.
+                            val = text
+                    if hasattr(self, u'post_tag_hook'):
+                        (element.tag, val) = \
+                            self.post_tag_hook(element.tag, val)
+                setattr(self, element.tag, val)
+
+    def __str__(self):
+        """
+        Return string with all public attributes
+
+        The string is formatted with one attribute per line
+        If the string is split on newline then the length of the
+        list is equal to the number of attributes
+        """
+        attributes = []
+        for attrib in dir(self):
+            if not attrib.startswith(u'_'):
+                attributes.append(
+                    u'%30s : %s' % (attrib, getattr(self, attrib)))
+        return u'\n'.join(attributes)
+
+    def _get_as_string(self):
+        """
+        Return one string with all public attributes
+        """
+        result = u''
+        for attrib in dir(self):
+            if not attrib.startswith(u'_'):
+                result += u'_%s_' % getattr(self, attrib)
+        return result
+
     def _reset(self):
         """Reset all song attributes"""
         self._setFromXml(_BLANK_OPENSONG_XML, 'song')

From 0c184d5e601ccf3e83207d61cf36c21305ae7837 Mon Sep 17 00:00:00 2001
From: Jon Tibble <meths@btinternet.com>
Date: Sat, 3 Jul 2010 02:07:36 +0100
Subject: [PATCH 02/21] Remove some unused methods

---
 openlp/plugins/songs/lib/songxml.py | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/openlp/plugins/songs/lib/songxml.py b/openlp/plugins/songs/lib/songxml.py
index e26a06e90..08234f093 100644
--- a/openlp/plugins/songs/lib/songxml.py
+++ b/openlp/plugins/songs/lib/songxml.py
@@ -317,14 +317,6 @@ class Song(object):
         self.set_lyrics(u'')
         return
 
-    def set_songid(self, songid):
-        """Set the songid for the database"""
-        self.songid = songid
-
-    def get_songid(self):
-        """Return the songid for the database"""
-        return self.songid
-
     def from_opensong_buffer(self, xmlcontent):
         """Initialize from buffer(string) of xml lines in opensong format"""
         self._reset()
@@ -388,10 +380,6 @@ class Song(object):
         """Return title value"""
         return self.title
 
-    def get_search_title(self):
-        """Return search_title"""
-        return self.search_title
-
     def from_ccli_text_buffer(self, textList):
         """
         Create song from a list of texts (strings) - CCLI text format expected

From 497d1c9dc99c9b56e46a92f6134fdafbeb3ebe59 Mon Sep 17 00:00:00 2001
From: Jon Tibble <meths@btinternet.com>
Date: Sat, 3 Jul 2010 02:33:40 +0100
Subject: [PATCH 03/21] XML: Put it where it should be

---
 documentation/source/core/lib.rst             |  13 --
 openlp/core/lib/__init__.py                   |   1 -
 openlp/plugins/custom/forms/editcustomform.py |   9 +-
 openlp/plugins/custom/lib/__init__.py         |   1 +
 openlp/plugins/custom/lib/customxmlhandler.py | 156 ++++++++++++++++++
 openlp/plugins/custom/lib/mediaitem.py        |   7 +-
 openlp/plugins/songs/forms/editsongform.py    |   4 +-
 openlp/plugins/songs/lib/__init__.py          |   1 +
 openlp/plugins/songs/lib/mediaitem.py         |   5 +-
 openlp/plugins/songs/lib/songimport.py        |   4 +-
 .../songs}/lib/songxmlhandler.py              |   0
 11 files changed, 174 insertions(+), 27 deletions(-)
 create mode 100644 openlp/plugins/custom/lib/customxmlhandler.py
 rename openlp/{core => plugins/songs}/lib/songxmlhandler.py (100%)

diff --git a/documentation/source/core/lib.rst b/documentation/source/core/lib.rst
index dd90b24a9..43ca90b3b 100644
--- a/documentation/source/core/lib.rst
+++ b/documentation/source/core/lib.rst
@@ -60,18 +60,6 @@
 .. autoclass:: openlp.core.lib.settingstab.SettingsTab
    :members:
 
-:mod:`SongXMLBuilder`
----------------------
-
-.. autoclass:: openlp.core.lib.songxmlhandler.SongXMLBuilder
-   :members:
-
-:mod:`SongXMLParser`
---------------------
-
-.. autoclass:: openlp.core.lib.songxmlhandler.SongXMLParser
-   :members:
-
 :mod:`ThemeXML`
 ---------------
 
@@ -83,4 +71,3 @@
 
 .. autoclass:: openlp.core.lib.toolbar.OpenLPToolbar
    :members:
-
diff --git a/openlp/core/lib/__init__.py b/openlp/core/lib/__init__.py
index 5a4725c80..11ba7e2dc 100644
--- a/openlp/core/lib/__init__.py
+++ b/openlp/core/lib/__init__.py
@@ -221,7 +221,6 @@ from serviceitem import ServiceItemType
 from serviceitem import ItemCapabilities
 from toolbar import OpenLPToolbar
 from dockwidget import OpenLPDockWidget
-from songxmlhandler import SongXMLBuilder, SongXMLParser
 from themexmlhandler import ThemeXML
 from renderer import Renderer
 from rendermanager import RenderManager
diff --git a/openlp/plugins/custom/forms/editcustomform.py b/openlp/plugins/custom/forms/editcustomform.py
index a266c44c5..24810eb0b 100644
--- a/openlp/plugins/custom/forms/editcustomform.py
+++ b/openlp/plugins/custom/forms/editcustomform.py
@@ -28,7 +28,8 @@ import logging
 from PyQt4 import QtCore, QtGui
 
 from editcustomdialog import Ui_customEditDialog
-from openlp.core.lib import SongXMLBuilder, SongXMLParser, Receiver, translate
+from openlp.core.lib import Receiver, translate
+from openlp.plugins.custom.lib import CustomXMLBuilder, CustomXMLParser
 from openlp.plugins.custom.lib.db import CustomSlide
 
 log = logging.getLogger(__name__)
@@ -119,8 +120,8 @@ class EditCustomForm(QtGui.QDialog, Ui_customEditDialog):
             self.customSlide = self.custommanager.get_object(CustomSlide, id)
             self.TitleEdit.setText(self.customSlide.title)
             self.CreditEdit.setText(self.customSlide.credits)
-            songXML = SongXMLParser(self.customSlide.text)
-            verseList = songXML.get_verses()
+            customXML = CustomXMLParser(self.customSlide.text)
+            verseList = customXML.get_verses()
             for verse in verseList:
                 self.VerseListView.addItem(verse[1])
             theme = self.customSlide.theme_name
@@ -152,7 +153,7 @@ class EditCustomForm(QtGui.QDialog, Ui_customEditDialog):
                 translate('CustomPlugin.EditCustomForm', 'Error'), message,
                 QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok))
             return False
-        sxml = SongXMLBuilder()
+        sxml = CustomXMLBuilder()
         sxml.new_document()
         sxml.add_lyrics_to_song()
         count = 1
diff --git a/openlp/plugins/custom/lib/__init__.py b/openlp/plugins/custom/lib/__init__.py
index 0d9de3173..1eea5e32d 100644
--- a/openlp/plugins/custom/lib/__init__.py
+++ b/openlp/plugins/custom/lib/__init__.py
@@ -23,5 +23,6 @@
 # Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
 ###############################################################################
 
+from customxmlhandler import CustomXMLBuilder, CustomXMLParser
 from mediaitem import CustomMediaItem
 from customtab import CustomTab
diff --git a/openlp/plugins/custom/lib/customxmlhandler.py b/openlp/plugins/custom/lib/customxmlhandler.py
new file mode 100644
index 000000000..ebb8b1685
--- /dev/null
+++ b/openlp/plugins/custom/lib/customxmlhandler.py
@@ -0,0 +1,156 @@
+# -*- coding: utf-8 -*-
+# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4
+
+###############################################################################
+# OpenLP - Open Source Lyrics Projection                                      #
+# --------------------------------------------------------------------------- #
+# Copyright (c) 2008-2010 Raoul Snyman                                        #
+# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael      #
+# Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin      #
+# Thompson, Jon Tibble, Carsten Tinggaard                                     #
+# --------------------------------------------------------------------------- #
+# This program is free software; you can redistribute it and/or modify it     #
+# under the terms of the GNU General Public License as published by the Free  #
+# Software Foundation; version 2 of the License.                              #
+#                                                                             #
+# This program is distributed in the hope that it will be useful, but WITHOUT #
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or       #
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for    #
+# more details.                                                               #
+#                                                                             #
+# You should have received a copy of the GNU General Public License along     #
+# with this program; if not, write to the Free Software Foundation, Inc., 59  #
+# Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
+###############################################################################
+"""
+The :mod:`customxmlhandler` module provides the XML functionality for custom
+slides
+
+The basic XML is of the format::
+
+    <?xml version="1.0" encoding="UTF-8"?>
+    <song version="1.0">
+        <lyrics language="en">
+            <verse type="chorus" label="1">
+                <![CDATA[ ... ]]>
+            </verse>
+        </lyrics>
+    </song>
+"""
+
+import logging
+
+from xml.dom.minidom import Document
+from xml.etree.ElementTree import ElementTree, XML, dump
+from xml.parsers.expat import ExpatError
+
+log = logging.getLogger(__name__)
+
+class CustomXMLBuilder(object):
+    """
+    This class builds the XML used to describe songs.
+    """
+    log.info(u'CustomXMLBuilder Loaded')
+
+    def __init__(self):
+        """
+        Set up the song builder.
+        """
+        # Create the minidom document
+        self.song_xml = Document()
+
+    def new_document(self):
+        """
+        Create a new song XML document.
+        """
+        # Create the <song> base element
+        self.song = self.song_xml.createElement(u'song')
+        self.song_xml.appendChild(self.song)
+        self.song.setAttribute(u'version', u'1.0')
+
+    def add_lyrics_to_song(self):
+        """
+        Set up and add a ``<lyrics>`` tag which contains the lyrics of the
+        song.
+        """
+        # Create the main <lyrics> element
+        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):
+        """
+        Add a verse to the ``<lyrics>`` tag.
+
+        ``type``
+            A string denoting the type of verse. Possible values are "Chorus",
+            "Verse", "Bridge", and "Custom".
+
+        ``number``
+            An integer denoting the number of the item, for example: verse 1.
+
+        ``content``
+            The actual text of the verse to be stored.
+        """
+        #log.debug(u'add_verse_to_lyrics %s, %s\n%s' % (type, number, content))
+        verse = self.song_xml.createElement(u'verse')
+        verse.setAttribute(u'type', type)
+        verse.setAttribute(u'label', number)
+        self.lyrics.appendChild(verse)
+        # add data as a CDATA section to protect the XML from special chars
+        cds = self.song_xml.createCDATASection(content)
+        verse.appendChild(cds)
+
+    def dump_xml(self):
+        """
+        Debugging aid to dump XML so that we can see what we have.
+        """
+        return self.song_xml.toprettyxml(indent=u'  ')
+
+    def extract_xml(self):
+        """
+        Extract our newly created XML song.
+        """
+        return self.song_xml.toxml(u'utf-8')
+
+
+class CustomXMLParser(object):
+    """
+    A class to read in and parse a song's XML.
+    """
+    log.info(u'CustomXMLParser Loaded')
+
+    def __init__(self, xml):
+        """
+        Set up our song XML parser.
+
+        ``xml``
+            The XML of the song to be parsed.
+        """
+        self.song_xml = None
+        try:
+            self.song_xml = ElementTree(
+                element=XML(unicode(xml).encode('unicode-escape')))
+        except ExpatError:
+            log.exception(u'Invalid xml %s', xml)
+
+    def get_verses(self):
+        """
+        Iterates through the verses in the XML and returns a list of verses
+        and their attributes.
+        """
+        xml_iter = self.song_xml.getiterator()
+        verse_list = []
+        for element in xml_iter:
+            if element.tag == u'verse':
+                if element.text is None:
+                    element.text = u''
+                verse_list.append([element.attrib,
+                    unicode(element.text).decode('unicode-escape')])
+        return verse_list
+
+    def dump_xml(self):
+        """
+        Debugging aid to dump XML so that we can see what we have.
+        """
+        return dump(self.song_xml)
diff --git a/openlp/plugins/custom/lib/mediaitem.py b/openlp/plugins/custom/lib/mediaitem.py
index 8f4cf6a7f..9cc5627ed 100644
--- a/openlp/plugins/custom/lib/mediaitem.py
+++ b/openlp/plugins/custom/lib/mediaitem.py
@@ -27,8 +27,9 @@ import logging
 
 from PyQt4 import QtCore, QtGui
 
-from openlp.core.lib import MediaManagerItem, SongXMLParser, BaseListWithDnD, \
+from openlp.core.lib import MediaManagerItem, BaseListWithDnD, \
     Receiver, ItemCapabilities, translate, check_item_selected
+from openlp.plugins.custom.lib import CustomXMLParser
 from openlp.plugins.custom.lib.db import CustomSlide
 
 log = logging.getLogger(__name__)
@@ -170,8 +171,8 @@ class CustomMediaItem(MediaManagerItem):
         theme = customSlide.theme_name
         if theme:
             service_item.theme = theme
-        songXML = SongXMLParser(customSlide.text)
-        verseList = songXML.get_verses()
+        customXML = CustomXMLParser(customSlide.text)
+        verseList = customXML.get_verses()
         for verse in verseList:
             raw_slides.append(verse[1])
         service_item.title = title
diff --git a/openlp/plugins/songs/forms/editsongform.py b/openlp/plugins/songs/forms/editsongform.py
index 8c39a2fe8..18c613abf 100644
--- a/openlp/plugins/songs/forms/editsongform.py
+++ b/openlp/plugins/songs/forms/editsongform.py
@@ -28,9 +28,9 @@ import re
 
 from PyQt4 import QtCore, QtGui
 
-from openlp.core.lib import SongXMLBuilder, SongXMLParser, Receiver, translate
+from openlp.core.lib import Receiver, translate
 from openlp.plugins.songs.forms import EditVerseForm
-from openlp.plugins.songs.lib import VerseType
+from openlp.plugins.songs.lib import SongXMLBuilder, SongXMLParser, VerseType
 from openlp.plugins.songs.lib.db import Book, Song, Author, Topic
 from editsongdialog import Ui_EditSongDialog
 
diff --git a/openlp/plugins/songs/lib/__init__.py b/openlp/plugins/songs/lib/__init__.py
index 8c07c31c7..85206f5be 100644
--- a/openlp/plugins/songs/lib/__init__.py
+++ b/openlp/plugins/songs/lib/__init__.py
@@ -137,6 +137,7 @@ class VerseType(object):
             unicode(VerseType.to_string(VerseType.Other)).lower():
             return VerseType.Other
 
+from songxmlhandler import SongXMLBuilder, SongXMLParser
 from songstab import SongsTab
 from mediaitem import SongMediaItem
 from songimport import SongImport
diff --git a/openlp/plugins/songs/lib/mediaitem.py b/openlp/plugins/songs/lib/mediaitem.py
index 4557f53fa..496840412 100644
--- a/openlp/plugins/songs/lib/mediaitem.py
+++ b/openlp/plugins/songs/lib/mediaitem.py
@@ -27,10 +27,11 @@ import logging
 
 from PyQt4 import QtCore, QtGui
 
-from openlp.core.lib import MediaManagerItem, SongXMLParser, \
-    BaseListWithDnD, Receiver, ItemCapabilities, translate, check_item_selected
+from openlp.core.lib import MediaManagerItem, BaseListWithDnD, Receiver, \
+    ItemCapabilities, translate, check_item_selected
 from openlp.plugins.songs.forms import EditSongForm, SongMaintenanceForm, \
     ImportWizardForm
+from openlp.plugins.songs.lib import SongXMLParser
 from openlp.plugins.songs.lib.db import Song
 
 log = logging.getLogger(__name__)
diff --git a/openlp/plugins/songs/lib/songimport.py b/openlp/plugins/songs/lib/songimport.py
index 115f52e58..5b083c7c5 100644
--- a/openlp/plugins/songs/lib/songimport.py
+++ b/openlp/plugins/songs/lib/songimport.py
@@ -25,8 +25,8 @@
 
 import re
 
-from openlp.core.lib import SongXMLBuilder, translate
-from openlp.plugins.songs.lib import VerseType
+from openlp.core.lib import translate
+from openlp.plugins.songs.lib import SongXMLBuilder, VerseType
 from openlp.plugins.songs.lib.db import Song, Author, Topic, Book
 
 class SongImport(object):
diff --git a/openlp/core/lib/songxmlhandler.py b/openlp/plugins/songs/lib/songxmlhandler.py
similarity index 100%
rename from openlp/core/lib/songxmlhandler.py
rename to openlp/plugins/songs/lib/songxmlhandler.py

From fda7412f75dfa20062cf213747b2320f7ba6499e Mon Sep 17 00:00:00 2001
From: Phill Ridout <phill.ridout@googlemail.com>
Date: Sat, 3 Jul 2010 04:06:02 +0100
Subject: [PATCH 04/21] added css to remove white space arround background
 video adjusted spacing, added escapes to double quotes and moved the > on the
 body tag to its proper place!

---
 openlp/core/ui/maindisplay.py | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/openlp/core/ui/maindisplay.py b/openlp/core/ui/maindisplay.py
index aaef47612..36df43988 100644
--- a/openlp/core/ui/maindisplay.py
+++ b/openlp/core/ui/maindisplay.py
@@ -43,19 +43,27 @@ HTMLIMAGE = """<html>
 
 #http://www.steveheffernan.com/html5-video-player/demo-video-player.html
 HTMLVIDEO = u"""<html>
-  <script type="text/javascript" charset="utf-8">
+    <head>
+    <style>
+    *{
+        margin: 0;
+        padding:0
+    }
+    </style>
+    <script type=\"text/javascript\" charset=\"utf-8\">
     var video;
     var bodyLoaded = function(){
-        video = document.getElementById("video");
+        video = document.getElementById(\"video\");
         video.volume = 0;
     }
-  </script>
-        <body id=\"body\" onload=\"bodyLoaded();>\"
-        <video id=\"video\" src=\"%s\"
-            autoplay loop width=%s height=%s autobuffer=\"autobuffer\" preload >
-            your browser does not support the video tag
-        </video>
-        </body></html>
+    </script>
+    <body id=\"body\" onload=\"bodyLoaded();\">
+    <video id=\"video\" src=\"%s\"
+        autoplay loop width=\"%s\" height=\"%s\"
+        autobuffer=\"autobuffer\" preload >
+        your browser does not support the video tag
+    </video>
+    </body></html>
     """
 
 class DisplayManager(QtGui.QWidget):

From 5f15b2fd7ddf4f635f6fa993a16fbc7b213e199f Mon Sep 17 00:00:00 2001
From: Phill Ridout <phill.ridout@googlemail.com>
Date: Sat, 3 Jul 2010 06:41:24 +0100
Subject: [PATCH 05/21] added missing </head>

---
 openlp/core/ui/maindisplay.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/openlp/core/ui/maindisplay.py b/openlp/core/ui/maindisplay.py
index 36df43988..c397b570c 100644
--- a/openlp/core/ui/maindisplay.py
+++ b/openlp/core/ui/maindisplay.py
@@ -57,6 +57,7 @@ HTMLVIDEO = u"""<html>
         video.volume = 0;
     }
     </script>
+    </head>
     <body id=\"body\" onload=\"bodyLoaded();\">
     <video id=\"video\" src=\"%s\"
         autoplay loop width=\"%s\" height=\"%s\"

From 2b8565903102bf61943768c7341a29f53a12a2bb Mon Sep 17 00:00:00 2001
From: Phill Ridout <phill.ridout@googlemail.com>
Date: Sat, 3 Jul 2010 11:46:13 +0100
Subject: [PATCH 06/21] Removal of HTMLIMAGE at the request of TRB143

---
 openlp/core/ui/maindisplay.py | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/openlp/core/ui/maindisplay.py b/openlp/core/ui/maindisplay.py
index c397b570c..94f524e5f 100644
--- a/openlp/core/ui/maindisplay.py
+++ b/openlp/core/ui/maindisplay.py
@@ -35,12 +35,6 @@ from openlp.core.ui import HideMode
 
 log = logging.getLogger(__name__)
 
-HTMLIMAGE = """<html>
-    <body>
-    <img src=\"file://%s\" alt\"Hello\">
-    </body></html>
-    """
-
 #http://www.steveheffernan.com/html5-video-player/demo-video-player.html
 HTMLVIDEO = u"""<html>
     <head>

From 732bf24ef8233624b32f00cfbd503b6857d768f6 Mon Sep 17 00:00:00 2001
From: Jon Tibble <meths@btinternet.com>
Date: Sat, 3 Jul 2010 14:26:29 +0100
Subject: [PATCH 07/21] XML: Cleanups

---
 openlp/core/lib/__init__.py                      | 11 +----------
 openlp/core/lib/{themexmlhandler.py => theme.py} | 10 ++++++++--
 openlp/plugins/songs/lib/songxml.py              | 16 +++-------------
 openlp/plugins/songs/lib/xml.py                  |  1 -
 4 files changed, 12 insertions(+), 26 deletions(-)
 rename openlp/core/lib/{themexmlhandler.py => theme.py} (99%)

diff --git a/openlp/core/lib/__init__.py b/openlp/core/lib/__init__.py
index 11ba7e2dc..4718e289e 100644
--- a/openlp/core/lib/__init__.py
+++ b/openlp/core/lib/__init__.py
@@ -202,15 +202,6 @@ def check_item_selected(list_widget, message):
         return False
     return True
 
-
-class ThemeLevel(object):
-    """
-    Provides an enumeration for the level a theme applies to
-    """
-    Global = 1
-    Service = 2
-    Song = 3
-
 from eventreceiver import Receiver
 from settingsmanager import SettingsManager
 from plugin import PluginStatus, Plugin
@@ -221,7 +212,7 @@ from serviceitem import ServiceItemType
 from serviceitem import ItemCapabilities
 from toolbar import OpenLPToolbar
 from dockwidget import OpenLPDockWidget
-from themexmlhandler import ThemeXML
+from theme import ThemeLevel, ThemeXML
 from renderer import Renderer
 from rendermanager import RenderManager
 from mediamanageritem import MediaManagerItem
diff --git a/openlp/core/lib/themexmlhandler.py b/openlp/core/lib/theme.py
similarity index 99%
rename from openlp/core/lib/themexmlhandler.py
rename to openlp/core/lib/theme.py
index a5b4137ce..fe797279a 100644
--- a/openlp/core/lib/themexmlhandler.py
+++ b/openlp/core/lib/theme.py
@@ -79,6 +79,14 @@ BLANK_THEME_XML = \
  </theme>
 '''
 
+class ThemeLevel(object):
+    """
+    Provides an enumeration for the level a theme applies to
+    """
+    Global = 1
+    Service = 2
+    Song = 3
+
 class ThemeXML(object):
     """
     A class to encapsulate the Theme XML.
@@ -313,7 +321,6 @@ class ThemeXML(object):
         element.appendChild(value)
         background.appendChild(element)
 
-
     def child_element(self, element, tag, value):
         """
         Generic child element creator.
@@ -414,4 +421,3 @@ class ThemeXML(object):
             if key[0:1] != u'_':
                 theme_strings.append(u'%30s: %s' % (key, getattr(self, key)))
         return u'\n'.join(theme_strings)
-
diff --git a/openlp/plugins/songs/lib/songxml.py b/openlp/plugins/songs/lib/songxml.py
index 08234f093..2965c579b 100644
--- a/openlp/plugins/songs/lib/songxml.py
+++ b/openlp/plugins/songs/lib/songxml.py
@@ -34,10 +34,8 @@ from xml.etree.ElementTree import ElementTree, XML
 #sys.path.append(os.path.abspath(u'./../../../..'))
 #sys.path.append(os.path.abspath(os.path.join(u'.', u'..', u'..')))
 
-
 log = logging.getLogger(__name__)
 
-
 class SongException(Exception):
     pass
 
@@ -84,7 +82,9 @@ class _OpenSong(object):
         """
         Initialize from given xml content
         """
-        self.from_buffer(xmlContent)
+        self._set_from_xml(_BLANK_OPENSONG_XML, 'song')
+        if xmlContent:
+            self._set_from_xml(xmlContent, 'song')
 
     def _set_from_xml(self, xml, root_tag):
         """
@@ -147,16 +147,6 @@ class _OpenSong(object):
                 result += u'_%s_' % getattr(self, attrib)
         return result
 
-    def _reset(self):
-        """Reset all song attributes"""
-        self._setFromXml(_BLANK_OPENSONG_XML, 'song')
-
-    def from_buffer(self, xmlContent):
-        """Initialize from buffer(string) with xml content"""
-        self._reset()
-        if xmlContent:
-            self._setFromXml(xmlContent, 'song')
-
     def get_author_list(self):
         """Convert author field to an authorlist
 
diff --git a/openlp/plugins/songs/lib/xml.py b/openlp/plugins/songs/lib/xml.py
index 2be9573a2..4fa7424f9 100644
--- a/openlp/plugins/songs/lib/xml.py
+++ b/openlp/plugins/songs/lib/xml.py
@@ -136,4 +136,3 @@ class LyricsXML(object):
         song_output = u'<?xml version="1.0" encoding="UTF-8"?>' + \
             u'<song version="1.0">%s</song>' % lyrics_output
         return song_output
-

From 1e4a11f4e51ca055480656fbaf16962a41c62305 Mon Sep 17 00:00:00 2001
From: Jon Tibble <meths@btinternet.com>
Date: Sat, 3 Jul 2010 18:46:00 +0100
Subject: [PATCH 08/21] XML: Objecify it to make it run

---
 openlp/plugins/songs/forms/editsongform.py |  2 -
 openlp/plugins/songs/lib/songimport.py     |  2 -
 openlp/plugins/songs/lib/songxmlhandler.py | 53 +++++++---------------
 3 files changed, 17 insertions(+), 40 deletions(-)

diff --git a/openlp/plugins/songs/forms/editsongform.py b/openlp/plugins/songs/forms/editsongform.py
index 18c613abf..663b510d3 100644
--- a/openlp/plugins/songs/forms/editsongform.py
+++ b/openlp/plugins/songs/forms/editsongform.py
@@ -639,8 +639,6 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
         log.debug(u'processLyrics')
         try:
             sxml = SongXMLBuilder()
-            sxml.new_document()
-            sxml.add_lyrics_to_song()
             text = u''
             multiple = []
             for i in range (0, self.VerseListWidget.rowCount()):
diff --git a/openlp/plugins/songs/lib/songimport.py b/openlp/plugins/songs/lib/songimport.py
index 5b083c7c5..0e950f18c 100644
--- a/openlp/plugins/songs/lib/songimport.py
+++ b/openlp/plugins/songs/lib/songimport.py
@@ -276,8 +276,6 @@ class SongImport(object):
         song.song_number = self.song_number
         song.search_lyrics = u''
         sxml = SongXMLBuilder()
-        sxml.new_document()
-        sxml.add_lyrics_to_song()
         for (versetag, versetext) in self.verses:
             if versetag[0] == u'C':
                 versetype = VerseType.to_string(VerseType.Chorus)
diff --git a/openlp/plugins/songs/lib/songxmlhandler.py b/openlp/plugins/songs/lib/songxmlhandler.py
index 76b01e376..395777c17 100644
--- a/openlp/plugins/songs/lib/songxmlhandler.py
+++ b/openlp/plugins/songs/lib/songxmlhandler.py
@@ -38,10 +38,10 @@ The basic XML is of the format::
 """
 
 import logging
+import StringIO
 
-from xml.dom.minidom import Document
-from xml.etree.ElementTree import ElementTree, XML, dump
-from xml.parsers.expat import ExpatError
+from lxml import etree, objectify
+#from lxml.etree import SubElement, XMLSyntaxError, dump
 
 log = logging.getLogger(__name__)
 
@@ -51,31 +51,18 @@ class SongXMLBuilder(object):
     """
     log.info(u'SongXMLBuilder Loaded')
 
-    def __init__(self):
+    def __init__(self, song_language=None):
         """
         Set up the song builder.
-        """
-        # Create the minidom document
-        self.song_xml = Document()
 
-    def new_document(self):
+        ``song_language``
+            The language used in this song
         """
-        Create a new song XML document.
-        """
-        # Create the <song> base element
-        self.song = self.song_xml.createElement(u'song')
-        self.song_xml.appendChild(self.song)
-        self.song.setAttribute(u'version', u'1.0')
-
-    def add_lyrics_to_song(self):
-        """
-        Set up and add a ``<lyrics>`` tag which contains the lyrics of the
-        song.
-        """
-        # Create the main <lyrics> element
-        self.lyrics = self.song_xml.createElement(u'lyrics')
-        self.lyrics.setAttribute(u'language', u'en')
-        self.song.appendChild(self.lyrics)
+        lang = u'en'
+        if song_language:
+            lang = song_language
+        self.song_xml = objectify.fromstring(u'<song version="1.0" />')
+        self.lyrics = etree.SubElement(self.song_xml, u'lyrics', language=lang)
 
     def add_verse_to_lyrics(self, type, number, content):
         """
@@ -92,25 +79,20 @@ class SongXMLBuilder(object):
             The actual text of the verse to be stored.
         """
         #log.debug(u'add_verse_to_lyrics %s, %s\n%s' % (type, number, content))
-        verse = self.song_xml.createElement(u'verse')
-        verse.setAttribute(u'type', type)
-        verse.setAttribute(u'label', number)
-        self.lyrics.appendChild(verse)
-        # add data as a CDATA section to protect the XML from special chars
-        cds = self.song_xml.createCDATASection(content)
-        verse.appendChild(cds)
+        verse = etree.SubElement(self.lyrics, u'verse', type=type, label=number)
+        verse.text = etree.CDATA(content)
 
     def dump_xml(self):
         """
         Debugging aid to dump XML so that we can see what we have.
         """
-        return self.song_xml.toprettyxml(indent=u'  ')
+        return etree.tostring(self.song_xml, pretty_print=True)
 
     def extract_xml(self):
         """
         Extract our newly created XML song.
         """
-        return self.song_xml.toxml(u'utf-8')
+        return etree.tostring(self.song_xml, encoding=u'utf-8')
 
 
 class SongXMLParser(object):
@@ -128,9 +110,8 @@ class SongXMLParser(object):
         """
         self.song_xml = None
         try:
-            self.song_xml = ElementTree(
-                element=XML(unicode(xml).encode('unicode-escape')))
-        except ExpatError:
+            self.song_xml = objectify.fromstring(str(xml))
+        except etree.XMLSyntaxError:
             log.exception(u'Invalid xml %s', xml)
 
     def get_verses(self):

From b58d501e289efdb450b444c0a5cb1fdb67a8456c Mon Sep 17 00:00:00 2001
From: Phill Ridout <phill.ridout@googlemail.com>
Date: Sat, 3 Jul 2010 19:26:11 +0100
Subject: [PATCH 09/21] removed unecessary escapes!

---
 openlp/core/ui/maindisplay.py | 1412 ++++++++++++++++-----------------
 1 file changed, 706 insertions(+), 706 deletions(-)

diff --git a/openlp/core/ui/maindisplay.py b/openlp/core/ui/maindisplay.py
index 94f524e5f..30864405c 100644
--- a/openlp/core/ui/maindisplay.py
+++ b/openlp/core/ui/maindisplay.py
@@ -1,706 +1,706 @@
-# -*- coding: utf-8 -*-
-# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4
-
-###############################################################################
-# OpenLP - Open Source Lyrics Projection                                      #
-# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman                                        #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin      #
-# Thompson, Jon Tibble, Carsten Tinggaard                                     #
-# --------------------------------------------------------------------------- #
-# This program is free software; you can redistribute it and/or modify it     #
-# under the terms of the GNU General Public License as published by the Free  #
-# Software Foundation; version 2 of the License.                              #
-#                                                                             #
-# This program is distributed in the hope that it will be useful, but WITHOUT #
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or       #
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for    #
-# more details.                                                               #
-#                                                                             #
-# You should have received a copy of the GNU General Public License along     #
-# with this program; if not, write to the Free Software Foundation, Inc., 59  #
-# Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
-###############################################################################
-
-import logging
-import os
-import time
-
-from PyQt4 import QtCore, QtGui, QtWebKit
-from PyQt4.phonon import Phonon
-
-from openlp.core.lib import Receiver, resize_image
-from openlp.core.ui import HideMode
-
-log = logging.getLogger(__name__)
-
-#http://www.steveheffernan.com/html5-video-player/demo-video-player.html
-HTMLVIDEO = u"""<html>
-    <head>
-    <style>
-    *{
-        margin: 0;
-        padding:0
-    }
-    </style>
-    <script type=\"text/javascript\" charset=\"utf-8\">
-    var video;
-    var bodyLoaded = function(){
-        video = document.getElementById(\"video\");
-        video.volume = 0;
-    }
-    </script>
-    </head>
-    <body id=\"body\" onload=\"bodyLoaded();\">
-    <video id=\"video\" src=\"%s\"
-        autoplay loop width=\"%s\" height=\"%s\"
-        autobuffer=\"autobuffer\" preload >
-        your browser does not support the video tag
-    </video>
-    </body></html>
-    """
-
-class DisplayManager(QtGui.QWidget):
-    """
-    Wrapper class to hold the display widgets.
-    I will provide API's in future to access the screens allow for
-    extra displays to be added.
-    RenderManager is poked in by MainWindow
-    """
-    def __init__(self, screens):
-        QtGui.QWidget.__init__(self)
-        self.screens = screens
-        self.videoDisplay = VideoDisplay(self, screens)
-        self.audioPlayer = AudioPlayer(self)
-        self.mainDisplay = MainDisplay(self, screens)
-        QtCore.QObject.connect(Receiver.get_receiver(),
-            QtCore.SIGNAL(u'maindisplay_hide'), self.hideDisplay)
-        QtCore.QObject.connect(Receiver.get_receiver(),
-            QtCore.SIGNAL(u'maindisplay_show'), self.showDisplay)
-        QtCore.QObject.connect(Receiver.get_receiver(),
-            QtCore.SIGNAL(u'videodisplay_start'), self.onStartVideo)
-        QtCore.QObject.connect(Receiver.get_receiver(),
-            QtCore.SIGNAL(u'videodisplay_stop'), self.onStopVideo)
-
-    def setup(self):
-        self.videoDisplay.setup()
-        self.mainDisplay.setup()
-
-    def hideDisplay(self, message):
-        """
-        Hide the output displays
-        """
-        self.videoDisplay.mediaHide(message)
-        self.mainDisplay.hideDisplay(message)
-
-    def showDisplay(self, message):
-        """
-        Hide the output displays
-        """
-        self.videoDisplay.mediaShow(message)
-        self.mainDisplay.showDisplay(message)
-
-    def addAlert(self, alertMessage, location):
-        """
-        Handles the addition of an Alert Message to the Displays
-        """
-        self.mainDisplay.addAlert(alertMessage, location)
-
-    def displayImageWithText(self, frame):
-        """
-        Handles the addition of a background Image to the displays
-        """
-        self.mainDisplay.addImageWithText(frame)
-
-    def displayImage(self, frame):
-        """
-        Handles the addition of a background Image to the displays
-        """
-        self.mainDisplay.displayImage(frame)
-
-    def displayVideo(self, path):
-        """
-        Handles the addition of a background Video to the displays
-        """
-        self.mainDisplay.displayVideo(path)
-
-    def onStartVideo(self, item):
-        """
-        Handles the Starting of a Video and Display Management
-        """
-        self.videoDisplay.setVisible(True)
-        self.mainDisplay.setVisible(False)
-        self.videoDisplay.onMediaQueue(item)
-
-    def onStopVideo(self):
-        """
-        Handles the Stopping of a Video and Display Management
-        """
-        self.mainDisplay.setVisible(True)
-        self.videoDisplay.setVisible(False)
-        self.videoDisplay.onMediaStop()
-
-    def close(self):
-        """
-        Handles the closure of the displays
-        """
-        self.videoDisplay.close()
-        self.audioPlayer.close()
-        self.mainDisplay.close()
-
-
-class DisplayWidget(QtGui.QGraphicsView):
-    """
-    Customised version of QTableWidget which can respond to keyboard
-    events.
-    """
-    log.info(u'MainDisplay loaded')
-
-    def __init__(self, parent=None, name=None):
-        QtGui.QWidget.__init__(self, None)
-        self.parent = parent
-        self.hotkey_map = {
-            QtCore.Qt.Key_Return: 'servicemanager_next_item',
-            QtCore.Qt.Key_Space: 'slidecontroller_live_next_noloop',
-            QtCore.Qt.Key_Enter: 'slidecontroller_live_next_noloop',
-            QtCore.Qt.Key_0: 'servicemanager_next_item',
-            QtCore.Qt.Key_Backspace: 'slidecontroller_live_previous_noloop'}
-
-    def keyPressEvent(self, event):
-        if isinstance(event, QtGui.QKeyEvent):
-            #here accept the event and do something
-            if event.key() == QtCore.Qt.Key_Up:
-                Receiver.send_message(u'slidecontroller_live_previous')
-                event.accept()
-            elif event.key() == QtCore.Qt.Key_Down:
-                Receiver.send_message(u'slidecontroller_live_next')
-                event.accept()
-            elif event.key() == QtCore.Qt.Key_PageUp:
-                Receiver.send_message(u'slidecontroller_live_first')
-                event.accept()
-            elif event.key() == QtCore.Qt.Key_PageDown:
-                Receiver.send_message(u'slidecontroller_live_last')
-                event.accept()
-            elif event.key() in self.hotkey_map:
-                Receiver.send_message(self.hotkey_map[event.key()])
-                event.accept()
-            elif event.key() == QtCore.Qt.Key_Escape:
-                self.resetDisplay()
-                event.accept()
-            event.ignore()
-        else:
-            event.ignore()
-
-class MainDisplay(DisplayWidget):
-    """
-    This is the form that is used to display things on the projector.
-    """
-    log.info(u'MainDisplay Loaded')
-
-    def __init__(self, parent, screens):
-        """
-        The constructor for the display form.
-
-        ``parent``
-            The parent widget.
-
-        ``screens``
-            The list of screens.
-        """
-        log.debug(u'Initialisation started')
-        DisplayWidget.__init__(self, parent)
-        self.setWindowFlags(QtCore.Qt.Window | QtCore.Qt.FramelessWindowHint)
-        self.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOff)
-        self.setVerticalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOff)
-        self.parent = parent
-        # WA_TranslucentBackground is not available in QT4.4
-        try:
-            self.setAttribute(QtCore.Qt.WA_TranslucentBackground)
-        except AttributeError:
-            pass
-        self.screens = screens
-        self.setupScene()
-        self.setupVideo()
-        self.setupImage()
-        self.setupText()
-        self.setupAlert()
-        self.setupBlank()
-        self.primary = True
-        self.blankFrame = None
-        self.frame = None
-        #Hide desktop for now until we know where to put it
-        #and what size it should be.
-        self.setVisible(False)
-
-    def setup(self):
-        """
-        Sets up the screen on a particular screen.
-        """
-        log.debug(u'Setup %s for %s ' % (
-            self.screens, self.screens.monitor_number))
-        self.setVisible(False)
-        self.screen = self.screens.current
-        #Sort out screen locations and sizes
-        self.setGeometry(self.screen[u'size'])
-        self.scene.setSceneRect(0,0,self.size().width(), self.size().height())
-        self.webView.setGeometry(0, 0, self.size().width(), self.size().height())
-        #Build a custom splash screen
-        self.InitialFrame = QtGui.QImage(
-            self.screen[u'size'].width(),
-            self.screen[u'size'].height(),
-            QtGui.QImage.Format_ARGB32_Premultiplied)
-        splash_image = QtGui.QImage(u':/graphics/openlp-splash-screen.png')
-        painter_image = QtGui.QPainter()
-        painter_image.begin(self.InitialFrame)
-        painter_image.fillRect(self.InitialFrame.rect(), QtCore.Qt.white)
-        painter_image.drawImage(
-            (self.screen[u'size'].width() - splash_image.width()) / 2,
-            (self.screen[u'size'].height() - splash_image.height()) / 2,
-            splash_image)
-        self.displayImage(self.InitialFrame)
-        self.repaint()
-        #Build a Black screen
-        painter = QtGui.QPainter()
-        self.blankFrame = QtGui.QImage(
-            self.screen[u'size'].width(),
-            self.screen[u'size'].height(),
-            QtGui.QImage.Format_ARGB32_Premultiplied)
-        painter.begin(self.blankFrame)
-        painter.fillRect(self.blankFrame.rect(), QtCore.Qt.black)
-        #build a blank transparent image
-        self.transparent = QtGui.QPixmap(
-            self.screen[u'size'].width(), self.screen[u'size'].height())
-        self.transparent.fill(QtCore.Qt.transparent)
-#        self.displayText.setPixmap(self.transparent)
-        #self.frameView(self.transparent)
-        # To display or not to display?
-        if not self.screen[u'primary']:
-            self.setVisible(True)
-            self.primary = False
-        else:
-            self.setVisible(False)
-            self.primary = True
-
-    def setupScene(self):
-        self.scene = QtGui.QGraphicsScene(self)
-        self.scene.setSceneRect(0,0,self.size().width(), self.size().height())
-        self.setScene(self.scene)
-
-    def setupVideo(self):
-        self.webView = QtWebKit.QWebView()
-        self.page = self.webView.page()
-        self.videoDisplay = self.page.mainFrame()
-        self.videoDisplay.setScrollBarPolicy(QtCore.Qt.Vertical, QtCore.Qt.ScrollBarAlwaysOff)
-        self.videoDisplay.setScrollBarPolicy(QtCore.Qt.Horizontal, QtCore.Qt.ScrollBarAlwaysOff)
-        self.proxy = QtGui.QGraphicsProxyWidget()
-        self.proxy.setWidget(self.webView)
-        self.proxy.setWindowFlags(QtCore.Qt.Window | QtCore.Qt.FramelessWindowHint)
-        self.proxy.setZValue(1)
-        self.scene.addItem(self.proxy)
-
-    def setupImage(self):
-        self.imageDisplay = QtGui.QGraphicsPixmapItem()
-        self.imageDisplay.setZValue(2)
-        self.scene.addItem(self.imageDisplay)
-
-    def setupText(self):
-        #self.displayText = QtGui.QGraphicsTextItem()
-        self.displayText = QtGui.QGraphicsPixmapItem()
-        #self.displayText.setPos(0,0)
-        #self.displayText.setTextWidth(self.size().width())
-        self.displayText.setZValue(4)
-        self.scene.addItem(self.displayText)
-
-    def setupAlert(self):
-        self.alertText = QtGui.QGraphicsTextItem()
-        self.alertText.setTextWidth(self.size().width())
-        self.alertText.setZValue(8)
-        self.scene.addItem(self.alertText)
-
-    def setupBlank(self):
-        self.displayBlank = QtGui.QGraphicsPixmapItem()
-        self.displayBlank.setZValue(10)
-        self.scene.addItem(self.displayBlank)
-
-    def resetDisplay(self):
-        log.debug(u'resetDisplay')
-        Receiver.send_message(u'slidecontroller_live_stop_loop')
-        if self.primary:
-            self.setVisible(False)
-        else:
-            self.setVisible(True)
-
-#    def hideDisplayForVideo(self):
-#        """
-#        Hides the main display if for the video to be played
-#        """
-#        self.hideDisplay(HideMode.Screen)
-
-    def hideDisplay(self, mode=HideMode.Screen):
-        """
-        Hide the display by making all layers transparent
-        Store the images so they can be replaced when required
-        """
-        log.debug(u'hideDisplay mode = %d', mode)
-        #self.displayText.setPixmap(self.transparent)
-        if mode == HideMode.Screen:
-            #self.display_image.setPixmap(self.transparent)
-            self.setVisible(False)
-        elif mode == HideMode.Blank:
-            self.displayBlank.setPixmap(
-                QtGui.QPixmap.fromImage(self.blankFrame))
-        else:
-            if self.parent.renderManager.renderer.bg_frame:
-                self.displayBlank.setPixmap(QtGui.QPixmap.fromImage(
-                    self.parent.renderManager.renderer.bg_frame))
-            else:
-                self.displayBlank.setPixmap(
-                    QtGui.QPixmap.fromImage(self.blankFrame))
-
-    def showDisplay(self, message=u''):
-        """
-        Show the stored layers so the screen reappears as it was
-        originally.
-        Make the stored images None to release memory.
-        """
-        log.debug(u'showDisplay')
-        self.displayBlank.setPixmap(self.transparent)
-        #Trigger actions when display is active again
-        Receiver.send_message(u'maindisplay_active')
-
-    def addImageWithText(self, frame):
-        log.debug(u'addImageWithText')
-        frame = resize_image(
-            frame, self.screen[u'size'].width(), self.screen[u'size'].height())
-        self.imageDisplay.setPixmap(QtGui.QPixmap.fromImage(frame))
-        self.videoDisplay.setHtml(u'<html></html>')
-
-    def addAlert(self, message, location):
-        """
-        Places the Alert text on the display at the correct location
-        ``message``
-            Text to be displayed
-        ``location``
-            Where on the screen the text should be.  From the AlertTab
-            Combo box.
-        """
-        log.debug(u'addAlertImage')
-        if location == 0:
-            self.alertText.setPos(0, 0)
-        elif location == 1:
-            self.alertText.setPos(0,self.size().height()/2)
-        else:
-            self.alertText.setPos(0,self.size().height() - 76)
-        self.alertText.setHtml(message)
-
-    def displayImage(self, frame):
-        """
-        Places the Image passed on the display screen
-        ``frame``
-            The image to be displayed
-        """
-        log.debug(u'adddisplayImage')
-        if isinstance(frame, QtGui.QImage):
-            self.imageDisplay.setPixmap(QtGui.QPixmap.fromImage(frame))
-        else:
-            self.imageDisplay.setPixmap(frame)
-        self.videoDisplay.setHtml(u'<html></html>')
-
-    def displayVideo(self, path):
-        """
-        Places the Video passed on the display screen
-        ``path``
-            The path to the image to be displayed
-        """
-        log.debug(u'adddisplayVideo')
-        self.displayImage(self.transparent)
-        self.videoDisplay.setHtml(HTMLVIDEO %
-            (path, self.screen[u'size'].width(), self.screen[u'size'].height()))
-
-    def frameView(self, frame, transition=False):
-        """
-        Called from a slide controller to display a frame
-        if the alert is in progress the alert is added on top
-        ``frame``
-            Image frame to be rendered
-        ``transition``
-            Are transitions required.
-        """
-        log.debug(u'frameView')
-        if transition:
-            if self.frame is not None:
-                self.displayText.setPixmap(
-                    QtGui.QPixmap.fromImage(self.frame))
-                self.repaint()
-                Receiver.send_message(u'openlp_process_events')
-                time.sleep(0.1)
-            self.frame = None
-            if frame[u'trans'] is not None:
-                self.displayText.setPixmap(
-                    QtGui.QPixmap.fromImage(frame[u'trans']))
-                self.repaint()
-                Receiver.send_message(u'openlp_process_events')
-                time.sleep(0.1)
-                self.frame = frame[u'trans']
-            self.displayText.setPixmap(
-                QtGui.QPixmap.fromImage(frame[u'main']))
-        else:
-            if isinstance(frame, QtGui.QPixmap):
-                self.displayText.setPixmap(frame)
-            else:
-                self.displayText.setPixmap(QtGui.QPixmap.fromImage(frame))
-        if not self.isVisible() and self.screens.display:
-            self.setVisible(True)
-
-class VideoDisplay(Phonon.VideoWidget):
-    """
-    This is the form that is used to display videos on the projector.
-    """
-    log.info(u'VideoDisplay Loaded')
-
-    def __init__(self, parent, screens,
-        aspect=Phonon.VideoWidget.AspectRatioWidget):
-        """
-        The constructor for the display form.
-
-        ``parent``
-            The parent widget.
-
-        ``screens``
-            The list of screens.
-        """
-        log.debug(u'VideoDisplay Initialisation started')
-        Phonon.VideoWidget.__init__(self)
-        self.setWindowTitle(u'OpenLP Video Display')
-        self.parent = parent
-        self.screens = screens
-        self.hidden = False
-        self.message = None
-        self.mediaActive = False
-        self.mediaObject = Phonon.MediaObject()
-        self.setAspectRatio(aspect)
-        self.audioObject = Phonon.AudioOutput(Phonon.VideoCategory)
-        Phonon.createPath(self.mediaObject, self)
-        Phonon.createPath(self.mediaObject, self.audioObject)
-        flags = QtCore.Qt.FramelessWindowHint | QtCore.Qt.Dialog
-##        # WindowsStaysOnBottomHint is not available in QT4.4
-#        try:
-#            flags = flags | QtCore.Qt.WindowStaysOnBottomHint
-#        except AttributeError:
-#            pass
-        self.setWindowFlags(flags)
-        QtCore.QObject.connect(Receiver.get_receiver(),
-            QtCore.SIGNAL(u'videodisplay_play'), self.onMediaPlay)
-        QtCore.QObject.connect(Receiver.get_receiver(),
-            QtCore.SIGNAL(u'videodisplay_pause'), self.onMediaPause)
-#        QtCore.QObject.connect(Receiver.get_receiver(),
-#            QtCore.SIGNAL(u'videodisplay_background'), self.onMediaBackground)
-        QtCore.QObject.connect(Receiver.get_receiver(),
-            QtCore.SIGNAL(u'config_updated'), self.setup)
-        QtCore.QObject.connect(self.mediaObject,
-            QtCore.SIGNAL(u'finished()'), self.onMediaStop)
-        self.setVisible(False)
-
-    def keyPressEvent(self, event):
-        if isinstance(event, QtGui.QKeyEvent):
-            #here accept the event and do something
-            if event.key() == QtCore.Qt.Key_Escape:
-                self.onMediaStop()
-                event.accept()
-            event.ignore()
-        else:
-            event.ignore()
-
-    def setup(self):
-        """
-        Sets up the screen on a particular screen.
-        """
-        log.debug(u'VideoDisplay Setup %s for %s ' % (self.screens,
-             self.screens.monitor_number))
-        self.screen = self.screens.current
-        #Sort out screen locations and sizes
-        self.setGeometry(self.screen[u'size'])
-        # To display or not to display?
-        if not self.screen[u'primary']: # and self.isVisible():
-            #self.showFullScreen()
-            self.setVisible(False)
-            self.primary = False
-        else:
-            self.setVisible(False)
-            self.primary = True
-
-    def closeEvent(self, event):
-        """
-        Shutting down so clean up connections
-        """
-        self.onMediaStop()
-        for pth in self.outputPaths():
-          disconnected = pth.disconnect()
-
-#    def onMediaBackground(self, message=None):
-#        """
-#        Play a video triggered from the video plugin with the
-#        file name passed in on the event.
-#        Also triggered from the Finish event so the video will loop
-#        if it is triggered from the plugin
-#        """
-#        log.debug(u'VideoDisplay Queue new media message %s' % message)
-#        #If not file take the stored one
-#        if not message:
-#            message = self.message
-#        # still no file name then stop as it was a normal video stopping
-#        if message:
-#            self.mediaObject.setCurrentSource(Phonon.MediaSource(message))
-#            self.message = message
-#            self._play()
-
-    def onMediaQueue(self, message):
-        """
-        Set up a video to play from the serviceitem.
-        """
-        log.debug(u'VideoDisplay Queue new media message %s' % message)
-        file = os.path.join(message.get_frame_path(),
-            message.get_frame_title())
-        self.mediaObject.setCurrentSource(Phonon.MediaSource(file))
-        self.mediaActive = True
-        self._play()
-
-    def onMediaPlay(self):
-        """
-        Respond to the Play button on the slide controller unless the display
-        has been hidden by the slidecontroller
-        """
-        if not self.hidden:
-            log.debug(u'VideoDisplay Play the new media, Live ')
-            self._play()
-
-    def _play(self):
-        """
-        We want to play the video so start it and display the screen
-        """
-        log.debug(u'VideoDisplay _play called')
-        self.mediaObject.play()
-        self.setVisible(True)
-
-    def onMediaPause(self):
-        """
-        Pause the video and refresh the screen
-        """
-        log.debug(u'VideoDisplay Media paused by user')
-        self.mediaObject.pause()
-        self.show()
-
-    def onMediaStop(self):
-        """
-        Stop the video and clean up
-        """
-        log.debug(u'VideoDisplay Media stopped by user')
-        self.message = None
-        self.mediaActive = False
-        self.mediaObject.stop()
-        self.onMediaFinish()
-
-    def onMediaFinish(self):
-        """
-        Clean up the Object queue
-        """
-        log.debug(u'VideoDisplay Reached end of media playlist')
-        self.mediaObject.clearQueue()
-        self.setVisible(False)
-
-    def mediaHide(self, message=u''):
-        """
-        Hide the video display
-        """
-        self.mediaObject.pause()
-        self.hidden = True
-        self.setVisible(False)
-
-    def mediaShow(self, message=''):
-        """
-        Show the video disaply if it was already hidden
-        """
-        if self.hidden:
-            self.hidden = False
-            if self.mediaActive:
-                self._play()
-
-class AudioPlayer(QtCore.QObject):
-    """
-    This Class will play audio only allowing components to work witn a
-    soundtrack which does not take over the user interface.
-    """
-    log.info(u'AudioPlayer Loaded')
-
-    def __init__(self, parent):
-        """
-        The constructor for the display form.
-
-        ``parent``
-            The parent widget.
-
-        ``screens``
-            The list of screens.
-        """
-        log.debug(u'AudioPlayer Initialisation started')
-        QtCore.QObject.__init__(self)
-        self.parent = parent
-        self.message = None
-        self.mediaObject = Phonon.MediaObject()
-        self.audioObject = Phonon.AudioOutput(Phonon.VideoCategory)
-        Phonon.createPath(self.mediaObject, self.audioObject)
-
-    def setup(self):
-        """
-        Sets up the Audio Player for use
-        """
-        log.debug(u'AudioPlayer Setup')
-
-    def close(self):
-        """
-        Shutting down so clean up connections
-        """
-        self.onMediaStop()
-        for pth in self.mediaObject.outputPaths():
-            disconnected = pth.disconnect()
-
-    def onMediaQueue(self, message):
-        """
-        Set up a video to play from the serviceitem.
-        """
-        log.debug(u'AudioPlayer Queue new media message %s' % message)
-        file = os.path.join(message[0].get_frame_path(),
-            message[0].get_frame_title())
-        self.mediaObject.setCurrentSource(Phonon.MediaSource(file))
-        self.onMediaPlay()
-
-    def onMediaPlay(self):
-        """
-        We want to play the play so start it
-        """
-        log.debug(u'AudioPlayer _play called')
-        self.mediaObject.play()
-
-    def onMediaPause(self):
-        """
-        Pause the Audio
-        """
-        log.debug(u'AudioPlayer Media paused by user')
-        self.mediaObject.pause()
-
-    def onMediaStop(self):
-        """
-        Stop the Audio and clean up
-        """
-        log.debug(u'AudioPlayer Media stopped by user')
-        self.message = None
-        self.mediaObject.stop()
-        self.onMediaFinish()
-
-    def onMediaFinish(self):
-        """
-        Clean up the Object queue
-        """
-        log.debug(u'AudioPlayer Reached end of media playlist')
-        self.mediaObject.clearQueue()
+# -*- coding: utf-8 -*-
+# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4
+
+###############################################################################
+# OpenLP - Open Source Lyrics Projection                                      #
+# --------------------------------------------------------------------------- #
+# Copyright (c) 2008-2010 Raoul Snyman                                        #
+# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael      #
+# Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin      #
+# Thompson, Jon Tibble, Carsten Tinggaard                                     #
+# --------------------------------------------------------------------------- #
+# This program is free software; you can redistribute it and/or modify it     #
+# under the terms of the GNU General Public License as published by the Free  #
+# Software Foundation; version 2 of the License.                              #
+#                                                                             #
+# This program is distributed in the hope that it will be useful, but WITHOUT #
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or       #
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for    #
+# more details.                                                               #
+#                                                                             #
+# You should have received a copy of the GNU General Public License along     #
+# with this program; if not, write to the Free Software Foundation, Inc., 59  #
+# Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
+###############################################################################
+
+import logging
+import os
+import time
+
+from PyQt4 import QtCore, QtGui, QtWebKit
+from PyQt4.phonon import Phonon
+
+from openlp.core.lib import Receiver, resize_image
+from openlp.core.ui import HideMode
+
+log = logging.getLogger(__name__)
+
+#http://www.steveheffernan.com/html5-video-player/demo-video-player.html
+HTMLVIDEO = u"""<html>
+    <head>
+    <style>
+    *{
+        margin: 0;
+        padding:0
+    }
+    </style>
+    <script type="text/javascript" charset="utf-8">
+    var video;
+    var bodyLoaded = function(){
+        video = document.getElementById(\"video\");
+        video.volume = 0;
+    }
+    </script>
+    </head>
+    <body id="body" onload="bodyLoaded();">
+    <video id="video" src="%s"
+        autoplay loop width="%s" height="%s"
+        autobuffer="autobuffer" preload >
+        your browser does not support the video tag
+    </video>
+    </body></html>
+    """
+
+class DisplayManager(QtGui.QWidget):
+    """
+    Wrapper class to hold the display widgets.
+    I will provide API's in future to access the screens allow for
+    extra displays to be added.
+    RenderManager is poked in by MainWindow
+    """
+    def __init__(self, screens):
+        QtGui.QWidget.__init__(self)
+        self.screens = screens
+        self.videoDisplay = VideoDisplay(self, screens)
+        self.audioPlayer = AudioPlayer(self)
+        self.mainDisplay = MainDisplay(self, screens)
+        QtCore.QObject.connect(Receiver.get_receiver(),
+            QtCore.SIGNAL(u'maindisplay_hide'), self.hideDisplay)
+        QtCore.QObject.connect(Receiver.get_receiver(),
+            QtCore.SIGNAL(u'maindisplay_show'), self.showDisplay)
+        QtCore.QObject.connect(Receiver.get_receiver(),
+            QtCore.SIGNAL(u'videodisplay_start'), self.onStartVideo)
+        QtCore.QObject.connect(Receiver.get_receiver(),
+            QtCore.SIGNAL(u'videodisplay_stop'), self.onStopVideo)
+
+    def setup(self):
+        self.videoDisplay.setup()
+        self.mainDisplay.setup()
+
+    def hideDisplay(self, message):
+        """
+        Hide the output displays
+        """
+        self.videoDisplay.mediaHide(message)
+        self.mainDisplay.hideDisplay(message)
+
+    def showDisplay(self, message):
+        """
+        Hide the output displays
+        """
+        self.videoDisplay.mediaShow(message)
+        self.mainDisplay.showDisplay(message)
+
+    def addAlert(self, alertMessage, location):
+        """
+        Handles the addition of an Alert Message to the Displays
+        """
+        self.mainDisplay.addAlert(alertMessage, location)
+
+    def displayImageWithText(self, frame):
+        """
+        Handles the addition of a background Image to the displays
+        """
+        self.mainDisplay.addImageWithText(frame)
+
+    def displayImage(self, frame):
+        """
+        Handles the addition of a background Image to the displays
+        """
+        self.mainDisplay.displayImage(frame)
+
+    def displayVideo(self, path):
+        """
+        Handles the addition of a background Video to the displays
+        """
+        self.mainDisplay.displayVideo(path)
+
+    def onStartVideo(self, item):
+        """
+        Handles the Starting of a Video and Display Management
+        """
+        self.videoDisplay.setVisible(True)
+        self.mainDisplay.setVisible(False)
+        self.videoDisplay.onMediaQueue(item)
+
+    def onStopVideo(self):
+        """
+        Handles the Stopping of a Video and Display Management
+        """
+        self.mainDisplay.setVisible(True)
+        self.videoDisplay.setVisible(False)
+        self.videoDisplay.onMediaStop()
+
+    def close(self):
+        """
+        Handles the closure of the displays
+        """
+        self.videoDisplay.close()
+        self.audioPlayer.close()
+        self.mainDisplay.close()
+
+
+class DisplayWidget(QtGui.QGraphicsView):
+    """
+    Customised version of QTableWidget which can respond to keyboard
+    events.
+    """
+    log.info(u'MainDisplay loaded')
+
+    def __init__(self, parent=None, name=None):
+        QtGui.QWidget.__init__(self, None)
+        self.parent = parent
+        self.hotkey_map = {
+            QtCore.Qt.Key_Return: 'servicemanager_next_item',
+            QtCore.Qt.Key_Space: 'slidecontroller_live_next_noloop',
+            QtCore.Qt.Key_Enter: 'slidecontroller_live_next_noloop',
+            QtCore.Qt.Key_0: 'servicemanager_next_item',
+            QtCore.Qt.Key_Backspace: 'slidecontroller_live_previous_noloop'}
+
+    def keyPressEvent(self, event):
+        if isinstance(event, QtGui.QKeyEvent):
+            #here accept the event and do something
+            if event.key() == QtCore.Qt.Key_Up:
+                Receiver.send_message(u'slidecontroller_live_previous')
+                event.accept()
+            elif event.key() == QtCore.Qt.Key_Down:
+                Receiver.send_message(u'slidecontroller_live_next')
+                event.accept()
+            elif event.key() == QtCore.Qt.Key_PageUp:
+                Receiver.send_message(u'slidecontroller_live_first')
+                event.accept()
+            elif event.key() == QtCore.Qt.Key_PageDown:
+                Receiver.send_message(u'slidecontroller_live_last')
+                event.accept()
+            elif event.key() in self.hotkey_map:
+                Receiver.send_message(self.hotkey_map[event.key()])
+                event.accept()
+            elif event.key() == QtCore.Qt.Key_Escape:
+                self.resetDisplay()
+                event.accept()
+            event.ignore()
+        else:
+            event.ignore()
+
+class MainDisplay(DisplayWidget):
+    """
+    This is the form that is used to display things on the projector.
+    """
+    log.info(u'MainDisplay Loaded')
+
+    def __init__(self, parent, screens):
+        """
+        The constructor for the display form.
+
+        ``parent``
+            The parent widget.
+
+        ``screens``
+            The list of screens.
+        """
+        log.debug(u'Initialisation started')
+        DisplayWidget.__init__(self, parent)
+        self.setWindowFlags(QtCore.Qt.Window | QtCore.Qt.FramelessWindowHint)
+        self.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOff)
+        self.setVerticalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOff)
+        self.parent = parent
+        # WA_TranslucentBackground is not available in QT4.4
+        try:
+            self.setAttribute(QtCore.Qt.WA_TranslucentBackground)
+        except AttributeError:
+            pass
+        self.screens = screens
+        self.setupScene()
+        self.setupVideo()
+        self.setupImage()
+        self.setupText()
+        self.setupAlert()
+        self.setupBlank()
+        self.primary = True
+        self.blankFrame = None
+        self.frame = None
+        #Hide desktop for now until we know where to put it
+        #and what size it should be.
+        self.setVisible(False)
+
+    def setup(self):
+        """
+        Sets up the screen on a particular screen.
+        """
+        log.debug(u'Setup %s for %s ' % (
+            self.screens, self.screens.monitor_number))
+        self.setVisible(False)
+        self.screen = self.screens.current
+        #Sort out screen locations and sizes
+        self.setGeometry(self.screen[u'size'])
+        self.scene.setSceneRect(0,0,self.size().width(), self.size().height())
+        self.webView.setGeometry(0, 0, self.size().width(), self.size().height())
+        #Build a custom splash screen
+        self.InitialFrame = QtGui.QImage(
+            self.screen[u'size'].width(),
+            self.screen[u'size'].height(),
+            QtGui.QImage.Format_ARGB32_Premultiplied)
+        splash_image = QtGui.QImage(u':/graphics/openlp-splash-screen.png')
+        painter_image = QtGui.QPainter()
+        painter_image.begin(self.InitialFrame)
+        painter_image.fillRect(self.InitialFrame.rect(), QtCore.Qt.white)
+        painter_image.drawImage(
+            (self.screen[u'size'].width() - splash_image.width()) / 2,
+            (self.screen[u'size'].height() - splash_image.height()) / 2,
+            splash_image)
+        self.displayImage(self.InitialFrame)
+        self.repaint()
+        #Build a Black screen
+        painter = QtGui.QPainter()
+        self.blankFrame = QtGui.QImage(
+            self.screen[u'size'].width(),
+            self.screen[u'size'].height(),
+            QtGui.QImage.Format_ARGB32_Premultiplied)
+        painter.begin(self.blankFrame)
+        painter.fillRect(self.blankFrame.rect(), QtCore.Qt.black)
+        #build a blank transparent image
+        self.transparent = QtGui.QPixmap(
+            self.screen[u'size'].width(), self.screen[u'size'].height())
+        self.transparent.fill(QtCore.Qt.transparent)
+#        self.displayText.setPixmap(self.transparent)
+        #self.frameView(self.transparent)
+        # To display or not to display?
+        if not self.screen[u'primary']:
+            self.setVisible(True)
+            self.primary = False
+        else:
+            self.setVisible(False)
+            self.primary = True
+
+    def setupScene(self):
+        self.scene = QtGui.QGraphicsScene(self)
+        self.scene.setSceneRect(0,0,self.size().width(), self.size().height())
+        self.setScene(self.scene)
+
+    def setupVideo(self):
+        self.webView = QtWebKit.QWebView()
+        self.page = self.webView.page()
+        self.videoDisplay = self.page.mainFrame()
+        self.videoDisplay.setScrollBarPolicy(QtCore.Qt.Vertical, QtCore.Qt.ScrollBarAlwaysOff)
+        self.videoDisplay.setScrollBarPolicy(QtCore.Qt.Horizontal, QtCore.Qt.ScrollBarAlwaysOff)
+        self.proxy = QtGui.QGraphicsProxyWidget()
+        self.proxy.setWidget(self.webView)
+        self.proxy.setWindowFlags(QtCore.Qt.Window | QtCore.Qt.FramelessWindowHint)
+        self.proxy.setZValue(1)
+        self.scene.addItem(self.proxy)
+
+    def setupImage(self):
+        self.imageDisplay = QtGui.QGraphicsPixmapItem()
+        self.imageDisplay.setZValue(2)
+        self.scene.addItem(self.imageDisplay)
+
+    def setupText(self):
+        #self.displayText = QtGui.QGraphicsTextItem()
+        self.displayText = QtGui.QGraphicsPixmapItem()
+        #self.displayText.setPos(0,0)
+        #self.displayText.setTextWidth(self.size().width())
+        self.displayText.setZValue(4)
+        self.scene.addItem(self.displayText)
+
+    def setupAlert(self):
+        self.alertText = QtGui.QGraphicsTextItem()
+        self.alertText.setTextWidth(self.size().width())
+        self.alertText.setZValue(8)
+        self.scene.addItem(self.alertText)
+
+    def setupBlank(self):
+        self.displayBlank = QtGui.QGraphicsPixmapItem()
+        self.displayBlank.setZValue(10)
+        self.scene.addItem(self.displayBlank)
+
+    def resetDisplay(self):
+        log.debug(u'resetDisplay')
+        Receiver.send_message(u'slidecontroller_live_stop_loop')
+        if self.primary:
+            self.setVisible(False)
+        else:
+            self.setVisible(True)
+
+#    def hideDisplayForVideo(self):
+#        """
+#        Hides the main display if for the video to be played
+#        """
+#        self.hideDisplay(HideMode.Screen)
+
+    def hideDisplay(self, mode=HideMode.Screen):
+        """
+        Hide the display by making all layers transparent
+        Store the images so they can be replaced when required
+        """
+        log.debug(u'hideDisplay mode = %d', mode)
+        #self.displayText.setPixmap(self.transparent)
+        if mode == HideMode.Screen:
+            #self.display_image.setPixmap(self.transparent)
+            self.setVisible(False)
+        elif mode == HideMode.Blank:
+            self.displayBlank.setPixmap(
+                QtGui.QPixmap.fromImage(self.blankFrame))
+        else:
+            if self.parent.renderManager.renderer.bg_frame:
+                self.displayBlank.setPixmap(QtGui.QPixmap.fromImage(
+                    self.parent.renderManager.renderer.bg_frame))
+            else:
+                self.displayBlank.setPixmap(
+                    QtGui.QPixmap.fromImage(self.blankFrame))
+
+    def showDisplay(self, message=u''):
+        """
+        Show the stored layers so the screen reappears as it was
+        originally.
+        Make the stored images None to release memory.
+        """
+        log.debug(u'showDisplay')
+        self.displayBlank.setPixmap(self.transparent)
+        #Trigger actions when display is active again
+        Receiver.send_message(u'maindisplay_active')
+
+    def addImageWithText(self, frame):
+        log.debug(u'addImageWithText')
+        frame = resize_image(
+            frame, self.screen[u'size'].width(), self.screen[u'size'].height())
+        self.imageDisplay.setPixmap(QtGui.QPixmap.fromImage(frame))
+        self.videoDisplay.setHtml(u'<html></html>')
+
+    def addAlert(self, message, location):
+        """
+        Places the Alert text on the display at the correct location
+        ``message``
+            Text to be displayed
+        ``location``
+            Where on the screen the text should be.  From the AlertTab
+            Combo box.
+        """
+        log.debug(u'addAlertImage')
+        if location == 0:
+            self.alertText.setPos(0, 0)
+        elif location == 1:
+            self.alertText.setPos(0,self.size().height()/2)
+        else:
+            self.alertText.setPos(0,self.size().height() - 76)
+        self.alertText.setHtml(message)
+
+    def displayImage(self, frame):
+        """
+        Places the Image passed on the display screen
+        ``frame``
+            The image to be displayed
+        """
+        log.debug(u'adddisplayImage')
+        if isinstance(frame, QtGui.QImage):
+            self.imageDisplay.setPixmap(QtGui.QPixmap.fromImage(frame))
+        else:
+            self.imageDisplay.setPixmap(frame)
+        self.videoDisplay.setHtml(u'<html></html>')
+
+    def displayVideo(self, path):
+        """
+        Places the Video passed on the display screen
+        ``path``
+            The path to the image to be displayed
+        """
+        log.debug(u'adddisplayVideo')
+        self.displayImage(self.transparent)
+        self.videoDisplay.setHtml(HTMLVIDEO %
+            (path, self.screen[u'size'].width(), self.screen[u'size'].height()))
+
+    def frameView(self, frame, transition=False):
+        """
+        Called from a slide controller to display a frame
+        if the alert is in progress the alert is added on top
+        ``frame``
+            Image frame to be rendered
+        ``transition``
+            Are transitions required.
+        """
+        log.debug(u'frameView')
+        if transition:
+            if self.frame is not None:
+                self.displayText.setPixmap(
+                    QtGui.QPixmap.fromImage(self.frame))
+                self.repaint()
+                Receiver.send_message(u'openlp_process_events')
+                time.sleep(0.1)
+            self.frame = None
+            if frame[u'trans'] is not None:
+                self.displayText.setPixmap(
+                    QtGui.QPixmap.fromImage(frame[u'trans']))
+                self.repaint()
+                Receiver.send_message(u'openlp_process_events')
+                time.sleep(0.1)
+                self.frame = frame[u'trans']
+            self.displayText.setPixmap(
+                QtGui.QPixmap.fromImage(frame[u'main']))
+        else:
+            if isinstance(frame, QtGui.QPixmap):
+                self.displayText.setPixmap(frame)
+            else:
+                self.displayText.setPixmap(QtGui.QPixmap.fromImage(frame))
+        if not self.isVisible() and self.screens.display:
+            self.setVisible(True)
+
+class VideoDisplay(Phonon.VideoWidget):
+    """
+    This is the form that is used to display videos on the projector.
+    """
+    log.info(u'VideoDisplay Loaded')
+
+    def __init__(self, parent, screens,
+        aspect=Phonon.VideoWidget.AspectRatioWidget):
+        """
+        The constructor for the display form.
+
+        ``parent``
+            The parent widget.
+
+        ``screens``
+            The list of screens.
+        """
+        log.debug(u'VideoDisplay Initialisation started')
+        Phonon.VideoWidget.__init__(self)
+        self.setWindowTitle(u'OpenLP Video Display')
+        self.parent = parent
+        self.screens = screens
+        self.hidden = False
+        self.message = None
+        self.mediaActive = False
+        self.mediaObject = Phonon.MediaObject()
+        self.setAspectRatio(aspect)
+        self.audioObject = Phonon.AudioOutput(Phonon.VideoCategory)
+        Phonon.createPath(self.mediaObject, self)
+        Phonon.createPath(self.mediaObject, self.audioObject)
+        flags = QtCore.Qt.FramelessWindowHint | QtCore.Qt.Dialog
+##        # WindowsStaysOnBottomHint is not available in QT4.4
+#        try:
+#            flags = flags | QtCore.Qt.WindowStaysOnBottomHint
+#        except AttributeError:
+#            pass
+        self.setWindowFlags(flags)
+        QtCore.QObject.connect(Receiver.get_receiver(),
+            QtCore.SIGNAL(u'videodisplay_play'), self.onMediaPlay)
+        QtCore.QObject.connect(Receiver.get_receiver(),
+            QtCore.SIGNAL(u'videodisplay_pause'), self.onMediaPause)
+#        QtCore.QObject.connect(Receiver.get_receiver(),
+#            QtCore.SIGNAL(u'videodisplay_background'), self.onMediaBackground)
+        QtCore.QObject.connect(Receiver.get_receiver(),
+            QtCore.SIGNAL(u'config_updated'), self.setup)
+        QtCore.QObject.connect(self.mediaObject,
+            QtCore.SIGNAL(u'finished()'), self.onMediaStop)
+        self.setVisible(False)
+
+    def keyPressEvent(self, event):
+        if isinstance(event, QtGui.QKeyEvent):
+            #here accept the event and do something
+            if event.key() == QtCore.Qt.Key_Escape:
+                self.onMediaStop()
+                event.accept()
+            event.ignore()
+        else:
+            event.ignore()
+
+    def setup(self):
+        """
+        Sets up the screen on a particular screen.
+        """
+        log.debug(u'VideoDisplay Setup %s for %s ' % (self.screens,
+             self.screens.monitor_number))
+        self.screen = self.screens.current
+        #Sort out screen locations and sizes
+        self.setGeometry(self.screen[u'size'])
+        # To display or not to display?
+        if not self.screen[u'primary']: # and self.isVisible():
+            #self.showFullScreen()
+            self.setVisible(False)
+            self.primary = False
+        else:
+            self.setVisible(False)
+            self.primary = True
+
+    def closeEvent(self, event):
+        """
+        Shutting down so clean up connections
+        """
+        self.onMediaStop()
+        for pth in self.outputPaths():
+          disconnected = pth.disconnect()
+
+#    def onMediaBackground(self, message=None):
+#        """
+#        Play a video triggered from the video plugin with the
+#        file name passed in on the event.
+#        Also triggered from the Finish event so the video will loop
+#        if it is triggered from the plugin
+#        """
+#        log.debug(u'VideoDisplay Queue new media message %s' % message)
+#        #If not file take the stored one
+#        if not message:
+#            message = self.message
+#        # still no file name then stop as it was a normal video stopping
+#        if message:
+#            self.mediaObject.setCurrentSource(Phonon.MediaSource(message))
+#            self.message = message
+#            self._play()
+
+    def onMediaQueue(self, message):
+        """
+        Set up a video to play from the serviceitem.
+        """
+        log.debug(u'VideoDisplay Queue new media message %s' % message)
+        file = os.path.join(message.get_frame_path(),
+            message.get_frame_title())
+        self.mediaObject.setCurrentSource(Phonon.MediaSource(file))
+        self.mediaActive = True
+        self._play()
+
+    def onMediaPlay(self):
+        """
+        Respond to the Play button on the slide controller unless the display
+        has been hidden by the slidecontroller
+        """
+        if not self.hidden:
+            log.debug(u'VideoDisplay Play the new media, Live ')
+            self._play()
+
+    def _play(self):
+        """
+        We want to play the video so start it and display the screen
+        """
+        log.debug(u'VideoDisplay _play called')
+        self.mediaObject.play()
+        self.setVisible(True)
+
+    def onMediaPause(self):
+        """
+        Pause the video and refresh the screen
+        """
+        log.debug(u'VideoDisplay Media paused by user')
+        self.mediaObject.pause()
+        self.show()
+
+    def onMediaStop(self):
+        """
+        Stop the video and clean up
+        """
+        log.debug(u'VideoDisplay Media stopped by user')
+        self.message = None
+        self.mediaActive = False
+        self.mediaObject.stop()
+        self.onMediaFinish()
+
+    def onMediaFinish(self):
+        """
+        Clean up the Object queue
+        """
+        log.debug(u'VideoDisplay Reached end of media playlist')
+        self.mediaObject.clearQueue()
+        self.setVisible(False)
+
+    def mediaHide(self, message=u''):
+        """
+        Hide the video display
+        """
+        self.mediaObject.pause()
+        self.hidden = True
+        self.setVisible(False)
+
+    def mediaShow(self, message=''):
+        """
+        Show the video disaply if it was already hidden
+        """
+        if self.hidden:
+            self.hidden = False
+            if self.mediaActive:
+                self._play()
+
+class AudioPlayer(QtCore.QObject):
+    """
+    This Class will play audio only allowing components to work witn a
+    soundtrack which does not take over the user interface.
+    """
+    log.info(u'AudioPlayer Loaded')
+
+    def __init__(self, parent):
+        """
+        The constructor for the display form.
+
+        ``parent``
+            The parent widget.
+
+        ``screens``
+            The list of screens.
+        """
+        log.debug(u'AudioPlayer Initialisation started')
+        QtCore.QObject.__init__(self)
+        self.parent = parent
+        self.message = None
+        self.mediaObject = Phonon.MediaObject()
+        self.audioObject = Phonon.AudioOutput(Phonon.VideoCategory)
+        Phonon.createPath(self.mediaObject, self.audioObject)
+
+    def setup(self):
+        """
+        Sets up the Audio Player for use
+        """
+        log.debug(u'AudioPlayer Setup')
+
+    def close(self):
+        """
+        Shutting down so clean up connections
+        """
+        self.onMediaStop()
+        for pth in self.mediaObject.outputPaths():
+            disconnected = pth.disconnect()
+
+    def onMediaQueue(self, message):
+        """
+        Set up a video to play from the serviceitem.
+        """
+        log.debug(u'AudioPlayer Queue new media message %s' % message)
+        file = os.path.join(message[0].get_frame_path(),
+            message[0].get_frame_title())
+        self.mediaObject.setCurrentSource(Phonon.MediaSource(file))
+        self.onMediaPlay()
+
+    def onMediaPlay(self):
+        """
+        We want to play the play so start it
+        """
+        log.debug(u'AudioPlayer _play called')
+        self.mediaObject.play()
+
+    def onMediaPause(self):
+        """
+        Pause the Audio
+        """
+        log.debug(u'AudioPlayer Media paused by user')
+        self.mediaObject.pause()
+
+    def onMediaStop(self):
+        """
+        Stop the Audio and clean up
+        """
+        log.debug(u'AudioPlayer Media stopped by user')
+        self.message = None
+        self.mediaObject.stop()
+        self.onMediaFinish()
+
+    def onMediaFinish(self):
+        """
+        Clean up the Object queue
+        """
+        log.debug(u'AudioPlayer Reached end of media playlist')
+        self.mediaObject.clearQueue()

From 9b89788b2113746155e87fcce010607be734f671 Mon Sep 17 00:00:00 2001
From: Phill Ridout <phill.ridout@googlemail.com>
Date: Sat, 3 Jul 2010 19:55:53 +0100
Subject: [PATCH 10/21] removed escapes

---
 openlp/core/ui/maindisplay.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openlp/core/ui/maindisplay.py b/openlp/core/ui/maindisplay.py
index 30864405c..b82642509 100644
--- a/openlp/core/ui/maindisplay.py
+++ b/openlp/core/ui/maindisplay.py
@@ -47,7 +47,7 @@ HTMLVIDEO = u"""<html>
     <script type="text/javascript" charset="utf-8">
     var video;
     var bodyLoaded = function(){
-        video = document.getElementById(\"video\");
+        video = document.getElementById("video");
         video.volume = 0;
     }
     </script>

From 02f86d0603e7722f380293deef0698c31fcaa700 Mon Sep 17 00:00:00 2001
From: Phill Ridout <phill.ridout@googlemail.com>
Date: Sat, 3 Jul 2010 20:02:36 +0100
Subject: [PATCH 11/21] hopefully should be go for this one! :-p

---
 openlp/core/ui/maindisplay.py | 1412 ++++++++++++++++-----------------
 1 file changed, 706 insertions(+), 706 deletions(-)

diff --git a/openlp/core/ui/maindisplay.py b/openlp/core/ui/maindisplay.py
index b82642509..445a3aa26 100644
--- a/openlp/core/ui/maindisplay.py
+++ b/openlp/core/ui/maindisplay.py
@@ -1,706 +1,706 @@
-# -*- coding: utf-8 -*-
-# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4
-
-###############################################################################
-# OpenLP - Open Source Lyrics Projection                                      #
-# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman                                        #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin      #
-# Thompson, Jon Tibble, Carsten Tinggaard                                     #
-# --------------------------------------------------------------------------- #
-# This program is free software; you can redistribute it and/or modify it     #
-# under the terms of the GNU General Public License as published by the Free  #
-# Software Foundation; version 2 of the License.                              #
-#                                                                             #
-# This program is distributed in the hope that it will be useful, but WITHOUT #
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or       #
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for    #
-# more details.                                                               #
-#                                                                             #
-# You should have received a copy of the GNU General Public License along     #
-# with this program; if not, write to the Free Software Foundation, Inc., 59  #
-# Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
-###############################################################################
-
-import logging
-import os
-import time
-
-from PyQt4 import QtCore, QtGui, QtWebKit
-from PyQt4.phonon import Phonon
-
-from openlp.core.lib import Receiver, resize_image
-from openlp.core.ui import HideMode
-
-log = logging.getLogger(__name__)
-
-#http://www.steveheffernan.com/html5-video-player/demo-video-player.html
-HTMLVIDEO = u"""<html>
-    <head>
-    <style>
-    *{
-        margin: 0;
-        padding:0
-    }
-    </style>
-    <script type="text/javascript" charset="utf-8">
-    var video;
-    var bodyLoaded = function(){
-        video = document.getElementById("video");
-        video.volume = 0;
-    }
-    </script>
-    </head>
-    <body id="body" onload="bodyLoaded();">
-    <video id="video" src="%s"
-        autoplay loop width="%s" height="%s"
-        autobuffer="autobuffer" preload >
-        your browser does not support the video tag
-    </video>
-    </body></html>
-    """
-
-class DisplayManager(QtGui.QWidget):
-    """
-    Wrapper class to hold the display widgets.
-    I will provide API's in future to access the screens allow for
-    extra displays to be added.
-    RenderManager is poked in by MainWindow
-    """
-    def __init__(self, screens):
-        QtGui.QWidget.__init__(self)
-        self.screens = screens
-        self.videoDisplay = VideoDisplay(self, screens)
-        self.audioPlayer = AudioPlayer(self)
-        self.mainDisplay = MainDisplay(self, screens)
-        QtCore.QObject.connect(Receiver.get_receiver(),
-            QtCore.SIGNAL(u'maindisplay_hide'), self.hideDisplay)
-        QtCore.QObject.connect(Receiver.get_receiver(),
-            QtCore.SIGNAL(u'maindisplay_show'), self.showDisplay)
-        QtCore.QObject.connect(Receiver.get_receiver(),
-            QtCore.SIGNAL(u'videodisplay_start'), self.onStartVideo)
-        QtCore.QObject.connect(Receiver.get_receiver(),
-            QtCore.SIGNAL(u'videodisplay_stop'), self.onStopVideo)
-
-    def setup(self):
-        self.videoDisplay.setup()
-        self.mainDisplay.setup()
-
-    def hideDisplay(self, message):
-        """
-        Hide the output displays
-        """
-        self.videoDisplay.mediaHide(message)
-        self.mainDisplay.hideDisplay(message)
-
-    def showDisplay(self, message):
-        """
-        Hide the output displays
-        """
-        self.videoDisplay.mediaShow(message)
-        self.mainDisplay.showDisplay(message)
-
-    def addAlert(self, alertMessage, location):
-        """
-        Handles the addition of an Alert Message to the Displays
-        """
-        self.mainDisplay.addAlert(alertMessage, location)
-
-    def displayImageWithText(self, frame):
-        """
-        Handles the addition of a background Image to the displays
-        """
-        self.mainDisplay.addImageWithText(frame)
-
-    def displayImage(self, frame):
-        """
-        Handles the addition of a background Image to the displays
-        """
-        self.mainDisplay.displayImage(frame)
-
-    def displayVideo(self, path):
-        """
-        Handles the addition of a background Video to the displays
-        """
-        self.mainDisplay.displayVideo(path)
-
-    def onStartVideo(self, item):
-        """
-        Handles the Starting of a Video and Display Management
-        """
-        self.videoDisplay.setVisible(True)
-        self.mainDisplay.setVisible(False)
-        self.videoDisplay.onMediaQueue(item)
-
-    def onStopVideo(self):
-        """
-        Handles the Stopping of a Video and Display Management
-        """
-        self.mainDisplay.setVisible(True)
-        self.videoDisplay.setVisible(False)
-        self.videoDisplay.onMediaStop()
-
-    def close(self):
-        """
-        Handles the closure of the displays
-        """
-        self.videoDisplay.close()
-        self.audioPlayer.close()
-        self.mainDisplay.close()
-
-
-class DisplayWidget(QtGui.QGraphicsView):
-    """
-    Customised version of QTableWidget which can respond to keyboard
-    events.
-    """
-    log.info(u'MainDisplay loaded')
-
-    def __init__(self, parent=None, name=None):
-        QtGui.QWidget.__init__(self, None)
-        self.parent = parent
-        self.hotkey_map = {
-            QtCore.Qt.Key_Return: 'servicemanager_next_item',
-            QtCore.Qt.Key_Space: 'slidecontroller_live_next_noloop',
-            QtCore.Qt.Key_Enter: 'slidecontroller_live_next_noloop',
-            QtCore.Qt.Key_0: 'servicemanager_next_item',
-            QtCore.Qt.Key_Backspace: 'slidecontroller_live_previous_noloop'}
-
-    def keyPressEvent(self, event):
-        if isinstance(event, QtGui.QKeyEvent):
-            #here accept the event and do something
-            if event.key() == QtCore.Qt.Key_Up:
-                Receiver.send_message(u'slidecontroller_live_previous')
-                event.accept()
-            elif event.key() == QtCore.Qt.Key_Down:
-                Receiver.send_message(u'slidecontroller_live_next')
-                event.accept()
-            elif event.key() == QtCore.Qt.Key_PageUp:
-                Receiver.send_message(u'slidecontroller_live_first')
-                event.accept()
-            elif event.key() == QtCore.Qt.Key_PageDown:
-                Receiver.send_message(u'slidecontroller_live_last')
-                event.accept()
-            elif event.key() in self.hotkey_map:
-                Receiver.send_message(self.hotkey_map[event.key()])
-                event.accept()
-            elif event.key() == QtCore.Qt.Key_Escape:
-                self.resetDisplay()
-                event.accept()
-            event.ignore()
-        else:
-            event.ignore()
-
-class MainDisplay(DisplayWidget):
-    """
-    This is the form that is used to display things on the projector.
-    """
-    log.info(u'MainDisplay Loaded')
-
-    def __init__(self, parent, screens):
-        """
-        The constructor for the display form.
-
-        ``parent``
-            The parent widget.
-
-        ``screens``
-            The list of screens.
-        """
-        log.debug(u'Initialisation started')
-        DisplayWidget.__init__(self, parent)
-        self.setWindowFlags(QtCore.Qt.Window | QtCore.Qt.FramelessWindowHint)
-        self.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOff)
-        self.setVerticalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOff)
-        self.parent = parent
-        # WA_TranslucentBackground is not available in QT4.4
-        try:
-            self.setAttribute(QtCore.Qt.WA_TranslucentBackground)
-        except AttributeError:
-            pass
-        self.screens = screens
-        self.setupScene()
-        self.setupVideo()
-        self.setupImage()
-        self.setupText()
-        self.setupAlert()
-        self.setupBlank()
-        self.primary = True
-        self.blankFrame = None
-        self.frame = None
-        #Hide desktop for now until we know where to put it
-        #and what size it should be.
-        self.setVisible(False)
-
-    def setup(self):
-        """
-        Sets up the screen on a particular screen.
-        """
-        log.debug(u'Setup %s for %s ' % (
-            self.screens, self.screens.monitor_number))
-        self.setVisible(False)
-        self.screen = self.screens.current
-        #Sort out screen locations and sizes
-        self.setGeometry(self.screen[u'size'])
-        self.scene.setSceneRect(0,0,self.size().width(), self.size().height())
-        self.webView.setGeometry(0, 0, self.size().width(), self.size().height())
-        #Build a custom splash screen
-        self.InitialFrame = QtGui.QImage(
-            self.screen[u'size'].width(),
-            self.screen[u'size'].height(),
-            QtGui.QImage.Format_ARGB32_Premultiplied)
-        splash_image = QtGui.QImage(u':/graphics/openlp-splash-screen.png')
-        painter_image = QtGui.QPainter()
-        painter_image.begin(self.InitialFrame)
-        painter_image.fillRect(self.InitialFrame.rect(), QtCore.Qt.white)
-        painter_image.drawImage(
-            (self.screen[u'size'].width() - splash_image.width()) / 2,
-            (self.screen[u'size'].height() - splash_image.height()) / 2,
-            splash_image)
-        self.displayImage(self.InitialFrame)
-        self.repaint()
-        #Build a Black screen
-        painter = QtGui.QPainter()
-        self.blankFrame = QtGui.QImage(
-            self.screen[u'size'].width(),
-            self.screen[u'size'].height(),
-            QtGui.QImage.Format_ARGB32_Premultiplied)
-        painter.begin(self.blankFrame)
-        painter.fillRect(self.blankFrame.rect(), QtCore.Qt.black)
-        #build a blank transparent image
-        self.transparent = QtGui.QPixmap(
-            self.screen[u'size'].width(), self.screen[u'size'].height())
-        self.transparent.fill(QtCore.Qt.transparent)
-#        self.displayText.setPixmap(self.transparent)
-        #self.frameView(self.transparent)
-        # To display or not to display?
-        if not self.screen[u'primary']:
-            self.setVisible(True)
-            self.primary = False
-        else:
-            self.setVisible(False)
-            self.primary = True
-
-    def setupScene(self):
-        self.scene = QtGui.QGraphicsScene(self)
-        self.scene.setSceneRect(0,0,self.size().width(), self.size().height())
-        self.setScene(self.scene)
-
-    def setupVideo(self):
-        self.webView = QtWebKit.QWebView()
-        self.page = self.webView.page()
-        self.videoDisplay = self.page.mainFrame()
-        self.videoDisplay.setScrollBarPolicy(QtCore.Qt.Vertical, QtCore.Qt.ScrollBarAlwaysOff)
-        self.videoDisplay.setScrollBarPolicy(QtCore.Qt.Horizontal, QtCore.Qt.ScrollBarAlwaysOff)
-        self.proxy = QtGui.QGraphicsProxyWidget()
-        self.proxy.setWidget(self.webView)
-        self.proxy.setWindowFlags(QtCore.Qt.Window | QtCore.Qt.FramelessWindowHint)
-        self.proxy.setZValue(1)
-        self.scene.addItem(self.proxy)
-
-    def setupImage(self):
-        self.imageDisplay = QtGui.QGraphicsPixmapItem()
-        self.imageDisplay.setZValue(2)
-        self.scene.addItem(self.imageDisplay)
-
-    def setupText(self):
-        #self.displayText = QtGui.QGraphicsTextItem()
-        self.displayText = QtGui.QGraphicsPixmapItem()
-        #self.displayText.setPos(0,0)
-        #self.displayText.setTextWidth(self.size().width())
-        self.displayText.setZValue(4)
-        self.scene.addItem(self.displayText)
-
-    def setupAlert(self):
-        self.alertText = QtGui.QGraphicsTextItem()
-        self.alertText.setTextWidth(self.size().width())
-        self.alertText.setZValue(8)
-        self.scene.addItem(self.alertText)
-
-    def setupBlank(self):
-        self.displayBlank = QtGui.QGraphicsPixmapItem()
-        self.displayBlank.setZValue(10)
-        self.scene.addItem(self.displayBlank)
-
-    def resetDisplay(self):
-        log.debug(u'resetDisplay')
-        Receiver.send_message(u'slidecontroller_live_stop_loop')
-        if self.primary:
-            self.setVisible(False)
-        else:
-            self.setVisible(True)
-
-#    def hideDisplayForVideo(self):
-#        """
-#        Hides the main display if for the video to be played
-#        """
-#        self.hideDisplay(HideMode.Screen)
-
-    def hideDisplay(self, mode=HideMode.Screen):
-        """
-        Hide the display by making all layers transparent
-        Store the images so they can be replaced when required
-        """
-        log.debug(u'hideDisplay mode = %d', mode)
-        #self.displayText.setPixmap(self.transparent)
-        if mode == HideMode.Screen:
-            #self.display_image.setPixmap(self.transparent)
-            self.setVisible(False)
-        elif mode == HideMode.Blank:
-            self.displayBlank.setPixmap(
-                QtGui.QPixmap.fromImage(self.blankFrame))
-        else:
-            if self.parent.renderManager.renderer.bg_frame:
-                self.displayBlank.setPixmap(QtGui.QPixmap.fromImage(
-                    self.parent.renderManager.renderer.bg_frame))
-            else:
-                self.displayBlank.setPixmap(
-                    QtGui.QPixmap.fromImage(self.blankFrame))
-
-    def showDisplay(self, message=u''):
-        """
-        Show the stored layers so the screen reappears as it was
-        originally.
-        Make the stored images None to release memory.
-        """
-        log.debug(u'showDisplay')
-        self.displayBlank.setPixmap(self.transparent)
-        #Trigger actions when display is active again
-        Receiver.send_message(u'maindisplay_active')
-
-    def addImageWithText(self, frame):
-        log.debug(u'addImageWithText')
-        frame = resize_image(
-            frame, self.screen[u'size'].width(), self.screen[u'size'].height())
-        self.imageDisplay.setPixmap(QtGui.QPixmap.fromImage(frame))
-        self.videoDisplay.setHtml(u'<html></html>')
-
-    def addAlert(self, message, location):
-        """
-        Places the Alert text on the display at the correct location
-        ``message``
-            Text to be displayed
-        ``location``
-            Where on the screen the text should be.  From the AlertTab
-            Combo box.
-        """
-        log.debug(u'addAlertImage')
-        if location == 0:
-            self.alertText.setPos(0, 0)
-        elif location == 1:
-            self.alertText.setPos(0,self.size().height()/2)
-        else:
-            self.alertText.setPos(0,self.size().height() - 76)
-        self.alertText.setHtml(message)
-
-    def displayImage(self, frame):
-        """
-        Places the Image passed on the display screen
-        ``frame``
-            The image to be displayed
-        """
-        log.debug(u'adddisplayImage')
-        if isinstance(frame, QtGui.QImage):
-            self.imageDisplay.setPixmap(QtGui.QPixmap.fromImage(frame))
-        else:
-            self.imageDisplay.setPixmap(frame)
-        self.videoDisplay.setHtml(u'<html></html>')
-
-    def displayVideo(self, path):
-        """
-        Places the Video passed on the display screen
-        ``path``
-            The path to the image to be displayed
-        """
-        log.debug(u'adddisplayVideo')
-        self.displayImage(self.transparent)
-        self.videoDisplay.setHtml(HTMLVIDEO %
-            (path, self.screen[u'size'].width(), self.screen[u'size'].height()))
-
-    def frameView(self, frame, transition=False):
-        """
-        Called from a slide controller to display a frame
-        if the alert is in progress the alert is added on top
-        ``frame``
-            Image frame to be rendered
-        ``transition``
-            Are transitions required.
-        """
-        log.debug(u'frameView')
-        if transition:
-            if self.frame is not None:
-                self.displayText.setPixmap(
-                    QtGui.QPixmap.fromImage(self.frame))
-                self.repaint()
-                Receiver.send_message(u'openlp_process_events')
-                time.sleep(0.1)
-            self.frame = None
-            if frame[u'trans'] is not None:
-                self.displayText.setPixmap(
-                    QtGui.QPixmap.fromImage(frame[u'trans']))
-                self.repaint()
-                Receiver.send_message(u'openlp_process_events')
-                time.sleep(0.1)
-                self.frame = frame[u'trans']
-            self.displayText.setPixmap(
-                QtGui.QPixmap.fromImage(frame[u'main']))
-        else:
-            if isinstance(frame, QtGui.QPixmap):
-                self.displayText.setPixmap(frame)
-            else:
-                self.displayText.setPixmap(QtGui.QPixmap.fromImage(frame))
-        if not self.isVisible() and self.screens.display:
-            self.setVisible(True)
-
-class VideoDisplay(Phonon.VideoWidget):
-    """
-    This is the form that is used to display videos on the projector.
-    """
-    log.info(u'VideoDisplay Loaded')
-
-    def __init__(self, parent, screens,
-        aspect=Phonon.VideoWidget.AspectRatioWidget):
-        """
-        The constructor for the display form.
-
-        ``parent``
-            The parent widget.
-
-        ``screens``
-            The list of screens.
-        """
-        log.debug(u'VideoDisplay Initialisation started')
-        Phonon.VideoWidget.__init__(self)
-        self.setWindowTitle(u'OpenLP Video Display')
-        self.parent = parent
-        self.screens = screens
-        self.hidden = False
-        self.message = None
-        self.mediaActive = False
-        self.mediaObject = Phonon.MediaObject()
-        self.setAspectRatio(aspect)
-        self.audioObject = Phonon.AudioOutput(Phonon.VideoCategory)
-        Phonon.createPath(self.mediaObject, self)
-        Phonon.createPath(self.mediaObject, self.audioObject)
-        flags = QtCore.Qt.FramelessWindowHint | QtCore.Qt.Dialog
-##        # WindowsStaysOnBottomHint is not available in QT4.4
-#        try:
-#            flags = flags | QtCore.Qt.WindowStaysOnBottomHint
-#        except AttributeError:
-#            pass
-        self.setWindowFlags(flags)
-        QtCore.QObject.connect(Receiver.get_receiver(),
-            QtCore.SIGNAL(u'videodisplay_play'), self.onMediaPlay)
-        QtCore.QObject.connect(Receiver.get_receiver(),
-            QtCore.SIGNAL(u'videodisplay_pause'), self.onMediaPause)
-#        QtCore.QObject.connect(Receiver.get_receiver(),
-#            QtCore.SIGNAL(u'videodisplay_background'), self.onMediaBackground)
-        QtCore.QObject.connect(Receiver.get_receiver(),
-            QtCore.SIGNAL(u'config_updated'), self.setup)
-        QtCore.QObject.connect(self.mediaObject,
-            QtCore.SIGNAL(u'finished()'), self.onMediaStop)
-        self.setVisible(False)
-
-    def keyPressEvent(self, event):
-        if isinstance(event, QtGui.QKeyEvent):
-            #here accept the event and do something
-            if event.key() == QtCore.Qt.Key_Escape:
-                self.onMediaStop()
-                event.accept()
-            event.ignore()
-        else:
-            event.ignore()
-
-    def setup(self):
-        """
-        Sets up the screen on a particular screen.
-        """
-        log.debug(u'VideoDisplay Setup %s for %s ' % (self.screens,
-             self.screens.monitor_number))
-        self.screen = self.screens.current
-        #Sort out screen locations and sizes
-        self.setGeometry(self.screen[u'size'])
-        # To display or not to display?
-        if not self.screen[u'primary']: # and self.isVisible():
-            #self.showFullScreen()
-            self.setVisible(False)
-            self.primary = False
-        else:
-            self.setVisible(False)
-            self.primary = True
-
-    def closeEvent(self, event):
-        """
-        Shutting down so clean up connections
-        """
-        self.onMediaStop()
-        for pth in self.outputPaths():
-          disconnected = pth.disconnect()
-
-#    def onMediaBackground(self, message=None):
-#        """
-#        Play a video triggered from the video plugin with the
-#        file name passed in on the event.
-#        Also triggered from the Finish event so the video will loop
-#        if it is triggered from the plugin
-#        """
-#        log.debug(u'VideoDisplay Queue new media message %s' % message)
-#        #If not file take the stored one
-#        if not message:
-#            message = self.message
-#        # still no file name then stop as it was a normal video stopping
-#        if message:
-#            self.mediaObject.setCurrentSource(Phonon.MediaSource(message))
-#            self.message = message
-#            self._play()
-
-    def onMediaQueue(self, message):
-        """
-        Set up a video to play from the serviceitem.
-        """
-        log.debug(u'VideoDisplay Queue new media message %s' % message)
-        file = os.path.join(message.get_frame_path(),
-            message.get_frame_title())
-        self.mediaObject.setCurrentSource(Phonon.MediaSource(file))
-        self.mediaActive = True
-        self._play()
-
-    def onMediaPlay(self):
-        """
-        Respond to the Play button on the slide controller unless the display
-        has been hidden by the slidecontroller
-        """
-        if not self.hidden:
-            log.debug(u'VideoDisplay Play the new media, Live ')
-            self._play()
-
-    def _play(self):
-        """
-        We want to play the video so start it and display the screen
-        """
-        log.debug(u'VideoDisplay _play called')
-        self.mediaObject.play()
-        self.setVisible(True)
-
-    def onMediaPause(self):
-        """
-        Pause the video and refresh the screen
-        """
-        log.debug(u'VideoDisplay Media paused by user')
-        self.mediaObject.pause()
-        self.show()
-
-    def onMediaStop(self):
-        """
-        Stop the video and clean up
-        """
-        log.debug(u'VideoDisplay Media stopped by user')
-        self.message = None
-        self.mediaActive = False
-        self.mediaObject.stop()
-        self.onMediaFinish()
-
-    def onMediaFinish(self):
-        """
-        Clean up the Object queue
-        """
-        log.debug(u'VideoDisplay Reached end of media playlist')
-        self.mediaObject.clearQueue()
-        self.setVisible(False)
-
-    def mediaHide(self, message=u''):
-        """
-        Hide the video display
-        """
-        self.mediaObject.pause()
-        self.hidden = True
-        self.setVisible(False)
-
-    def mediaShow(self, message=''):
-        """
-        Show the video disaply if it was already hidden
-        """
-        if self.hidden:
-            self.hidden = False
-            if self.mediaActive:
-                self._play()
-
-class AudioPlayer(QtCore.QObject):
-    """
-    This Class will play audio only allowing components to work witn a
-    soundtrack which does not take over the user interface.
-    """
-    log.info(u'AudioPlayer Loaded')
-
-    def __init__(self, parent):
-        """
-        The constructor for the display form.
-
-        ``parent``
-            The parent widget.
-
-        ``screens``
-            The list of screens.
-        """
-        log.debug(u'AudioPlayer Initialisation started')
-        QtCore.QObject.__init__(self)
-        self.parent = parent
-        self.message = None
-        self.mediaObject = Phonon.MediaObject()
-        self.audioObject = Phonon.AudioOutput(Phonon.VideoCategory)
-        Phonon.createPath(self.mediaObject, self.audioObject)
-
-    def setup(self):
-        """
-        Sets up the Audio Player for use
-        """
-        log.debug(u'AudioPlayer Setup')
-
-    def close(self):
-        """
-        Shutting down so clean up connections
-        """
-        self.onMediaStop()
-        for pth in self.mediaObject.outputPaths():
-            disconnected = pth.disconnect()
-
-    def onMediaQueue(self, message):
-        """
-        Set up a video to play from the serviceitem.
-        """
-        log.debug(u'AudioPlayer Queue new media message %s' % message)
-        file = os.path.join(message[0].get_frame_path(),
-            message[0].get_frame_title())
-        self.mediaObject.setCurrentSource(Phonon.MediaSource(file))
-        self.onMediaPlay()
-
-    def onMediaPlay(self):
-        """
-        We want to play the play so start it
-        """
-        log.debug(u'AudioPlayer _play called')
-        self.mediaObject.play()
-
-    def onMediaPause(self):
-        """
-        Pause the Audio
-        """
-        log.debug(u'AudioPlayer Media paused by user')
-        self.mediaObject.pause()
-
-    def onMediaStop(self):
-        """
-        Stop the Audio and clean up
-        """
-        log.debug(u'AudioPlayer Media stopped by user')
-        self.message = None
-        self.mediaObject.stop()
-        self.onMediaFinish()
-
-    def onMediaFinish(self):
-        """
-        Clean up the Object queue
-        """
-        log.debug(u'AudioPlayer Reached end of media playlist')
-        self.mediaObject.clearQueue()
+# -*- coding: utf-8 -*-
+# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4
+
+###############################################################################
+# OpenLP - Open Source Lyrics Projection                                      #
+# --------------------------------------------------------------------------- #
+# Copyright (c) 2008-2010 Raoul Snyman                                        #
+# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael      #
+# Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin      #
+# Thompson, Jon Tibble, Carsten Tinggaard                                     #
+# --------------------------------------------------------------------------- #
+# This program is free software; you can redistribute it and/or modify it     #
+# under the terms of the GNU General Public License as published by the Free  #
+# Software Foundation; version 2 of the License.                              #
+#                                                                             #
+# This program is distributed in the hope that it will be useful, but WITHOUT #
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or       #
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for    #
+# more details.                                                               #
+#                                                                             #
+# You should have received a copy of the GNU General Public License along     #
+# with this program; if not, write to the Free Software Foundation, Inc., 59  #
+# Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
+###############################################################################
+
+import logging
+import os
+import time
+
+from PyQt4 import QtCore, QtGui, QtWebKit
+from PyQt4.phonon import Phonon
+
+from openlp.core.lib import Receiver, resize_image
+from openlp.core.ui import HideMode
+
+log = logging.getLogger(__name__)
+
+#http://www.steveheffernan.com/html5-video-player/demo-video-player.html
+HTMLVIDEO = u"""<html>
+    <head>
+    <style>
+    *{
+        margin: 0;
+        padding:0
+    }
+    </style>
+    <script type="text/javascript" charset="utf-8">
+    var video;
+    var bodyLoaded = function(){
+        video = document.getElementById("video");
+        video.volume = 0;
+    }
+    </script>
+    </head>
+    <body id="body" onload="bodyLoaded();">
+    <video id="video" src="%s"
+        autoplay loop width="%s" height="%s"
+        autobuffer="autobuffer" preload >
+        your browser does not support the video tag
+    </video>
+    </body></html>
+    """
+
+class DisplayManager(QtGui.QWidget):
+    """
+    Wrapper class to hold the display widgets.
+    I will provide API's in future to access the screens allow for
+    extra displays to be added.
+    RenderManager is poked in by MainWindow
+    """
+    def __init__(self, screens):
+        QtGui.QWidget.__init__(self)
+        self.screens = screens
+        self.videoDisplay = VideoDisplay(self, screens)
+        self.audioPlayer = AudioPlayer(self)
+        self.mainDisplay = MainDisplay(self, screens)
+        QtCore.QObject.connect(Receiver.get_receiver(),
+            QtCore.SIGNAL(u'maindisplay_hide'), self.hideDisplay)
+        QtCore.QObject.connect(Receiver.get_receiver(),
+            QtCore.SIGNAL(u'maindisplay_show'), self.showDisplay)
+        QtCore.QObject.connect(Receiver.get_receiver(),
+            QtCore.SIGNAL(u'videodisplay_start'), self.onStartVideo)
+        QtCore.QObject.connect(Receiver.get_receiver(),
+            QtCore.SIGNAL(u'videodisplay_stop'), self.onStopVideo)
+
+    def setup(self):
+        self.videoDisplay.setup()
+        self.mainDisplay.setup()
+
+    def hideDisplay(self, message):
+        """
+        Hide the output displays
+        """
+        self.videoDisplay.mediaHide(message)
+        self.mainDisplay.hideDisplay(message)
+
+    def showDisplay(self, message):
+        """
+        Hide the output displays
+        """
+        self.videoDisplay.mediaShow(message)
+        self.mainDisplay.showDisplay(message)
+
+    def addAlert(self, alertMessage, location):
+        """
+        Handles the addition of an Alert Message to the Displays
+        """
+        self.mainDisplay.addAlert(alertMessage, location)
+
+    def displayImageWithText(self, frame):
+        """
+        Handles the addition of a background Image to the displays
+        """
+        self.mainDisplay.addImageWithText(frame)
+
+    def displayImage(self, frame):
+        """
+        Handles the addition of a background Image to the displays
+        """
+        self.mainDisplay.displayImage(frame)
+
+    def displayVideo(self, path):
+        """
+        Handles the addition of a background Video to the displays
+        """
+        self.mainDisplay.displayVideo(path)
+
+    def onStartVideo(self, item):
+        """
+        Handles the Starting of a Video and Display Management
+        """
+        self.videoDisplay.setVisible(True)
+        self.mainDisplay.setVisible(False)
+        self.videoDisplay.onMediaQueue(item)
+
+    def onStopVideo(self):
+        """
+        Handles the Stopping of a Video and Display Management
+        """
+        self.mainDisplay.setVisible(True)
+        self.videoDisplay.setVisible(False)
+        self.videoDisplay.onMediaStop()
+
+    def close(self):
+        """
+        Handles the closure of the displays
+        """
+        self.videoDisplay.close()
+        self.audioPlayer.close()
+        self.mainDisplay.close()
+
+
+class DisplayWidget(QtGui.QGraphicsView):
+    """
+    Customised version of QTableWidget which can respond to keyboard
+    events.
+    """
+    log.info(u'MainDisplay loaded')
+
+    def __init__(self, parent=None, name=None):
+        QtGui.QWidget.__init__(self, None)
+        self.parent = parent
+        self.hotkey_map = {
+            QtCore.Qt.Key_Return: 'servicemanager_next_item',
+            QtCore.Qt.Key_Space: 'slidecontroller_live_next_noloop',
+            QtCore.Qt.Key_Enter: 'slidecontroller_live_next_noloop',
+            QtCore.Qt.Key_0: 'servicemanager_next_item',
+            QtCore.Qt.Key_Backspace: 'slidecontroller_live_previous_noloop'}
+
+    def keyPressEvent(self, event):
+        if isinstance(event, QtGui.QKeyEvent):
+            #here accept the event and do something
+            if event.key() == QtCore.Qt.Key_Up:
+                Receiver.send_message(u'slidecontroller_live_previous')
+                event.accept()
+            elif event.key() == QtCore.Qt.Key_Down:
+                Receiver.send_message(u'slidecontroller_live_next')
+                event.accept()
+            elif event.key() == QtCore.Qt.Key_PageUp:
+                Receiver.send_message(u'slidecontroller_live_first')
+                event.accept()
+            elif event.key() == QtCore.Qt.Key_PageDown:
+                Receiver.send_message(u'slidecontroller_live_last')
+                event.accept()
+            elif event.key() in self.hotkey_map:
+                Receiver.send_message(self.hotkey_map[event.key()])
+                event.accept()
+            elif event.key() == QtCore.Qt.Key_Escape:
+                self.resetDisplay()
+                event.accept()
+            event.ignore()
+        else:
+            event.ignore()
+
+class MainDisplay(DisplayWidget):
+    """
+    This is the form that is used to display things on the projector.
+    """
+    log.info(u'MainDisplay Loaded')
+
+    def __init__(self, parent, screens):
+        """
+        The constructor for the display form.
+
+        ``parent``
+            The parent widget.
+
+        ``screens``
+            The list of screens.
+        """
+        log.debug(u'Initialisation started')
+        DisplayWidget.__init__(self, parent)
+        self.setWindowFlags(QtCore.Qt.Window | QtCore.Qt.FramelessWindowHint)
+        self.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOff)
+        self.setVerticalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOff)
+        self.parent = parent
+        # WA_TranslucentBackground is not available in QT4.4
+        try:
+            self.setAttribute(QtCore.Qt.WA_TranslucentBackground)
+        except AttributeError:
+            pass
+        self.screens = screens
+        self.setupScene()
+        self.setupVideo()
+        self.setupImage()
+        self.setupText()
+        self.setupAlert()
+        self.setupBlank()
+        self.primary = True
+        self.blankFrame = None
+        self.frame = None
+        #Hide desktop for now until we know where to put it
+        #and what size it should be.
+        self.setVisible(False)
+
+    def setup(self):
+        """
+        Sets up the screen on a particular screen.
+        """
+        log.debug(u'Setup %s for %s ' % (
+            self.screens, self.screens.monitor_number))
+        self.setVisible(False)
+        self.screen = self.screens.current
+        #Sort out screen locations and sizes
+        self.setGeometry(self.screen[u'size'])
+        self.scene.setSceneRect(0,0,self.size().width(), self.size().height())
+        self.webView.setGeometry(0, 0, self.size().width(), self.size().height())
+        #Build a custom splash screen
+        self.InitialFrame = QtGui.QImage(
+            self.screen[u'size'].width(),
+            self.screen[u'size'].height(),
+            QtGui.QImage.Format_ARGB32_Premultiplied)
+        splash_image = QtGui.QImage(u':/graphics/openlp-splash-screen.png')
+        painter_image = QtGui.QPainter()
+        painter_image.begin(self.InitialFrame)
+        painter_image.fillRect(self.InitialFrame.rect(), QtCore.Qt.white)
+        painter_image.drawImage(
+            (self.screen[u'size'].width() - splash_image.width()) / 2,
+            (self.screen[u'size'].height() - splash_image.height()) / 2,
+            splash_image)
+        self.displayImage(self.InitialFrame)
+        self.repaint()
+        #Build a Black screen
+        painter = QtGui.QPainter()
+        self.blankFrame = QtGui.QImage(
+            self.screen[u'size'].width(),
+            self.screen[u'size'].height(),
+            QtGui.QImage.Format_ARGB32_Premultiplied)
+        painter.begin(self.blankFrame)
+        painter.fillRect(self.blankFrame.rect(), QtCore.Qt.black)
+        #build a blank transparent image
+        self.transparent = QtGui.QPixmap(
+            self.screen[u'size'].width(), self.screen[u'size'].height())
+        self.transparent.fill(QtCore.Qt.transparent)
+#        self.displayText.setPixmap(self.transparent)
+        #self.frameView(self.transparent)
+        # To display or not to display?
+        if not self.screen[u'primary']:
+            self.setVisible(True)
+            self.primary = False
+        else:
+            self.setVisible(False)
+            self.primary = True
+
+    def setupScene(self):
+        self.scene = QtGui.QGraphicsScene(self)
+        self.scene.setSceneRect(0,0,self.size().width(), self.size().height())
+        self.setScene(self.scene)
+
+    def setupVideo(self):
+        self.webView = QtWebKit.QWebView()
+        self.page = self.webView.page()
+        self.videoDisplay = self.page.mainFrame()
+        self.videoDisplay.setScrollBarPolicy(QtCore.Qt.Vertical, QtCore.Qt.ScrollBarAlwaysOff)
+        self.videoDisplay.setScrollBarPolicy(QtCore.Qt.Horizontal, QtCore.Qt.ScrollBarAlwaysOff)
+        self.proxy = QtGui.QGraphicsProxyWidget()
+        self.proxy.setWidget(self.webView)
+        self.proxy.setWindowFlags(QtCore.Qt.Window | QtCore.Qt.FramelessWindowHint)
+        self.proxy.setZValue(1)
+        self.scene.addItem(self.proxy)
+
+    def setupImage(self):
+        self.imageDisplay = QtGui.QGraphicsPixmapItem()
+        self.imageDisplay.setZValue(2)
+        self.scene.addItem(self.imageDisplay)
+
+    def setupText(self):
+        #self.displayText = QtGui.QGraphicsTextItem()
+        self.displayText = QtGui.QGraphicsPixmapItem()
+        #self.displayText.setPos(0,0)
+        #self.displayText.setTextWidth(self.size().width())
+        self.displayText.setZValue(4)
+        self.scene.addItem(self.displayText)
+
+    def setupAlert(self):
+        self.alertText = QtGui.QGraphicsTextItem()
+        self.alertText.setTextWidth(self.size().width())
+        self.alertText.setZValue(8)
+        self.scene.addItem(self.alertText)
+
+    def setupBlank(self):
+        self.displayBlank = QtGui.QGraphicsPixmapItem()
+        self.displayBlank.setZValue(10)
+        self.scene.addItem(self.displayBlank)
+
+    def resetDisplay(self):
+        log.debug(u'resetDisplay')
+        Receiver.send_message(u'slidecontroller_live_stop_loop')
+        if self.primary:
+            self.setVisible(False)
+        else:
+            self.setVisible(True)
+
+#    def hideDisplayForVideo(self):
+#        """
+#        Hides the main display if for the video to be played
+#        """
+#        self.hideDisplay(HideMode.Screen)
+
+    def hideDisplay(self, mode=HideMode.Screen):
+        """
+        Hide the display by making all layers transparent
+        Store the images so they can be replaced when required
+        """
+        log.debug(u'hideDisplay mode = %d', mode)
+        #self.displayText.setPixmap(self.transparent)
+        if mode == HideMode.Screen:
+            #self.display_image.setPixmap(self.transparent)
+            self.setVisible(False)
+        elif mode == HideMode.Blank:
+            self.displayBlank.setPixmap(
+                QtGui.QPixmap.fromImage(self.blankFrame))
+        else:
+            if self.parent.renderManager.renderer.bg_frame:
+                self.displayBlank.setPixmap(QtGui.QPixmap.fromImage(
+                    self.parent.renderManager.renderer.bg_frame))
+            else:
+                self.displayBlank.setPixmap(
+                    QtGui.QPixmap.fromImage(self.blankFrame))
+
+    def showDisplay(self, message=u''):
+        """
+        Show the stored layers so the screen reappears as it was
+        originally.
+        Make the stored images None to release memory.
+        """
+        log.debug(u'showDisplay')
+        self.displayBlank.setPixmap(self.transparent)
+        #Trigger actions when display is active again
+        Receiver.send_message(u'maindisplay_active')
+
+    def addImageWithText(self, frame):
+        log.debug(u'addImageWithText')
+        frame = resize_image(
+            frame, self.screen[u'size'].width(), self.screen[u'size'].height())
+        self.imageDisplay.setPixmap(QtGui.QPixmap.fromImage(frame))
+        self.videoDisplay.setHtml(u'<html></html>')
+
+    def addAlert(self, message, location):
+        """
+        Places the Alert text on the display at the correct location
+        ``message``
+            Text to be displayed
+        ``location``
+            Where on the screen the text should be.  From the AlertTab
+            Combo box.
+        """
+        log.debug(u'addAlertImage')
+        if location == 0:
+            self.alertText.setPos(0, 0)
+        elif location == 1:
+            self.alertText.setPos(0,self.size().height()/2)
+        else:
+            self.alertText.setPos(0,self.size().height() - 76)
+        self.alertText.setHtml(message)
+
+    def displayImage(self, frame):
+        """
+        Places the Image passed on the display screen
+        ``frame``
+            The image to be displayed
+        """
+        log.debug(u'adddisplayImage')
+        if isinstance(frame, QtGui.QImage):
+            self.imageDisplay.setPixmap(QtGui.QPixmap.fromImage(frame))
+        else:
+            self.imageDisplay.setPixmap(frame)
+        self.videoDisplay.setHtml(u'<html></html>')
+
+    def displayVideo(self, path):
+        """
+        Places the Video passed on the display screen
+        ``path``
+            The path to the image to be displayed
+        """
+        log.debug(u'adddisplayVideo')
+        self.displayImage(self.transparent)
+        self.videoDisplay.setHtml(HTMLVIDEO %
+            (path, self.screen[u'size'].width(), self.screen[u'size'].height()))
+
+    def frameView(self, frame, transition=False):
+        """
+        Called from a slide controller to display a frame
+        if the alert is in progress the alert is added on top
+        ``frame``
+            Image frame to be rendered
+        ``transition``
+            Are transitions required.
+        """
+        log.debug(u'frameView')
+        if transition:
+            if self.frame is not None:
+                self.displayText.setPixmap(
+                    QtGui.QPixmap.fromImage(self.frame))
+                self.repaint()
+                Receiver.send_message(u'openlp_process_events')
+                time.sleep(0.1)
+            self.frame = None
+            if frame[u'trans'] is not None:
+                self.displayText.setPixmap(
+                    QtGui.QPixmap.fromImage(frame[u'trans']))
+                self.repaint()
+                Receiver.send_message(u'openlp_process_events')
+                time.sleep(0.1)
+                self.frame = frame[u'trans']
+            self.displayText.setPixmap(
+                QtGui.QPixmap.fromImage(frame[u'main']))
+        else:
+            if isinstance(frame, QtGui.QPixmap):
+                self.displayText.setPixmap(frame)
+            else:
+                self.displayText.setPixmap(QtGui.QPixmap.fromImage(frame))
+        if not self.isVisible() and self.screens.display:
+            self.setVisible(True)
+
+class VideoDisplay(Phonon.VideoWidget):
+    """
+    This is the form that is used to display videos on the projector.
+    """
+    log.info(u'VideoDisplay Loaded')
+
+    def __init__(self, parent, screens,
+        aspect=Phonon.VideoWidget.AspectRatioWidget):
+        """
+        The constructor for the display form.
+
+        ``parent``
+            The parent widget.
+
+        ``screens``
+            The list of screens.
+        """
+        log.debug(u'VideoDisplay Initialisation started')
+        Phonon.VideoWidget.__init__(self)
+        self.setWindowTitle(u'OpenLP Video Display')
+        self.parent = parent
+        self.screens = screens
+        self.hidden = False
+        self.message = None
+        self.mediaActive = False
+        self.mediaObject = Phonon.MediaObject()
+        self.setAspectRatio(aspect)
+        self.audioObject = Phonon.AudioOutput(Phonon.VideoCategory)
+        Phonon.createPath(self.mediaObject, self)
+        Phonon.createPath(self.mediaObject, self.audioObject)
+        flags = QtCore.Qt.FramelessWindowHint | QtCore.Qt.Dialog
+##        # WindowsStaysOnBottomHint is not available in QT4.4
+#        try:
+#            flags = flags | QtCore.Qt.WindowStaysOnBottomHint
+#        except AttributeError:
+#            pass
+        self.setWindowFlags(flags)
+        QtCore.QObject.connect(Receiver.get_receiver(),
+            QtCore.SIGNAL(u'videodisplay_play'), self.onMediaPlay)
+        QtCore.QObject.connect(Receiver.get_receiver(),
+            QtCore.SIGNAL(u'videodisplay_pause'), self.onMediaPause)
+#        QtCore.QObject.connect(Receiver.get_receiver(),
+#            QtCore.SIGNAL(u'videodisplay_background'), self.onMediaBackground)
+        QtCore.QObject.connect(Receiver.get_receiver(),
+            QtCore.SIGNAL(u'config_updated'), self.setup)
+        QtCore.QObject.connect(self.mediaObject,
+            QtCore.SIGNAL(u'finished()'), self.onMediaStop)
+        self.setVisible(False)
+
+    def keyPressEvent(self, event):
+        if isinstance(event, QtGui.QKeyEvent):
+            #here accept the event and do something
+            if event.key() == QtCore.Qt.Key_Escape:
+                self.onMediaStop()
+                event.accept()
+            event.ignore()
+        else:
+            event.ignore()
+
+    def setup(self):
+        """
+        Sets up the screen on a particular screen.
+        """
+        log.debug(u'VideoDisplay Setup %s for %s ' % (self.screens,
+             self.screens.monitor_number))
+        self.screen = self.screens.current
+        #Sort out screen locations and sizes
+        self.setGeometry(self.screen[u'size'])
+        # To display or not to display?
+        if not self.screen[u'primary']: # and self.isVisible():
+            #self.showFullScreen()
+            self.setVisible(False)
+            self.primary = False
+        else:
+            self.setVisible(False)
+            self.primary = True
+
+    def closeEvent(self, event):
+        """
+        Shutting down so clean up connections
+        """
+        self.onMediaStop()
+        for pth in self.outputPaths():
+          disconnected = pth.disconnect()
+
+#    def onMediaBackground(self, message=None):
+#        """
+#        Play a video triggered from the video plugin with the
+#        file name passed in on the event.
+#        Also triggered from the Finish event so the video will loop
+#        if it is triggered from the plugin
+#        """
+#        log.debug(u'VideoDisplay Queue new media message %s' % message)
+#        #If not file take the stored one
+#        if not message:
+#            message = self.message
+#        # still no file name then stop as it was a normal video stopping
+#        if message:
+#            self.mediaObject.setCurrentSource(Phonon.MediaSource(message))
+#            self.message = message
+#            self._play()
+
+    def onMediaQueue(self, message):
+        """
+        Set up a video to play from the serviceitem.
+        """
+        log.debug(u'VideoDisplay Queue new media message %s' % message)
+        file = os.path.join(message.get_frame_path(),
+            message.get_frame_title())
+        self.mediaObject.setCurrentSource(Phonon.MediaSource(file))
+        self.mediaActive = True
+        self._play()
+
+    def onMediaPlay(self):
+        """
+        Respond to the Play button on the slide controller unless the display
+        has been hidden by the slidecontroller
+        """
+        if not self.hidden:
+            log.debug(u'VideoDisplay Play the new media, Live ')
+            self._play()
+
+    def _play(self):
+        """
+        We want to play the video so start it and display the screen
+        """
+        log.debug(u'VideoDisplay _play called')
+        self.mediaObject.play()
+        self.setVisible(True)
+
+    def onMediaPause(self):
+        """
+        Pause the video and refresh the screen
+        """
+        log.debug(u'VideoDisplay Media paused by user')
+        self.mediaObject.pause()
+        self.show()
+
+    def onMediaStop(self):
+        """
+        Stop the video and clean up
+        """
+        log.debug(u'VideoDisplay Media stopped by user')
+        self.message = None
+        self.mediaActive = False
+        self.mediaObject.stop()
+        self.onMediaFinish()
+
+    def onMediaFinish(self):
+        """
+        Clean up the Object queue
+        """
+        log.debug(u'VideoDisplay Reached end of media playlist')
+        self.mediaObject.clearQueue()
+        self.setVisible(False)
+
+    def mediaHide(self, message=u''):
+        """
+        Hide the video display
+        """
+        self.mediaObject.pause()
+        self.hidden = True
+        self.setVisible(False)
+
+    def mediaShow(self, message=''):
+        """
+        Show the video disaply if it was already hidden
+        """
+        if self.hidden:
+            self.hidden = False
+            if self.mediaActive:
+                self._play()
+
+class AudioPlayer(QtCore.QObject):
+    """
+    This Class will play audio only allowing components to work witn a
+    soundtrack which does not take over the user interface.
+    """
+    log.info(u'AudioPlayer Loaded')
+
+    def __init__(self, parent):
+        """
+        The constructor for the display form.
+
+        ``parent``
+            The parent widget.
+
+        ``screens``
+            The list of screens.
+        """
+        log.debug(u'AudioPlayer Initialisation started')
+        QtCore.QObject.__init__(self)
+        self.parent = parent
+        self.message = None
+        self.mediaObject = Phonon.MediaObject()
+        self.audioObject = Phonon.AudioOutput(Phonon.VideoCategory)
+        Phonon.createPath(self.mediaObject, self.audioObject)
+
+    def setup(self):
+        """
+        Sets up the Audio Player for use
+        """
+        log.debug(u'AudioPlayer Setup')
+
+    def close(self):
+        """
+        Shutting down so clean up connections
+        """
+        self.onMediaStop()
+        for pth in self.mediaObject.outputPaths():
+            disconnected = pth.disconnect()
+
+    def onMediaQueue(self, message):
+        """
+        Set up a video to play from the serviceitem.
+        """
+        log.debug(u'AudioPlayer Queue new media message %s' % message)
+        file = os.path.join(message[0].get_frame_path(),
+            message[0].get_frame_title())
+        self.mediaObject.setCurrentSource(Phonon.MediaSource(file))
+        self.onMediaPlay()
+
+    def onMediaPlay(self):
+        """
+        We want to play the play so start it
+        """
+        log.debug(u'AudioPlayer _play called')
+        self.mediaObject.play()
+
+    def onMediaPause(self):
+        """
+        Pause the Audio
+        """
+        log.debug(u'AudioPlayer Media paused by user')
+        self.mediaObject.pause()
+
+    def onMediaStop(self):
+        """
+        Stop the Audio and clean up
+        """
+        log.debug(u'AudioPlayer Media stopped by user')
+        self.message = None
+        self.mediaObject.stop()
+        self.onMediaFinish()
+
+    def onMediaFinish(self):
+        """
+        Clean up the Object queue
+        """
+        log.debug(u'AudioPlayer Reached end of media playlist')
+        self.mediaObject.clearQueue()

From a180c4c3210641aaa435590fc70471b2012350a0 Mon Sep 17 00:00:00 2001
From: Phill Ridout <phill.ridout@googlemail.com>
Date: Sat, 3 Jul 2010 20:45:14 +0100
Subject: [PATCH 12/21] corrected video tag

---
 openlp/core/ui/maindisplay.py | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/openlp/core/ui/maindisplay.py b/openlp/core/ui/maindisplay.py
index 445a3aa26..b770a9e05 100644
--- a/openlp/core/ui/maindisplay.py
+++ b/openlp/core/ui/maindisplay.py
@@ -53,11 +53,8 @@ HTMLVIDEO = u"""<html>
     </script>
     </head>
     <body id="body" onload="bodyLoaded();">
-    <video id="video" src="%s"
-        autoplay loop width="%s" height="%s"
-        autobuffer="autobuffer" preload >
-        your browser does not support the video tag
-    </video>
+    <video id="video" src="%s" autoplay="autoplay" loop="loop"
+    width="%s" height="%s" autobuffer="autobuffer" preload="preload" />
     </body></html>
     """
 

From aa390e9831a65ff73781ab7de2d0147bea748404 Mon Sep 17 00:00:00 2001
From: Jon Tibble <meths@btinternet.com>
Date: Sat, 3 Jul 2010 22:50:42 +0100
Subject: [PATCH 13/21] Cleanups

---
 openlp/core/theme/theme.py                 | 1 -
 openlp/plugins/songs/forms/editsongform.py | 1 -
 openlp/plugins/songs/lib/songxmlhandler.py | 8 ++++----
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/openlp/core/theme/theme.py b/openlp/core/theme/theme.py
index 6cddbcb45..82e7ac2cc 100644
--- a/openlp/core/theme/theme.py
+++ b/openlp/core/theme/theme.py
@@ -222,4 +222,3 @@ class Theme(object):
             if key[0:1] != u'_':
                 theme_strings.append(u'%30s : %s' % (key, getattr(self, key)))
         return u'\n'.join(theme_strings)
-
diff --git a/openlp/plugins/songs/forms/editsongform.py b/openlp/plugins/songs/forms/editsongform.py
index 663b510d3..c0db7b741 100644
--- a/openlp/plugins/songs/forms/editsongform.py
+++ b/openlp/plugins/songs/forms/editsongform.py
@@ -664,4 +664,3 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
         log.debug(u'processTitle')
         self.song.search_title = \
             re.sub(r'[\'"`,;:(){}?]+', u'', unicode(self.song.search_title))
-
diff --git a/openlp/plugins/songs/lib/songxmlhandler.py b/openlp/plugins/songs/lib/songxmlhandler.py
index 395777c17..9237c7622 100644
--- a/openlp/plugins/songs/lib/songxmlhandler.py
+++ b/openlp/plugins/songs/lib/songxmlhandler.py
@@ -38,10 +38,8 @@ The basic XML is of the format::
 """
 
 import logging
-import StringIO
 
 from lxml import etree, objectify
-#from lxml.etree import SubElement, XMLSyntaxError, dump
 
 log = logging.getLogger(__name__)
 
@@ -86,13 +84,15 @@ class SongXMLBuilder(object):
         """
         Debugging aid to dump XML so that we can see what we have.
         """
-        return etree.tostring(self.song_xml, pretty_print=True)
+        return etree.tostring(self.song_xml, encoding=u'UTF-8',
+            xml_declaration=True, pretty_print=True)
 
     def extract_xml(self):
         """
         Extract our newly created XML song.
         """
-        return etree.tostring(self.song_xml, encoding=u'utf-8')
+        return etree.tostring(self.song_xml, encoding=u'UTF-8',
+            xml_declaration=True)
 
 
 class SongXMLParser(object):

From 0f53c65f4fd9e5b0955296cfd97a74d3ab2ddee6 Mon Sep 17 00:00:00 2001
From: Jon Tibble <meths@btinternet.com>
Date: Sat, 3 Jul 2010 22:52:28 +0100
Subject: [PATCH 14/21] Importish fix

---
 openlp/plugins/songs/lib/songxmlhandler.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openlp/plugins/songs/lib/songxmlhandler.py b/openlp/plugins/songs/lib/songxmlhandler.py
index 9237c7622..9f76d3221 100644
--- a/openlp/plugins/songs/lib/songxmlhandler.py
+++ b/openlp/plugins/songs/lib/songxmlhandler.py
@@ -133,4 +133,4 @@ class SongXMLParser(object):
         """
         Debugging aid to dump XML so that we can see what we have.
         """
-        return dump(self.song_xml)
+        return etree.dump(self.song_xml)

From b7563ae0759a49ef2d5724812924b1650f780994 Mon Sep 17 00:00:00 2001
From: Jon Tibble <meths@btinternet.com>
Date: Sun, 4 Jul 2010 00:10:28 +0100
Subject: [PATCH 15/21] Import fix

---
 openlp/plugins/songs/lib/mediaitem.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/openlp/plugins/songs/lib/mediaitem.py b/openlp/plugins/songs/lib/mediaitem.py
index 4557f53fa..fbafcb356 100644
--- a/openlp/plugins/songs/lib/mediaitem.py
+++ b/openlp/plugins/songs/lib/mediaitem.py
@@ -27,11 +27,11 @@ import logging
 
 from PyQt4 import QtCore, QtGui
 
-from openlp.core.lib import MediaManagerItem, SongXMLParser, \
-    BaseListWithDnD, Receiver, ItemCapabilities, translate, check_item_selected
+from openlp.core.lib import MediaManagerItem, SongXMLParser, Receiver, \
+    BaseListWithDnD, ItemCapabilities, translate, check_item_selected
 from openlp.plugins.songs.forms import EditSongForm, SongMaintenanceForm, \
     ImportWizardForm
-from openlp.plugins.songs.lib.db import Song
+from openlp.plugins.songs.lib.db import Author, Song
 
 log = logging.getLogger(__name__)
 

From 99106552233d3d80e9b8704b02a3a1f3393ce103 Mon Sep 17 00:00:00 2001
From: Jon Tibble <meths@btinternet.com>
Date: Sun, 4 Jul 2010 14:42:01 +0100
Subject: [PATCH 16/21] Start customisation

---
 openlp/plugins/custom/lib/customxmlhandler.py | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/openlp/plugins/custom/lib/customxmlhandler.py b/openlp/plugins/custom/lib/customxmlhandler.py
index ebb8b1685..bb6e33390 100644
--- a/openlp/plugins/custom/lib/customxmlhandler.py
+++ b/openlp/plugins/custom/lib/customxmlhandler.py
@@ -57,15 +57,15 @@ class CustomXMLBuilder(object):
         Set up the song builder.
         """
         # Create the minidom document
-        self.song_xml = Document()
+        self.custom_xml = Document()
 
     def new_document(self):
         """
         Create a new song XML document.
         """
         # Create the <song> base element
-        self.song = self.song_xml.createElement(u'song')
-        self.song_xml.appendChild(self.song)
+        self.song = self.custom_xml.createElement(u'song')
+        self.custom_xml.appendChild(self.song)
         self.song.setAttribute(u'version', u'1.0')
 
     def add_lyrics_to_song(self):
@@ -74,7 +74,7 @@ class CustomXMLBuilder(object):
         song.
         """
         # Create the main <lyrics> element
-        self.lyrics = self.song_xml.createElement(u'lyrics')
+        self.lyrics = self.custom_xml.createElement(u'lyrics')
         self.lyrics.setAttribute(u'language', u'en')
         self.song.appendChild(self.lyrics)
 
@@ -93,25 +93,25 @@ class CustomXMLBuilder(object):
             The actual text of the verse to be stored.
         """
         #log.debug(u'add_verse_to_lyrics %s, %s\n%s' % (type, number, content))
-        verse = self.song_xml.createElement(u'verse')
+        verse = self.custom_xml.createElement(u'verse')
         verse.setAttribute(u'type', type)
         verse.setAttribute(u'label', number)
         self.lyrics.appendChild(verse)
         # add data as a CDATA section to protect the XML from special chars
-        cds = self.song_xml.createCDATASection(content)
+        cds = self.custom_xml.createCDATASection(content)
         verse.appendChild(cds)
 
     def dump_xml(self):
         """
         Debugging aid to dump XML so that we can see what we have.
         """
-        return self.song_xml.toprettyxml(indent=u'  ')
+        return self.custom_xml.toprettyxml(indent=u'  ')
 
     def extract_xml(self):
         """
         Extract our newly created XML song.
         """
-        return self.song_xml.toxml(u'utf-8')
+        return self.custom_xml.toxml(u'utf-8')
 
 
 class CustomXMLParser(object):
@@ -127,9 +127,9 @@ class CustomXMLParser(object):
         ``xml``
             The XML of the song to be parsed.
         """
-        self.song_xml = None
+        self.custom_xml = None
         try:
-            self.song_xml = ElementTree(
+            self.custom_xml = ElementTree(
                 element=XML(unicode(xml).encode('unicode-escape')))
         except ExpatError:
             log.exception(u'Invalid xml %s', xml)
@@ -139,7 +139,7 @@ class CustomXMLParser(object):
         Iterates through the verses in the XML and returns a list of verses
         and their attributes.
         """
-        xml_iter = self.song_xml.getiterator()
+        xml_iter = self.custom_xml.getiterator()
         verse_list = []
         for element in xml_iter:
             if element.tag == u'verse':
@@ -153,4 +153,4 @@ class CustomXMLParser(object):
         """
         Debugging aid to dump XML so that we can see what we have.
         """
-        return dump(self.song_xml)
+        return dump(self.custom_xml)

From e2a2500a1a7cb849de553ffbb81321d177693807 Mon Sep 17 00:00:00 2001
From: Jon Tibble <meths@btinternet.com>
Date: Sun, 4 Jul 2010 17:40:53 +0100
Subject: [PATCH 17/21] XML: merge song XML handling

---
 openlp/plugins/songs/lib/__init__.py       |   3 +-
 openlp/plugins/songs/lib/songxmlhandler.py | 136 ---------------------
 openlp/plugins/songs/lib/xml.py            | 127 ++++++++++++++++---
 3 files changed, 114 insertions(+), 152 deletions(-)
 delete mode 100644 openlp/plugins/songs/lib/songxmlhandler.py

diff --git a/openlp/plugins/songs/lib/__init__.py b/openlp/plugins/songs/lib/__init__.py
index 85206f5be..ef7b8b7d3 100644
--- a/openlp/plugins/songs/lib/__init__.py
+++ b/openlp/plugins/songs/lib/__init__.py
@@ -137,7 +137,7 @@ class VerseType(object):
             unicode(VerseType.to_string(VerseType.Other)).lower():
             return VerseType.Other
 
-from songxmlhandler import SongXMLBuilder, SongXMLParser
+from xml import LyricsXML, SongXMLBuilder, SongXMLParser
 from songstab import SongsTab
 from mediaitem import SongMediaItem
 from songimport import SongImport
@@ -146,4 +146,3 @@ try:
     from oooimport import OooImport
 except ImportError:
     pass
-
diff --git a/openlp/plugins/songs/lib/songxmlhandler.py b/openlp/plugins/songs/lib/songxmlhandler.py
deleted file mode 100644
index 9f76d3221..000000000
--- a/openlp/plugins/songs/lib/songxmlhandler.py
+++ /dev/null
@@ -1,136 +0,0 @@
-# -*- coding: utf-8 -*-
-# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4
-
-###############################################################################
-# OpenLP - Open Source Lyrics Projection                                      #
-# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman                                        #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin      #
-# Thompson, Jon Tibble, Carsten Tinggaard                                     #
-# --------------------------------------------------------------------------- #
-# This program is free software; you can redistribute it and/or modify it     #
-# under the terms of the GNU General Public License as published by the Free  #
-# Software Foundation; version 2 of the License.                              #
-#                                                                             #
-# This program is distributed in the hope that it will be useful, but WITHOUT #
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or       #
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for    #
-# more details.                                                               #
-#                                                                             #
-# You should have received a copy of the GNU General Public License along     #
-# with this program; if not, write to the Free Software Foundation, Inc., 59  #
-# Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
-###############################################################################
-"""
-The :mod:`songxmlhandler` module provides the XML functionality for songs
-
-The basic XML is of the format::
-
-    <?xml version="1.0" encoding="UTF-8"?>
-    <song version="1.0">
-        <lyrics language="en">
-            <verse type="chorus" label="1">
-                <![CDATA[ ... ]]>
-            </verse>
-        </lyrics>
-    </song>
-"""
-
-import logging
-
-from lxml import etree, objectify
-
-log = logging.getLogger(__name__)
-
-class SongXMLBuilder(object):
-    """
-    This class builds the XML used to describe songs.
-    """
-    log.info(u'SongXMLBuilder Loaded')
-
-    def __init__(self, song_language=None):
-        """
-        Set up the song builder.
-
-        ``song_language``
-            The language used in this song
-        """
-        lang = u'en'
-        if song_language:
-            lang = song_language
-        self.song_xml = objectify.fromstring(u'<song version="1.0" />')
-        self.lyrics = etree.SubElement(self.song_xml, u'lyrics', language=lang)
-
-    def add_verse_to_lyrics(self, type, number, content):
-        """
-        Add a verse to the ``<lyrics>`` tag.
-
-        ``type``
-            A string denoting the type of verse. Possible values are "Chorus",
-            "Verse", "Bridge", and "Custom".
-
-        ``number``
-            An integer denoting the number of the item, for example: verse 1.
-
-        ``content``
-            The actual text of the verse to be stored.
-        """
-        #log.debug(u'add_verse_to_lyrics %s, %s\n%s' % (type, number, content))
-        verse = etree.SubElement(self.lyrics, u'verse', type=type, label=number)
-        verse.text = etree.CDATA(content)
-
-    def dump_xml(self):
-        """
-        Debugging aid to dump XML so that we can see what we have.
-        """
-        return etree.tostring(self.song_xml, encoding=u'UTF-8',
-            xml_declaration=True, pretty_print=True)
-
-    def extract_xml(self):
-        """
-        Extract our newly created XML song.
-        """
-        return etree.tostring(self.song_xml, encoding=u'UTF-8',
-            xml_declaration=True)
-
-
-class SongXMLParser(object):
-    """
-    A class to read in and parse a song's XML.
-    """
-    log.info(u'SongXMLParser Loaded')
-
-    def __init__(self, xml):
-        """
-        Set up our song XML parser.
-
-        ``xml``
-            The XML of the song to be parsed.
-        """
-        self.song_xml = None
-        try:
-            self.song_xml = objectify.fromstring(str(xml))
-        except etree.XMLSyntaxError:
-            log.exception(u'Invalid xml %s', xml)
-
-    def get_verses(self):
-        """
-        Iterates through the verses in the XML and returns a list of verses
-        and their attributes.
-        """
-        xml_iter = self.song_xml.getiterator()
-        verse_list = []
-        for element in xml_iter:
-            if element.tag == u'verse':
-                if element.text is None:
-                    element.text = u''
-                verse_list.append([element.attrib,
-                    unicode(element.text).decode('unicode-escape')])
-        return verse_list
-
-    def dump_xml(self):
-        """
-        Debugging aid to dump XML so that we can see what we have.
-        """
-        return etree.dump(self.song_xml)
diff --git a/openlp/plugins/songs/lib/xml.py b/openlp/plugins/songs/lib/xml.py
index 4fa7424f9..41490b8fd 100644
--- a/openlp/plugins/songs/lib/xml.py
+++ b/openlp/plugins/songs/lib/xml.py
@@ -22,24 +22,123 @@
 # with this program; if not, write to the Free Software Foundation, Inc., 59  #
 # Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
 ###############################################################################
+"""
+The :mod:`xml` module provides the XML functionality for songs
+
+The basic XML is of the format::
+
+    <?xml version="1.0" encoding="UTF-8"?>
+    <song version="1.0">
+        <lyrics language="en">
+            <verse type="chorus" label="1">
+                <![CDATA[ ... ]]>
+            </verse>
+        </lyrics>
+    </song>
+"""
+
+import logging
+
+from lxml import etree, objectify
+
+log = logging.getLogger(__name__)
+
+class SongXMLBuilder(object):
+    """
+    This class builds the XML used to describe songs.
+    """
+    log.info(u'SongXMLBuilder Loaded')
+
+    def __init__(self, song_language=None):
+        """
+        Set up the song builder.
+
+        ``song_language``
+            The language used in this song
+        """
+        lang = u'en'
+        if song_language:
+            lang = song_language
+        self.song_xml = objectify.fromstring(u'<song version="1.0" />')
+        self.lyrics = etree.SubElement(self.song_xml, u'lyrics', language=lang)
+
+    def add_verse_to_lyrics(self, type, number, content):
+        """
+        Add a verse to the ``<lyrics>`` tag.
+
+        ``type``
+            A string denoting the type of verse. Possible values are "Chorus",
+            "Verse", "Bridge", and "Custom".
+
+        ``number``
+            An integer denoting the number of the item, for example: verse 1.
+
+        ``content``
+            The actual text of the verse to be stored.
+        """
+        #log.debug(u'add_verse_to_lyrics %s, %s\n%s' % (type, number, content))
+        verse = etree.SubElement(self.lyrics, u'verse', type=type, label=number)
+        verse.text = etree.CDATA(content)
+
+    def dump_xml(self):
+        """
+        Debugging aid to dump XML so that we can see what we have.
+        """
+        return etree.tostring(self.song_xml, encoding=u'UTF-8',
+            xml_declaration=True, pretty_print=True)
+
+    def extract_xml(self):
+        """
+        Extract our newly created XML song.
+        """
+        return etree.tostring(self.song_xml, encoding=u'UTF-8',
+            xml_declaration=True)
+
+
+class SongXMLParser(object):
+    """
+    A class to read in and parse a song's XML.
+    """
+    log.info(u'SongXMLParser Loaded')
+
+    def __init__(self, xml):
+        """
+        Set up our song XML parser.
+
+        ``xml``
+            The XML of the song to be parsed.
+        """
+        self.song_xml = None
+        try:
+            self.song_xml = objectify.fromstring(str(xml))
+        except etree.XMLSyntaxError:
+            log.exception(u'Invalid xml %s', xml)
+
+    def get_verses(self):
+        """
+        Iterates through the verses in the XML and returns a list of verses
+        and their attributes.
+        """
+        xml_iter = self.song_xml.getiterator()
+        verse_list = []
+        for element in xml_iter:
+            if element.tag == u'verse':
+                if element.text is None:
+                    element.text = u''
+                verse_list.append([element.attrib,
+                    unicode(element.text).decode('unicode-escape')])
+        return verse_list
+
+    def dump_xml(self):
+        """
+        Debugging aid to dump XML so that we can see what we have.
+        """
+        return etree.dump(self.song_xml)
 
-from lxml import objectify
-from lxml.etree import XMLSyntaxError
 
 class LyricsXML(object):
     """
     This class represents the XML in the ``lyrics`` field of a song.
-
-    The basic XML looks like this::
-
-        <?xml version="1.0" encoding="UTF-8"?>
-        <song version="1.0">
-          <lyrics language="en">
-            <verse type="chorus" label="1">
-              <![CDATA[ ... ]]>
-            </verse>
-          </lyrics>
-        </song>
     """
     def __init__(self, song=None):
         if song:
@@ -74,7 +173,7 @@ class LyricsXML(object):
                     })
                 self.lyrics.append(language)
             return True
-        except XMLSyntaxError:
+        except etree.XMLSyntaxError:
             return False
 
     def extract(self, text):

From 443962501353546a8efb3cccce8664a1f7f1ca8a Mon Sep 17 00:00:00 2001
From: Jon Tibble <meths@btinternet.com>
Date: Mon, 5 Jul 2010 12:39:48 +0100
Subject: [PATCH 18/21] Fixes and cleanups

---
 openlp/core/lib/db.py            | 4 ++--
 openlp/core/lib/renderer.py      | 1 +
 openlp/core/lib/rendermanager.py | 3 +--
 openlp/core/lib/theme.py         | 8 +-------
 openlp/plugins/songs/lib/xml.py  | 7 ++++---
 5 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/openlp/core/lib/db.py b/openlp/core/lib/db.py
index f20f3ab38..8acc79541 100644
--- a/openlp/core/lib/db.py
+++ b/openlp/core/lib/db.py
@@ -189,7 +189,7 @@ class Manager(object):
             Any parameters to order the returned objects by.  Defaults to None.
         """
         query = self.session.query(object_class)
-        if order_by_ref:
+        if order_by_ref is not None:
             return query.order_by(order_by_ref).all()
         return query.all()
 
@@ -208,7 +208,7 @@ class Manager(object):
             Any parameters to order the returned objects by.  Defaults to None.
         """
         query = self.session.query(object_class).filter(filter_clause)
-        if order_by_ref:
+        if order_by_ref is not None:
             return query.order_by(order_by_ref).all()
         return query.all()
 
diff --git a/openlp/core/lib/renderer.py b/openlp/core/lib/renderer.py
index c7f96528c..04c854afa 100644
--- a/openlp/core/lib/renderer.py
+++ b/openlp/core/lib/renderer.py
@@ -29,6 +29,7 @@ format it for the output display.
 import logging
 
 from PyQt4 import QtGui, QtCore
+
 from openlp.core.lib import resize_image
 
 log = logging.getLogger(__name__)
diff --git a/openlp/core/lib/rendermanager.py b/openlp/core/lib/rendermanager.py
index 431f74564..b3c46a5eb 100644
--- a/openlp/core/lib/rendermanager.py
+++ b/openlp/core/lib/rendermanager.py
@@ -27,8 +27,7 @@ import logging
 
 from PyQt4 import QtCore
 
-from renderer import Renderer
-from openlp.core.lib import ThemeLevel
+from openlp.core.lib import Renderer, ThemeLevel
 
 log = logging.getLogger(__name__)
 
diff --git a/openlp/core/lib/theme.py b/openlp/core/lib/theme.py
index fe797279a..3f7b613d4 100644
--- a/openlp/core/lib/theme.py
+++ b/openlp/core/lib/theme.py
@@ -358,14 +358,8 @@ class ThemeXML(object):
         ``xml``
             The XML string to parse.
         """
-        self.base_parse_xml()
-        self.parse_xml(xml)
-
-    def base_parse_xml(self):
-        """
-        Pull in the blank theme XML as a starting point.
-        """
         self.parse_xml(BLANK_THEME_XML)
+        self.parse_xml(xml)
 
     def parse_xml(self, xml):
         """
diff --git a/openlp/plugins/songs/lib/xml.py b/openlp/plugins/songs/lib/xml.py
index 41490b8fd..e73e020af 100644
--- a/openlp/plugins/songs/lib/xml.py
+++ b/openlp/plugins/songs/lib/xml.py
@@ -109,8 +109,10 @@ class SongXMLParser(object):
             The XML of the song to be parsed.
         """
         self.song_xml = None
+        if xml[:5] == u'<?xml':
+            xml = xml[38:]
         try:
-            self.song_xml = objectify.fromstring(str(xml))
+            self.song_xml = objectify.fromstring(xml)
         except etree.XMLSyntaxError:
             log.exception(u'Invalid xml %s', xml)
 
@@ -125,8 +127,7 @@ class SongXMLParser(object):
             if element.tag == u'verse':
                 if element.text is None:
                     element.text = u''
-                verse_list.append([element.attrib,
-                    unicode(element.text).decode('unicode-escape')])
+                verse_list.append([element.attrib, unicode(element.text)])
         return verse_list
 
     def dump_xml(self):

From 08f650871a7814241c8312bc189e564c66d69f6e Mon Sep 17 00:00:00 2001
From: Tim Bentley <tim.bentley@gmail.com>
Date: Mon, 5 Jul 2010 17:00:48 +0100
Subject: [PATCH 19/21] Signature Cleanups

---
 openlp/core/lib/plugin.py                     | 50 +++++++++----------
 openlp/core/lib/pluginmanager.py              | 27 +++++-----
 openlp/core/ui/pluginform.py                  |  6 +--
 openlp/core/ui/thememanager.py                |  3 +-
 openlp/plugins/alerts/alertsplugin.py         |  6 +--
 openlp/plugins/bibles/bibleplugin.py          | 12 ++---
 openlp/plugins/custom/customplugin.py         |  8 +--
 openlp/plugins/images/imageplugin.py          |  6 +--
 openlp/plugins/media/mediaplugin.py           |  4 +-
 .../presentations/lib/powerpointcontroller.py |  6 +--
 .../presentations/presentationplugin.py       | 12 ++---
 openlp/plugins/remotes/remoteplugin.py        |  6 +--
 openlp/plugins/songs/songsplugin.py           | 12 ++---
 openlp/plugins/songusage/songusageplugin.py   |  4 +-
 14 files changed, 80 insertions(+), 82 deletions(-)

diff --git a/openlp/core/lib/plugin.py b/openlp/core/lib/plugin.py
index c8397f39a..18d4bdc9e 100644
--- a/openlp/core/lib/plugin.py
+++ b/openlp/core/lib/plugin.py
@@ -67,23 +67,23 @@ class Plugin(QtCore.QObject):
 
     **Hook Functions**
 
-    ``check_pre_conditions()``
+    ``checkPreConditions()``
         Provides the Plugin with a handle to check if it can be loaded.
 
-    ``get_media_manager_item()``
+    ``getMediaManagerItem()``
         Returns an instance of MediaManagerItem to be used in the Media Manager.
 
-    ``add_import_menu_item(import_menu)``
+    ``addImportMenuItem(import_menu)``
         Add an item to the Import menu.
 
-    ``add_export_menu_item(export_menu)``
+    ``addExportMenuItem(export_menu)``
         Add an item to the Export menu.
 
-    ``get_settings_tab()``
+    ``getSettingsTab()``
         Returns an instance of SettingsTabItem to be used in the Settings
         dialog.
 
-    ``add_to_menu(menubar)``
+    ``addToMenu(menubar)``
         A method to add a menu item to anywhere in the menu, given the menu bar.
 
     ``handle_event(event)``
@@ -134,9 +134,9 @@ class Plugin(QtCore.QObject):
         self.pluginManager = plugin_helpers[u'pluginmanager']
         QtCore.QObject.connect(Receiver.get_receiver(),
             QtCore.SIGNAL(u'%s_add_service_item' % self.name),
-            self.process_add_service_event)
+            self.processAddServiceEvent)
 
-    def check_pre_conditions(self):
+    def checkPreConditions(self):
         """
         Provides the Plugin with a handle to check if it can be loaded.
         Failing Preconditions does not stop a settings Tab being created
@@ -145,7 +145,7 @@ class Plugin(QtCore.QObject):
         """
         return True
 
-    def set_status(self):
+    def setStatus(self):
         """
         Sets the status of the plugin
         """
@@ -153,7 +153,7 @@ class Plugin(QtCore.QObject):
             self.settingsSection + u'/status',
             QtCore.QVariant(PluginStatus.Inactive)).toInt()[0]
 
-    def toggle_status(self, new_status):
+    def toggleStatus(self, new_status):
         """
         Changes the status of the plugin and remembers it
         """
@@ -161,7 +161,7 @@ class Plugin(QtCore.QObject):
         QtCore.QSettings().setValue(
             self.settingsSection + u'/status', QtCore.QVariant(self.status))
 
-    def is_active(self):
+    def isActive(self):
         """
         Indicates if the plugin is active
 
@@ -169,14 +169,14 @@ class Plugin(QtCore.QObject):
         """
         return self.status == PluginStatus.Active
 
-    def get_media_manager_item(self):
+    def getMediaManagerItem(self):
         """
         Construct a MediaManagerItem object with all the buttons and things
         you need, and return it for integration into openlp.org.
         """
         pass
 
-    def add_import_menu_item(self, importMenu):
+    def addImportMenuItem(self, importMenu):
         """
         Create a menu item and add it to the "Import" menu.
 
@@ -185,7 +185,7 @@ class Plugin(QtCore.QObject):
         """
         pass
 
-    def add_export_menu_item(self, exportMenu):
+    def addExportMenuItem(self, exportMenu):
         """
         Create a menu item and add it to the "Export" menu.
 
@@ -194,7 +194,7 @@ class Plugin(QtCore.QObject):
         """
         pass
 
-    def add_tools_menu_item(self, toolsMenu):
+    def addToolsMenuItem(self, toolsMenu):
         """
         Create a menu item and add it to the "Tools" menu.
 
@@ -203,13 +203,13 @@ class Plugin(QtCore.QObject):
         """
         pass
 
-    def get_settings_tab(self):
+    def getSettingsTab(self):
         """
         Create a tab for the settings window.
         """
         pass
 
-    def add_to_menu(self, menubar):
+    def addToMenu(self, menubar):
         """
         Add menu items to the menu, given the menubar.
 
@@ -218,11 +218,11 @@ class Plugin(QtCore.QObject):
         """
         pass
 
-    def process_add_service_event(self, replace=False):
+    def processAddServiceEvent(self, replace=False):
         """
         Generic Drag and drop handler triggered from service_manager.
         """
-        log.debug(u'process_add_service_event event called for plugin %s' %
+        log.debug(u'processAddServiceEvent event called for plugin %s' %
             self.name)
         if replace:
             self.mediaItem.onAddEditClick()
@@ -243,15 +243,15 @@ class Plugin(QtCore.QObject):
         """
         if self.mediaItem:
             self.mediaItem.initialise()
-        self.insert_toolbox_item()
+        self.insertToolboxItem()
 
     def finalise(self):
         """
         Called by the plugin Manager to cleanup things.
         """
-        self.remove_toolbox_item()
+        self.removeToolboxItem()
 
-    def remove_toolbox_item(self):
+    def removeToolboxItem(self):
         """
         Called by the plugin to remove toolbar
         """
@@ -260,7 +260,7 @@ class Plugin(QtCore.QObject):
         if self.settings_tab:
             self.settingsForm.removeTab(self.name)
 
-    def insert_toolbox_item(self):
+    def insertToolboxItem(self):
         """
         Called by plugin to replace toolbar
         """
@@ -269,8 +269,8 @@ class Plugin(QtCore.QObject):
         if self.settings_tab:
             self.settingsForm.insertTab(self.settings_tab, self.weight)
 
-    def can_delete_theme(self, theme):
+    def canDeleteTheme(self, theme):
         """
         Called to ask the plugin if a theme can be deleted
         """
-        return True
+        return True
\ No newline at end of file
diff --git a/openlp/core/lib/pluginmanager.py b/openlp/core/lib/pluginmanager.py
index c9c578603..20c8bc97b 100644
--- a/openlp/core/lib/pluginmanager.py
+++ b/openlp/core/lib/pluginmanager.py
@@ -109,9 +109,9 @@ class PluginManager(object):
                 log.exception(u'loaded plugin %s has no helpers', unicode(p))
         plugins_list = sorted(plugin_objects, self.order_by_weight)
         for plugin in plugins_list:
-            if plugin.check_pre_conditions():
+            if plugin.checkPreConditions():
                 log.debug(u'Plugin %s active', unicode(plugin.name))
-                plugin.set_status()
+                plugin.setStatus()
             else:
                 plugin.status = PluginStatus.Disabled
             self.plugins.append(plugin)
@@ -138,7 +138,7 @@ class PluginManager(object):
         """
         for plugin in self.plugins:
             if plugin.status is not PluginStatus.Disabled:
-                plugin.mediaItem = plugin.get_media_manager_item()
+                plugin.mediaItem = plugin.getMediaManagerItem()
 
     def hook_settings_tabs(self, settingsform=None):
         """
@@ -151,7 +151,7 @@ class PluginManager(object):
         """
         for plugin in self.plugins:
             if plugin.status is not PluginStatus.Disabled:
-                plugin.settings_tab = plugin.get_settings_tab()
+                plugin.settings_tab = plugin.getSettingsTab()
                 if plugin.settings_tab:
                     log.debug(u'Inserting settings tab item from %s' %
                         plugin.name)
@@ -169,7 +169,7 @@ class PluginManager(object):
         """
         for plugin in self.plugins:
             if plugin.status is not PluginStatus.Disabled:
-                plugin.add_import_menu_item(import_menu)
+                plugin.addImportMenuItem(import_menu)
 
     def hook_export_menu(self, export_menu):
         """
@@ -181,7 +181,7 @@ class PluginManager(object):
         """
         for plugin in self.plugins:
             if plugin.status is not PluginStatus.Disabled:
-                plugin.add_export_menu_item(export_menu)
+                plugin.addExportMenuItem(export_menu)
 
     def hook_tools_menu(self, tools_menu):
         """
@@ -193,7 +193,7 @@ class PluginManager(object):
         """
         for plugin in self.plugins:
             if plugin.status is not PluginStatus.Disabled:
-                plugin.add_tools_menu_item(tools_menu)
+                plugin.addToolsMenuItem(tools_menu)
 
     def initialise_plugins(self):
         """
@@ -202,12 +202,12 @@ class PluginManager(object):
         """
         for plugin in self.plugins:
             log.info(u'initialising plugins %s in a %s state'
-                % (plugin.name, plugin.is_active()))
-            if plugin.is_active():
+                % (plugin.name, plugin.isActive()))
+            if plugin.isActive():
                 plugin.initialise()
                 log.info(u'Initialisation Complete for %s ' % plugin.name)
-            if not plugin.is_active():
-                plugin.remove_toolbox_item()
+            if not plugin.isActive():
+                plugin.removeToolboxItem()
 
     def finalise_plugins(self):
         """
@@ -216,7 +216,6 @@ class PluginManager(object):
         """
         log.info(u'finalising plugins')
         for plugin in self.plugins:
-            if plugin.is_active():
+            if plugin.isActive():
                 plugin.finalise()
-                log.info(u'Finalisation Complete for %s ' % plugin.name)
-
+                log.info(u'Finalisation Complete for %s ' % plugin.name)
\ No newline at end of file
diff --git a/openlp/core/ui/pluginform.py b/openlp/core/ui/pluginform.py
index 62373435c..77ce458f4 100644
--- a/openlp/core/ui/pluginform.py
+++ b/openlp/core/ui/pluginform.py
@@ -115,10 +115,10 @@ class PluginForm(QtGui.QDialog, Ui_PluginViewDialog):
         if self.programaticChange:
             return
         if status == 0:
-            self.activePlugin.toggle_status(PluginStatus.Active)
+            self.activePlugin.toggleStatus(PluginStatus.Active)
             self.activePlugin.initialise()
         else:
-            self.activePlugin.toggle_status(PluginStatus.Inactive)
+            self.activePlugin.toggleStatus(PluginStatus.Inactive)
             self.activePlugin.finalise()
         status_text = 'Inactive'
         if self.activePlugin.status == PluginStatus.Active:
@@ -128,4 +128,4 @@ class PluginForm(QtGui.QDialog, Ui_PluginViewDialog):
         elif self.activePlugin.status == PluginStatus.Disabled:
             status_text = 'Disabled'
         self.PluginListWidget.currentItem().setText(
-            u'%s (%s)' % (self.activePlugin.name, status_text))
+            u'%s (%s)' % (self.activePlugin.name, status_text))
\ No newline at end of file
diff --git a/openlp/core/ui/thememanager.py b/openlp/core/ui/thememanager.py
index 65170e281..46b4d0c50 100644
--- a/openlp/core/ui/thememanager.py
+++ b/openlp/core/ui/thememanager.py
@@ -212,7 +212,7 @@ class ThemeManager(QtGui.QWidget):
                     QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok))
             else:
                 for plugin in self.parent.plugin_manager.plugins:
-                    if not plugin.can_delete_theme(theme):
+                    if not plugin.canDeleteTheme(theme):
                         QtGui.QMessageBox.critical(self,
                             translate('ThemeManager', 'Error'),
                             unicode(translate('ThemeManager',
@@ -682,4 +682,3 @@ class ThemeManager(QtGui.QWidget):
         #theme.theme_mode
         theme.theme_name = theme.theme_name.strip()
         #theme.theme_version
-
diff --git a/openlp/plugins/alerts/alertsplugin.py b/openlp/plugins/alerts/alertsplugin.py
index c6c3593f4..fbf7df6db 100644
--- a/openlp/plugins/alerts/alertsplugin.py
+++ b/openlp/plugins/alerts/alertsplugin.py
@@ -47,14 +47,14 @@ class alertsPlugin(Plugin):
         self.alertForm = AlertForm(self.manager, self)
         self.status = PluginStatus.Active
 
-    def get_settings_tab(self):
+    def getSettingsTab(self):
         """
         Return the settings tab for the Alerts plugin
         """
         self.alertsTab = AlertsTab(self)
         return self.alertsTab
 
-    def add_tools_menu_item(self, tools_menu):
+    def addToolsMenuItem(self, tools_menu):
         """
         Give the alerts plugin the opportunity to add items to the
         **Tools** menu.
@@ -102,4 +102,4 @@ class alertsPlugin(Plugin):
         about_text = translate('AlertsPlugin',
             '<b>Alerts Plugin</b><br>This plugin '
             'controls the displaying of alerts on the presentations screen')
-        return about_text
+        return about_text
\ No newline at end of file
diff --git a/openlp/plugins/bibles/bibleplugin.py b/openlp/plugins/bibles/bibleplugin.py
index 9f4f034ab..f66842871 100644
--- a/openlp/plugins/bibles/bibleplugin.py
+++ b/openlp/plugins/bibles/bibleplugin.py
@@ -57,14 +57,14 @@ class BiblePlugin(Plugin):
         self.ImportBibleItem.setVisible(False)
         self.ExportBibleItem.setVisible(False)
 
-    def get_settings_tab(self):
+    def getSettingsTab(self):
         return BiblesTab(self.name)
 
-    def get_media_manager_item(self):
+    def getMediaManagerItem(self):
         # Create the BibleManagerItem object
         return BibleMediaItem(self, self.icon, self.name)
 
-    def add_import_menu_item(self, import_menu):
+    def addImportMenuItem(self, import_menu):
         self.ImportBibleItem = QtGui.QAction(import_menu)
         self.ImportBibleItem.setObjectName(u'ImportBibleItem')
         import_menu.addAction(self.ImportBibleItem)
@@ -75,7 +75,7 @@ class BiblePlugin(Plugin):
             QtCore.SIGNAL(u'triggered()'), self.onBibleImportClick)
         self.ImportBibleItem.setVisible(False)
 
-    def add_export_menu_item(self, export_menu):
+    def addExportMenuItem(self, export_menu):
         self.ExportBibleItem = QtGui.QAction(export_menu)
         self.ExportBibleItem.setObjectName(u'ExportBibleItem')
         export_menu.addAction(self.ExportBibleItem)
@@ -94,7 +94,7 @@ class BiblePlugin(Plugin):
             'displayed on the screen during the service.')
         return about_text
 
-    def can_delete_theme(self, theme):
+    def canDeleteTheme(self, theme):
         if self.settings_tab.bible_theme == theme:
             return False
-        return True
+        return True
\ No newline at end of file
diff --git a/openlp/plugins/custom/customplugin.py b/openlp/plugins/custom/customplugin.py
index 60a0b312c..ecbf1b440 100644
--- a/openlp/plugins/custom/customplugin.py
+++ b/openlp/plugins/custom/customplugin.py
@@ -53,10 +53,10 @@ class CustomPlugin(Plugin):
         self.icon = build_icon(u':/plugins/plugin_custom.png')
         self.status = PluginStatus.Active
 
-    def get_settings_tab(self):
+    def getSettingsTab(self):
         return CustomTab(self.name)
 
-    def get_media_manager_item(self):
+    def getMediaManagerItem(self):
         # Create the CustomManagerItem object
         return CustomMediaItem(self, self.icon, self.name)
 
@@ -68,8 +68,8 @@ class CustomPlugin(Plugin):
             'songs plugin.<br>')
         return about_text
 
-    def can_delete_theme(self, theme):
+    def canDeleteTheme(self, theme):
         if not self.custommanager.get_all_objects_filtered(CustomSlide,
             CustomSlide.theme_name == theme):
             return True
-        return False
+        return False
\ No newline at end of file
diff --git a/openlp/plugins/images/imageplugin.py b/openlp/plugins/images/imageplugin.py
index be3863bda..cfd0ec90e 100644
--- a/openlp/plugins/images/imageplugin.py
+++ b/openlp/plugins/images/imageplugin.py
@@ -39,10 +39,10 @@ class ImagePlugin(Plugin):
         self.icon = build_icon(u':/plugins/plugin_images.png')
         self.status = PluginStatus.Active
 
-    def get_settings_tab(self):
+    def getSettingsTab(self):
         return ImageTab(self.name)
 
-    def get_media_manager_item(self):
+    def getMediaManagerItem(self):
         # Create the MediaManagerItem object
         return ImageMediaItem(self, self.icon, self.name)
 
@@ -55,4 +55,4 @@ class ImagePlugin(Plugin):
             'an image is selected any songs which are rendered will use the '
             'selected image from the background instead of the one provied by '
             'the theme.<br>')
-        return about_text
+        return about_text
\ No newline at end of file
diff --git a/openlp/plugins/media/mediaplugin.py b/openlp/plugins/media/mediaplugin.py
index 70f88ab50..aa741e2d7 100644
--- a/openlp/plugins/media/mediaplugin.py
+++ b/openlp/plugins/media/mediaplugin.py
@@ -67,7 +67,7 @@ class MediaPlugin(Plugin):
             type = u''
         return list, type
 
-    def get_media_manager_item(self):
+    def getMediaManagerItem(self):
         # Create the MediaManagerItem object
         return MediaMediaItem(self, self.icon, self.name)
 
@@ -75,4 +75,4 @@ class MediaPlugin(Plugin):
         about_text = translate('MediaPlugin',
             '<b>Media Plugin</b><br>This plugin '
             'allows the playing of audio and video media')
-        return about_text
+        return about_text
\ No newline at end of file
diff --git a/openlp/plugins/presentations/lib/powerpointcontroller.py b/openlp/plugins/presentations/lib/powerpointcontroller.py
index 477145bb0..e7126990d 100644
--- a/openlp/plugins/presentations/lib/powerpointcontroller.py
+++ b/openlp/plugins/presentations/lib/powerpointcontroller.py
@@ -173,7 +173,7 @@ class PowerpointDocument(PresentationDocument):
         return True
 
 
-    def is_active(self):
+    def isActive(self):
         """
         Returns true if a presentation is currently active
         """
@@ -206,7 +206,7 @@ class PowerpointDocument(PresentationDocument):
         """
         Returns true if screen is blank
         """
-        if self.is_active():
+        if self.isActive():
             return self.presentation.SlideShowWindow.View.State == 3
         else:
             return False
@@ -298,4 +298,4 @@ class PowerpointDocument(PresentationDocument):
             shape = shapes(idx + 1)
             if shape.HasTextFrame:
                 text += shape.TextFrame.TextRange.Text + '\n'
-        return text
+        return text
\ No newline at end of file
diff --git a/openlp/plugins/presentations/presentationplugin.py b/openlp/plugins/presentations/presentationplugin.py
index 22c7c554e..a905a3312 100644
--- a/openlp/plugins/presentations/presentationplugin.py
+++ b/openlp/plugins/presentations/presentationplugin.py
@@ -43,7 +43,7 @@ class PresentationPlugin(Plugin):
         self.icon = build_icon(u':/plugins/plugin_presentations.png')
         self.status = PluginStatus.Active
 
-    def get_settings_tab(self):
+    def getSettingsTab(self):
         """
         Create the settings Tab
         """
@@ -52,7 +52,7 @@ class PresentationPlugin(Plugin):
     def initialise(self):
         log.info(u'Presentations Initialising')
         Plugin.initialise(self)
-        self.insert_toolbox_item()
+        self.insertToolboxItem()
         for controller in self.controllers:
             if self.controllers[controller].enabled:
                 self.controllers[controller].start_process()
@@ -66,7 +66,7 @@ class PresentationPlugin(Plugin):
                 controller.kill()
         Plugin.finalise(self)
 
-    def get_media_manager_item(self):
+    def getMediaManagerItem(self):
         """
         Create the Media Manager List
         """
@@ -76,12 +76,12 @@ class PresentationPlugin(Plugin):
     def registerControllers(self, controller):
         self.controllers[controller.name] = controller
 
-    def check_pre_conditions(self):
+    def checkPreConditions(self):
         """
         Check to see if we have any presentation software available
         If Not do not install the plugin.
         """
-        log.debug(u'check_pre_conditions')
+        log.debug(u'checkPreConditions')
         controller_dir = os.path.join(
             AppLocation.get_directory(AppLocation.PluginsDir),
             u'presentations', u'lib')
@@ -113,4 +113,4 @@ class PresentationPlugin(Plugin):
             'the ability to show presentations using a number of different '
             'programs. The choice of available presentation programs is '
             'available to the user in a drop down box.')
-        return about_text
+        return about_text
\ No newline at end of file
diff --git a/openlp/plugins/remotes/remoteplugin.py b/openlp/plugins/remotes/remoteplugin.py
index 808714fb3..a878869d0 100644
--- a/openlp/plugins/remotes/remoteplugin.py
+++ b/openlp/plugins/remotes/remoteplugin.py
@@ -48,7 +48,7 @@ class RemotesPlugin(Plugin):
         """
         log.debug(u'initialise')
         Plugin.initialise(self)
-        self.insert_toolbox_item()
+        self.insertToolboxItem()
         self.server = HttpServer(self)
 
     def finalise(self):
@@ -60,7 +60,7 @@ class RemotesPlugin(Plugin):
         if self.server:
             self.server.close()
 
-    def get_settings_tab(self):
+    def getSettingsTab(self):
         """
         Create the settings Tab
         """
@@ -75,4 +75,4 @@ class RemotesPlugin(Plugin):
             'provides the ability to send messages to a running version of '
             'openlp on a different computer via a web browser or other app<br>'
             'The Primary use for this would be to send alerts from a creche')
-        return about_text
+        return about_text
\ No newline at end of file
diff --git a/openlp/plugins/songs/songsplugin.py b/openlp/plugins/songs/songsplugin.py
index 994c9884e..3828f9913 100644
--- a/openlp/plugins/songs/songsplugin.py
+++ b/openlp/plugins/songs/songsplugin.py
@@ -61,7 +61,7 @@ class SongsPlugin(Plugin):
         self.icon = build_icon(u':/plugins/plugin_songs.png')
         self.status = PluginStatus.Active
 
-    def get_settings_tab(self):
+    def getSettingsTab(self):
         return SongsTab(self.name)
 
     def initialise(self):
@@ -70,14 +70,14 @@ class SongsPlugin(Plugin):
         self.mediaItem.displayResultsSong(
             self.manager.get_all_objects(Song, Song.title))
 
-    def get_media_manager_item(self):
+    def getMediaManagerItem(self):
         """
         Create the MediaManagerItem object, which is displaed in the
         Media Manager.
         """
         return SongMediaItem(self, self.icon, self.name)
 
-    def add_import_menu_item(self, import_menu):
+    def addImportMenuItem(self, import_menu):
         """
         Give the Songs plugin the opportunity to add items to the
         **Import** menu.
@@ -137,7 +137,7 @@ class SongsPlugin(Plugin):
             QtCore.QObject.connect(self.ImportOooItem,
                 QtCore.SIGNAL(u'triggered()'), self.onImportOooItemClick)
 
-    def add_export_menu_item(self, export_menu):
+    def addExportMenuItem(self, export_menu):
         """
         Give the Songs plugin the opportunity to add items to the
         **Export** menu.
@@ -191,8 +191,8 @@ class SongsPlugin(Plugin):
             'This plugin allows songs to be managed and displayed.')
         return about_text
 
-    def can_delete_theme(self, theme):
+    def canDeleteTheme(self, theme):
         if not self.manager.get_all_objects_filtered(Song,
             Song.theme_name == theme):
             return True
-        return False
+        return False
\ No newline at end of file
diff --git a/openlp/plugins/songusage/songusageplugin.py b/openlp/plugins/songusage/songusageplugin.py
index a9994902a..07e7271a1 100644
--- a/openlp/plugins/songusage/songusageplugin.py
+++ b/openlp/plugins/songusage/songusageplugin.py
@@ -46,7 +46,7 @@ class SongUsagePlugin(Plugin):
         self.songusagemanager = None
         self.songusageActive = False
 
-    def add_tools_menu_item(self, tools_menu):
+    def addToolsMenuItem(self, tools_menu):
         """
         Give the SongUsage plugin the opportunity to add items to the
         **Tools** menu.
@@ -162,4 +162,4 @@ class SongUsagePlugin(Plugin):
             '<b>SongUsage Plugin</b><br>This plugin '
             'records the use of songs and when they have been used during '
             'a live service')
-        return about_text
+        return about_text
\ No newline at end of file

From 667d44eb8cef954b8f3503e1a17f32a13dcd0494 Mon Sep 17 00:00:00 2001
From: Tim Bentley <tim.bentley@gmail.com>
Date: Mon, 5 Jul 2010 17:33:45 +0100
Subject: [PATCH 20/21] and add_to_list

---
 openlp/plugins/media/mediaplugin.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/openlp/plugins/media/mediaplugin.py b/openlp/plugins/media/mediaplugin.py
index aa741e2d7..adc5f800f 100644
--- a/openlp/plugins/media/mediaplugin.py
+++ b/openlp/plugins/media/mediaplugin.py
@@ -47,19 +47,19 @@ class MediaPlugin(Plugin):
         for mimetype in Phonon.BackendCapabilities.availableMimeTypes():
             mimetype = unicode(mimetype)
             type = mimetype.split(u'audio/x-')
-            self.audio_list, mimetype = self._add_to_list(self.audio_list,
+            self.audio_list, mimetype = self._addToList(self.audio_list,
                 type, mimetype)
             type = mimetype.split(u'audio/')
-            self.audio_list, mimetype = self._add_to_list(self.audio_list,
+            self.audio_list, mimetype = self._addToList(self.audio_list,
                 type, mimetype)
             type = mimetype.split(u'video/x-')
-            self.video_list, mimetype = self._add_to_list(self.video_list,
+            self.video_list, mimetype = self._addToList(self.video_list,
                 type, mimetype)
             type = mimetype.split(u'video/')
-            self.video_list, mimetype = self._add_to_list(self.video_list,
+            self.video_list, mimetype = self._addToList(self.video_list,
                 type, mimetype)
 
-    def _add_to_list(self, list, value, type):
+    def _addToList(self, list, value, type):
         if len(value) == 2:
             if list.find(value[1]) == -1:
                 list += u'*.%s ' % value[1]
@@ -75,4 +75,4 @@ class MediaPlugin(Plugin):
         about_text = translate('MediaPlugin',
             '<b>Media Plugin</b><br>This plugin '
             'allows the playing of audio and video media')
-        return about_text
\ No newline at end of file
+        return about_text

From c8faf0cc082f06d87c7adaf4fe146c97a9dfaaa6 Mon Sep 17 00:00:00 2001
From: Jon Tibble <meths@btinternet.com>
Date: Mon, 5 Jul 2010 22:23:39 +0100
Subject: [PATCH 21/21] Fix song saving

---
 openlp/plugins/songs/lib/xml.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/openlp/plugins/songs/lib/xml.py b/openlp/plugins/songs/lib/xml.py
index e73e020af..359c28eda 100644
--- a/openlp/plugins/songs/lib/xml.py
+++ b/openlp/plugins/songs/lib/xml.py
@@ -77,8 +77,9 @@ class SongXMLBuilder(object):
             The actual text of the verse to be stored.
         """
         #log.debug(u'add_verse_to_lyrics %s, %s\n%s' % (type, number, content))
-        verse = etree.SubElement(self.lyrics, u'verse', type=type, label=number)
+        verse = etree.Element(u'verse', type=type, label=number)
         verse.text = etree.CDATA(content)
+        self.lyrics.append(verse)
 
     def dump_xml(self):
         """