Merge lp:~raoul-snyman/openlp/bug-1212801-2.0 into lp:openlp/2.0

[Raoul Snyman]

Fix bug #1212801 where the song edit form did not clear a previously set theme.

Fix bug #1212801 where the song edit form did not clear a previously set theme.

[Tim Bentley (trb143)]

Visual only

review: Approve

[Andreas Preikschat (googol-deactivatedaccount)]

review: Approve

=== modified file 'openlp/plugins/songs/forms/editsongform.py'
--- openlp/plugins/songs/forms/editsongform.py	2013-06-16 17:19:32 +0000
+++ openlp/plugins/songs/forms/editsongform.py	2013-08-15 19:59:33 +0000
@@ -47,6 +47,7 @@
 
 log = logging.getLogger(__name__)
 
+
 class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
     """
     Class to manage the editing of a song
@@ -229,6 +230,7 @@
         self.loadTopics()
         self.loadBooks()
         self.loadMediaFiles()
+        self.themeComboBox.setEditText(u'')
         self.themeComboBox.setCurrentIndex(0)
         # it's a new song to preview is not possible
         self.previewButton.setVisible(False)
@@ -261,6 +263,9 @@
         if self.song.theme_name:
             find_and_set_in_combo_box(
                 self.themeComboBox, unicode(self.song.theme_name))
+        else:
+            self.themeComboBox.setEditText(u'')
+            self.themeComboBox.setCurrentIndex(0)
         self.copyrightEdit.setText(
             self.song.copyright if self.song.copyright else u'')
         self.commentsEdit.setPlainText(