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

tidy

Browse Source
This commit is contained in:
Jonathan Corwin 2010-09-04 14:09:47 +01:00
parent 1899fc3415
commit a74af25265
2 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -331,8 +331,6 @@ def build_lyrics_css(item, webkitvers):
(item.main.x(), item.main.y()) (item.main.x(), item.main.y())
lyrics = build_lyrics_format_css(theme, item.main.width(), lyrics = build_lyrics_format_css(theme, item.main.width(),
item.main.height()) item.main.height())
#lyrics += u'width: %spx; height: %spx; ' % \
# (item.main.width(), item.main.height())
# For performance reasons we want to show as few DIV's as possible, # For performance reasons we want to show as few DIV's as possible,
# especially when animating/transitions. # especially when animating/transitions.
# However some bugs in older versions of qtwebkit mean we need to # However some bugs in older versions of qtwebkit mean we need to

16
openlp/core/lib/renderer.py
View File

@ -152,29 +152,21 @@ class Renderer(object):
# Adjust width and height to account for shadow. outline done in css # Adjust width and height to account for shadow. outline done in css
width = self._rect.width() + int(self._theme.display_shadow_size) width = self._rect.width() + int(self._theme.display_shadow_size)
height = self._rect.height() + int(self._theme.display_shadow_size) height = self._rect.height() + int(self._theme.display_shadow_size)
css = u'<html><head><style>#main {%s %s}</style><body>' \ shell = u'<html><head><style>#main {%s %s}</style><body>' \
u'<div id="main">' % \ u'<div id="main">' % \
(build_lyrics_format_css(self._theme, width, height), (build_lyrics_format_css(self._theme, width, height),
build_lyrics_outline_css(self._theme)) build_lyrics_outline_css(self._theme))
# doc = QtGui.QTextDocument()
# doc.setPageSize(QtCore.QSizeF(self._rect.width(), self._rect.height()))
# doc.setDocumentMargin(0)
# css = u'* {%s}' % build_lyrics_format_css(self._theme)
# doc.setDefaultStyleSheet(css)
#layout = doc.documentLayout()
formatted = [] formatted = []
html_text = u'' html_text = u''
styled_text = u'' styled_text = u''
divheight = 'document.getElementById("main").scrollHeight' js_height = 'document.getElementById("main").scrollHeight'
for line in text: for line in text:
styled_line = expand_tags(line) + line_end styled_line = expand_tags(line) + line_end
styled_text += styled_line styled_text += styled_line
html = css + styled_text + u'</div></body></html>' html = shell + styled_text + u'</div></body></html>'
web.setHtml(html) web.setHtml(html)
# doc.setHtml(styled_text)
# Text too long so go to next page # Text too long so go to next page
# if doc.pageCount() != 1: text_height = int(frame.evaluateJavaScript(js_height).toString())
text_height = int(frame.evaluateJavaScript(divheight).toString())
if text_height > height: if text_height > height:
formatted.append(html_text) formatted.append(html_text)
html_text = u'' html_text = u''