From 304aed1c1e85d42b7b5b62fda33c5cfcbb28b5b5 Mon Sep 17 00:00:00 2001 From: Raoul Snyman Date: Tue, 18 May 2010 23:18:52 +0200 Subject: [PATCH] Fixed up problems with adding and removing songs from the service manager. --- openlp/plugins/songs/lib/mediaitem.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/openlp/plugins/songs/lib/mediaitem.py b/openlp/plugins/songs/lib/mediaitem.py index 1c2dad169..0a2d29b14 100644 --- a/openlp/plugins/songs/lib/mediaitem.py +++ b/openlp/plugins/songs/lib/mediaitem.py @@ -52,7 +52,7 @@ class SongMediaItem(MediaManagerItem): MediaManagerItem.__init__(self, parent, icon, title) self.edit_song_form = EditSongForm(self, self.parent.manager) self.singleServiceItem = False - #self.edit_song_form = EditSongForm(self.parent.songmanager, self) + #self.edit_song_form = EditSongForm(self.parent.manager, self) self.song_maintenance_form = SongMaintenanceForm( self.parent.manager, self) # Holds information about whether the edit is remotly triggered and @@ -293,7 +293,7 @@ class SongMediaItem(MediaManagerItem): return for item in items: item_id = (item.data(QtCore.Qt.UserRole)).toInt()[0] - self.parent.songmanager.delete_song(item_id) + self.parent.manager.delete_song(item_id) self.onSearchTextButtonClick() def generateSlideData(self, service_item, item=None): @@ -314,7 +314,7 @@ class SongMediaItem(MediaManagerItem): service_item.add_capability(ItemCapabilities.AllowsEdit) service_item.add_capability(ItemCapabilities.AllowsPreview) service_item.add_capability(ItemCapabilities.AllowsLoop) - song = self.parent.songmanager.get_song(item_id) + song = self.parent.manager.get_song(item_id) service_item.theme = song.theme_name service_item.editId = item_id if song.lyrics.startswith(u'