From 206eb1006e3141a2583a727f2ed33ae06f46ab53 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Mon, 1 Nov 2010 19:22:00 +0000 Subject: [PATCH 1/3] Fix preview bug --- openlp/core/ui/slidecontroller.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py index 59ae353cc..f4858f72e 100644 --- a/openlp/core/ui/slidecontroller.py +++ b/openlp/core/ui/slidecontroller.py @@ -794,10 +794,11 @@ class SlideController(QtGui.QWidget): row = self.PreviewListWidget.currentRow() self.selectedRow = 0 if row > -1 and row < self.PreviewListWidget.rowCount(): - if self.serviceItem.is_command() and self.isLive: - Receiver.send_message(u'%s_slide' % self.serviceItem.name.lower(), - [self.serviceItem, self.isLive, row]) - self.updatePreview() + if self.serviceItem.is_command(): + if self.isLive: + Receiver.send_message(u'%s_slide' % self.serviceItem.name.lower(), + [self.serviceItem, self.isLive, row]) + self.updatePreview() else: toDisplay = self.serviceItem.get_rendered_frame(row) if self.serviceItem.is_text(): From f7ddb507e842bc66203c06d45826bc4c84552099 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Mon, 1 Nov 2010 19:33:33 +0000 Subject: [PATCH 2/3] Fix renderer --- openlp/core/lib/renderer.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/openlp/core/lib/renderer.py b/openlp/core/lib/renderer.py index 23d0623c5..2a8e46dca 100644 --- a/openlp/core/lib/renderer.py +++ b/openlp/core/lib/renderer.py @@ -116,18 +116,19 @@ class Renderer(object): html_text = u'' styled_text = u'' for line in text: - styled_line = expand_tags(line) - if styled_text: - styled_text += line_end + styled_line + styled_line = expand_tags(line) + line_end + styled_text += styled_line html = self.page_shell + styled_text + u'' self.web.setHtml(html) # Text too long so go to next page if self.web_frame.contentsSize().height() > self.page_height: + if html_text.endswith(u'
'): + html_text = html_text[:len(html_text)-4] formatted.append(html_text) html_text = u'' styled_text = styled_line html_text += line + line_end - if line_break: + if html_text.endswith(u'
'): html_text = html_text[:len(html_text)-4] formatted.append(html_text) log.debug(u'format_slide - End') From 6cf851022e5949098489e344fca36cf3f1ee735c Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Wed, 3 Nov 2010 17:33:08 +0000 Subject: [PATCH 3/3] Update preview --- openlp/core/ui/slidecontroller.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py index f4858f72e..e4b4733a2 100644 --- a/openlp/core/ui/slidecontroller.py +++ b/openlp/core/ui/slidecontroller.py @@ -798,7 +798,7 @@ class SlideController(QtGui.QWidget): if self.isLive: Receiver.send_message(u'%s_slide' % self.serviceItem.name.lower(), [self.serviceItem, self.isLive, row]) - self.updatePreview() + self.updatePreview() else: toDisplay = self.serviceItem.get_rendered_frame(row) if self.serviceItem.is_text():