Head

openlp/core/ui/aboutdialog.py

@@ -118,8 +118,8 @@ class Ui_AboutDialog(object):
             u'Armin "orangeshirt" K\xf6hler', u'Joshua "milleja46" Miller',
             u'Stevan "StevanP" Pettit', u'Mattias "mahfiaz" P\xf5ldaru',
             u'Christian "crichter" Richter', u'Philip "Phill" Ridout',
-            u'Simon "samscudder" Scudder, Jeffrey "whydoubt" Smith',
-            u'Maikel Stuivenberg Frode "frodus" Woldsund']
+            u'Simon "samscudder" Scudder', u'Jeffrey "whydoubt" Smith',
+            u'Maikel Stuivenberg', u'Frode "frodus" Woldsund']
         testers = [u'Philip "Phill" Ridout', u'Wesley "wrst" Stout',
             u'John "jseagull1" Cegalis (lead)']
         packagers = ['Thomas "tabthorpe" Abthorpe (FreeBSD)',

openlp/core/ui/servicenoteform.py

@@ -42,6 +42,10 @@ class ServiceNoteForm(QtGui.QDialog):
         self.setupUi()
         self.retranslateUi()
 
+    def exec_(self):
+        self.textEdit.setFocus()
+        return QtGui.QDialog.exec_(self)
+
     def setupUi(self):
         self.setObjectName(u'serviceNoteEdit')
         self.dialogLayout = QtGui.QVBoxLayout(self)

openlp/plugins/songs/forms/editverseform.py

@@ -185,7 +185,14 @@ class EditVerseForm(QtGui.QDialog, Ui_EditVerseDialog):
         if self.hasSingleVerse:
             value = unicode(self.getVerse()[0])
         else:
-            value = self.getVerse()[0].split(u'\n')[1]
+            log.debug(unicode(self.getVerse()[0]).split(u'\n'))
+            value = unicode(self.getVerse()[0]).split(u'\n')[1]
+            if len(value) == 0:
+                lines = unicode(self.getVerse()[0]).split(u'\n')
+                index = 2
+                while index < len(lines) and len(value) == 0:
+                    value = lines[index]
+                    index += 1
         if len(value) == 0:
             critical_error_message_box(
                 message=translate('SongsPlugin.EditSongForm',

openlp/plugins/songs/lib/songshowplusimport.py

@@ -165,8 +165,9 @@ class SongShowPlusImport(SongImport):
                 elif blockKey == VERSE_ORDER:
                     verseTag = self.toOpenLPVerseTag(data, True)
                     if verseTag:
-                        self.sspVerseOrderList.append(unicode(verseTag,
-                            u'cp1252'))
+                        if not isinstance(verseTag, unicode):
+                            verseTag = unicode(verseTag, u'cp1252')
+                        self.sspVerseOrderList.append(verseTag)
                 elif blockKey == SONG_BOOK:
                     self.song_book_name = unicode(data, u'cp1252')
                 elif blockKey == SONG_NUMBER: