openlp-core team mailing list archive

[Andreas Preikschat <andreaspreikschat@xxxxxxxxxx>]

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

Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~googol-hush/openlp/songs/+merge/60678

Hello,

- clean up

(Sorry, that his does not bring any fixes or improvements, but I worried I could forget about it. There are just too many new branches.)
-- 
https://code.launchpad.net/~googol-hush/openlp/songs/+merge/60678
Your team OpenLP Core is requested to review the proposed merge of lp:~googol-hush/openlp/songs into lp:openlp.

=== modified file 'openlp/plugins/songs/lib/foilpresenterimport.py'
--- openlp/plugins/songs/lib/foilpresenterimport.py	2011-04-18 19:24:06 +0000
+++ openlp/plugins/songs/lib/foilpresenterimport.py	2011-05-11 18:52:36 +0000
@@ -431,7 +431,7 @@
                     verse_sortnr = self._child(strophe.sortnr)
                     sortnr = True
                 # In older Version there is no sortnr, but we need one
-            if sortnr == False:
+            if not sortnr:
                 verse_sortnr = unicode(temp_sortnr_backup)
                 temp_sortnr_backup += 1
             # Foilpresenter allows e. g. "Ref" or "1", but we need "C1" or "V1".
@@ -467,7 +467,7 @@
                 # test if foilpresenter have the same versenumber two times with
                 # different parts raise the verse number
                 for value in temp_verse_order_backup:
-                    if value == (u''.join((verse_type, verse_number))):
+                    if value == u''.join((verse_type, verse_number)):
                         verse_number = unicode(int(verse_number) + 1)
             verse_type_index = VerseType.from_tag(verse_type[0])
             verse_type = VerseType.Names[verse_type_index]

=== modified file 'openlp/plugins/songs/lib/songshowplusimport.py'
--- openlp/plugins/songs/lib/songshowplusimport.py	2011-05-10 11:14:56 +0000
+++ openlp/plugins/songs/lib/songshowplusimport.py	2011-05-11 18:52:36 +0000
@@ -150,13 +150,13 @@
                     self.ccli_number = int(data)
                 elif blockKey == VERSE:
                     self.add_verse(unicode(data, u'cp1252'),
-                        "V%s" % verseNo)
+                        "%s%s" % (VerseType.Tags[VerseType.Verse], verseNo))
                 elif blockKey == CHORUS:
                     self.add_verse(unicode(data, u'cp1252'),
-                        "C%s" % verseNo)
+                        "%s%s" % (VerseType.Tags[VerseType.Chorus], verseNo))
                 elif blockKey == BRIDGE:
                     self.add_verse(unicode(data, u'cp1252'),
-                        "B%s" % verseNo)
+                        "%s%s" % (VerseType.Tags[VerseType.Bridge], verseNo))
                 elif blockKey == TOPIC:
                     self.topics.append(unicode(data, u'cp1252'))
                 elif blockKey == COMMENTS: