From 67f4669df26ebe14baced4a57d804809082c3ddd Mon Sep 17 00:00:00 2001 From: Raoul Snyman Date: Sun, 26 Jul 2009 12:02:18 +0200 Subject: [PATCH] Updated author validation to validate the display name as well. --- openlp/plugins/songs/forms/authorsform.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/openlp/plugins/songs/forms/authorsform.py b/openlp/plugins/songs/forms/authorsform.py index 7fc8f708f..7b5cddd3f 100644 --- a/openlp/plugins/songs/forms/authorsform.py +++ b/openlp/plugins/songs/forms/authorsform.py @@ -81,5 +81,18 @@ class AuthorsForm(QtGui.QDialog, Ui_AuthorsDialog): QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok)) self.LastNameEdit.setFocus() return False + elif self.DisplayEdit.text() == u'': + if QtGui.QMessageBox.critical(self, + translate(u'AuthorsDialog', u'Error'), + translate(u'AuthorsDialog', u'You haven\'t set a display name for the author, would you like me to combine the first and last names for you?'), + QtGui.QMessageBox.StandardButtons( + QtGui.QMessageBox.Yes | QtGui.QMessageBox.No) + ) == QtGui.QMessageBox.Yes: + self.DisplayEdit.setText(self.FirstNameEdit.text() + \ + u' ' + self.LastNameEdit.text()) + return QtGui.QDialog.accept(self) + else: + self.DisplayEdit.setFocus() + return False else: return QtGui.QDialog.accept(self)