openlp
/
openlp
mirror of https://gitlab.com/openlp/openlp.git
1
0
Fork 1
Code Issues Projects Releases Wiki Activity

Outline works - Irsh shadow

This commit is contained in:
Tim Bentley 2010-07-28 18:21:32 +01:00
parent ca0c98e72e
commit b7c241cf36
4 changed files with 20 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
openlp/core/lib/htmlbuilder.py
View File

@ -72,10 +72,10 @@ HTMLSRC = u"""
</script> </script>
</head> </head>
<body> <body>
<table class="lyricsmaintable" class="lyricstable"> <table id="lyricsmaintable" class="lyricstable">
<tr><td id="lyricsmain" class="lyrics"></td></tr> <tr><td id="lyricsmain" class="lyrics"></td></tr>
</table> </table>
<table class="lyricsoutlinetable" class="lyricstable"> <table id="lyricsoutlinetable" class="lyricstable">
<tr><td id="lyricsoutline" class="lyrics"></td></tr> <tr><td id="lyricsoutline" class="lyrics"></td></tr>
</table> </table>
<div id="footer" class="footer"></div> <div id="footer" class="footer"></div>
@ -136,13 +136,8 @@ def build_blank(width, height):
Screen height Screen height
""" """
blank = """ blank = """
#blank { #blank { position: absolute; left: 0px; top: 0px;
position: absolute; width: %spx; height: %spx; z-index:10;
left: 0px;
top: 0px;
width: %spx;
height: %spx;
z-index:10;
} }
""" """
return blank % (width, height) return blank % (width, height)
@ -157,19 +152,13 @@ def build_image(width, height):
Screen height Screen height
""" """
image = """ image = """
#image { #image { position: absolute; left: 0px; top: 0px;
position: absolute; width: %spx; height: %spx; z-index:2;
left: 0px;
top: 0px;
width: %spx;
height: %spx;
z-index:2;
} }
""" """
return image % (width, height) return image % (width, height)
def build_image_src(image): def build_image_src(image):
# <img src="" height="480" width="640" />
image_src = """ image_src = """
<img src="data:image/png;base64,%s"> <img src="data:image/png;base64,%s">
""" """
@ -236,7 +225,7 @@ def build_lyrics(item):
def build_footer(item): def build_footer(item):
lyrics = """ lyrics = """
#footer {position: absolute; %s z-index:3; %s; %s } #footer {position: absolute; %s z-index:5; %s; %s }
""" """
theme = item.themedata theme = item.themedata
lyrics_html = u'' lyrics_html = u''
@ -269,7 +258,7 @@ def build_footer(item):
def build_alert(width, alertTab): def build_alert(width, alertTab):
alert = """ alert = """
#alert { position: absolute; left: 0px; top: 70px; #alert { position: absolute; left: 0px; top: 70px;
width: %spx; height: 10px; z-index:4; font-size: %spx; width: %spx; height: 10px; z-index:6; font-size: %spx;
} }
#alert p { #alert p {
background-color: %s; background-color: %s;

16
openlp/core/ui/maindisplay.py
View File

@ -202,13 +202,17 @@ class MainDisplay(DisplayWidget):
"document.getElementById('video').style.visibility = 'hidden'") "document.getElementById('video').style.visibility = 'hidden'")
self.frame.evaluateJavaScript( self.frame.evaluateJavaScript(
"document.getElementById('image').style.visibility = 'visible'") "document.getElementById('image').style.visibility = 'visible'")
self.frame.findFirstElement('img').setAttribute( self.frame.findFirstElement(u'img').setAttribute(
'src', unicode('data:image/png;base64,%s' % image_to_byte(image))) u'src', unicode(u'data:image/png;base64,%s' % image_to_byte(image)))
def reset(self): def resetImage(self):
log.debug(u'reset') log.debug(u'resetImage')
self.frame.findFirstElement('img').setAttribute( self.frame.findFirstElement(u'img').setAttribute(
'src', unicode('data:image/png;base64,%s' % image_to_byte(self.serviceItem.bg_frame))) u'src', unicode(u'data:image/png;base64,%s' % image_to_byte(self.serviceItem.bg_frame)))
def resetVideo(self):
log.debug(u'resetVideo')
self.frame.findFirstElement('img').setAttribute(u'src',u'display: none;' )
def video(self, videoPath, noSound=False): def video(self, videoPath, noSound=False):
log.debug(u'video') log.debug(u'video')

2
openlp/plugins/images/lib/mediaitem.py
View File

@ -177,7 +177,7 @@ class ImageMediaItem(MediaManagerItem):
def onResetClick(self): def onResetClick(self):
self.resetButton.setVisible(False) self.resetButton.setVisible(False)
self.parent.liveController.display.reset() self.parent.liveController.display.resetImage()
def onReplaceClick(self): def onReplaceClick(self):
if check_item_selected(self.listView, if check_item_selected(self.listView,

2
openlp/plugins/media/lib/mediaitem.py
View File

@ -107,7 +107,7 @@ class MediaMediaItem(MediaManagerItem):
def onResetClick(self): def onResetClick(self):
self.resetButton.setVisible(False) self.resetButton.setVisible(False)
self.parent.liveController.display.reset() self.parent.liveController.display.resetVideo()
def onReplaceClick(self): def onReplaceClick(self):
if check_item_selected(self.listView, if check_item_selected(self.listView,