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

Song validation changes

Browse Source
This commit is contained in:
Tim Bentley 2009-11-29 18:21:40 +00:00
parent ff8ab8f14f
commit f46cd2c6cb
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
openlp/plugins/songs/forms/editsongform.py
View File

@ -407,7 +407,7 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
self.SongTabWidget.setCurrentIndex(0) self.SongTabWidget.setCurrentIndex(0)
self.VerseOrderEdit.setFocus() self.VerseOrderEdit.setFocus()
return False, \ return False, \
self.trUtf8('Invalid verse entry - values must be Numberic, B or C') self.trUtf8('Invalid verse entry - values must be Numeric, B or C')
return True, u'' return True, u''
def onTitleEditItemLostFocus(self): def onTitleEditItemLostFocus(self):
@ -479,17 +479,13 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
sxml.add_lyrics_to_song() sxml.add_lyrics_to_song()
count = 1 count = 1
text = u' ' text = u' '
verse_order = u''
for i in range (0, self.VerseListWidget.count()): for i in range (0, self.VerseListWidget.count()):
item = self.VerseListWidget.item(i) item = self.VerseListWidget.item(i)
verseId = unicode((item.data(QtCore.Qt.UserRole)).toString()) verseId = unicode((item.data(QtCore.Qt.UserRole)).toString())
bits = verseId.split(u':') bits = verseId.split(u':')
sxml.add_verse_to_lyrics(bits[0], bits[1], unicode(item.text())) sxml.add_verse_to_lyrics(bits[0], bits[1], unicode(item.text()))
text = text + unicode(self.VerseListWidget.item(i).text()) + u' ' text = text + unicode(self.VerseListWidget.item(i).text()) + u' '
verse_order = verse_order + verseId + u' '
count += 1 count += 1
if self.song.verse_order is None:
self.song.verse_order = verse_order
text = text.replace(u'\'', u'') text = text.replace(u'\'', u'')
text = text.replace(u',', u'') text = text.replace(u',', u'')
text = text.replace(u';', u'') text = text.replace(u';', u'')