raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

Make sure we always add a blank line between verses. Fixes bug 1439311.

Browse Source 
Fixes: https://launchpad.net/bugs/1439311
This commit is contained in:
Tomas Groth 2015-04-11 23:13:30 +01:00
parent 6f5a139329
commit cd7c4f6197
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openlp/core/ui/printserviceform.py
View File

@ -193,13 +193,15 @@ class PrintServiceForm(QtGui.QDialog, Ui_PrintServiceDialog, RegistryProperties)
# Add the text of the service item. # Add the text of the service item.
if item.is_text(): if item.is_text():
verse_def = None verse_def = None
verse_html = None
for slide in item.get_frames(): for slide in item.get_frames():
if not verse_def or verse_def != slide['verseTag']: if not verse_def or verse_def != slide['verseTag'] or verse_html == slide['html']:
text_div = self._add_element('div', parent=div, classId='itemText') text_div = self._add_element('div', parent=div, classId='itemText')
else: else:
self._add_element('br', parent=text_div) self._add_element('br', parent=text_div)
self._add_element('span', slide['html'], text_div) self._add_element('span', slide['html'], text_div)
verse_def = slide['verseTag'] verse_def = slide['verseTag']
verse_html = slide['html']
# Break the page before the div element. # Break the page before the div element.
if index != 0 and self.page_break_after_text.isChecked(): if index != 0 and self.page_break_after_text.isChecked():
div.set('class', 'item newPage') div.set('class', 'item newPage')