From 059af571c033811c5ec1996290c9e526f0fad2a9 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Tue, 27 Jul 2010 19:42:53 +0100 Subject: [PATCH] Alerts part 1 --- openlp/core/lib/htmlbuilder.py | 11 +++++++---- openlp/core/ui/maindisplay.py | 2 +- openlp/plugins/alerts/lib/alertstab.py | 9 ++++++++- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/openlp/core/lib/htmlbuilder.py b/openlp/core/lib/htmlbuilder.py index 9bc28a7f8..f1b026fcf 100644 --- a/openlp/core/lib/htmlbuilder.py +++ b/openlp/core/lib/htmlbuilder.py @@ -260,13 +260,16 @@ def build_footer(item): return lyrics_html -def build_alert(width, alert): +def build_alert(width, alertTab): alert = """ #alert { position: absolute; left: 0px; top: 70px; - width: %spx; height: 10px; z-index:4; font-size: 50px; + width: %spx; height: 10px; z-index:4; font-size: %spx; } #alert p { - background-color: red; + background-color: %s; } """ - return alert % (width) + alertText = u'' + if alertTab: + alertText = alert % (width, alertTab.font_size, alertTab.bg_color) + return alertText diff --git a/openlp/core/ui/maindisplay.py b/openlp/core/ui/maindisplay.py index c9de674fd..54f4d50a2 100644 --- a/openlp/core/ui/maindisplay.py +++ b/openlp/core/ui/maindisplay.py @@ -251,7 +251,7 @@ class MainDisplay(DisplayWidget): log.debug(u'buildHtml') self.loaded = False self.serviceItem = serviceItem - html = build_html(self.serviceItem, self.screen, None) + html = build_html(self.serviceItem, self.screen, self.alertTab) self.webView.setHtml(html) if serviceItem.footer and serviceItem.foot_text: self.frame.findFirstElement('div#footer').setInnerXml(serviceItem.foot_text) diff --git a/openlp/plugins/alerts/lib/alertstab.py b/openlp/plugins/alerts/lib/alertstab.py index 7c10d4715..5a3482c12 100644 --- a/openlp/plugins/alerts/lib/alertstab.py +++ b/openlp/plugins/alerts/lib/alertstab.py @@ -295,4 +295,11 @@ class AlertsTab(SettingsTab): font.setPointSize(self.font_size) self.FontPreview.setFont(font) self.FontPreview.setStyleSheet(u'background-color: %s; color: %s' % - (self.bg_color, self.font_color)) \ No newline at end of file + (self.bg_color, self.font_color)) + + def postSetUp(self): + """ + Reset screens after initial definition + """ + self.parent.previewController.display.alertTab = self + self.parent.liveController.display.alertTab = self