From 46f9153ea8e49612892d1f4db19c442670b759c7 Mon Sep 17 00:00:00 2001 From: Stevan Pettit Date: Sun, 29 May 2011 09:12:11 -0400 Subject: [PATCH 1/2] Remove some whitespace in editsongform.py --- openlp/plugins/songs/forms/editsongform.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openlp/plugins/songs/forms/editsongform.py b/openlp/plugins/songs/forms/editsongform.py index f30c618b4..d30a1be10 100644 --- a/openlp/plugins/songs/forms/editsongform.py +++ b/openlp/plugins/songs/forms/editsongform.py @@ -757,7 +757,7 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog): self.manager.save_object(self.song) if self.parent.new: self.parent.auto_select_id = self.song.id - + def _processLyrics(self): """ Process the lyric data entered by the user into the OpenLP XML format. From fe35a5775c3036d6bf41a474e1f2eae248fa428d Mon Sep 17 00:00:00 2001 From: Stevan Pettit Date: Sun, 29 May 2011 19:52:36 -0400 Subject: [PATCH 2/2] bug-789102 - Removed code that auto-selects new items. --- openlp/plugins/custom/forms/editcustomform.py | 2 -- openlp/plugins/custom/lib/mediaitem.py | 3 --- openlp/plugins/songs/forms/editsongform.py | 2 -- openlp/plugins/songs/lib/mediaitem.py | 3 --- 4 files changed, 10 deletions(-) diff --git a/openlp/plugins/custom/forms/editcustomform.py b/openlp/plugins/custom/forms/editcustomform.py index b74954fe6..eb4a13fda 100644 --- a/openlp/plugins/custom/forms/editcustomform.py +++ b/openlp/plugins/custom/forms/editcustomform.py @@ -137,8 +137,6 @@ class EditCustomForm(QtGui.QDialog, Ui_CustomEditDialog): self.customSlide.credits = unicode(self.creditEdit.text()) self.customSlide.theme_name = unicode(self.themeComboBox.currentText()) success = self.manager.save_object(self.customSlide) - if self.parent.new: - self.parent.auto_select_id = self.customSlide.id return success def onUpButtonClicked(self): diff --git a/openlp/plugins/custom/lib/mediaitem.py b/openlp/plugins/custom/lib/mediaitem.py index 718c78d75..d0a3de061 100644 --- a/openlp/plugins/custom/lib/mediaitem.py +++ b/openlp/plugins/custom/lib/mediaitem.py @@ -66,7 +66,6 @@ class CustomMediaItem(MediaManagerItem): # which Custom is required. self.remoteCustom = -1 self.manager = parent.manager - self.new = False def addEndHeaderBar(self): self.addToolbarSeparator() @@ -157,11 +156,9 @@ class CustomMediaItem(MediaManagerItem): self.auto_select_id = -1 def onNewClick(self): - self.new = True self.edit_custom_form.loadCustom(0) self.edit_custom_form.exec_() self.initialise() - self.new = False def onRemoteEditClear(self): self.remoteTriggered = None diff --git a/openlp/plugins/songs/forms/editsongform.py b/openlp/plugins/songs/forms/editsongform.py index d30a1be10..e6643568c 100644 --- a/openlp/plugins/songs/forms/editsongform.py +++ b/openlp/plugins/songs/forms/editsongform.py @@ -755,8 +755,6 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog): self.song.topics.append(self.manager.get_object(Topic, topicId)) clean_song(self.manager, self.song) self.manager.save_object(self.song) - if self.parent.new: - self.parent.auto_select_id = self.song.id def _processLyrics(self): """ diff --git a/openlp/plugins/songs/lib/mediaitem.py b/openlp/plugins/songs/lib/mediaitem.py index 5454d5401..3d9a9ef76 100644 --- a/openlp/plugins/songs/lib/mediaitem.py +++ b/openlp/plugins/songs/lib/mediaitem.py @@ -74,7 +74,6 @@ class SongMediaItem(MediaManagerItem): self.editItem = None self.quickPreviewAllowed = True self.hasSearch = True - self.new = False def addEndHeaderBar(self): self.addToolbarSeparator() @@ -297,10 +296,8 @@ class SongMediaItem(MediaManagerItem): def onNewClick(self): log.debug(u'onNewClick') - self.new = True self.edit_song_form.newSong() self.edit_song_form.exec_() - self.new = False def onSongMaintenanceClick(self): self.song_maintenance_form.exec_()