raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

Fix alignment

Browse Source
This commit is contained in:
Tim Bentley 2010-07-27 20:13:56 +01:00
parent 44fd8f31e0
commit b66287f822
2 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
openlp/core/lib/htmlbuilder.py
View File

@ -72,7 +72,7 @@ HTMLSRC = u"""
</script> </script>
</head> </head>
<body> <body>
<div id="lyrics" class="lyrics"></div> <table class="lyricstable"><tr><td id="lyrics" class="lyrics"></td?</tr></table>
<div id="footer" class="footer"></div> <div id="footer" class="footer"></div>
<div id="alert"></div> <div id="alert"></div>
<video id="video"></video> <video id="video"></video>
@ -81,6 +81,7 @@ HTMLSRC = u"""
</body> </body>
</html> </html>
""" """
def build_html(item, screen, alert): def build_html(item, screen, alert):
""" """
Build the full web paged structure for display Build the full web paged structure for display
@ -177,8 +178,9 @@ def build_lyrics(item):
Service Item containing theme and location information Service Item containing theme and location information
""" """
lyrics = """ lyrics = """
#lyrics {position: absolute; %s z-index:3; %s; %s %s } .lyricstable {position: absolute; %s z-index:3;}
table {border=0;margin=0padding=0;} .lyrics { %s; %s %s }
table {border=0; margin=0;padding=0;}
""" """
theme = item.themedata theme = item.themedata
lyrics_html = u'' lyrics_html = u''
@ -194,15 +196,15 @@ def build_lyrics(item):
(theme.font_main_name, theme.font_main_proportion) (theme.font_main_name, theme.font_main_proportion)
align = u'' align = u''
if theme.display_horizontalAlign == 2: if theme.display_horizontalAlign == 2:
align = u'align=center;' align = u'align:center;'
elif theme.display_horizontalAlign == 1: elif theme.display_horizontalAlign == 1:
align = u'align=right;' align = u'align:right;'
if theme.display_verticalAlign == 2: if theme.display_verticalAlign == 2:
valign = u'vertical-align=top;' valign = u'vertical-align:bottom;'
elif theme.display_verticalAlign == 1: elif theme.display_verticalAlign == 1:
valign = u'vertical-align=middle;' valign = u'vertical-align:middle;'
else: else:
valign = u'vertical-align=bottom;' valign = u'vertical-align:top;'
text = u'color:%s; %s %s' % (theme.font_main_color, align, valign) text = u'color:%s; %s %s' % (theme.font_main_color, align, valign)
if theme.display_shadow and theme.display_outline: if theme.display_shadow and theme.display_outline:
fontworks = u'text-shadow: -%spx 0 %s, 0 %spx %s, %spx 0 %s, 0 ' \ 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) (theme.font_footer_name, theme.font_footer_proportion)
align = u'' align = u''
if theme.display_horizontalAlign == 2: if theme.display_horizontalAlign == 2:
align = u'align=center;' align = u'align:center;'
elif theme.display_horizontalAlign == 1: elif theme.display_horizontalAlign == 1:
align = u'align=right;' align = u'align:right;'
if theme.display_verticalAlign == 2: if theme.display_verticalAlign == 2:
valign = u'vertical-align=top;' valign = u'vertical-align:bottom;'
elif theme.display_verticalAlign == 1: elif theme.display_verticalAlign == 1:
valign = u'vertical-align=middle;' valign = u'vertical-align:middle;'
else: else:
valign = u'vertical-align=bottom;' valign = u'vertical-align:top;'
text = u'color:%s; %s %s' % (theme.font_footer_color, align, valign) text = u'color:%s; %s %s' % (theme.font_footer_color, align, valign)
lyrics_html = lyrics % (position, font, text) lyrics_html = lyrics % (position, font, text)
print lyrics_html print lyrics_html

11
openlp/core/ui/maindisplay.py
View File

@ -116,6 +116,7 @@ class MainDisplay(DisplayWidget):
self.webView.setGeometry(0, 0, self.screen[u'size'].width(), self.screen[u'size'].height()) self.webView.setGeometry(0, 0, self.screen[u'size'].width(), self.screen[u'size'].height())
self.page = self.webView.page() self.page = self.webView.page()
self.frame = self.page.mainFrame() self.frame = self.page.mainFrame()
self.alertTab = None
QtCore.QObject.connect(self.webView, QtCore.QObject.connect(self.webView,
QtCore.SIGNAL(u'loadFinished(bool)'), self.loaded) QtCore.SIGNAL(u'loadFinished(bool)'), self.loaded)
self.frame.setScrollBarPolicy(QtCore.Qt.Vertical, self.frame.setScrollBarPolicy(QtCore.Qt.Vertical,
@ -156,11 +157,11 @@ class MainDisplay(DisplayWidget):
def next(self): def next(self):
if self.currslide: if self.currslide:
self.frame.evaluateJavaScript("startfade('" + self.slide2 + "')") #self.frame.evaluateJavaScript("startfade('" + self.slide2 + "')")
#self.frame.findFirstElement('div#lyrics').setInnerXml(self.slide2) self.frame.findFirstElement('td#lyrics').setInnerXml(self.slide2)
else: else:
self.frame.evaluateJavaScript("startfade('" + self.slide1 + "')") #self.frame.evaluateJavaScript("startfade('" + self.slide1 + "')")
#self.frame.findFirstElement('div#lyrics').setInnerXml(self.slide1) self.frame.findFirstElement('td#lyrics').setInnerXml(self.slide1)
self.currslide = not self.currslide self.currslide = not self.currslide
def text(self, slide): def text(self, slide):
@ -172,7 +173,7 @@ class MainDisplay(DisplayWidget):
""" """
log.debug(u'text') log.debug(u'text')
print slide print slide
self.frame.findFirstElement('div#lyrics').setInnerXml(slide) self.frame.findFirstElement('td#lyrics').setInnerXml(slide)
return self.preview() return self.preview()
def alert(self): def alert(self):