From 3061c319d59d340e79fd21602ae85ac41b058e9c Mon Sep 17 00:00:00 2001 From: M2j Date: Sun, 20 Jun 2010 01:16:15 +0200 Subject: [PATCH] Automatic verse order entry expanding deleted a misplaced QSpacerItem --- openlp/plugins/songs/forms/editsongdialog.py | 3 --- openlp/plugins/songs/forms/editsongform.py | 9 +++++++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/openlp/plugins/songs/forms/editsongdialog.py b/openlp/plugins/songs/forms/editsongdialog.py index 3bec03a09..8d145d8bf 100644 --- a/openlp/plugins/songs/forms/editsongdialog.py +++ b/openlp/plugins/songs/forms/editsongdialog.py @@ -384,9 +384,6 @@ class Ui_EditSongDialog(object): self.CommentsLayout.addWidget(self.CommentsEdit) self.ThemeCopyCommentsLayout.addWidget(self.CommentsGroupBox) self.ThemeTabLayout.addWidget(self.ThemeCopyCommentsWidget) - spacerItem5 = QtGui.QSpacerItem(20, 40, - QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) - self.ThemeTabLayout.addItem(spacerItem5) self.SongTabWidget.addTab(self.ThemeTab, u'') self.verticalLayout.addWidget(self.SongTabWidget) self.ButtonBox = QtGui.QDialogButtonBox(EditSongDialog) diff --git a/openlp/plugins/songs/forms/editsongform.py b/openlp/plugins/songs/forms/editsongform.py index 62fda42a7..f2ee5979f 100644 --- a/openlp/plugins/songs/forms/editsongform.py +++ b/openlp/plugins/songs/forms/editsongform.py @@ -630,6 +630,7 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog): sxml.new_document() sxml.add_lyrics_to_song() text = u'' + multiple = [] for i in range (0, self.VerseListWidget.rowCount()): item = self.VerseListWidget.item(i, 0) verseId = unicode(item.data(QtCore.Qt.UserRole).toString()) @@ -637,8 +638,16 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog): sxml.add_verse_to_lyrics(bits[0], bits[1], unicode(item.text())) text = text + re.sub(r'\W+', u' ', unicode(self.VerseListWidget.item(i, 0).text())) + u' ' + if (bits[1] > u'1') and (bits[0][0] not in multiple): + multiple.append(bits[0][0]) + print bits[0][0] self.song.search_lyrics = text self.song.lyrics = unicode(sxml.extract_xml(), u'utf-8') + for verse in multiple: + self.song.verse_order = self.song.verse_order.replace( + verse.upper() + u' ', verse.upper() + u'1 ') + self.song.verse_order = self.song.verse_order.replace( + verse.lower() + u' ', verse.lower() + u'1 ') except: log.exception(u'Problem processing song Lyrics \n%s', sxml.dump_xml())