openlp-core team mailing list archive

[Tim Bentley <tim.bentley@xxxxxxxxx>]

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

    Requested reviews:
    OpenLP Core (openlp-core)


Allow songs to have more the single digit verses.  
Tested with 10,11,12,13 and 100!  
That should be enough I hope
-- 
https://code.launchpad.net/~trb143/openlp/working/+merge/18989
Your team OpenLP Core is subscribed to branch lp:openlp.

=== modified file 'openlp/core/ui/slidecontroller.py'
--- openlp/core/ui/slidecontroller.py	2010-02-04 19:25:32 +0000
+++ openlp/core/ui/slidecontroller.py	2010-02-10 07:13:12 +0000
@@ -444,7 +444,7 @@
                     tag = None
                     #If verse handle verse number else tag only
                     if bits[0] == self.trUtf8('Verse'):
-                        tag = u'%s%s' % (bits[0][0], bits[1][0] )
+                        tag = u'%s%s' % (bits[0][0], bits[1][0:] )
                     else:
                         tag = bits[0]
                     try:

=== modified file 'openlp/plugins/songs/forms/editsongform.py'
--- openlp/plugins/songs/forms/editsongform.py	2010-02-07 20:11:37 +0000
+++ openlp/plugins/songs/forms/editsongform.py	2010-02-10 07:13:12 +0000
@@ -410,7 +410,7 @@
             self.AuthorsListView.setFocus()
         #split the verse list by space and mark lower case for testing
         for verse in unicode(self.VerseOrderEdit.text()).lower().split(u' '):
-            if len(verse) == 2:
+            if len(verse) > 1:
                 if verse[0:1] == u'v' and verse[1:].isdigit():
                     pass
                 else:

=== modified file 'openlp/plugins/songs/lib/mediaitem.py'
--- openlp/plugins/songs/lib/mediaitem.py	2010-01-31 19:49:01 +0000
+++ openlp/plugins/songs/lib/mediaitem.py	2010-02-10 07:13:12 +0000
@@ -310,7 +310,7 @@
                     for verse in verseList:
                         if verse[1]:
                             if verse[0][u'type'] == "Verse":
-                                if verse[0][u'label'][0] == order[1:]:
+                                if verse[0][u'label'] == order[1:]:
                                     verseTag = u'%s:%s' % \
                                         (verse[0][u'type'], verse[0][u'label'])
                                     service_item.add_from_text\