From d8e5226b207d83817b70f9c39935004f49299495 Mon Sep 17 00:00:00 2001
From: Jonathan Corwin <j@corwin.co.uk>
Date: Mon, 27 Aug 2012 20:04:53 +0100
Subject: [PATCH] Next attempt

---
 openlp/core/lib/renderer.py    | 15 ++-------------
 openlp/core/ui/maindisplay.py  | 19 ++++++++++++++++---
 openlp/core/ui/thememanager.py |  2 +-
 3 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/openlp/core/lib/renderer.py b/openlp/core/lib/renderer.py
index e7ad81698..936585515 100644
--- a/openlp/core/lib/renderer.py
+++ b/openlp/core/lib/renderer.py
@@ -97,7 +97,6 @@ class Renderer(object):
             self.display.close()
         self.display = MainDisplay(None, self.image_manager, False, self)
         self.display.setup()
-        #self.web_frame = self.web.page().mainFrame()
         self._theme_dimensions = {}
 
     def update_theme(self, theme_name, old_theme_name=None, only_delete=False):
@@ -223,8 +222,7 @@ class Renderer(object):
         self._set_theme(item_theme_name)
         self.item_theme_name = item_theme_name
 
-    def generate_preview(self, theme_data, force_page=False,
-        same_thread=True):
+    def generate_preview(self, theme_data, force_page=False):
         """
         Generate a preview of a theme.
 
@@ -259,15 +257,7 @@ class Renderer(object):
         if not self.force_page:
             self.display.buildHtml(serviceItem)
             raw_html = serviceItem.get_rendered_frame(0)
-            if same_thread:
-                self.display.text(raw_html)
-            else:
-                # This exists for https://bugs.launchpad.net/openlp/+bug/1016843
-                # For unknown reasons if evaluateJavaScript is called
-                # from the themewizard, then it causes a crash on
-                # Windows if there are many items in the service to re-render.
-                # Calling it via a signal seems to workaround the problem.
-                Receiver.send_message(u'renderer_display_text', raw_html)
+            self.display.text(raw_html, False)
             preview = self.display.preview()
             return preview
         self.force_page = False
@@ -421,7 +411,6 @@ class Renderer(object):
         # QWebView in order for the display to work properly, but we do. See
         # bug #1041366 for an example of what happens if we take this out.
         self.web = None
-        gc.collect()
         self.web = QtWebKit.QWebView()
         self.web.setVisible(False)
         self.web.resize(self.page_width, self.page_height)
diff --git a/openlp/core/ui/maindisplay.py b/openlp/core/ui/maindisplay.py
index 593acf3e8..5780c27e9 100644
--- a/openlp/core/ui/maindisplay.py
+++ b/openlp/core/ui/maindisplay.py
@@ -227,20 +227,33 @@ class MainDisplay(Display):
             self.__hideMouse()
         log.debug(u'Finished MainDisplay setup')
 
-    def text(self, slide):
+    def text(self, slide, animate=True):
         """
         Add the slide text from slideController
 
         ``slide``
             The slide text to be displayed
+
+        ``animate``
+            Ensures any transitions are performed when setting the text
         """
         log.debug(u'text to display')
         # Wait for the webview to update before displaying text.
         while not self.webLoaded:
             Receiver.send_message(u'openlp_process_events')
         self.setGeometry(self.screen[u'size'])
-        self.frame.evaluateJavaScript(u'show_text("%s")' %
-            slide.replace(u'\\', u'\\\\').replace(u'\"', u'\\\"'))
+        if animate:
+            self.frame.evaluateJavaScript(u'show_text("%s")' %
+                slide.replace(u'\\', u'\\\\').replace(u'\"', u'\\\"'))
+        else:
+            # This exists for https://bugs.launchpad.net/openlp/+bug/1016843
+            # For unknown reasons if evaluateJavaScript is called
+            # from the themewizard, then it causes a crash on
+            # Windows if there are many items in the service to re-render.
+            # Calling it via a signal seems to workaround the problem.
+            self.frame.findFirstElement("#lyricsmain").setInnerXml(slide)
+            self.frame.findFirstElement("#lyricsoutline").setInnerXml(slide)
+            self.frame.findFirstElement("#lyricsshadow").setInnerXml(slide)
 
     def alert(self, text, location):
         """
diff --git a/openlp/core/ui/thememanager.py b/openlp/core/ui/thememanager.py
index e976be67a..585ab2329 100644
--- a/openlp/core/ui/thememanager.py
+++ b/openlp/core/ui/thememanager.py
@@ -741,7 +741,7 @@ class ThemeManager(QtGui.QWidget):
         """
         log.debug(u'generateImage \n%s ', theme_data)
         return self.mainwindow.renderer.generate_preview(
-            theme_data, forcePage, False)
+            theme_data, forcePage)
 
     def getPreviewImage(self, theme):
         """