openlp-core team mailing list archive
-
openlp-core team
-
Mailing list archive
-
Message #09493
[Merge] lp:~googol-hush/openlp/bug-789618 into lp:openlp
Andreas Preikschat has proposed merging lp:~googol-hush/openlp/bug-789618 into lp:openlp.
Requested reviews:
Raoul Snyman (raoul-snyman)
Related bugs:
Bug #789618 in OpenLP: "Large gap between two parts of a verse in Service Order Print "
https://bugs.launchpad.net/openlp/+bug/789618
For more details, see:
https://code.launchpad.net/~googol-hush/openlp/bug-789618/+merge/62817
Hello,
- fixed bug #789618 "Large gap between two parts of a verse in Service Order Print"
--
https://code.launchpad.net/~googol-hush/openlp/bug-789618/+merge/62817
Your team OpenLP Core is subscribed to branch lp:openlp.
=== modified file 'openlp/core/ui/printserviceform.py'
--- openlp/core/ui/printserviceform.py 2011-05-26 17:11:22 +0000
+++ openlp/core/ui/printserviceform.py 2011-05-30 05:08:23 +0000
@@ -42,42 +42,44 @@
*/
.serviceTitle {
- font-weight:600;
- font-size:x-large;
- color:black;
+ font-weight: 600;
+ font-size: x-large;
+ color: black;
}
.item {
- color:black;
+ color: black;
}
.itemTitle {
- font-weight:600;
- font-size:large;
+ font-weight: 600;
+ font-size: large;
}
-.itemText {}
+.itemText {
+ margin-top: 10px;
+}
.itemFooter {
- font-size:8px;
+ font-size: 8px;
}
.itemNotes {}
.itemNotesTitle {
- font-weight:bold;
- font-size:12px;
+ font-weight: bold;
+ font-size: 12px;
}
.itemNotesText {
- font-size:11px;
+ font-size: 11px;
}
.media {}
.mediaTitle {
- font-weight:bold;
- font-size:11px;
+ font-weight: bold;
+ font-size: 11px;
}
.mediaText {}
@@ -89,16 +91,16 @@
}
.customNotesTitle {
- font-weight:bold;
- font-size:11px;
+ font-weight: bold;
+ font-size: 11px;
}
.customNotesText {
- font-size:11px;
+ font-size: 11px;
}
.newPage {
- page-break-before:always;
+ page-break-before: always;
}
"""
@@ -212,11 +214,11 @@
verse_def = None
for slide in item.get_frames():
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')
else:
- self._addElement(u'br', parent=p)
- self._addElement(u'p', slide[u'html'], p)
+ self._addElement(u'br', parent=text_div)
+ self._addElement(u'span', slide[u'html'], text_div)
verse_def = slide[u'verseTag']
# Break the page before the div element.
if index != 0 and self.pageBreakAfterText.isChecked():
Follow ups