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 1/7] 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 2/7] 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 3/7] 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 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 4/7] 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 5/7] 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 6/7] 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 7/7] 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>
     """
 
