raoul
/
openlp
forked from openlp/openlp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Head

This commit is contained in:
rimach crichter@web.de 2011-06-14 22:51:55 +02:00
parent cbb6b8d405 d84098348b
commit f0b03daa78
4 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openlp/core/ui/aboutdialog.py
View File

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

4
openlp/core/ui/servicenoteform.py
View File

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

9
openlp/plugins/songs/forms/editverseform.py
View File

@ -185,7 +185,14 @@ class EditVerseForm(QtGui.QDialog, Ui_EditVerseDialog):
if self.hasSingleVerse: if self.hasSingleVerse:
value = unicode(self.getVerse()[0]) value = unicode(self.getVerse()[0])
else: 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: if len(value) == 0:
critical_error_message_box( critical_error_message_box(
message=translate('SongsPlugin.EditSongForm', message=translate('SongsPlugin.EditSongForm',

5
openlp/plugins/songs/lib/songshowplusimport.py
View File

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