From 91769118102e820714847cccb1960f084fb0a227 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Tue, 11 Oct 2011 19:10:53 +0100 Subject: [PATCH] Try 1 --- openlp/core/lib/pluginmanager.py | 5 +++++ openlp/core/ui/maindisplay.py | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/openlp/core/lib/pluginmanager.py b/openlp/core/lib/pluginmanager.py index 2248d0ddd..4b706a4c6 100644 --- a/openlp/core/lib/pluginmanager.py +++ b/openlp/core/lib/pluginmanager.py @@ -42,6 +42,10 @@ class PluginManager(object): """ log.info(u'Plugin manager loaded') + @staticmethod + def get_instance(): + return PluginManager.instance + def __init__(self, plugin_dir): """ The constructor for the plugin manager. Passes the controllers on to @@ -51,6 +55,7 @@ class PluginManager(object): The directory to search for plugins. """ log.info(u'Plugin manager Initialising') + PluginManager.instance = self if not plugin_dir in sys.path: log.debug(u'Inserting %s into sys.path', plugin_dir) sys.path.insert(0, plugin_dir) diff --git a/openlp/core/ui/maindisplay.py b/openlp/core/ui/maindisplay.py index d6eff912c..0cf47ae5e 100644 --- a/openlp/core/ui/maindisplay.py +++ b/openlp/core/ui/maindisplay.py @@ -35,7 +35,7 @@ from PyQt4 import QtCore, QtGui, QtWebKit from PyQt4.phonon import Phonon from openlp.core.lib import Receiver, build_html, ServiceItem, image_to_byte, \ - translate + translate, PluginManager from openlp.core.ui import HideMode, ScreenList @@ -56,6 +56,7 @@ class MainDisplay(QtGui.QGraphicsView): self.isLive = live self.imageManager = imageManager self.screens = ScreenList.get_instance() + self.plugins = PluginManager.get_instance().plugins self.alertTab = None self.hideMode = None self.videoHide = False