Merge lp:~trb143/openlp/bug_788231 into lp:openlp

[Tim Bentley]

Try to improve the number of lines calculation.
As stated in the bug report the number of lines is not an exact science and things like super and sub script mess things up.
I have tested with a text only slide and the numbers now match!

Updated UI to add vagueness but may be the documentation needs to be changed as well

[Raoul Snyman (raoul-snyman)]

review: Approve

[Andreas Preikschat (googol-deactivatedaccount)]

Hello,

Why the -1 in line 27? In my tests this makes the results rather inaccurate. I tested 30px-74px (certainly not all sizes, but I checked the line count predictions and they were all smaller than the actual line count).

review: Needs Information

[Tim Bentley (trb143)]

> Hello,
>
> Why the -1 in line 27? In my tests this makes the results rather inaccurate. I
> tested 30px-74px (certainly not all sizes, but I checked the line count
> predictions and they were all smaller than the actual line count).

line_count is incremented at the start of the loop so it is one line bigger that number of lines that fit on the page

[Andreas Preikschat (googol-deactivatedaccount)]

Approve, because the logic is correct.

review: Approve

=== modified file 'openlp/core/lib/renderer.py'
--- openlp/core/lib/renderer.py	2011-06-01 07:38:19 +0000
+++ openlp/core/lib/renderer.py	2011-06-06 17:41:16 +0000
@@ -241,7 +241,7 @@
         ``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 @@
         ``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 @@
             # 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'<br>'):
                     html_text = html_text[:-4]
 
=== modified file 'openlp/core/ui/themeform.py'
--- openlp/core/ui/themeform.py	2011-05-26 17:11:22 +0000
+++ openlp/core/ui/themeform.py	2011-06-06 17:41:16 +0000
@@ -202,7 +202,7 @@
         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):
         """