openlp-core team mailing list archive

[Andreas Preikschat <andreaspreikschat@xxxxxxxxxx>]

Andreas Preikschat has proposed merging lp:~googol-hush/openlp/bug-789618 into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)
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/62797

Hello,

- fixed bug #789618
-- 
https://code.launchpad.net/~googol-hush/openlp/bug-789618/+merge/62797
Your team OpenLP Core is requested to review the proposed merge of lp:~googol-hush/openlp/bug-789618 into 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-29 16:05:56 +0000
@@ -56,7 +56,9 @@
    font-size:large;
 }
 
-.itemText {}
+.itemText {
+   margin-top:10px;
+}
 
 .itemFooter {
    font-size:8px;
@@ -85,7 +87,7 @@
 .imageList {}
 
 .customNotes {
-   margin-top: 10px;
+   margin-top:10px;
 }
 
 .customNotesTitle {
@@ -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():