From 33510c3346ba264331749a6fd400c0449875669a Mon Sep 17 00:00:00 2001 From: Philip Ridout Date: Sat, 14 Jul 2012 18:53:24 +0100 Subject: [PATCH] Refactored validation of edit all form so that it does not crash on empty textedit, and so that it does not allow empty verses. Ideally we would accept empty verses, but these are removed automatically else where. Changed the save button to OK as per the reasons in my email. --- openlp/plugins/songs/forms/editversedialog.py | 2 +- openlp/plugins/songs/forms/editverseform.py | 15 ++------------- 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/openlp/plugins/songs/forms/editversedialog.py b/openlp/plugins/songs/forms/editversedialog.py index fb5698c88..7cc7670bf 100644 --- a/openlp/plugins/songs/forms/editversedialog.py +++ b/openlp/plugins/songs/forms/editversedialog.py @@ -66,7 +66,7 @@ class Ui_EditVerseDialog(object): self.verseTypeLayout.addStretch() self.dialogLayout.addLayout(self.verseTypeLayout) self.buttonBox = create_button_box(editVerseDialog, u'buttonBox', - [u'cancel', u'save']) + [u'cancel', u'ok']) self.dialogLayout.addWidget(self.buttonBox) self.retranslateUi(editVerseDialog) diff --git a/openlp/plugins/songs/forms/editverseform.py b/openlp/plugins/songs/forms/editverseform.py index 8493825b0..417707844 100644 --- a/openlp/plugins/songs/forms/editverseform.py +++ b/openlp/plugins/songs/forms/editverseform.py @@ -188,21 +188,10 @@ class EditVerseForm(QtGui.QDialog, Ui_EditVerseDialog): def accept(self): value = unicode(self.getVerse()[0]) if not self.hasSingleVerse: - value = value.split(u'\n') - if len(value) <= 1: - critical_error_message_box( - message=translate('SongsPlugin.EditSongForm', - 'Invalid entry, you need a verse splitter and some text.')) - return False - if not value: - lines = unicode(self.getVerse()[0]).split(u'\n') - index = 2 - while index < len(lines) and not value: - value = lines[index] - index += 1 + value = not u'' in re.split(r'---\[[^\]]*\]---\n*', value)[1:] if not value: critical_error_message_box( message=translate('SongsPlugin.EditSongForm', - 'You need to type some text in to the verse.')) + 'You must enter text for each verse.')) return False QtGui.QDialog.accept(self)