- fixed bug #789618 "Large gap between two parts of a verse in Service Order Print"

bzr-revno: 1598
Fixes: https://launchpad.net/bugs/789618
This commit is contained in:
Andreas Preikschat 2011-05-31 12:53:35 +02:00
commit 79b107138a

View File

@ -56,7 +56,9 @@ http://doc.trolltech.com/4.7/richtext-html-subset.html#css-properties
font-size: large; font-size: large;
} }
.itemText {} .itemText {
margin-top: 10px;
}
.itemFooter { .itemFooter {
font-size: 8px; font-size: 8px;
@ -212,11 +214,11 @@ class PrintServiceForm(QtGui.QDialog, Ui_PrintServiceDialog):
verse_def = None verse_def = None
for slide in item.get_frames(): for slide in item.get_frames():
if not verse_def or verse_def != slide[u'verseTag']: if not verse_def or verse_def != slide[u'verseTag']:
p = self._addElement(u'div', parent=div, text_div = self._addElement(u'div', parent=div,
classId=u'itemText') classId=u'itemText')
else: else:
self._addElement(u'br', parent=p) self._addElement(u'br', parent=text_div)
self._addElement(u'p', slide[u'html'], p) self._addElement(u'span', slide[u'html'], text_div)
verse_def = slide[u'verseTag'] verse_def = slide[u'verseTag']
# Break the page before the div element. # Break the page before the div element.
if index != 0 and self.pageBreakAfterText.isChecked(): if index != 0 and self.pageBreakAfterText.isChecked():