From 9f4066bf3f131867ab9f37faa2e8ec772f6c20a5 Mon Sep 17 00:00:00 2001
From: Tim Bentley <tim.bentley@gmail.com>
Date: Sat, 21 Aug 2010 20:35:32 +0100
Subject: [PATCH] More fixes and update song editing

---
 openlp/core/ui/amendthemedialog.py         | 22 ----------------------
 openlp/plugins/songs/forms/editsongform.py |  6 ++++--
 2 files changed, 4 insertions(+), 24 deletions(-)

diff --git a/openlp/core/ui/amendthemedialog.py b/openlp/core/ui/amendthemedialog.py
index 2a9747b8e..b77c9cfff 100644
--- a/openlp/core/ui/amendthemedialog.py
+++ b/openlp/core/ui/amendthemedialog.py
@@ -68,17 +68,6 @@ class Ui_AmendThemeDialog(object):
         self.backgroundLayout.setMargin(8)
         self.backgroundLayout.setSpacing(8)
         self.backgroundLayout.setObjectName(u'backgroundLayout')
-#        self.backgroundLabel = QtGui.QLabel(self.backgroundTab)
-#        self.backgroundLabel.setObjectName(u'backgroundLabel')
-#        self.backgroundLayout.setWidget(0, QtGui.QFormLayout.LabelRole,
-#            self.backgroundLabel)
-#        self.backgroundComboBox = QtGui.QComboBox(self.backgroundTab)
-#        self.backgroundComboBox.setObjectName(u'backgroundComboBox')
-#        self.backgroundLabel.setBuddy(self.backgroundComboBox)
-#        self.backgroundComboBox.addItem(QtCore.QString())
-#        self.backgroundComboBox.addItem(QtCore.QString())
-#        self.backgroundLayout.setWidget(0, QtGui.QFormLayout.FieldRole,
-#            self.backgroundComboBox)
         self.backgroundTypeLabel = QtGui.QLabel(self.backgroundTab)
         self.backgroundTypeLabel.setObjectName(u'backgroundTypeLabel')
         self.backgroundLayout.setWidget(1, QtGui.QFormLayout.LabelRole,
@@ -216,17 +205,6 @@ class Ui_AmendThemeDialog(object):
         self.fontMainLineAdjustmentSpinBox.setMinimum(-99)
         self.mainFontLayout.setWidget(4, QtGui.QFormLayout.FieldRole,
             self.fontMainLineAdjustmentSpinBox)
-#        self.fontMainWrapIndentationLabel = QtGui.QLabel(self.fontMainGroupBox)
-#        self.fontMainWrapIndentationLabel.setObjectName(
-#            u'fontMainWrapIndentationLabel')
-#        self.mainFontLayout.setWidget(5, QtGui.QFormLayout.LabelRole,
-#            self.fontMainWrapIndentationLabel)
-#        self.fontMainLineSpacingSpinBox = QtGui.QSpinBox(self.fontMainGroupBox)
-#        self.fontMainLineSpacingSpinBox.setObjectName(
-#            u'fontMainLineSpacingSpinBox')
-#        self.fontMainLineSpacingSpinBox.setMaximum(10)
-#        self.mainFontLayout.setWidget(5, QtGui.QFormLayout.FieldRole,
-#            self.fontMainLineSpacingSpinBox)
         self.fontMainLinesPageLabel = QtGui.QLabel(self.fontMainGroupBox)
         self.fontMainLinesPageLabel.setObjectName(u'fontMainLinesPageLabel')
         self.mainFontLayout.addRow(self.fontMainLinesPageLabel)
diff --git a/openlp/plugins/songs/forms/editsongform.py b/openlp/plugins/songs/forms/editsongform.py
index 1567fa62e..c98054c6e 100644
--- a/openlp/plugins/songs/forms/editsongform.py
+++ b/openlp/plugins/songs/forms/editsongform.py
@@ -314,7 +314,7 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
             author = self.songmanager.get_object(Author, item_id)
             if author in self.song.authors:
                 QtGui.QMessageBox.warning(self,
-                    translate('SongsPlugin.EditSongForm', 'Error'), 
+                    translate('SongsPlugin.EditSongForm', 'Error'),
                     translate('SongsPlugin.EditSongForm', 'This author is '
                     'already in the list.'))
             else:
@@ -422,7 +422,9 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
         self.VerseDeleteButton.setEnabled(True)
 
     def onVerseAddButtonClicked(self):
-        self.verse_form.setVerse(u'', True)
+        # Allow insert button as you do not know if multiple verses will
+        # be entered.
+        self.verse_form.setVerse(u'')
         if self.verse_form.exec_():
             afterText, verse, subVerse = self.verse_form.getVerse()
             data = u'%s:%s' % (verse, subVerse)