Alerts start to work

openlp/core/ui/maindisplay.py

@@ -93,7 +93,6 @@ class MainDisplay(DisplayWidget):
         self.setWindowTitle(u'OpenLP Display')
         self.setWindowFlags(QtCore.Qt.FramelessWindowHint |
             QtCore.Qt.WindowStaysOnTopHint)
-        self.alerttext = "<p>Red Alert! Raise Shields!</p>"
         if self.isLive:
             QtCore.QObject.connect(Receiver.get_receiver(),
                 QtCore.SIGNAL(u'maindisplay_hide'), self.hideDisplay)
@@ -163,12 +162,12 @@ class MainDisplay(DisplayWidget):
             The slide text to be displayed
         """
         log.debug(u'text')
-        print slide 
-        self.frame.evaluateJavaScript("startfade('" + 
+        print slide
+        self.frame.evaluateJavaScript("startfade('" +
             slide.replace("\\", "\\\\").replace("\'", "\\\'") + "')")
         return self.preview()
 
-    def alert(self):
+    def alert(self, text):
         """
         Add the alert text
 
@@ -176,7 +175,7 @@ class MainDisplay(DisplayWidget):
             The slide text to be displayed
         """
         log.debug(u'alert')
-        self.frame.findFirstElement('div#alert').setInnerXml(self.alerttext)
+        self.frame.findFirstElement('div#alert').setInnerXml(text)
 
     def image(self, image):
         """

openlp/plugins/alerts/lib/alertsmanager.py

@@ -96,8 +96,7 @@ class AlertsManager(QtCore.QObject):
         alertTab = self.parent.alertsTab
         text = HTMLCODE % (alertTab.font_color, alertTab.bg_color,
                            alertTab.font_face, alertTab.font_size, text)
-        self.parent.previewController.parent.displayManager.addAlert(text,
-            alertTab.location)
+        self.parent.liveController.display.alert(text)
         # check to see if we have a timer running
         if self.timer_id == 0:
             self.timer_id = self.startTimer(int(alertTab.timeout) * 1000)
@@ -113,8 +112,7 @@ class AlertsManager(QtCore.QObject):
         log.debug(u'timer event')
         alertTab = self.parent.alertsTab
         if event.timerId() == self.timer_id:
-            self.parent.previewController.parent.displayManager.addAlert(u'',
-                alertTab.location)
+            self.parent.liveController.display.alert(u'')
         self.killTimer(self.timer_id)
         self.timer_id = 0
         self.generateAlert()

openlp/plugins/bibles/lib/mediaitem.py

@@ -549,7 +549,7 @@ class BibleMediaItem(MediaManagerItem):
                 if self.parent.settings_tab.layout_style == 1:
                     text = text + u'\n\n'
                 else:
-                    text = text + u'\n'
+                    text = text + u'\ngus   '
                 bible_text = u'%s %s %s' % (bible_text, verse_text, text)
                 #if we are verse per slide then create slide
                 if self.parent.settings_tab.layout_style == 0: