From 65beb6ccda2402611960e3d24d35e0997c0cf2c4 Mon Sep 17 00:00:00 2001 From: Jonathan Corwin Date: Sat, 30 Jun 2012 23:20:16 +0100 Subject: [PATCH] move webview to init and use %s --- openlp/core/lib/renderer.py | 8 +++----- openlp/core/lib/serviceitem.py | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/openlp/core/lib/renderer.py b/openlp/core/lib/renderer.py index b781c0882..0f89d218f 100644 --- a/openlp/core/lib/renderer.py +++ b/openlp/core/lib/renderer.py @@ -82,7 +82,9 @@ class Renderer(object): self._calculate_default() QtCore.QObject.connect(Receiver.get_receiver(), QtCore.SIGNAL(u'theme_update_global'), self.set_global_theme) - self.web = None + self.web = QtWebKit.QWebView() + self.web.setVisible(False) + self.web_frame = self.web.page().mainFrame() def update_display(self): """ @@ -398,10 +400,6 @@ class Renderer(object): The footer text block. """ log.debug(u'_set_text_rectangle %s , %s' % (rect_main, rect_footer)) - if not self.web: - self.web = QtWebKit.QWebView() - self.web.setVisible(False) - self.web_frame = self.web.page().mainFrame() self._rect = rect_main self._rect_footer = rect_footer self.page_width = self._rect.width() diff --git a/openlp/core/lib/serviceitem.py b/openlp/core/lib/serviceitem.py index b3e0761de..d61440239 100644 --- a/openlp/core/lib/serviceitem.py +++ b/openlp/core/lib/serviceitem.py @@ -178,7 +178,7 @@ class ServiceItem(object): self.renderer.set_item_theme(self.theme) self.themedata, self.main, self.footer = self.renderer.pre_render() if self.service_item_type == ServiceItemType.Text: - log.debug(u'Formatting slides: ' + self.title) + log.debug(u'Formatting slides: %s' % self.title) for slide in self._raw_frames: pages = self.renderer.format_slide(slide[u'raw_slide'], self) for page in pages: