OpenLP

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

  1. audit
  2. Merge into trunk
Proposed by Tim Bentley
Status: Merged
Merged at revision: not available
Proposed branch: lp:~trb143/openlp/audit
Merge into: lp:openlp
Diff against target: 56 lines
1 file modified
openlp/plugins/bibles/lib/mediaitem.py (+9/-9)
To merge this branch: bzr merge lp:~trb143/openlp/audit
Reviewer Review Type Date Requested Status
Raoul Snyman Approve
Review via email: mp+13121@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Tim Bentley (trb143) wrote :

Changes to hide plugins broke Bible rendering.
This fixes it.

Revision history for this message
Raoul Snyman (raoul-snyman) :
review: Approve
lp:~trb143/openlp/audit updated
621. By Tim Bentley

Bible New features and Clean up

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'openlp/plugins/bibles/lib/mediaitem.py'
2--- openlp/plugins/bibles/lib/mediaitem.py 2009-10-08 05:02:39 +0000
3+++ openlp/plugins/bibles/lib/mediaitem.py 2009-10-09 12:55:21 +0000
4@@ -345,20 +345,20 @@
5 verse = unicode(self.search_results[0].verse)
6 text = self.search_results[0].text
7 #Paragraph style force new line per verse
8- if self.parent.bibles_tab.layout_style == 1:
9+ if self.parent.settings_tab.layout_style == 1:
10 text = text + u'\n\n'
11- if self.parent.bibles_tab.display_style == 1:
12+ if self.parent.settings_tab.display_style == 1:
13 loc = self.formatVerse(old_chapter, chapter, verse, u'(u', u')')
14- elif self.parent.bibles_tab.display_style == 2:
15+ elif self.parent.settings_tab.display_style == 2:
16 loc = self.formatVerse(old_chapter, chapter, verse, u'{', u'}')
17- elif self.parent.bibles_tab.display_style == 3:
18+ elif self.parent.settings_tab.display_style == 3:
19 loc = self.formatVerse(old_chapter, chapter, verse, u'[', u']')
20 else:
21 loc = self.formatVerse(old_chapter, chapter, verse, u'', u'')
22 old_chapter = chapter
23 bible_text = bible_text + u' '+ loc + u' '+ text
24 #if we are verse per slide then create slide
25- if self.parent.bibles_tab.layout_style == 0:
26+ if self.parent.settings_tab.layout_style == 0:
27 raw_slides.append(bible_text)
28 bible_text = u''
29 service_item.title = book + u' ' + loc
30@@ -368,12 +368,12 @@
31 raw_footer.index(footer)
32 except:
33 raw_footer.append(footer)
34- if len(self.parent.bibles_tab.bible_theme) == 0:
35+ if len(self.parent.settings_tab.bible_theme) == 0:
36 service_item.theme = None
37 else:
38- service_item.theme = self.parent.bibles_tab.bible_theme
39+ service_item.theme = self.parent.settings_tab.bible_theme
40 #if we are verse per slide we have already been added
41- if self.parent.bibles_tab.layout_style != 0:
42+ if self.parent.settings_tab.layout_style != 0:
43 raw_slides.append(bible_text)
44 for slide in raw_slides:
45 service_item.add_from_text(slide[:30], slide)
46@@ -384,7 +384,7 @@
47 loc = opening
48 if old_chapter != chapter:
49 loc += chapter + u':'
50- elif not self.parent.bibles_tab.show_new_chapters:
51+ elif not self.parent.settings_tab.show_new_chapters:
52 loc += chapter + u':'
53 loc += verse
54 loc += closing
55
56=== modified file 'openlp/plugins/songs/songsplugin.py'