forked from openlp/openlp
Alerts start to work
This commit is contained in:
parent
c46dfab8a1
commit
e95ea60d9b
|
@ -93,7 +93,6 @@ class MainDisplay(DisplayWidget):
|
||||||
self.setWindowTitle(u'OpenLP Display')
|
self.setWindowTitle(u'OpenLP Display')
|
||||||
self.setWindowFlags(QtCore.Qt.FramelessWindowHint |
|
self.setWindowFlags(QtCore.Qt.FramelessWindowHint |
|
||||||
QtCore.Qt.WindowStaysOnTopHint)
|
QtCore.Qt.WindowStaysOnTopHint)
|
||||||
self.alerttext = "<p>Red Alert! Raise Shields!</p>"
|
|
||||||
if self.isLive:
|
if self.isLive:
|
||||||
QtCore.QObject.connect(Receiver.get_receiver(),
|
QtCore.QObject.connect(Receiver.get_receiver(),
|
||||||
QtCore.SIGNAL(u'maindisplay_hide'), self.hideDisplay)
|
QtCore.SIGNAL(u'maindisplay_hide'), self.hideDisplay)
|
||||||
|
@ -163,12 +162,12 @@ class MainDisplay(DisplayWidget):
|
||||||
The slide text to be displayed
|
The slide text to be displayed
|
||||||
"""
|
"""
|
||||||
log.debug(u'text')
|
log.debug(u'text')
|
||||||
print slide
|
print slide
|
||||||
self.frame.evaluateJavaScript("startfade('" +
|
self.frame.evaluateJavaScript("startfade('" +
|
||||||
slide.replace("\\", "\\\\").replace("\'", "\\\'") + "')")
|
slide.replace("\\", "\\\\").replace("\'", "\\\'") + "')")
|
||||||
return self.preview()
|
return self.preview()
|
||||||
|
|
||||||
def alert(self):
|
def alert(self, text):
|
||||||
"""
|
"""
|
||||||
Add the alert text
|
Add the alert text
|
||||||
|
|
||||||
|
@ -176,7 +175,7 @@ class MainDisplay(DisplayWidget):
|
||||||
The slide text to be displayed
|
The slide text to be displayed
|
||||||
"""
|
"""
|
||||||
log.debug(u'alert')
|
log.debug(u'alert')
|
||||||
self.frame.findFirstElement('div#alert').setInnerXml(self.alerttext)
|
self.frame.findFirstElement('div#alert').setInnerXml(text)
|
||||||
|
|
||||||
def image(self, image):
|
def image(self, image):
|
||||||
"""
|
"""
|
||||||
|
|
|
@ -96,8 +96,7 @@ class AlertsManager(QtCore.QObject):
|
||||||
alertTab = self.parent.alertsTab
|
alertTab = self.parent.alertsTab
|
||||||
text = HTMLCODE % (alertTab.font_color, alertTab.bg_color,
|
text = HTMLCODE % (alertTab.font_color, alertTab.bg_color,
|
||||||
alertTab.font_face, alertTab.font_size, text)
|
alertTab.font_face, alertTab.font_size, text)
|
||||||
self.parent.previewController.parent.displayManager.addAlert(text,
|
self.parent.liveController.display.alert(text)
|
||||||
alertTab.location)
|
|
||||||
# check to see if we have a timer running
|
# check to see if we have a timer running
|
||||||
if self.timer_id == 0:
|
if self.timer_id == 0:
|
||||||
self.timer_id = self.startTimer(int(alertTab.timeout) * 1000)
|
self.timer_id = self.startTimer(int(alertTab.timeout) * 1000)
|
||||||
|
@ -113,8 +112,7 @@ class AlertsManager(QtCore.QObject):
|
||||||
log.debug(u'timer event')
|
log.debug(u'timer event')
|
||||||
alertTab = self.parent.alertsTab
|
alertTab = self.parent.alertsTab
|
||||||
if event.timerId() == self.timer_id:
|
if event.timerId() == self.timer_id:
|
||||||
self.parent.previewController.parent.displayManager.addAlert(u'',
|
self.parent.liveController.display.alert(u'')
|
||||||
alertTab.location)
|
|
||||||
self.killTimer(self.timer_id)
|
self.killTimer(self.timer_id)
|
||||||
self.timer_id = 0
|
self.timer_id = 0
|
||||||
self.generateAlert()
|
self.generateAlert()
|
||||||
|
|
|
@ -549,7 +549,7 @@ class BibleMediaItem(MediaManagerItem):
|
||||||
if self.parent.settings_tab.layout_style == 1:
|
if self.parent.settings_tab.layout_style == 1:
|
||||||
text = text + u'\n\n'
|
text = text + u'\n\n'
|
||||||
else:
|
else:
|
||||||
text = text + u'\n'
|
text = text + u'\ngus '
|
||||||
bible_text = u'%s %s %s' % (bible_text, verse_text, text)
|
bible_text = u'%s %s %s' % (bible_text, verse_text, text)
|
||||||
#if we are verse per slide then create slide
|
#if we are verse per slide then create slide
|
||||||
if self.parent.settings_tab.layout_style == 0:
|
if self.parent.settings_tab.layout_style == 0:
|
||||||
|
|
Loading…
Reference in New Issue