forked from openlp/openlp
clean ups
This commit is contained in:
parent
6883427cbd
commit
658e8f234b
@ -271,9 +271,6 @@ class MainDisplay(QtGui.QGraphicsView):
|
|||||||
else:
|
else:
|
||||||
js = u'show_image("");'
|
js = u'show_image("");'
|
||||||
self.frame.evaluateJavaScript(js)
|
self.frame.evaluateJavaScript(js)
|
||||||
# Update the preview frame.
|
|
||||||
if self.isLive:
|
|
||||||
Receiver.send_message(u'maindisplay_active')
|
|
||||||
|
|
||||||
def resetImage(self):
|
def resetImage(self):
|
||||||
"""
|
"""
|
||||||
@ -287,10 +284,6 @@ class MainDisplay(QtGui.QGraphicsView):
|
|||||||
self.displayImage(None)
|
self.displayImage(None)
|
||||||
# clear the cache
|
# clear the cache
|
||||||
self.override = {}
|
self.override = {}
|
||||||
# Update the preview frame.
|
|
||||||
if self.isLive:
|
|
||||||
self._parent.updatePreview()
|
|
||||||
Receiver.send_message(u'maindisplay_active')
|
|
||||||
|
|
||||||
def resetVideo(self):
|
def resetVideo(self):
|
||||||
"""
|
"""
|
||||||
@ -306,9 +299,6 @@ class MainDisplay(QtGui.QGraphicsView):
|
|||||||
else:
|
else:
|
||||||
self.frame.evaluateJavaScript(u'show_video("close");')
|
self.frame.evaluateJavaScript(u'show_video("close");')
|
||||||
self.override = {}
|
self.override = {}
|
||||||
# Update the preview frame.
|
|
||||||
if self.isLive:
|
|
||||||
Receiver.send_message(u'maindisplay_active')
|
|
||||||
|
|
||||||
def videoPlay(self):
|
def videoPlay(self):
|
||||||
"""
|
"""
|
||||||
@ -388,9 +378,6 @@ class MainDisplay(QtGui.QGraphicsView):
|
|||||||
self.webView.setVisible(False)
|
self.webView.setVisible(False)
|
||||||
self.videoWidget.setVisible(True)
|
self.videoWidget.setVisible(True)
|
||||||
self.audio.setVolume(vol)
|
self.audio.setVolume(vol)
|
||||||
# Update the preview frame.
|
|
||||||
if self.isLive:
|
|
||||||
Receiver.send_message(u'maindisplay_active')
|
|
||||||
|
|
||||||
def videoState(self, newState, oldState):
|
def videoState(self, newState, oldState):
|
||||||
"""
|
"""
|
||||||
|
@ -81,7 +81,7 @@ class AlertsManager(QtCore.QObject):
|
|||||||
Format and request the Alert and start the timer
|
Format and request the Alert and start the timer
|
||||||
"""
|
"""
|
||||||
log.debug(u'Generate Alert called')
|
log.debug(u'Generate Alert called')
|
||||||
if len(self.alertList) == 0:
|
if not self.alertList:
|
||||||
return
|
return
|
||||||
text = self.alertList.pop(0)
|
text = self.alertList.pop(0)
|
||||||
alertTab = self.parent().settings_tab
|
alertTab = self.parent().settings_tab
|
||||||
|
Loading…
Reference in New Issue
Block a user