From 50aa14344616c252bb81d08a4a7f3080b8d498c5 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Sun, 22 Nov 2009 20:51:52 +0000 Subject: [PATCH] Save verse details --- openlp/plugins/songs/forms/editsongform.py | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/openlp/plugins/songs/forms/editsongform.py b/openlp/plugins/songs/forms/editsongform.py index 547613def..2f0ef424c 100644 --- a/openlp/plugins/songs/forms/editsongform.py +++ b/openlp/plugins/songs/forms/editsongform.py @@ -356,7 +356,11 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog): verse_list = verse_list.replace(u'\r\n', u'\n') self.VerseListWidget.clear() for row in verse_list.split(u'\n---\n'): - self.VerseListWidget.addItem(row) + bits = row.split(u'>\n') + item = QtGui.QListWidgetItem(bits[1]) + verse = bits[0][1:] + item.setData(QtCore.Qt.UserRole, QtCore.QVariant(verse)) + self.VerseListWidget.addItem(item) self.VerseListWidget.repaint() def onVerseDeleteButtonClicked(self): @@ -456,10 +460,17 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog): text = u' ' verse_order = u'' for i in range (0, self.VerseListWidget.count()): - sxml.add_verse_to_lyrics(u'Verse', unicode(count), + verseId = unicode((item.data(QtCore.Qt.UserRole)).toString()[0]) + if len(verseId) <= 2: + type = u'Verse' + value = verseId + else: + type = verseId + value = 0 + sxml.add_verse_to_lyrics(type, verseId, unicode(self.VerseListWidget.item(i).text())) text = text + unicode(self.VerseListWidget.item(i).text()) + u' ' - verse_order = verse_order + unicode(count) + u' ' + verse_order = verse_order + verseId + u' ' count += 1 if self.song.verse_order is None: self.song.verse_order = verse_order