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

Stop plugins being initialised when Inactive. Bible Import Tab state correction

Browse Source
This commit is contained in:
Tim Bentley 2009-08-15 08:55:16 +01:00
parent b774cc10be
commit 1987258fcb
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -122,7 +122,7 @@ class Plugin(object):
self.log = logging.getLogger(self.name) self.log = logging.getLogger(self.name)
self.preview_controller = plugin_helpers[u'preview'] self.preview_controller = plugin_helpers[u'preview']
self.live_controller = plugin_helpers[u'live'] self.live_controller = plugin_helpers[u'live']
self.theme_manager = plugin_helpers[u'theme'] #self.theme_manager = plugin_helpers[u'theme']
self.event_manager = plugin_helpers[u'event'] self.event_manager = plugin_helpers[u'event']
self.render_manager = plugin_helpers[u'render'] self.render_manager = plugin_helpers[u'render']
self.service_manager = plugin_helpers[u'service'] self.service_manager = plugin_helpers[u'service']

9
openlp/core/lib/pluginmanager.py
View File

@ -160,7 +160,8 @@ class PluginManager(object):
The Import menu. The Import menu.
""" """
for plugin in self.plugins: for plugin in self.plugins:
plugin[u'plugin'].add_import_menu_item(import_menu) if plugin[u'status'] == u'Active':
plugin[u'plugin'].add_import_menu_item(import_menu)
def hook_export_menu(self, export_menu): def hook_export_menu(self, export_menu):
""" """
@ -180,7 +181,8 @@ class PluginManager(object):
initialise themselves. initialise themselves.
""" """
for plugin in self.plugins: for plugin in self.plugins:
plugin[u'plugin'].initialise() if plugin[u'status'] == u'Active':
plugin[u'plugin'].initialise()
def finalise_plugins(self): def finalise_plugins(self):
""" """
@ -188,4 +190,5 @@ class PluginManager(object):
clean themselves up clean themselves up
""" """
for plugin in self.plugins: for plugin in self.plugins:
plugin[u'plugin'].finalise() if plugin[u'status'] == u'Active':
plugin[u'plugin'].finalise()

1
openlp/plugins/bibles/forms/bibleimportform.py
View File

@ -47,6 +47,7 @@ class BibleImportForm(QtGui.QDialog, Ui_BibleImportDialog):
self.bibleplugin = bibleplugin self.bibleplugin = bibleplugin
self.bible_type = None self.bible_type = None
self.barmax = 0 self.barmax = 0
self.tabWidget.setCurrentIndex(0)
self.AddressEdit.setText(self.config.get_config(u'proxy_address', u'')) self.AddressEdit.setText(self.config.get_config(u'proxy_address', u''))
self.UsernameEdit.setText(self.config.get_config(u'proxy_username',u'')) self.UsernameEdit.setText(self.config.get_config(u'proxy_username',u''))
self.PasswordEdit.setText(self.config.get_config(u'proxy_password',u'')) self.PasswordEdit.setText(self.config.get_config(u'proxy_password',u''))