From b2bb583fb04eb19d80b148fbcbe2b183b0cfe9a3 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Mon, 6 Jun 2011 18:35:47 +0100 Subject: [PATCH] Fixes --- openlp/core/lib/renderer.py | 6 +++--- openlp/core/ui/themeform.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/openlp/core/lib/renderer.py b/openlp/core/lib/renderer.py index c6e729be8..250991d2a 100644 --- a/openlp/core/lib/renderer.py +++ b/openlp/core/lib/renderer.py @@ -241,7 +241,7 @@ class Renderer(object): ``screen`` The QSize of the screen. """ - log.debug(u'calculate default %s', screen) + log.debug(u'_calculate default %s', screen) self.width = screen.width() self.height = screen.height() self.screen_ratio = float(self.height) / float(self.width) @@ -286,7 +286,7 @@ class Renderer(object): ``rect_footer`` The footer text block. """ - log.debug(u'set_text_rectangle %s , %s' % (rect_main, rect_footer)) + log.debug(u'_set_text_rectangle %s , %s' % (rect_main, rect_footer)) self._rect = rect_main self._rect_footer = rect_footer self.page_width = self._rect.width() @@ -339,7 +339,7 @@ class Renderer(object): # Text too long so go to next page. if self.web_frame.contentsSize().height() > self.page_height: if force_page and line_count > 0: - Receiver.send_message(u'theme_line_count', line_count) + Receiver.send_message(u'theme_line_count', line_count - 1) line_count = -1 while html_text.endswith(u'
'): html_text = html_text[:-4] diff --git a/openlp/core/ui/themeform.py b/openlp/core/ui/themeform.py index bae3e8692..921cab048 100644 --- a/openlp/core/ui/themeform.py +++ b/openlp/core/ui/themeform.py @@ -202,7 +202,7 @@ class ThemeForm(QtGui.QWizard, Ui_ThemeWizard): Updates the lines on a page on the wizard """ self.mainLineCountLabel.setText(unicode(translate('OpenLP.ThemeForm', - '(%d lines per slide)')) % int(lines)) + '(approximately %d lines per slide)')) % int(lines)) def resizeEvent(self, event=None): """