From f1e8f9812c118631fe9ebc8467172bdd48a87b47 Mon Sep 17 00:00:00 2001 From: Andreas Preikschat Date: Tue, 5 Feb 2013 18:47:57 +0100 Subject: [PATCH 1/2] fixed rename error --- openlp/plugins/songs/forms/editsongform.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/openlp/plugins/songs/forms/editsongform.py b/openlp/plugins/songs/forms/editsongform.py index 0c0e5c196..0758b18f7 100644 --- a/openlp/plugins/songs/forms/editsongform.py +++ b/openlp/plugins/songs/forms/editsongform.py @@ -184,7 +184,7 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog): Load the media files into a combobox. """ self.audioAddFromMediaButton.setVisible(False) - for plugin in self.parent().pluginManager.plugins: + for plugin in self.parent().plugin_manager.plugins: if plugin.name == u'media' and plugin.status == PluginStatus.Active: self.audioAddFromMediaButton.setVisible(True) self.mediaForm.populateFiles(plugin.mediaItem.getList(MediaType.Audio)) @@ -915,4 +915,5 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog): self._theme_manager = Registry().get(u'theme_manager') return self._theme_manager - theme_manager = property(_get_theme_manager) \ No newline at end of file + theme_manager = property(_get_theme_manager) + From ea3e24096c38aceb629aace25de76790a48ac913 Mon Sep 17 00:00:00 2001 From: Andreas Preikschat Date: Tue, 5 Feb 2013 20:29:31 +0100 Subject: [PATCH 2/2] use registry --- openlp/plugins/songs/forms/editsongform.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/openlp/plugins/songs/forms/editsongform.py b/openlp/plugins/songs/forms/editsongform.py index 0758b18f7..253225411 100644 --- a/openlp/plugins/songs/forms/editsongform.py +++ b/openlp/plugins/songs/forms/editsongform.py @@ -184,7 +184,7 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog): Load the media files into a combobox. """ self.audioAddFromMediaButton.setVisible(False) - for plugin in self.parent().plugin_manager.plugins: + for plugin in self.plugin_manager.plugins: if plugin.name == u'media' and plugin.status == PluginStatus.Active: self.audioAddFromMediaButton.setVisible(True) self.mediaForm.populateFiles(plugin.mediaItem.getList(MediaType.Audio)) @@ -907,6 +907,16 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog): except: log.exception(u'Problem processing song Lyrics \n%s', sxml.dump_xml()) + def _get_plugin_manager(self): + """ + Adds the plugin manager to the class dynamically + """ + if not hasattr(self, u'_plugin_manager'): + self._plugin_manager = Registry().get(u'plugin_manager') + return self._plugin_manager + + plugin_manager = property(_get_plugin_manager) + def _get_theme_manager(self): """ Adds the theme manager to the class dynamically