diff --git a/openlp/core/lib/imagemanager.py b/openlp/core/lib/imagemanager.py index 62a06335c..72389066b 100644 --- a/openlp/core/lib/imagemanager.py +++ b/openlp/core/lib/imagemanager.py @@ -39,8 +39,7 @@ import Queue from PyQt4 import QtCore -from openlp.core.lib import resize_image, image_to_byte, Receiver, Registry -from openlp.core.ui import ScreenList +from openlp.core.lib import resize_image, image_to_byte, Receiver, Registry, ScreenList log = logging.getLogger(__name__) diff --git a/openlp/core/lib/mediamanageritem.py b/openlp/core/lib/mediamanageritem.py index 70080a30d..100f248c0 100644 --- a/openlp/core/lib/mediamanageritem.py +++ b/openlp/core/lib/mediamanageritem.py @@ -470,7 +470,7 @@ class MediaManagerItem(QtGui.QWidget): serviceItem = self.buildServiceItem() if serviceItem: serviceItem.from_plugin = True - self.plugin.previewController.addServiceItem(serviceItem) + self.preview_controller.addServiceItem(serviceItem) if keepFocus: self.listView.setFocus() @@ -496,7 +496,7 @@ class MediaManagerItem(QtGui.QWidget): serviceItem.from_plugin = True if remote: serviceItem.will_auto_start = True - self.plugin.liveController.addServiceItem(serviceItem) + self.live_controller.addServiceItem(serviceItem) def createItemFromId(self, item_id): item = QtGui.QListWidgetItem() @@ -511,7 +511,7 @@ class MediaManagerItem(QtGui.QWidget): QtGui.QMessageBox.information(self, UiStrings().NISp, translate('OpenLP.MediaManagerItem', 'You must select one or more items to add.')) else: - # Is it posssible to process multiple list items to generate + # Is it possible to process multiple list items to generate # multiple service items? if self.singleServiceItem or self.remoteTriggered: log.debug(u'%s Add requested', self.plugin.name) @@ -525,7 +525,7 @@ class MediaManagerItem(QtGui.QWidget): serviceItem = self.buildServiceItem(item, True, remote=remote, context=ServiceItemContext.Service) if serviceItem: serviceItem.from_plugin = False - self.plugin.serviceManager.addServiceItem(serviceItem, replace=replace) + self.service_manager.addServiceItem(serviceItem, replace=replace) def onAddEditClick(self): """ @@ -542,7 +542,7 @@ class MediaManagerItem(QtGui.QWidget): translate('OpenLP.MediaManagerItem', 'You must select an existing service item to add to.')) elif self.plugin.name == serviceItem.name: self.generateSlideData(serviceItem) - self.plugin.serviceManager.addServiceItem(serviceItem, replace=True) + self.service_manager.addServiceItem(serviceItem, replace=True) else: # Turn off the remote edit update message indicator QtGui.QMessageBox.information(self, translate('OpenLP.MediaManagerItem', 'Invalid Service Item'), diff --git a/openlp/core/lib/plugin.py b/openlp/core/lib/plugin.py index 8d0347b38..49a08e32a 100644 --- a/openlp/core/lib/plugin.py +++ b/openlp/core/lib/plugin.py @@ -118,8 +118,7 @@ class Plugin(QtCore.QObject): """ log.info(u'loaded') - def __init__(self, name, default_settings, plugin_helpers=None, media_item_class=None, - settings_tab_class=None, version=None): + def __init__(self, name, default_settings, media_item_class=None, settings_tab_class=None, version=None): """ This is the constructor for the plugin object. This provides an easy way for descendent plugins to populate common data. This method *must* @@ -135,9 +134,6 @@ class Plugin(QtCore.QObject): ``default_settings`` A dict containing the plugin's settings. The value to each key is the default value to be used. - ``plugin_helpers`` - Defaults to *None*. A list of helper objects. - ``media_item_class`` The class name of the plugin's media item. @@ -165,8 +161,6 @@ class Plugin(QtCore.QObject): self.mediaItem = None self.weight = 0 self.status = PluginStatus.Inactive - self.previewController = plugin_helpers[u'preview'] - self.liveController = plugin_helpers[u'live'] # Add the default status to the default settings. default_settings[name + u'/status'] = PluginStatus.Inactive default_settings[name + u'/last directory'] = u'' diff --git a/openlp/core/lib/pluginmanager.py b/openlp/core/lib/pluginmanager.py index 021cdf256..ae1d9f984 100644 --- a/openlp/core/lib/pluginmanager.py +++ b/openlp/core/lib/pluginmanager.py @@ -62,7 +62,7 @@ class PluginManager(object): self.plugins = [] log.info(u'Plugin manager Initialised') - def find_plugins(self, plugin_dir, plugin_helpers): + def find_plugins(self, plugin_dir): """ Scan the directory ``plugin_dir`` for objects inheriting from the ``Plugin`` class. @@ -70,9 +70,6 @@ class PluginManager(object): ``plugin_dir`` The directory to scan. - ``plugin_helpers`` - A list of helper objects to pass to the plugins. - """ log.info(u'Finding plugins') startdepth = len(os.path.abspath(plugin_dir).split(os.sep)) @@ -110,7 +107,7 @@ class PluginManager(object): plugin_objects = [] for p in plugin_classes: try: - plugin = p(plugin_helpers) + plugin = p() log.debug(u'Loaded plugin %s', unicode(p)) plugin_objects.append(plugin) except TypeError: diff --git a/openlp/core/ui/maindisplay.py b/openlp/core/ui/maindisplay.py index 6e08f3d78..3fed96ec4 100644 --- a/openlp/core/ui/maindisplay.py +++ b/openlp/core/ui/maindisplay.py @@ -301,7 +301,7 @@ class MainDisplay(Display): """ log.debug(u'image to display') image = self.image_manager.getImageBytes(path, ImageSource.ImagePlugin) - self.controller.mediaController.media_reset(self.controller) + self.controller.media_controller.media_reset(self.controller) self.displayImage(image) def displayImage(self, image): diff --git a/openlp/core/ui/mainwindow.py b/openlp/core/ui/mainwindow.py index 2566ce911..9504327ff 100644 --- a/openlp/core/ui/mainwindow.py +++ b/openlp/core/ui/mainwindow.py @@ -482,7 +482,6 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow): # Set up the path with plugins plugin_path = AppLocation.get_directory(AppLocation.PluginsDir) self.pluginManager = PluginManager(plugin_path) - self.pluginHelpers = {} self.imageManager = ImageManager() # Set up the interface self.setupUi(self) @@ -547,17 +546,7 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow): # Define the media Dock Manager self.mediaDockManager = MediaDockManager(self.mediaToolBox) log.info(u'Load Plugins') - # make the controllers available to the plugins - self.pluginHelpers[u'preview'] = self.previewController - self.pluginHelpers[u'live'] = self.liveController - self.pluginHelpers[u'renderer'] = self.renderer - self.pluginHelpers[u'service'] = self.serviceManagerContents - self.pluginHelpers[u'settings form'] = self.settingsForm - self.pluginHelpers[u'toolbox'] = self.mediaDockManager - self.pluginHelpers[u'pluginmanager'] = self.pluginManager - self.pluginHelpers[u'formparent'] = self - self.pluginHelpers[u'mediacontroller'] = self.mediaController - self.pluginManager.find_plugins(plugin_path, self.pluginHelpers) + self.pluginManager.find_plugins(plugin_path) # hook methods have to happen after find_plugins. Find plugins needs # the controllers hence the hooks have moved from setupUI() to here # Find and insert settings tabs diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py index e22c96b6a..e60bf992a 100644 --- a/openlp/core/ui/slidecontroller.py +++ b/openlp/core/ui/slidecontroller.py @@ -35,9 +35,9 @@ from collections import deque from PyQt4 import QtCore, QtGui from openlp.core.lib import OpenLPToolbar, Receiver, ItemCapabilities, translate, build_icon, build_html, \ - ServiceItem, ImageSource, SlideLimits, ServiceItemAction, Settings, Registry, UiStrings -from openlp.core.ui import HideMode, MainDisplay, Display, ScreenList, DisplayControllerType -from openlp.core.lib.ui import UiStrings, create_action + ServiceItem, ImageSource, SlideLimits, ServiceItemAction, Settings, Registry, UiStrings, ScreenList +from openlp.core.ui import HideMode, MainDisplay, Display, DisplayControllerType +from openlp.core.lib.ui import create_action from openlp.core.utils.actions import ActionList, CategoryOrder log = logging.getLogger(__name__) diff --git a/openlp/plugins/alerts/alertsplugin.py b/openlp/plugins/alerts/alertsplugin.py index c0cc94ee9..29727b79d 100644 --- a/openlp/plugins/alerts/alertsplugin.py +++ b/openlp/plugins/alerts/alertsplugin.py @@ -128,8 +128,8 @@ __default_settings__ = { class AlertsPlugin(Plugin): log.info(u'Alerts Plugin loaded') - def __init__(self, plugin_helpers): - Plugin.__init__(self, u'alerts', __default_settings__, plugin_helpers, settings_tab_class=AlertsTab) + def __init__(self): + Plugin.__init__(self, u'alerts', __default_settings__, settings_tab_class=AlertsTab) self.weight = -3 self.iconPath = u':/plugins/plugin_alerts.png' self.icon = build_icon(self.iconPath) diff --git a/openlp/plugins/bibles/bibleplugin.py b/openlp/plugins/bibles/bibleplugin.py index 02526406a..d24858db5 100644 --- a/openlp/plugins/bibles/bibleplugin.py +++ b/openlp/plugins/bibles/bibleplugin.py @@ -68,8 +68,8 @@ __default_settings__ = { class BiblePlugin(Plugin): log.info(u'Bible Plugin loaded') - def __init__(self, plugin_helpers): - Plugin.__init__(self, u'bibles', __default_settings__, plugin_helpers, BibleMediaItem, BiblesTab) + def __init__(self): + Plugin.__init__(self, u'bibles', __default_settings__, BibleMediaItem, BiblesTab) self.weight = -9 self.iconPath = u':/plugins/plugin_bibles.png' self.icon = build_icon(self.iconPath) diff --git a/openlp/plugins/custom/customplugin.py b/openlp/plugins/custom/customplugin.py index 116c6454a..d80b8929d 100644 --- a/openlp/plugins/custom/customplugin.py +++ b/openlp/plugins/custom/customplugin.py @@ -60,8 +60,8 @@ class CustomPlugin(Plugin): """ log.info(u'Custom Plugin loaded') - def __init__(self, plugin_helpers): - Plugin.__init__(self, u'custom', __default_settings__, plugin_helpers, CustomMediaItem, CustomTab) + def __init__(self): + Plugin.__init__(self, u'custom', __default_settings__, CustomMediaItem, CustomTab) self.weight = -5 self.manager = Manager(u'custom', init_schema) self.iconPath = u':/plugins/plugin_custom.png' diff --git a/openlp/plugins/images/imageplugin.py b/openlp/plugins/images/imageplugin.py index d46fabb9d..11e542e60 100644 --- a/openlp/plugins/images/imageplugin.py +++ b/openlp/plugins/images/imageplugin.py @@ -45,8 +45,8 @@ __default_settings__ = { class ImagePlugin(Plugin): log.info(u'Image Plugin loaded') - def __init__(self, plugin_helpers): - Plugin.__init__(self, u'images', __default_settings__, plugin_helpers, ImageMediaItem, ImageTab) + def __init__(self): + Plugin.__init__(self, u'images', __default_settings__, ImageMediaItem, ImageTab) self.weight = -7 self.iconPath = u':/plugins/plugin_images.png' self.icon = build_icon(self.iconPath) diff --git a/openlp/plugins/media/mediaplugin.py b/openlp/plugins/media/mediaplugin.py index b79b9ab9f..d93f120ec 100644 --- a/openlp/plugins/media/mediaplugin.py +++ b/openlp/plugins/media/mediaplugin.py @@ -46,8 +46,8 @@ __default_settings__ = { class MediaPlugin(Plugin): log.info(u'%s MediaPlugin loaded', __name__) - def __init__(self, plugin_helpers): - Plugin.__init__(self, u'media', __default_settings__, plugin_helpers, MediaMediaItem) + def __init__(self): + Plugin.__init__(self, u'media', __default_settings__, MediaMediaItem) self.weight = -6 self.iconPath = u':/plugins/plugin_media.png' self.icon = build_icon(self.iconPath) diff --git a/openlp/plugins/presentations/presentationplugin.py b/openlp/plugins/presentations/presentationplugin.py index 68a0bbdd9..883bb4bb8 100644 --- a/openlp/plugins/presentations/presentationplugin.py +++ b/openlp/plugins/presentations/presentationplugin.py @@ -59,13 +59,13 @@ class PresentationPlugin(Plugin): """ log = logging.getLogger(u'PresentationPlugin') - def __init__(self, plugin_helpers): + def __init__(self): """ PluginPresentation constructor. """ log.debug(u'Initialised') self.controllers = {} - Plugin.__init__(self, u'presentations', __default_settings__, plugin_helpers, __default_settings__) + Plugin.__init__(self, u'presentations', __default_settings__, __default_settings__) self.weight = -8 self.iconPath = u':/plugins/plugin_presentations.png' self.icon = build_icon(self.iconPath) diff --git a/openlp/plugins/remotes/remoteplugin.py b/openlp/plugins/remotes/remoteplugin.py index 5e71ba5b4..160b7d542 100644 --- a/openlp/plugins/remotes/remoteplugin.py +++ b/openlp/plugins/remotes/remoteplugin.py @@ -44,11 +44,11 @@ __default_settings__ = { class RemotesPlugin(Plugin): log.info(u'Remote Plugin loaded') - def __init__(self, plugin_helpers): + def __init__(self): """ remotes constructor """ - Plugin.__init__(self, u'remotes', __default_settings__, plugin_helpers, settings_tab_class=RemoteTab) + Plugin.__init__(self, u'remotes', __default_settings__, settings_tab_class=RemoteTab) self.iconPath = u':/plugins/plugin_remote.png' self.icon = build_icon(self.iconPath) self.weight = -1 diff --git a/openlp/plugins/songs/songsplugin.py b/openlp/plugins/songs/songsplugin.py index 4f3007a1a..4f57d3e21 100644 --- a/openlp/plugins/songs/songsplugin.py +++ b/openlp/plugins/songs/songsplugin.py @@ -73,11 +73,11 @@ class SongsPlugin(Plugin): """ log.info(u'Song Plugin loaded') - def __init__(self, plugin_helpers): + def __init__(self): """ Create and set up the Songs plugin. """ - Plugin.__init__(self, u'songs', __default_settings__, plugin_helpers, SongMediaItem, SongsTab) + Plugin.__init__(self, u'songs', __default_settings__, SongMediaItem, SongsTab) self.manager = Manager(u'songs', init_schema, upgrade_mod=upgrade) self.weight = -10 self.iconPath = u':/plugins/plugin_songs.png' diff --git a/openlp/plugins/songusage/songusageplugin.py b/openlp/plugins/songusage/songusageplugin.py index d4c43bd54..398997715 100644 --- a/openlp/plugins/songusage/songusageplugin.py +++ b/openlp/plugins/songusage/songusageplugin.py @@ -60,8 +60,8 @@ __default_settings__ = { class SongUsagePlugin(Plugin): log.info(u'SongUsage Plugin loaded') - def __init__(self, plugin_helpers): - Plugin.__init__(self, u'songusage', __default_settings__, plugin_helpers) + def __init__(self): + Plugin.__init__(self, u'songusage', __default_settings__) self.manager = Manager(u'songusage', init_schema, upgrade_mod=upgrade) self.weight = -4 self.icon = build_icon(u':/plugins/plugin_songusage.png')