diff --git a/openlp/core/lib/plugin.py b/openlp/core/lib/plugin.py index e9b402085..c1ab865e2 100644 --- a/openlp/core/lib/plugin.py +++ b/openlp/core/lib/plugin.py @@ -122,7 +122,7 @@ class Plugin(object): self.log = logging.getLogger(self.name) self.preview_controller = plugin_helpers[u'preview'] 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.render_manager = plugin_helpers[u'render'] self.service_manager = plugin_helpers[u'service'] diff --git a/openlp/core/lib/pluginmanager.py b/openlp/core/lib/pluginmanager.py index 1e5e19bd6..8e1b519ea 100644 --- a/openlp/core/lib/pluginmanager.py +++ b/openlp/core/lib/pluginmanager.py @@ -160,7 +160,8 @@ class PluginManager(object): The Import menu. """ 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): """ @@ -180,7 +181,8 @@ class PluginManager(object): initialise themselves. """ for plugin in self.plugins: - plugin[u'plugin'].initialise() + if plugin[u'status'] == u'Active': + plugin[u'plugin'].initialise() def finalise_plugins(self): """ @@ -188,4 +190,5 @@ class PluginManager(object): clean themselves up """ for plugin in self.plugins: - plugin[u'plugin'].finalise() + if plugin[u'status'] == u'Active': + plugin[u'plugin'].finalise() diff --git a/openlp/plugins/bibles/forms/bibleimportform.py b/openlp/plugins/bibles/forms/bibleimportform.py index 3e837a9de..342818585 100644 --- a/openlp/plugins/bibles/forms/bibleimportform.py +++ b/openlp/plugins/bibles/forms/bibleimportform.py @@ -47,6 +47,7 @@ class BibleImportForm(QtGui.QDialog, Ui_BibleImportDialog): self.bibleplugin = bibleplugin self.bible_type = None self.barmax = 0 + self.tabWidget.setCurrentIndex(0) self.AddressEdit.setText(self.config.get_config(u'proxy_address', u'')) self.UsernameEdit.setText(self.config.get_config(u'proxy_username',u'')) self.PasswordEdit.setText(self.config.get_config(u'proxy_password',u''))