openlp-core team mailing list archive
-
openlp-core team
-
Mailing list archive
-
Message #02311
[Merge] lp:~phill-ridout/openlp/fixes into lp:openlp
phill has proposed merging lp:~phill-ridout/openlp/fixes into lp:openlp.
Requested reviews:
Raoul Snyman (raoul-snyman)
Tim Bentley (trb143)
Added Escape Characters to double quotes
corrected body tad (>) in the wrong place.
Remover HTMLIMAGE as per TRB143's request.
--
https://code.launchpad.net/~phill-ridout/openlp/fixes/+merge/29153
Your team OpenLP Core is subscribed to branch lp:openlp.
=== modified file 'openlp/core/ui/maindisplay.py'
--- openlp/core/ui/maindisplay.py 2010-07-02 16:54:08 +0000
+++ openlp/core/ui/maindisplay.py 2010-07-03 19:20:39 +0000
@@ -35,27 +35,30 @@
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>
- <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.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>
+ </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):
Follow ups
