forked from openlp/openlp
html cleanup - text over video works
This commit is contained in:
parent
82acc32b78
commit
2cde65ba70
@ -102,6 +102,7 @@ def build_html(item, screen, alert):
|
|||||||
build_image(width, height),
|
build_image(width, height),
|
||||||
build_blank(width, height),
|
build_blank(width, height),
|
||||||
build_image_src(item.bg_frame))
|
build_image_src(item.bg_frame))
|
||||||
|
print html
|
||||||
return html
|
return html
|
||||||
|
|
||||||
def build_video(width, height):
|
def build_video(width, height):
|
||||||
@ -114,14 +115,8 @@ def build_video(width, height):
|
|||||||
Screen height
|
Screen height
|
||||||
"""
|
"""
|
||||||
video = """
|
video = """
|
||||||
#video {
|
#video { position: absolute; left: 0px; top: 0px;
|
||||||
position: absolute;
|
width: %spx; height: %spx; z-index:1; }
|
||||||
left: 0px;
|
|
||||||
top: 0px;
|
|
||||||
width: %spx
|
|
||||||
height: %spx;
|
|
||||||
z-index:1;
|
|
||||||
}
|
|
||||||
"""
|
"""
|
||||||
return video % (width, height)
|
return video % (width, height)
|
||||||
|
|
||||||
@ -139,7 +134,7 @@ def build_blank(width, height):
|
|||||||
position: absolute;
|
position: absolute;
|
||||||
left: 0px;
|
left: 0px;
|
||||||
top: 0px;
|
top: 0px;
|
||||||
width: %spx
|
width: %spx;
|
||||||
height: %spx;
|
height: %spx;
|
||||||
z-index:10;
|
z-index:10;
|
||||||
}
|
}
|
||||||
@ -170,7 +165,7 @@ def build_image(width, height):
|
|||||||
def build_image_src(image):
|
def build_image_src(image):
|
||||||
# <img src="" height="480" width="640" />
|
# <img src="" height="480" width="640" />
|
||||||
image_src = """
|
image_src = """
|
||||||
<img src="data:image/png;base64,%s">";
|
<img src="data:image/png;base64,%s">
|
||||||
"""
|
"""
|
||||||
return image_src % image_to_byte(image)
|
return image_src % image_to_byte(image)
|
||||||
|
|
||||||
@ -267,14 +262,8 @@ def build_footer(item):
|
|||||||
|
|
||||||
def build_alert(width, alert):
|
def build_alert(width, alert):
|
||||||
alert = """
|
alert = """
|
||||||
#alert {
|
#alert { position: absolute; left: 0px; top: 70px;
|
||||||
position: absolute;
|
width: %spx; height: 10px; z-index:4; font-size: 50px;
|
||||||
left: 0px;
|
|
||||||
top: 70px;
|
|
||||||
width: %spx;
|
|
||||||
height: 10px;
|
|
||||||
z-index:4;
|
|
||||||
font-size: 50px;
|
|
||||||
}
|
}
|
||||||
#alert p {
|
#alert p {
|
||||||
background-color: red;
|
background-color: red;
|
||||||
|
@ -188,7 +188,7 @@ class RenderManager(object):
|
|||||||
footer.append(u'CCLI 123456')
|
footer.append(u'CCLI 123456')
|
||||||
# build a service item to generate preview
|
# build a service item to generate preview
|
||||||
serviceItem = ServiceItem()
|
serviceItem = ServiceItem()
|
||||||
serviceItem.add_from_text(u'', verse, u'')
|
serviceItem.add_from_text(u'', verse, footer)
|
||||||
serviceItem.render_manager = self
|
serviceItem.render_manager = self
|
||||||
# serviceItem gets the theme data so switch it.
|
# serviceItem gets the theme data so switch it.
|
||||||
temp_themedata = self.themedata
|
temp_themedata = self.themedata
|
||||||
|
@ -549,8 +549,6 @@ class SlideController(QtGui.QWidget):
|
|||||||
self.serviceItem.name.lower(), [serviceItem, self.isLive])
|
self.serviceItem.name.lower(), [serviceItem, self.isLive])
|
||||||
if self.serviceItem.is_media():
|
if self.serviceItem.is_media():
|
||||||
self.onMediaStop()
|
self.onMediaStop()
|
||||||
if serviceItem.is_media():
|
|
||||||
self.onMediaStart(serviceItem)
|
|
||||||
if self.isLive:
|
if self.isLive:
|
||||||
blanked = self.BlankScreen.isChecked()
|
blanked = self.BlankScreen.isChecked()
|
||||||
else:
|
else:
|
||||||
@ -618,6 +616,8 @@ class SlideController(QtGui.QWidget):
|
|||||||
self.enableToolBar(serviceItem)
|
self.enableToolBar(serviceItem)
|
||||||
# Pass to display for viewing
|
# Pass to display for viewing
|
||||||
self.display.buildHtml(self.serviceItem)
|
self.display.buildHtml(self.serviceItem)
|
||||||
|
if serviceItem.is_media():
|
||||||
|
self.onMediaStart(serviceItem)
|
||||||
self.onSlideSelected()
|
self.onSlideSelected()
|
||||||
self.PreviewListWidget.setFocus()
|
self.PreviewListWidget.setFocus()
|
||||||
Receiver.send_message(u'slidecontroller_%s_started' % self.typePrefix,
|
Receiver.send_message(u'slidecontroller_%s_started' % self.typePrefix,
|
||||||
@ -947,7 +947,9 @@ class SlideController(QtGui.QWidget):
|
|||||||
"""
|
"""
|
||||||
log.debug(u'SlideController onMediaStart')
|
log.debug(u'SlideController onMediaStart')
|
||||||
if self.isLive:
|
if self.isLive:
|
||||||
Receiver.send_message(u'videodisplay_start', item)
|
file = os.path.join(item.get_frame_path(), item.get_frame_title())
|
||||||
|
self.display.video(file)
|
||||||
|
#Receiver.send_message(u'videodisplay_start', item)
|
||||||
else:
|
else:
|
||||||
self.mediaObject.stop()
|
self.mediaObject.stop()
|
||||||
self.mediaObject.clearQueue()
|
self.mediaObject.clearQueue()
|
||||||
|
@ -115,7 +115,7 @@ class MediaMediaItem(MediaManagerItem):
|
|||||||
'You must select a media file to replace the background with.')):
|
'You must select a media file to replace the background with.')):
|
||||||
item = self.listView.currentItem()
|
item = self.listView.currentItem()
|
||||||
filename = unicode(item.data(QtCore.Qt.UserRole).toString())
|
filename = unicode(item.data(QtCore.Qt.UserRole).toString())
|
||||||
self.parent.displayManager.displayVideo(filename)
|
self.parent.liveController.display.video(filename)
|
||||||
self.resetButton.setVisible(True)
|
self.resetButton.setVisible(True)
|
||||||
|
|
||||||
def generateSlideData(self, service_item, item=None):
|
def generateSlideData(self, service_item, item=None):
|
||||||
|
Loading…
Reference in New Issue
Block a user