Bring Custom and Song editing in line

openlp/plugins/custom/forms/editcustomform.py

@@ -200,7 +200,7 @@ class EditCustomForm(QtGui.QDialog, Ui_customEditDialog):
     def onSaveButtonPressed(self):
         if self.editAll:
             self.VerseListView.clear()
-            for row in unicode(self.VerseTextEdit.toPlainText()).split(u'---'):
+            for row in unicode(self.VerseTextEdit.toPlainText()).split(u'\n---\n'):
                 self.VerseListView.addItem(row)
         else:
             self.VerseListView.currentItem().setText(
@@ -227,15 +227,13 @@ class EditCustomForm(QtGui.QDialog, Ui_customEditDialog):
         self.EditAllButton.setEnabled(True)
 
     def _validate(self):
-        valid = True
-        message = u''
         if len(self.TitleEdit.displayText()) == 0:
-            valid = False
-            message = translate(
+            self.TitleEdit.setFocus()
+            return False, translate(
                 u'customEditDialog', u'You need to enter a title \n')
         # must have 1 slide
         if self.VerseListView.count() == 0:
-            valid = False
-            message += translate(
+            self.VerseTextEdit.setFocus()
+            return False, translate(
                 u'customEditDialog', u'You need to enter a slide \n')
-        return valid, message
+        return True,  u''

openlp/plugins/songs/forms/editsongform.py

@@ -335,7 +335,7 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
             verse_list = self.verse_form.getVerse()
             verse_list = verse_list.replace(u'\r\n', u'\n')
             self.VerseListWidget.clear()
-            for row in verse_list.split(u'---'):
+            for row in verse_list.split(u'\n---\n'):
                 self.VerseListWidget.addItem(row)
         self.VerseListWidget.repaint()