don't load unactivatable plugins
This commit is contained in:
parent
3fe07c9a14
commit
971e0502c0
|
@ -114,7 +114,10 @@ class PluginsWindow(object):
|
||||||
|
|
||||||
desc_textbuffer = self.plugin_description_textview.get_buffer()
|
desc_textbuffer = self.plugin_description_textview.get_buffer()
|
||||||
from plugins.plugins_i18n import _
|
from plugins.plugins_i18n import _
|
||||||
desc_textbuffer.set_text(_(plugin.description))
|
txt = plugin.description
|
||||||
|
if plugin.available_text:
|
||||||
|
txt += '\n\n' + _('Warning: %s') % plugin.available_text
|
||||||
|
desc_textbuffer.set_text(txt)
|
||||||
self.plugin_description_textview.set_property('sensitive', True)
|
self.plugin_description_textview.set_property('sensitive', True)
|
||||||
self.uninstall_plugin_button.set_property('sensitive',
|
self.uninstall_plugin_button.set_property('sensitive',
|
||||||
gajim.PLUGINS_DIRS[1] in plugin.__path__)
|
gajim.PLUGINS_DIRS[1] in plugin.__path__)
|
||||||
|
@ -145,7 +148,7 @@ class PluginsWindow(object):
|
||||||
|
|
||||||
for plugin in pm.plugins:
|
for plugin in pm.plugins:
|
||||||
self.installed_plugins_model.append([plugin, plugin.name,
|
self.installed_plugins_model.append([plugin, plugin.name,
|
||||||
plugin.active, plugin.activatable])
|
plugin.active and plugin.activatable, plugin.activatable])
|
||||||
|
|
||||||
@log_calls('PluginsWindow')
|
@log_calls('PluginsWindow')
|
||||||
def installed_plugins_toggled_cb(self, cell, path):
|
def installed_plugins_toggled_cb(self, cell, path):
|
||||||
|
|
|
@ -155,6 +155,7 @@ class GajimPlugin(object):
|
||||||
:type: `plugins.plugin.GajimPluginConfig`
|
:type: `plugins.plugin.GajimPluginConfig`
|
||||||
'''
|
'''
|
||||||
self.activatable = True
|
self.activatable = True
|
||||||
|
self.available_text = ''
|
||||||
self.load_config()
|
self.load_config()
|
||||||
self.config_dialog = GajimPluginConfigDialog(self)
|
self.config_dialog = GajimPluginConfigDialog(self)
|
||||||
self.init()
|
self.init()
|
||||||
|
|
|
@ -292,7 +292,7 @@ class PluginManager(object):
|
||||||
:param plugin: plugin to be activated
|
:param plugin: plugin to be activated
|
||||||
:type plugin: class object of `GajimPlugin` subclass
|
:type plugin: class object of `GajimPlugin` subclass
|
||||||
'''
|
'''
|
||||||
if not plugin.active:
|
if not plugin.active and plugin.activatable:
|
||||||
|
|
||||||
self._add_gui_extension_points_handlers_from_plugin(plugin)
|
self._add_gui_extension_points_handlers_from_plugin(plugin)
|
||||||
self._handle_all_gui_extension_points_with_plugin(plugin)
|
self._handle_all_gui_extension_points_with_plugin(plugin)
|
||||||
|
@ -374,7 +374,8 @@ class PluginManager(object):
|
||||||
|
|
||||||
def _activate_all_plugins_from_global_config(self):
|
def _activate_all_plugins_from_global_config(self):
|
||||||
for plugin in self.plugins:
|
for plugin in self.plugins:
|
||||||
if self._plugin_is_active_in_global_config(plugin):
|
if self._plugin_is_active_in_global_config(plugin) and \
|
||||||
|
plugin.activatable:
|
||||||
try:
|
try:
|
||||||
self.activate_plugin(plugin)
|
self.activate_plugin(plugin)
|
||||||
except GajimPluginActivateException:
|
except GajimPluginActivateException:
|
||||||
|
|
Loading…
Reference in New Issue