diff --git a/openlp/core/lib/renderer.py b/openlp/core/lib/renderer.py index 330c434c5..0cb92ad39 100644 --- a/openlp/core/lib/renderer.py +++ b/openlp/core/lib/renderer.py @@ -70,21 +70,11 @@ class Renderer(object): self.theme_name = theme.theme_name if theme.background_type == u'image': if theme.background_filename: - self.set_bg_image(theme.background_filename) - - def set_bg_image(self, filename): - """ - Set a background image. - - ``filename`` - The name of the image file. - """ - log.debug(u'set bg image %s', filename) - self._bg_image_filename = unicode(filename) - if self.frame: - self.bg_image = resize_image(self._bg_image_filename, - self.frame.width(), - self.frame.height()) + self._bg_image_filename = unicode(theme.background_filename) + if self.frame: + self.bg_image = resize_image(self._bg_image_filename, + self.frame.width(), + self.frame.height()) def set_text_rectangle(self, rect_main, rect_footer): """ @@ -100,7 +90,7 @@ class Renderer(object): self._rect = rect_main self._rect_footer = rect_footer - def set_frame_dest(self, frame_width, frame_height, preview=False): + def set_frame_dest(self, frame_width, frame_height): """ Set the size of the slide. @@ -110,11 +100,7 @@ class Renderer(object): ``frame_height`` The height of the slide. - ``preview`` - Defaults to *False*. Whether or not to generate a preview. """ - if preview: - self.bg_frame = None log.debug(u'set frame dest (frame) w %d h %d', frame_width, frame_height) self.frame = QtGui.QImage(frame_width, frame_height, @@ -122,8 +108,17 @@ class Renderer(object): if self._bg_image_filename and not self.bg_image: self.bg_image = resize_image(self._bg_image_filename, self.frame.width(), self.frame.height()) - if self.bg_frame is None: - self._generate_background_frame() + if self._theme.background_type == u'image': + self.bg_frame = QtGui.QImage(self.frame.width(), + self.frame.height(), QtGui.QImage.Format_ARGB32_Premultiplied) + painter = QtGui.QPainter() + painter.begin(self.bg_frame) + painter.fillRect(self.frame.rect(), QtCore.Qt.black) + if self.bg_image: + painter.drawImage(0, 0, self.bg_image) + painter.end() + else: + self.bg_frame = None def format_slide(self, words, line_break): """ @@ -143,14 +138,14 @@ class Renderer(object): for verse in verses_text: lines = verse.split(u'\n') for line in lines: - text.append(line) + text.append(line) web = QtWebKit.QWebView() web.resize(self._rect.width(), self._rect.height()) web.setVisible(False) frame = web.page().mainFrame() # Adjust width and height to account for shadow. outline done in css - width = self._rect.width() - int(self._theme.display_shadow_size) - height = self._rect.height() - 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) shell = u'
' \ u'