mirror of https://gitlab.com/openlp/openlp.git
Bug Fixes
This commit is contained in:
parent
3698f4abd9
commit
06901951a6
|
@ -176,8 +176,8 @@ body {
|
||||||
return text.clientHeight;
|
return text.clientHeight;
|
||||||
}
|
}
|
||||||
|
|
||||||
function show_footer(text){
|
function show_footer(footertext){
|
||||||
document.getElementById('footer').innerHTML(text);
|
document.getElementById('footer').innerHTML(footertext);
|
||||||
}
|
}
|
||||||
|
|
||||||
function show_text(newtext){
|
function show_text(newtext){
|
||||||
|
@ -314,6 +314,7 @@ def build_html(item, screen, alert):
|
||||||
build_lyrics(item),
|
build_lyrics(item),
|
||||||
u'true' if theme and theme.display_slideTransition else u'false',
|
u'true' if theme and theme.display_slideTransition else u'false',
|
||||||
image)
|
image)
|
||||||
|
print html
|
||||||
return html
|
return html
|
||||||
|
|
||||||
def build_lyrics(item):
|
def build_lyrics(item):
|
||||||
|
|
|
@ -91,6 +91,22 @@ class RenderManager(object):
|
||||||
u'start html':u'<font color=green>', \
|
u'start html':u'<font color=green>', \
|
||||||
u'end tag':u'{/g}', u'end html':u'</font>', \
|
u'end tag':u'{/g}', u'end html':u'</font>', \
|
||||||
u'protected':False})
|
u'protected':False})
|
||||||
|
self.html_expands.append({u'desc':u'Pink', u'start tag':u'{pk}', \
|
||||||
|
u'start html':u'<font color=#CC33CC>', \
|
||||||
|
u'end tag':u'{/pk}', u'end html':u'</font>', \
|
||||||
|
u'protected':False})
|
||||||
|
self.html_expands.append({u'desc':u'Orange', u'start tag':u'{o}', \
|
||||||
|
u'start html':u'<font color=#CC0033>', \
|
||||||
|
u'end tag':u'{/o}', u'end html':u'</font>', \
|
||||||
|
u'protected':False})
|
||||||
|
self.html_expands.append({u'desc':u'Purple', u'start tag':u'{pp}', \
|
||||||
|
u'start html':u'<font color=#9900FF>', \
|
||||||
|
u'end tag':u'{/pp}', u'end html':u'</font>', \
|
||||||
|
u'protected':False})
|
||||||
|
self.html_expands.append({u'desc':u'White', u'start tag':u'{w}', \
|
||||||
|
u'start html':u'<font color=white>', \
|
||||||
|
u'end tag':u'{/w}', u'end html':u'</font>', \
|
||||||
|
u'protected':False})
|
||||||
self.html_expands.append({u'desc':u'Superscript', u'start tag':u'{su}', \
|
self.html_expands.append({u'desc':u'Superscript', u'start tag':u'{su}', \
|
||||||
u'start html':u'<sup>', \
|
u'start html':u'<sup>', \
|
||||||
u'end tag':u'{/su}', u'end html':u'</sup>', \
|
u'end tag':u'{/su}', u'end html':u'</sup>', \
|
||||||
|
@ -243,8 +259,8 @@ class RenderManager(object):
|
||||||
serviceItem.theme = themedata
|
serviceItem.theme = themedata
|
||||||
serviceItem.add_from_text(u'', verse, footer)
|
serviceItem.add_from_text(u'', verse, footer)
|
||||||
serviceItem.render_manager = self
|
serviceItem.render_manager = self
|
||||||
serviceItem.render(True)
|
|
||||||
serviceItem.raw_footer = footer
|
serviceItem.raw_footer = footer
|
||||||
|
serviceItem.render(True)
|
||||||
self.display.buildHtml(serviceItem)
|
self.display.buildHtml(serviceItem)
|
||||||
frame, raw_html = serviceItem.get_rendered_frame(0)
|
frame, raw_html = serviceItem.get_rendered_frame(0)
|
||||||
preview = self.display.text(raw_html)
|
preview = self.display.text(raw_html)
|
||||||
|
|
|
@ -178,7 +178,7 @@ class MainDisplay(DisplayWidget):
|
||||||
or not self.isVisible():
|
or not self.isVisible():
|
||||||
shrink = True
|
shrink = True
|
||||||
else:
|
else:
|
||||||
shrink = False
|
shrink = False
|
||||||
js = u'show_alert("%s", "%s")' % (
|
js = u'show_alert("%s", "%s")' % (
|
||||||
text.replace(u'\\', u'\\\\').replace(u'\"', u'\\\"'),
|
text.replace(u'\\', u'\\\\').replace(u'\"', u'\\\"'),
|
||||||
u'top' if shrink else u'')
|
u'top' if shrink else u'')
|
||||||
|
@ -315,13 +315,13 @@ class MainDisplay(DisplayWidget):
|
||||||
self.serviceItem = serviceItem
|
self.serviceItem = serviceItem
|
||||||
html = build_html(self.serviceItem, self.screen, self.parent.alertTab)
|
html = build_html(self.serviceItem, self.screen, self.parent.alertTab)
|
||||||
self.webView.setHtml(html)
|
self.webView.setHtml(html)
|
||||||
if serviceItem.footer and serviceItem.foot_text:
|
if serviceItem.foot_text and serviceItem.foot_text:
|
||||||
self.footer(serviceItem.foot_text)
|
self.footer(serviceItem.foot_text)
|
||||||
|
|
||||||
def footer(self, text):
|
def footer(self, text):
|
||||||
log.debug(u'footer')
|
log.debug(u'footer')
|
||||||
js = "show_footer('" + \
|
js = "show_footer('" + \
|
||||||
text.replace("\\", "\\\\").replace("\'", "\\\'") + "')"
|
text.replace("\\", "\\\\").replace("\'", "\\\'") + "')"
|
||||||
self.frame.evaluateJavaScript(js)
|
self.frame.evaluateJavaScript(js)
|
||||||
|
|
||||||
def hideDisplay(self, mode=HideMode.Screen):
|
def hideDisplay(self, mode=HideMode.Screen):
|
||||||
|
|
Loading…
Reference in New Issue