From 047a0b3085c3a991e6c22ccfeff2d51733042842 Mon Sep 17 00:00:00 2001 From: Raoul Snyman Date: Thu, 15 Aug 2013 21:57:23 +0200 Subject: [PATCH] Fix bug #1212801 where the song edit form did not clear a previously set theme. Fixes: https://launchpad.net/bugs/1212801 --- openlp/plugins/songs/forms/editsongform.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/openlp/plugins/songs/forms/editsongform.py b/openlp/plugins/songs/forms/editsongform.py index 7593e4a95..3209f994b 100644 --- a/openlp/plugins/songs/forms/editsongform.py +++ b/openlp/plugins/songs/forms/editsongform.py @@ -47,6 +47,7 @@ from editsongdialog import Ui_EditSongDialog log = logging.getLogger(__name__) + class EditSongForm(QtGui.QDialog, Ui_EditSongDialog): """ Class to manage the editing of a song @@ -229,6 +230,7 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog): 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 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog): 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(