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

- 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
parent 77281d3142 0a2d97021c
commit 79b107138a
1 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,42 +42,44 @@ http://doc.trolltech.com/4.7/richtext-html-subset.html#css-properties
*/ */
.serviceTitle { .serviceTitle {
font-weight:600; font-weight: 600;
font-size:x-large; font-size: x-large;
color:black; color: black;
} }
.item { .item {
color:black; color: black;
} }
.itemTitle { .itemTitle {
font-weight:600; font-weight: 600;
font-size:large; font-size: large;
} }
.itemText {} .itemText {
margin-top: 10px;
}
.itemFooter { .itemFooter {
font-size:8px; font-size: 8px;
} }
.itemNotes {} .itemNotes {}
.itemNotesTitle { .itemNotesTitle {
font-weight:bold; font-weight: bold;
font-size:12px; font-size: 12px;
} }
.itemNotesText { .itemNotesText {
font-size:11px; font-size: 11px;
} }
.media {} .media {}
.mediaTitle { .mediaTitle {
font-weight:bold; font-weight: bold;
font-size:11px; font-size: 11px;
} }
.mediaText {} .mediaText {}
@ -89,16 +91,16 @@ http://doc.trolltech.com/4.7/richtext-html-subset.html#css-properties
} }
.customNotesTitle { .customNotesTitle {
font-weight:bold; font-weight: bold;
font-size:11px; font-size: 11px;
} }
.customNotesText { .customNotesText {
font-size:11px; font-size: 11px;
} }
.newPage { .newPage {
page-break-before:always; page-break-before: always;
} }
""" """
@ -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():