openlp-core team mailing list archive

[Andreas Preikschat <andreaspreikschat@xxxxxxxxxx>]

Andreas Preikschat has proposed merging lp:~googol/openlp/render into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)
Related bugs:
  Bug #856296 in OpenLP: "Improve performance of song loading for Preview/Live"
  https://bugs.launchpad.net/openlp/+bug/856296

For more details, see:
https://code.launchpad.net/~googol/openlp/render/+merge/77035

Hello,

I have improved the line counting.
-- 
https://code.launchpad.net/~googol/openlp/render/+merge/77035
Your team OpenLP Core is requested to review the proposed merge of lp:~googol/openlp/render into lp:openlp.

=== modified file 'openlp/core/lib/renderer.py'
--- openlp/core/lib/renderer.py	2011-09-26 16:57:32 +0000
+++ openlp/core/lib/renderer.py	2011-09-26 18:38:31 +0000
@@ -44,6 +44,8 @@
     'Get those children out of the muddy, muddy \n' \
     '{r}C{/r}{b}h{/b}{bl}i{/bl}{y}l{/y}{g}d{/g}{pk}' \
     'r{/pk}{o}e{/o}{pp}n{/pp} of the Lord\n'
+VERSE_FOR_LINE_COUNT = u'1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n11\n12\n13\n14\n15' \
+    '\n16\n17\n18\n19\n20\n21\n22\n23\n24\n25\n26\n27\n28\n29\n30\n31\n32\n33'
 FOOTER = [u'Arky Arky (Unknown)', u'Public Domain', u'CCLI 123456']
 
 class Renderer(object):
@@ -190,7 +192,7 @@
         serviceItem.theme = theme_data
         if self.force_page:
             # make big page for theme edit dialog to get line count
-            serviceItem.add_from_text(u'', VERSE + VERSE + VERSE)
+            serviceItem.add_from_text(u'', VERSE_FOR_LINE_COUNT)
         else:
             self.imageManager.del_image(theme_data.theme_name)
             serviceItem.add_from_text(u'', VERSE)