From 939909fdd808000a7b2e6486f8bec48e57b1bf09 Mon Sep 17 00:00:00 2001
From: Tim Bentley <tim.bentley@gmail.com>
Date: Sun, 29 Nov 2009 21:03:24 +0000
Subject: [PATCH] Remove Timer from transitions not needed Add Code to use the
 Verse Order to expand songs

---
 openlp/core/ui/maindisplay.py              |  3 ---
 openlp/plugins/songs/forms/editsongform.py |  2 +-
 openlp/plugins/songs/lib/mediaitem.py      | 22 ++++++++++++++++++----
 3 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/openlp/core/ui/maindisplay.py b/openlp/core/ui/maindisplay.py
index b7f5f31b6..4ba0f938a 100644
--- a/openlp/core/ui/maindisplay.py
+++ b/openlp/core/ui/maindisplay.py
@@ -198,13 +198,10 @@ class MainDisplay(DisplayWidget):
         elif not self.displayBlank:
             if transition:
                 if self.hasTransition:
-                    delay = 0.01
                     self.display.setPixmap(QtGui.QPixmap.fromImage(self.frame[u'trans']))
                     self.repaint()
-                    time.sleep(delay)
                     self.display.setPixmap(QtGui.QPixmap.fromImage(frame[u'trans']))
                     self.repaint()
-                    time.sleep(delay)
                 self.hasTransition = True
                 self.display.setPixmap(QtGui.QPixmap.fromImage(frame[u'main']))
                 self.repaint()
diff --git a/openlp/plugins/songs/forms/editsongform.py b/openlp/plugins/songs/forms/editsongform.py
index 178531bed..b7103fd61 100644
--- a/openlp/plugins/songs/forms/editsongform.py
+++ b/openlp/plugins/songs/forms/editsongform.py
@@ -226,7 +226,7 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
             verses = self.song.lyrics.split(u'\n\n')
             for count, verse in enumerate(verses):
                 item = QtGui.QListWidgetItem(verse)
-                variant = u'Verse:%s' % count + 1
+                variant = u'Verse:%s' % unicode(count + 1)
                 item.setData(QtCore.Qt.UserRole, QtCore.QVariant(variant))
                 self.VerseListWidget.addItem(item)
         # clear the results
diff --git a/openlp/plugins/songs/lib/mediaitem.py b/openlp/plugins/songs/lib/mediaitem.py
index 080b6ae35..04dae39fc 100644
--- a/openlp/plugins/songs/lib/mediaitem.py
+++ b/openlp/plugins/songs/lib/mediaitem.py
@@ -293,10 +293,24 @@ class SongMediaItem(MediaManagerItem):
         if song.lyrics.startswith(u'<?xml version='):
             songXML = SongXMLParser(song.lyrics)
             verseList = songXML.get_verses()
-            for verse in verseList:
-                if verse[1]:
-                    verseTag = u'%s:%s' % (verse[0][u'type'], verse[0][u'label'])
-                    service_item.add_from_text(verse[1][:30], verse[1], verseTag)
+            for order in service_item.verse_order:
+                for verse in verseList:
+                    if verse[1]:
+                        #Check for verses and expand all verses
+                        if order.isdigit():
+
+                            if verse[0][u'type'] == "Verse" and \
+                                    verse[0][u'label'].find(order) > -1:
+                                verseTag = u'%s:%s' % \
+                                    (verse[0][u'type'], verse[0][u'label'])
+                                service_item.add_from_text\
+                                    (verse[1][:30], verse[1], verseTag)
+                        else:
+                            if verse[0][u'type'].find(order) > -1:
+                                verseTag = u'%s:%s' % \
+                                    (verse[0][u'type'], verse[0][u'label'])
+                                service_item.add_from_text\
+                                    (verse[1][:30], verse[1], verseTag)
         else:
             verses = song.lyrics.split(u'\n\n')
             for slide in verses: