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

Renderer fixes and change theme export suffix

Browse Source 
bzr-revno: 999
This commit is contained in:
Tim Bentley 2010-08-29 19:59:36 +01:00
commit 6867f64b94
3 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -290,7 +290,7 @@ Therefore one table for text, one for outline and one for shadow.
</html>
"""
def build_html(item, screen, alert):
def build_html(item, screen, alert, islive):
"""
Build the full web paged structure for display
@ -312,7 +312,7 @@ def build_html(item, screen, alert):
build_alert(alert, width),
build_footer(item),
build_lyrics(item),
u'true' if theme and theme.display_slideTransition \
u'true' if theme and theme.display_slideTransition and islive \
else u'false',
image)
return html
@ -343,7 +343,7 @@ def build_lyrics(item):
shadow = u'display: none;'
if theme:
lyricscommon = u'width: %spx; height: %spx; word-wrap: break-word; ' \
u'font-family: %s; font-size: %spx; color: %s; line-height: %d%%;' \
u'font-family: %s; font-size: %spt; color: %s; line-height: %d%%;' \
% (item.main.width(), item.main.height(), theme.font_main_name,
theme.font_main_proportion, theme.font_main_color,
100 + int(theme.font_main_line_adjustment))
@ -398,7 +398,7 @@ def build_footer(item):
width: %spx;
height: %spx;
font-family: %s;
font-size: %spx;
font-size: %spt;
color: %s;
text-align: %s;
"""
@ -427,7 +427,7 @@ def build_alert(alertTab, width):
width: %s;
vertical-align: %s;
font-family: %s;
font-size: %spx;
font-size: %spt;
color: %s;
background-color: %s;
"""

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

@ -152,8 +152,8 @@ class MainDisplay(DisplayWidget):
splash_image)
serviceItem = ServiceItem()
serviceItem.bg_frame = initialFrame
self.webView.setHtml(build_html(serviceItem, self.screen, \
self.parent.alertTab))
self.webView.setHtml(build_html(serviceItem, self.screen,
self.parent.alertTab, self.isLive))
self.initialFrame = True
self.show()
# To display or not to display?
@ -297,13 +297,14 @@ class MainDisplay(DisplayWidget):
Generates a preview of the image displayed.
"""
log.debug(u'preview for %s', self.isLive)
# Wait for the fade to finish before geting the preview.
# Important otherwise preview will have incorrect text if at all !
if self.serviceItem.themedata and \
self.serviceItem.themedata.display_slideTransition:
while self.frame.evaluateJavaScript(u'show_text_complete()') \
.toString() == u'false':
Receiver.send_message(u'openlp_process_events')
if self.isLive:
# Wait for the fade to finish before geting the preview.
# Important otherwise preview will have incorrect text if at all !
if self.serviceItem.themedata and \
self.serviceItem.themedata.display_slideTransition:
while self.frame.evaluateJavaScript(u'show_text_complete()') \
.toString() == u'false':
Receiver.send_message(u'openlp_process_events')
# Wait for the webview to update before geting the preview.
# Important otherwise first preview will miss the background !
while not self.loaded:
@ -332,7 +333,8 @@ class MainDisplay(DisplayWidget):
self.loaded = False
self.initialFrame = False
self.serviceItem = serviceItem
html = build_html(self.serviceItem, self.screen, self.parent.alertTab)
html = build_html(self.serviceItem, self.screen, self.parent.alertTab,\
self.isLive)
self.webView.setHtml(html)
if serviceItem.foot_text and serviceItem.foot_text:
self.footer(serviceItem.foot_text)

2
openlp/core/ui/thememanager.py
View File

@ -295,7 +295,7 @@ class ThemeManager(QtGui.QWidget):
path = unicode(path)
if path:
SettingsManager.set_last_dir(self.settingsSection, path, 1)
themePath = os.path.join(path, theme + u'.thz')
themePath = os.path.join(path, theme + u'.otz')
zip = None
try:
zip = zipfile.ZipFile(themePath, u'w')