From 10aa9432d69179f053093163c132de0248738708 Mon Sep 17 00:00:00 2001
From: Tim Bentley <tim.bentley@gmail.com>
Date: Sat, 28 Aug 2010 19:44:49 +0100
Subject: [PATCH] Fix font sizes and performance of previews

---
 openlp/core/lib/htmlbuilder.py | 10 +++++-----
 openlp/core/ui/maindisplay.py  | 20 +++++++++++---------
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/openlp/core/lib/htmlbuilder.py b/openlp/core/lib/htmlbuilder.py
index 2fa7b0df0..b6a1a9130 100644
--- a/openlp/core/lib/htmlbuilder.py
+++ b/openlp/core/lib/htmlbuilder.py
@@ -290,7 +290,7 @@ Therefore one table for text, one for outline and one for shadow.
 </html>
     """
 
-def build_html(item, screen, alert):
+def build_html(item, screen, alert, islive):
     """
     Build the full web paged structure for display
 
@@ -312,7 +312,7 @@ def build_html(item, screen, alert):
         build_alert(alert, width),
         build_footer(item),
         build_lyrics(item),
-        u'true' if theme and theme.display_slideTransition \
+        u'true' if theme and theme.display_slideTransition and islive\
             else u'false',
         image)
     return html
@@ -343,7 +343,7 @@ def build_lyrics(item):
     shadow = u'display: none;'
     if theme:
         lyricscommon =  u'width: %spx; height: %spx; word-wrap: break-word;  ' \
-            u'font-family: %s; font-size: %spx; color: %s; line-height: %d%%;' % \
+            u'font-family: %s; font-size: %spt; color: %s; line-height: %d%%;' % \
             (item.main.width(), item.main.height(),
             theme.font_main_name, theme.font_main_proportion,
             theme.font_main_color, 100 + int(theme.font_main_line_adjustment))
@@ -398,7 +398,7 @@ def build_footer(item):
     width: %spx;
     height: %spx;
     font-family: %s;
-    font-size: %spx;
+    font-size: %spt;
     color: %s;
     text-align: %s;
     """
@@ -427,7 +427,7 @@ def build_alert(alertTab, width):
     width: %s;
     vertical-align: %s;
     font-family: %s;
-    font-size: %spx;
+    font-size: %spt;
     color: %s;
     background-color: %s;
     """
diff --git a/openlp/core/ui/maindisplay.py b/openlp/core/ui/maindisplay.py
index 98b7a84ec..6f7a6f74f 100644
--- a/openlp/core/ui/maindisplay.py
+++ b/openlp/core/ui/maindisplay.py
@@ -153,7 +153,7 @@ class MainDisplay(DisplayWidget):
             serviceItem = ServiceItem()
             serviceItem.bg_frame = initialFrame
             self.webView.setHtml(build_html(serviceItem, self.screen, \
-                self.parent.alertTab))
+                self.parent.alertTab, self.isLive))
             self.initialFrame = True
             self.show()
             # To display or not to display?
@@ -297,13 +297,14 @@ class MainDisplay(DisplayWidget):
         Generates a preview of the image displayed.
         """
         log.debug(u'preview for %s', self.isLive)
-        # Wait for the fade to finish before geting the preview.
-        # Important otherwise preview will have incorrect text if at all !
-        if self.serviceItem.themedata and \
-            self.serviceItem.themedata.display_slideTransition:
-            while self.frame.evaluateJavaScript(u'show_text_complete()') \
-                .toString() == u'false':
-                Receiver.send_message(u'openlp_process_events')
+        if self.isLive:
+            # Wait for the fade to finish before geting the preview.
+            # Important otherwise preview will have incorrect text if at all !
+            if self.serviceItem.themedata and \
+                self.serviceItem.themedata.display_slideTransition:
+                while self.frame.evaluateJavaScript(u'show_text_complete()') \
+                    .toString() == u'false':
+                    Receiver.send_message(u'openlp_process_events')
         # Wait for the webview to update before geting the preview.
         # Important otherwise first preview will miss the background !
         while not self.loaded:
@@ -332,7 +333,8 @@ class MainDisplay(DisplayWidget):
         self.loaded = False
         self.initialFrame = False
         self.serviceItem = serviceItem
-        html = build_html(self.serviceItem, self.screen, self.parent.alertTab)
+        html = build_html(self.serviceItem, self.screen, self.parent.alertTab,\
+            self.isLive)
         self.webView.setHtml(html)
         if serviceItem.foot_text and serviceItem.foot_text:
             self.footer(serviceItem.foot_text)