raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

Fixups

Browse Source
This commit is contained in:
Tim Bentley 2011-04-15 18:17:51 +01:00
parent 0b35701e30
commit 269c4fa044
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
openlp/core/lib/plugin.py
View File

@ -115,7 +115,7 @@ class Plugin(QtCore.QObject):
""" """
log.info(u'loaded') log.info(u'loaded')
def __init__(self, name, pluginHelpers=None, mediaItemClass=None, def __init__(self, name, plugin_helpers=None, media_item_class=None,
settings_tab_class=None, version=None): settings_tab_class=None, version=None):
""" """
This is the constructor for the plugin object. This provides an easy This is the constructor for the plugin object. This provides an easy
@ -132,10 +132,10 @@ class Plugin(QtCore.QObject):
``version`` ``version``
Defaults to *None*. The version of the plugin. Defaults to *None*. The version of the plugin.
``pluginHelpers`` ``plugin_helpers``
Defaults to *None*. A list of helper objects. Defaults to *None*. A list of helper objects.
``mediaItemClass`` ``media_item_class``
The class name of the plugin's media item. The class name of the plugin's media item.
``settings_tab_class`` ``settings_tab_class``
@ -153,20 +153,20 @@ class Plugin(QtCore.QObject):
self.version = get_application_version()[u'version'] self.version = get_application_version()[u'version']
self.settingsSection = self.name.lower() self.settingsSection = self.name.lower()
self.icon = None self.icon = None
self.mediaItemClass = mediaItemClass self.media_item_class = media_item_class
self.settings_tab_class = settings_tab_class self.settings_tab_class = settings_tab_class
self.weight = 0 self.weight = 0
self.status = PluginStatus.Inactive self.status = PluginStatus.Inactive
# Set up logging # Set up logging
self.log = logging.getLogger(self.name) self.log = logging.getLogger(self.name)
self.previewController = pluginHelpers[u'preview'] self.previewController = plugin_helpers[u'preview']
self.liveController = pluginHelpers[u'live'] self.liveController = plugin_helpers[u'live']
self.renderManager = pluginHelpers[u'render'] self.renderManager = plugin_helpers[u'render']
self.serviceManager = pluginHelpers[u'service'] self.serviceManager = plugin_helpers[u'service']
self.settingsForm = pluginHelpers[u'settings form'] self.settingsForm = plugin_helpers[u'settings form']
self.mediadock = pluginHelpers[u'toolbox'] self.mediadock = plugin_helpers[u'toolbox']
self.pluginManager = pluginHelpers[u'pluginmanager'] self.pluginManager = plugin_helpers[u'pluginmanager']
self.formparent = pluginHelpers[u'formparent'] self.formparent = plugin_helpers[u'formparent']
QtCore.QObject.connect(Receiver.get_receiver(), QtCore.QObject.connect(Receiver.get_receiver(),
QtCore.SIGNAL(u'%s_add_service_item' % self.name), QtCore.SIGNAL(u'%s_add_service_item' % self.name),
self.processAddServiceEvent) self.processAddServiceEvent)
@ -213,8 +213,8 @@ class Plugin(QtCore.QObject):
Construct a MediaManagerItem object with all the buttons and things Construct a MediaManagerItem object with all the buttons and things
you need, and return it for integration into openlp.org. you need, and return it for integration into openlp.org.
""" """
if self.mediaItemClass: if self.media_item_class:
return self.mediaItemClass(self, self, self.icon) return self.media_item_class(self, self, self.icon)
return None return None
def addImportMenuItem(self, importMenu): def addImportMenuItem(self, importMenu):

2
openlp/core/ui/advancedtab.py
View File

@ -45,7 +45,7 @@ class AdvancedTab(SettingsTab):
SettingsTab.__init__(self, parent ,u'Advanced', generalTranslated) SettingsTab.__init__(self, parent ,u'Advanced', generalTranslated)
self.default_image = u':/graphics/openlp-splash-screen.png' self.default_image = u':/graphics/openlp-splash-screen.png'
self.default_color = u'#ffffff' self.default_color = u'#ffffff'
self.icon_path = u':/icon/openlp-logo-16x16.png' self.icon_path = u':/system/system_settings.png'
def setupUi(self): def setupUi(self):
""" """