Red Alert! Raise Shields!
" + def setup(self): + log.debug(u'Setup %s for %s ' % ( + self.screens, self.screens.monitor_number)) + self.screen = self.screens.current + self.setVisible(False) + self.setGeometry(self.screen[u'size']) + self.webView = QtWebKit.QWebView(self) + self.webView.setGeometry(0, 0, self.screen[u'size'].width(), self.screen[u'size'].height()) + self.page = self.webView.page() + self.frame = self.page.mainFrame() + QtCore.QObject.connect(self.webView, + QtCore.SIGNAL(u'loadFinished(bool)'), self.loaded) + self.frame.setScrollBarPolicy(QtCore.Qt.Vertical, + QtCore.Qt.ScrollBarAlwaysOff) + self.frame.setScrollBarPolicy(QtCore.Qt.Horizontal, + QtCore.Qt.ScrollBarAlwaysOff) + if self.isLive: + #Build the initial frame. + initialFrame = QtGui.QImage( + self.screens.current[u'size'].width(), + self.screens.current[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(initialFrame) + painter_image.fillRect(initialFrame.rect(), QtCore.Qt.white) + painter_image.drawImage( + (self.screens.current[u'size'].width() - splash_image.width()) / 2, + (self.screens.current[u'size'].height() - splash_image.height()) / 2, + splash_image) + serviceItem = ServiceItem() + serviceItem.bg_frame = initialFrame + self.webView.setHtml(build_html(serviceItem, self.screen, None)) + self.show() + def next(self): if self.currslide: self.frame.evaluateJavaScript("startfade('" + self.slide2 + "')") @@ -289,41 +192,6 @@ class WebViewer(DisplayWidget): def loaded(self): self.loaded = True - def setup(self): - log.debug(u'Setup %s for %s ' % ( - self.screens, self.screens.monitor_number)) - self.screen = self.screens.current - self.setVisible(False) - self.setGeometry(self.screen[u'size']) - self.webView = QtWebKit.QWebView(self) - self.webView.setGeometry(0, 0, self.screen[u'size'].width(), self.screen[u'size'].height()) - self.page = self.webView.page() - self.frame = self.page.mainFrame() - QtCore.QObject.connect(self.webView, - QtCore.SIGNAL(u'loadFinished(bool)'), self.loaded) - self.frame.setScrollBarPolicy(QtCore.Qt.Vertical, - QtCore.Qt.ScrollBarAlwaysOff) - self.frame.setScrollBarPolicy(QtCore.Qt.Horizontal, - QtCore.Qt.ScrollBarAlwaysOff) - if self.isLive: - #Build the initial frame. - initialFrame = QtGui.QImage( - self.screens.current[u'size'].width(), - self.screens.current[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(initialFrame) - painter_image.fillRect(initialFrame.rect(), QtCore.Qt.white) - painter_image.drawImage( - (self.screens.current[u'size'].width() - splash_image.width()) / 2, - (self.screens.current[u'size'].height() - splash_image.height()) / 2, - splash_image) - self.serviceItem = ServiceItem() - self.serviceItem.bg_frame = initialFrame - self.webView.setHtml(build_html(self.serviceItem, self.screen, None)) - self.show() - def preview(self): # Wait for the webview to update before geting the preview. # Important otherwise first preview will miss the background ! @@ -353,863 +221,41 @@ class WebViewer(DisplayWidget): if serviceItem.footer: self.frame.findFirstElement('div#footer').setInnerXml(serviceItem.foot_text) -#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, primary=False): -# QtGui.QWidget.__init__(self, None) -# self.parent = parent -# self.primary = primary -# 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() -# -# 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) -# -#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, primary=True) -# self.setWindowFlags(QtCore.Qt.Window | QtCore.Qt.FramelessWindowHint) -# self.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOff) -# self.setVerticalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOff) -# # WA_TranslucentBackground is not available in QT4.4 -# 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 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)) -# if mode != HideMode.Screen and self.isHidden(): -# self.setVisible(True) -# -# 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) -# if self.isHidden(): -# self.setVisible(True) -# #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'') -# -# 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'') -# -# 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 -# -# 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 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)) -# if mode != HideMode.Screen and self.isHidden(): -# self.setVisible(True) -# -# 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) -# if self.isHidden(): -# self.setVisible(True) -# #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'') -# -# 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.frameView(self.transparent) -# self.videoDisplay.setHtml(u'') -# -# 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: -# 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.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.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 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'') -# -# 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'') -# -# 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(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 path in self.outputPaths(): -# path.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 display if it was already hidden -# """ -# if self.hidden: -# self.hidden = False -# if self.mediaActive: -# self._play() + 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)) + if mode != HideMode.Screen and self.isHidden(): + self.setVisible(True) + + 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) + if self.isHidden(): + self.setVisible(True) + #Trigger actions when display is active again + Receiver.send_message(u'maindisplay_active') class AudioPlayer(QtCore.QObject): """ diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py index 1f22bb894..2461f4a74 100644 --- a/openlp/core/ui/slidecontroller.py +++ b/openlp/core/ui/slidecontroller.py @@ -30,7 +30,7 @@ import os from PyQt4 import QtCore, QtGui from PyQt4.phonon import Phonon -from openlp.core.ui import HideMode, WebViewer +from openlp.core.ui import HideMode, MainDisplay from openlp.core.lib import OpenLPToolbar, Receiver, resize_image, \ ItemCapabilities, translate @@ -105,7 +105,7 @@ class SlideController(QtGui.QWidget): self.isLive = isLive self.parent = parent self.screens = screens - self.display = WebViewer(self, screens, isLive) + self.display = MainDisplay(self, screens, isLive) #self.displayManager = self.parent.displayManager self.loopList = [ u'Start Loop', @@ -986,4 +986,4 @@ class SlideController(QtGui.QWidget): text = text.replace(u'', u'')\ .replace(u'
', u'').replace(u'', u'')\ .replace(u'', u'') - return text + return text \ No newline at end of file