From 02645f0457665692ab16ca578a2d71489f247546 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Sat, 18 Dec 2010 17:11:21 +0000 Subject: [PATCH 1/5] Songs must have an Author --- openlp/plugins/songs/forms/editsongform.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/openlp/plugins/songs/forms/editsongform.py b/openlp/plugins/songs/forms/editsongform.py index 58488a6e9..21958d403 100644 --- a/openlp/plugins/songs/forms/editsongform.py +++ b/openlp/plugins/songs/forms/editsongform.py @@ -547,14 +547,11 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog): if self.AuthorsListView.count() == 0: self.SongTabWidget.setCurrentIndex(1) self.AuthorsListView.setFocus() - answer = QtGui.QMessageBox.warning(self, + QtGui.QMessageBox.critical(self, translate('SongsPlugin.EditSongForm', 'Warning'), translate('SongsPlugin.EditSongForm', - 'You have not added any authors for this song. Do you ' - 'want to add an author now?'), - QtGui.QMessageBox.Yes | QtGui.QMessageBox.No) - if answer == QtGui.QMessageBox.Yes: - return False + 'You need to have an author for this song.')) + return False if self.song.verse_order: order = [] order_names = self.song.verse_order.split() From 47ac10f413fbce5bb09833f23e23be9d81a3ec18 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Sat, 18 Dec 2010 17:28:50 +0000 Subject: [PATCH 2/5] Fix songs with no text being saved Fixes: https://launchpad.net/bugs/691952 --- openlp/plugins/songs/forms/editverseform.py | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/openlp/plugins/songs/forms/editverseform.py b/openlp/plugins/songs/forms/editverseform.py index d954bfb1f..e9f1359d2 100644 --- a/openlp/plugins/songs/forms/editverseform.py +++ b/openlp/plugins/songs/forms/editverseform.py @@ -29,7 +29,7 @@ import logging from PyQt4 import QtCore, QtGui -from openlp.plugins.songs.lib import VerseType +from openlp.plugins.songs.lib import VerseType, translate from editversedialog import Ui_EditVerseDialog @@ -130,7 +130,7 @@ class EditVerseForm(QtGui.QDialog, Ui_EditVerseDialog): self.verseNumberBox.setValue(verse_number) def setVerse(self, text, single=False, - tag=u'%s:1' % VerseType.to_string(VerseType.Verse)): + tag = u'%s:1' % VerseType.to_string(VerseType.Verse)): if single: verse_type, verse_number = tag.split(u':') verse_type_index = VerseType.from_string(verse_type) @@ -159,3 +159,12 @@ class EditVerseForm(QtGui.QDialog, Ui_EditVerseDialog): text = u'---[%s:1]---\n%s' % (VerseType.to_string(VerseType.Verse), text) return text + + def accept(self): + if len(unicode(self.getVerse()[0])) == 0: + QtGui.QMessageBox.critical(self, + translate('SongsPlugin.EditSongForm', 'Error'), + translate('SongsPlugin.EditSongForm', + 'You need to type some text in to the verse.')) + return False + QtGui.QDialog.accept(self) From b553b2ac89d2cc07c73b054f1fcd08b21c538be9 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Sat, 18 Dec 2010 19:24:44 +0000 Subject: [PATCH 3/5] Tighten up the validation --- openlp/plugins/songs/forms/editverseform.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/openlp/plugins/songs/forms/editverseform.py b/openlp/plugins/songs/forms/editverseform.py index e9f1359d2..dce8c91d7 100644 --- a/openlp/plugins/songs/forms/editverseform.py +++ b/openlp/plugins/songs/forms/editverseform.py @@ -131,6 +131,7 @@ class EditVerseForm(QtGui.QDialog, Ui_EditVerseDialog): def setVerse(self, text, single=False, tag = u'%s:1' % VerseType.to_string(VerseType.Verse)): + self.verseType = single if single: verse_type, verse_number = tag.split(u':') verse_type_index = VerseType.from_string(verse_type) @@ -161,7 +162,11 @@ class EditVerseForm(QtGui.QDialog, Ui_EditVerseDialog): return text def accept(self): - if len(unicode(self.getVerse()[0])) == 0: + if self.verseType: + value = unicode(self.getVerse()[0]) + else: + value = self.getVerse()[0].split(u'\n')[1] + if len(value) == 0: QtGui.QMessageBox.critical(self, translate('SongsPlugin.EditSongForm', 'Error'), translate('SongsPlugin.EditSongForm', From bef5479a6a9237ccf628e68e5f8a76ea35b68d8b Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Sun, 19 Dec 2010 08:22:48 +0000 Subject: [PATCH 4/5] Fix spacing --- openlp/plugins/songs/forms/editverseform.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openlp/plugins/songs/forms/editverseform.py b/openlp/plugins/songs/forms/editverseform.py index dce8c91d7..5711abc6c 100644 --- a/openlp/plugins/songs/forms/editverseform.py +++ b/openlp/plugins/songs/forms/editverseform.py @@ -130,7 +130,7 @@ class EditVerseForm(QtGui.QDialog, Ui_EditVerseDialog): self.verseNumberBox.setValue(verse_number) def setVerse(self, text, single=False, - tag = u'%s:1' % VerseType.to_string(VerseType.Verse)): + tag=u'%s:1' % VerseType.to_string(VerseType.Verse)): self.verseType = single if single: verse_type, verse_number = tag.split(u':') From 12af5cada389f34fba0658b1de326d4d2fe7aaec Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Mon, 20 Dec 2010 14:15:03 +0000 Subject: [PATCH 5/5] Fix field name --- openlp/plugins/songs/forms/editverseform.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openlp/plugins/songs/forms/editverseform.py b/openlp/plugins/songs/forms/editverseform.py index 5711abc6c..8f5f04194 100644 --- a/openlp/plugins/songs/forms/editverseform.py +++ b/openlp/plugins/songs/forms/editverseform.py @@ -131,7 +131,7 @@ class EditVerseForm(QtGui.QDialog, Ui_EditVerseDialog): def setVerse(self, text, single=False, tag=u'%s:1' % VerseType.to_string(VerseType.Verse)): - self.verseType = single + self.hasSingleVerse = single if single: verse_type, verse_number = tag.split(u':') verse_type_index = VerseType.from_string(verse_type) @@ -162,7 +162,7 @@ class EditVerseForm(QtGui.QDialog, Ui_EditVerseDialog): return text def accept(self): - if self.verseType: + if self.hasSingleVerse: value = unicode(self.getVerse()[0]) else: value = self.getVerse()[0].split(u'\n')[1]