From 9b378fbea55cb50985f7c5835e362746e452c091 Mon Sep 17 00:00:00 2001 From: Jonathan Corwin Date: Sat, 25 Aug 2012 17:29:17 +0100 Subject: [PATCH] Fix --- openlp/core/lib/renderer.py | 9 ++------- openlp/core/ui/maindisplay.py | 3 +++ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/openlp/core/lib/renderer.py b/openlp/core/lib/renderer.py index 6d8bbaab7..a1345f2ab 100644 --- a/openlp/core/lib/renderer.py +++ b/openlp/core/lib/renderer.py @@ -79,8 +79,6 @@ class Renderer(object): self.force_page = False self.display = MainDisplay(None, self.image_manager, False, self) self.display.setup() - QtCore.QObject.connect(Receiver.get_receiver(), - QtCore.SIGNAL(u'renderer_update_text'), self.update_text) self._theme_dimensions = {} self._calculate_default() QtCore.QObject.connect(Receiver.get_receiver(), @@ -262,16 +260,13 @@ class Renderer(object): self.display.buildHtml(serviceItem) raw_html = serviceItem.get_rendered_frame(0) if same_thread: - Receiver.send_message(u'renderer_update_text', raw_html) + self.display.text(raw_html) else: - self.update_text(raw_html) + Receiver.send_message(u'renderer_display_text', raw_html) preview = self.display.preview() return preview self.force_page = False - def update_text(self, text): - self.display.text(text) -com def format_slide(self, text, item): """ Calculate how much text can fit on a slide. diff --git a/openlp/core/ui/maindisplay.py b/openlp/core/ui/maindisplay.py index 6dd37b9ed..2367aba33 100644 --- a/openlp/core/ui/maindisplay.py +++ b/openlp/core/ui/maindisplay.py @@ -155,6 +155,9 @@ class MainDisplay(Display): QtCore.SIGNAL(u'update_display_css'), self.cssChanged) QtCore.QObject.connect(Receiver.get_receiver(), QtCore.SIGNAL(u'config_updated'), self.configChanged) + else: + QtCore.QObject.connect(Receiver.get_receiver(), + QtCore.SIGNAL(u'renderer_display_text'), self.text) def setTransparency(self, enabled): if enabled: