OpenLP

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

  1. bugfixes
  2. Merge into trunk
Proposed by Tim Bentley
Status: Merged
Merged at revision: not available
Proposed branch: lp:~trb143/openlp/bugfixes
Merge into: lp:openlp
Diff against target: None lines
To merge this branch: bzr merge lp:~trb143/openlp/bugfixes
Reviewer Review Type Date Requested Status
Martin Thompson (community) Approve
Review via email: mp+12141@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Tim Bentley (trb143) wrote :

Add error handling to song xml to see if I can discover the windows linux xml error I am having
Clean up slide titles where a slide is split by the renderer.

Revision history for this message
Martin Thompson (mjthompson) :
review: Approve
lp:~trb143/openlp/bugfixes updated
561. By Tim Bentley

rendering fixes

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'openlp/core/lib/serviceitem.py'
2--- openlp/core/lib/serviceitem.py 2009-09-20 07:17:20 +0000
3+++ openlp/core/lib/serviceitem.py 2009-09-20 18:47:18 +0000
4@@ -100,7 +100,8 @@
5 lines = u''
6 for line in format:
7 lines += line + u'\n'
8- self.frames.append({u'title': slide[u'title'],u'text':lines,
9+ title = lines.split(u'\n')[0]
10+ self.frames.append({u'title': title ,u'text':lines,
11 u'image': frame})
12 elif self.service_item_type == ServiceType.Command:
13 self.frames = self.service_frames
14
15=== modified file 'openlp/core/lib/songxmlhandler.py'
16--- openlp/core/lib/songxmlhandler.py 2009-09-08 19:58:05 +0000
17+++ openlp/core/lib/songxmlhandler.py 2009-09-20 18:47:18 +0000
18@@ -131,7 +131,7 @@
19 try:
20 self.song_xml = ElementTree(element=XML(xml))
21 except:
22- log.debug(u'Invalid xml %s', xml)
23+ log.exception(u'Invalid xml %s', xml)
24
25 def get_verses(self):
26 """