From b66287f8228073d22e5c5d5cc05f3c6f9f204cf3 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Tue, 27 Jul 2010 20:13:56 +0100 Subject: [PATCH] Fix alignment --- openlp/core/lib/htmlbuilder.py | 28 +++++++++++++++------------- openlp/core/ui/maindisplay.py | 11 ++++++----- 2 files changed, 21 insertions(+), 18 deletions(-) diff --git a/openlp/core/lib/htmlbuilder.py b/openlp/core/lib/htmlbuilder.py index f1b026fcf..57f14a907 100644 --- a/openlp/core/lib/htmlbuilder.py +++ b/openlp/core/lib/htmlbuilder.py @@ -72,7 +72,7 @@ HTMLSRC = u""" -
+
@@ -81,6 +81,7 @@ HTMLSRC = u""" """ + def build_html(item, screen, alert): """ Build the full web paged structure for display @@ -177,8 +178,9 @@ def build_lyrics(item): Service Item containing theme and location information """ lyrics = """ - #lyrics {position: absolute; %s z-index:3; %s; %s %s } - table {border=0;margin=0padding=0;} + .lyricstable {position: absolute; %s z-index:3;} + .lyrics { %s; %s %s } + table {border=0; margin=0;padding=0;} """ theme = item.themedata lyrics_html = u'' @@ -194,15 +196,15 @@ def build_lyrics(item): (theme.font_main_name, theme.font_main_proportion) align = u'' if theme.display_horizontalAlign == 2: - align = u'align=center;' + align = u'align:center;' elif theme.display_horizontalAlign == 1: - align = u'align=right;' + align = u'align:right;' if theme.display_verticalAlign == 2: - valign = u'vertical-align=top;' + valign = u'vertical-align:bottom;' elif theme.display_verticalAlign == 1: - valign = u'vertical-align=middle;' + valign = u'vertical-align:middle;' else: - valign = u'vertical-align=bottom;' + valign = u'vertical-align:top;' text = u'color:%s; %s %s' % (theme.font_main_color, align, valign) if theme.display_shadow and theme.display_outline: fontworks = u'text-shadow: -%spx 0 %s, 0 %spx %s, %spx 0 %s, 0 ' \ @@ -245,15 +247,15 @@ def build_footer(item): (theme.font_footer_name, theme.font_footer_proportion) align = u'' if theme.display_horizontalAlign == 2: - align = u'align=center;' + align = u'align:center;' elif theme.display_horizontalAlign == 1: - align = u'align=right;' + align = u'align:right;' if theme.display_verticalAlign == 2: - valign = u'vertical-align=top;' + valign = u'vertical-align:bottom;' elif theme.display_verticalAlign == 1: - valign = u'vertical-align=middle;' + valign = u'vertical-align:middle;' else: - valign = u'vertical-align=bottom;' + valign = u'vertical-align:top;' text = u'color:%s; %s %s' % (theme.font_footer_color, align, valign) lyrics_html = lyrics % (position, font, text) print lyrics_html diff --git a/openlp/core/ui/maindisplay.py b/openlp/core/ui/maindisplay.py index 54f4d50a2..820af2b4d 100644 --- a/openlp/core/ui/maindisplay.py +++ b/openlp/core/ui/maindisplay.py @@ -116,6 +116,7 @@ class MainDisplay(DisplayWidget): self.webView.setGeometry(0, 0, self.screen[u'size'].width(), self.screen[u'size'].height()) self.page = self.webView.page() self.frame = self.page.mainFrame() + self.alertTab = None QtCore.QObject.connect(self.webView, QtCore.SIGNAL(u'loadFinished(bool)'), self.loaded) self.frame.setScrollBarPolicy(QtCore.Qt.Vertical, @@ -156,11 +157,11 @@ class MainDisplay(DisplayWidget): def next(self): if self.currslide: - self.frame.evaluateJavaScript("startfade('" + self.slide2 + "')") - #self.frame.findFirstElement('div#lyrics').setInnerXml(self.slide2) + #self.frame.evaluateJavaScript("startfade('" + self.slide2 + "')") + self.frame.findFirstElement('td#lyrics').setInnerXml(self.slide2) else: - self.frame.evaluateJavaScript("startfade('" + self.slide1 + "')") - #self.frame.findFirstElement('div#lyrics').setInnerXml(self.slide1) + #self.frame.evaluateJavaScript("startfade('" + self.slide1 + "')") + self.frame.findFirstElement('td#lyrics').setInnerXml(self.slide1) self.currslide = not self.currslide def text(self, slide): @@ -172,7 +173,7 @@ class MainDisplay(DisplayWidget): """ log.debug(u'text') print slide - self.frame.findFirstElement('div#lyrics').setInnerXml(slide) + self.frame.findFirstElement('td#lyrics').setInnerXml(slide) return self.preview() def alert(self):