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

reverted some changes

Browse Source
This commit is contained in:
Andreas Preikschat 2011-07-17 15:01:28 +02:00
parent 47e43404aa
commit 46fa64b43d
2 changed files with 4 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -38,7 +38,6 @@ HTMLSRC = u"""
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<meta charset="UTF-8">
<title>OpenLP Display</title> <title>OpenLP Display</title>
<style> <style>
*{ *{

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

@ -46,28 +46,6 @@ VERSE = u'The Lord said to {r}Noah{/r}: \n' \
'r{/pk}{o}e{/o}{pp}n{/pp} of the Lord\n' 'r{/pk}{o}e{/o}{pp}n{/pp} of the Lord\n'
FOOTER = [u'Arky Arky (Unknown)', u'Public Domain', u'CCLI 123456'] FOOTER = [u'Arky Arky (Unknown)', u'Public Domain', u'CCLI 123456']
HTML_START = u"""
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8">
<style>
*{
margin: 0;
padding: 0;
border: 0;
}
#main {
position: absolute;
top: 0px;
%s %s
}
</style>
</head>
<body>
<div id="main">
"""
HTML_END = u'</div></body></html>' HTML_END = u'</div></body></html>'
class Renderer(object): class Renderer(object):
@ -332,7 +310,10 @@ class Renderer(object):
self.web.resize(self.page_width, self.page_height) self.web.resize(self.page_width, self.page_height)
self.web_frame = self.web.page().mainFrame() self.web_frame = self.web.page().mainFrame()
# Adjust width and height to account for shadow. outline done in css # Adjust width and height to account for shadow. outline done in css
self.page_shell = HTML_START % \ self.page_shell = u'<!DOCTYPE html><html><head><style>' \
u'*{margin: 0; padding: 0; border: 0;} '\
u'#main {position: absolute;top: 0px;%s %s}</style></head><body>' \
u'<div id="main">' % \
(build_lyrics_format_css(self.theme_data, self.page_width, (build_lyrics_format_css(self.theme_data, self.page_width,
self.page_height), build_lyrics_outline_css(self.theme_data)) self.page_height), build_lyrics_outline_css(self.theme_data))