diff --git a/openlp/core/ui/maindisplay.py b/openlp/core/ui/maindisplay.py index 273a3c4f0..84697f376 100644 --- a/openlp/core/ui/maindisplay.py +++ b/openlp/core/ui/maindisplay.py @@ -94,6 +94,7 @@ class DisplayWidget(QtGui.QGraphicsView): else: event.ignore() + class MainDisplay(DisplayWidget): """ This is the display screen. @@ -270,6 +271,8 @@ class MainDisplay(DisplayWidget): else: js = u'show_image("");' self.frame.evaluateJavaScript(js) + # Update the preview frame. + Receiver.send_message(u'maindisplay_active') def resetImage(self): """ @@ -278,6 +281,8 @@ class MainDisplay(DisplayWidget): """ log.debug(u'resetImage') self.displayImage(self.serviceItem.bg_image_bytes) + # Update the preview frame. + Receiver.send_message(u'maindisplay_active') def resetVideo(self): """ @@ -292,6 +297,8 @@ class MainDisplay(DisplayWidget): self.phononActive = False else: self.frame.evaluateJavaScript(u'show_video("close");') + # Update the preview frame. + Receiver.send_message(u'maindisplay_active') def videoPlay(self): """ @@ -359,6 +366,8 @@ class MainDisplay(DisplayWidget): self.webView.setVisible(False) self.videoWidget.setVisible(True) self.audio.setVolume(vol) + # Update the preview frame. + Receiver.send_message(u'maindisplay_active') return self.preview() def isLoaded(self): @@ -475,6 +484,7 @@ class MainDisplay(DisplayWidget): # Trigger actions when display is active again Receiver.send_message(u'maindisplay_active') + class AudioPlayer(QtCore.QObject): """ This Class will play audio only allowing components to work with a diff --git a/openlp/plugins/images/lib/mediaitem.py b/openlp/plugins/images/lib/mediaitem.py index d2652207c..bd84219fb 100644 --- a/openlp/plugins/images/lib/mediaitem.py +++ b/openlp/plugins/images/lib/mediaitem.py @@ -187,12 +187,15 @@ class ImageMediaItem(MediaManagerItem): return False def onResetClick(self): + """ + Called to reset the Live backgound with the image selected, + """ self.resetAction.setVisible(False) self.parent.liveController.display.resetImage() def onReplaceClick(self): """ - Called to replace Live backgound with the video selected + Called to replace Live backgound with the image selected. """ if check_item_selected(self.listView, translate('ImagePlugin.MediaItem', diff --git a/openlp/plugins/media/lib/mediaitem.py b/openlp/plugins/media/lib/mediaitem.py index 0280ba937..121fa80a0 100644 --- a/openlp/plugins/media/lib/mediaitem.py +++ b/openlp/plugins/media/lib/mediaitem.py @@ -40,6 +40,7 @@ class MediaListView(BaseListWithDnD): self.PluginName = u'Media' BaseListWithDnD.__init__(self, parent) + class MediaMediaItem(MediaManagerItem): """ This is the custom media manager item for Media Slides. @@ -92,10 +93,16 @@ class MediaMediaItem(MediaManagerItem): self.resetAction.setVisible(False) def onResetClick(self): + """ + Called to reset the Live backgound with the media selected, + """ self.resetAction.setVisible(False) self.parent.liveController.display.resetVideo() def onReplaceClick(self): + """ + Called to replace Live backgound with the media selected. + """ if check_item_selected(self.listView, translate('MediaPlugin.MediaItem', 'You must select a media file to replace the background with.')):