From c6afbec8491c6873d56da4da21f97f92b3a59846 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Mon, 13 Jun 2011 19:10:06 +0100 Subject: [PATCH 1/4] Fix names --- openlp/core/ui/aboutdialog.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openlp/core/ui/aboutdialog.py b/openlp/core/ui/aboutdialog.py index 7e308e529..3e941c051 100644 --- a/openlp/core/ui/aboutdialog.py +++ b/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)', From 79c0ef15e028cd6865db81b4c97192b9f630491b Mon Sep 17 00:00:00 2001 From: Andreas Preikschat Date: Mon, 13 Jun 2011 22:49:14 +0200 Subject: [PATCH 2/4] give text edit focus --- openlp/core/ui/servicenoteform.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/openlp/core/ui/servicenoteform.py b/openlp/core/ui/servicenoteform.py index 9d75ba780..d361c567e 100644 --- a/openlp/core/ui/servicenoteform.py +++ b/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) From 75d89d22b707ad24cacef54a1fbc3fe5d855bd6e Mon Sep 17 00:00:00 2001 From: Raoul Snyman Date: Tue, 14 Jun 2011 07:45:23 +0200 Subject: [PATCH 3/4] Fixed bug #792204: SongShow Plus importer fails to import song. --- openlp/plugins/songs/lib/songshowplusimport.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/openlp/plugins/songs/lib/songshowplusimport.py b/openlp/plugins/songs/lib/songshowplusimport.py index a2b971510..7f7527c6d 100644 --- a/openlp/plugins/songs/lib/songshowplusimport.py +++ b/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: From 45d992e956a9db3cf1ef2942e04340a208c3f0b7 Mon Sep 17 00:00:00 2001 From: Raoul Snyman Date: Tue, 14 Jun 2011 08:18:44 +0200 Subject: [PATCH 4/4] Fixed bug #763064: Empty line in first verse prevents saving a song. --- openlp/plugins/songs/forms/editverseform.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/openlp/plugins/songs/forms/editverseform.py b/openlp/plugins/songs/forms/editverseform.py index 226110840..79b2b295a 100644 --- a/openlp/plugins/songs/forms/editverseform.py +++ b/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',