openlp-core team mailing list archive

[Tim Bentley <tim.bentley@xxxxxxxxx>]

Tim Bentley has proposed merging lp:~trb143/openlp/renderer into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)
Related bugs:
  #630247 Song mark up shows in song verses when creating a new song
  https://bugs.launchpad.net/bugs/630247
  #630285 OpeLP goes live on items even though a hide screen mode is active
  https://bugs.launchpad.net/bugs/630285


More bug squishing 
-- 
https://code.launchpad.net/~trb143/openlp/renderer/+merge/34775
Your team OpenLP Core is requested to review the proposed merge of lp:~trb143/openlp/renderer into lp:openlp.

=== modified file 'openlp/plugins/songs/forms/editsongform.py'
--- openlp/plugins/songs/forms/editsongform.py	2010-08-28 19:40:27 +0000
+++ openlp/plugins/songs/forms/editsongform.py	2010-09-07 16:17:40 +0000
@@ -274,7 +274,7 @@
             item = self.VerseListWidget.item(row, 0)
             data = unicode(item.data(QtCore.Qt.UserRole).toString())
             bit = data.split(u':')
-            rowTag = u'%s\n%s' % (bit[0][0:1], bit[1])
+            rowTag = u'%s%s' % (bit[0][0:1], bit[1])
             rowLabel.append(rowTag)
         self.VerseListWidget.setVerticalHeaderLabels(rowLabel)
 
@@ -395,9 +395,7 @@
         self.VerseDeleteButton.setEnabled(True)
 
     def onVerseAddButtonClicked(self):
-        # Allow insert button as you do not know if multiple verses will
-        # be entered.
-        self.verse_form.setVerse(u'')
+        self.verse_form.setVerse(u'', True)
         if self.verse_form.exec_():
             afterText, verse, subVerse = self.verse_form.getVerse()
             data = u'%s:%s' % (verse, subVerse)