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

Fix review comments

Browse Source
This commit is contained in:
Tim Bentley 2010-09-21 18:24:01 +01:00
parent b1d312626a
commit d50ffbafa3
2 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -105,18 +105,6 @@ class Renderer(object):
(build_lyrics_format_css(self._theme, self.page_width, (build_lyrics_format_css(self._theme, self.page_width,
self.page_height), build_lyrics_outline_css(self._theme)) self.page_height), build_lyrics_outline_css(self._theme))
self.web = QtWebKit.QWebView()
self.web.resize(self._rect.width(), self._rect.height())
self.web.setVisible(False)
self.web_frame = self.web.page().mainFrame()
# Adjust width and height to account for shadow. outline done in css
self.page_width = self._rect.width() - int(self._theme.display_shadow_size)
self.page_height = self._rect.height() - int(self._theme.display_shadow_size)
self.page_shell = u'<html><head><style>#main {%s %s}</style><body>' \
u'<div id="main">' % \
(build_lyrics_format_css(self._theme, self.page_width, self.page_height),
build_lyrics_outline_css(self._theme))
def set_frame_dest(self, frame_width, frame_height): def set_frame_dest(self, frame_width, frame_height):
""" """
Set the size of the slide. Set the size of the slide.

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

@ -326,8 +326,9 @@ class MainDisplay(DisplayWidget):
# Important otherwise first preview will miss the background ! # Important otherwise first preview will miss the background !
while not self.loaded: while not self.loaded:
Receiver.send_message(u'openlp_process_events') Receiver.send_message(u'openlp_process_events')
if self.isLive: # if was hidden keep it hidden
self.setVisible(True) if self.hide_mode and self.isLive:
self.hideDisplay(self.hide_mode)
preview = QtGui.QImage(self.screen[u'size'].width(), preview = QtGui.QImage(self.screen[u'size'].width(),
self.screen[u'size'].height(), self.screen[u'size'].height(),
QtGui.QImage.Format_ARGB32_Premultiplied) QtGui.QImage.Format_ARGB32_Premultiplied)
@ -335,9 +336,6 @@ class MainDisplay(DisplayWidget):
painter.setRenderHint(QtGui.QPainter.Antialiasing) painter.setRenderHint(QtGui.QPainter.Antialiasing)
self.frame.render(painter) self.frame.render(painter)
painter.end() painter.end()
# if was hidden keep it hidden
if self.hide_mode and self.isLive:
self.hideDisplay(self.hide_mode)
return preview return preview
def buildHtml(self, serviceItem): def buildHtml(self, serviceItem):