Changeset 9762

Timestamp:

06/07/08 19:28:34 (4 months ago)

Author:

vardo

Message:

Added first version of 'Plugins' window. It's accessible through 'Edit/Plugins' item in roster menu. It seems that you can successfully (de)activate plug-ins through GUI now.

Added 'homepage' attribute to Plugin class.

Added (commented out) calls of pycallgraph in src/gajim.py for later use.

[xbright] Changed 'python' to 'python2.5' because code uses modules not available in previous versions of Python.

Location:

branches/plugin-system

Files:

• data/glade/plugins_window.glade (added)
• data/glade/roster_window.glade (modified) (1 diff)
• launch.sh (modified) (1 diff)
• plugins/length_notifier.py (modified) (1 diff)
• src/gajim.py (modified) (3 diffs)
• src/plugins/gui.py (added)
• src/plugins/pluginmanager.py (modified) (8 diffs)
• src/plugins/plugin.py (modified) (5 diffs)
• src/roster_window.py (modified) (2 diffs)

branches/plugin-system/data/glade/roster_window.glade

@@ -194 +194 @@
                       </widget>
                     </child>
+                    <child>
+                      <widget class="GtkImageMenuItem" id="plugins_menuitem">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">P_lugins</property>
+                        <property name="use_underline">True</property>
+                        <signal name="activate" handler="on_plugins_menuitem_activate"/>
+                        <child internal-child="image">
+                          <widget class="GtkImage" id="menu-item-image16">
+                            <property name="visible">True</property>
+                            <property name="stock">gtk-disconnect</property>
+                            <property name="icon_size">1</property>
+                          </widget>
+                        </child>
+                      </widget>
+                    </child>
                   </widget>
                 </child>

branches/plugin-system/launch.sh

@@ -16 +16 @@
 
 cd ${BASE}/src
-exec -a gajim python -t gajim.py $@
+exec -a gajim python2.5 -t gajim.py $@

branches/plugin-system/plugins/length_notifier.py

@@ -33 +33 @@
 
 class LengthNotifierPlugin(GajimPlugin):
-        name = 'Message Length Notifier'
-        short_name = 'length_notifier'
-        version = '0.1'
-        description = '''Highlights message entry field in chat window when given 
-length of message is exceeded.'''
-        authors = ['Mateusz Biliński <mateusz@bilinski.it>']
+        name = u'Message Length Notifier'
+        short_name = u'length_notifier'
+        version = u'0.1'
+        description = u'''Highlights message entry field in chat window when given length of message is exceeded.'''
+        authors = [u'Mateusz Biliński <mateusz@bilinski.it>']
+        homepage = u'http://blog.bilinski.it'
 
         @log_calls('LengthNotifierPlugin')

branches/plugin-system/src/gajim.py

@@ -27 +27 @@
 
 import os
+import pycallgraph
+
 
 if os.name == 'nt':
@@ -603 +605 @@
                 import osx
                 osx.shutdown()
+        
+        #pycallgraph.make_dot_graph('common.xmpp-only.dot', format='dot')
 
 import atexit
@@ -3232 +3236 @@
 
         def __init__(self):
+                #filter_func = pycallgraph.GlobbingFilter(include=['common.xmpp.*'])
+                #pycallgraph.start_trace(filter_func=filter_func)
+                
                 gajim.interface = self
                 # This is the manager and factory of message windows set by the module

branches/plugin-system/src/plugins/pluginmanager.py

@@ -95 +95 @@
 
                 for path in gajim.PLUGINS_DIRS:
-                        self.plugins.extend(PluginManager.scan_dir_for_plugins(path))
+                        self._add_plugins(PluginManager.scan_dir_for_plugins(path))
 
                 log.debug('plugins: %s'%(self.plugins))
@@ -103 +103 @@
                 log.debug('active: %s'%(self.active_plugins))
 
+                
+        @log_calls('PluginManager')
+        def _add_plugin(self, plugin_class):
+                '''
+                :todo: what about adding plug-ins that are already added? Module reload
+                and adding class from reloaded module or ignoring adding plug-in?
+                '''
+                plugin_class._active = False
+                plugin_class._instance = None
+                self.plugins.append(plugin_class)
+        
+        @log_calls('PluginManager')
+        def _add_plugins(self, plugin_classes):
+                for plugin_class in plugin_classes:
+                        self._add_plugin(plugin_class)
+                
         @log_calls('PluginManager')
         def gui_extension_point(self, gui_extpoint_name, *args):
@@ -125 +141 @@
                         Looking closer - we only rewrite tuples here. Real check should be
                         made in method that invokes gui_extpoints handlers.
-
                 '''
 
@@ -142 +157 @@
 
         @log_calls('PluginManager')
-        def activate_plugin(self, plugin):
+        def activate_plugin(self, plugin_class):
                 '''
                 :param plugin: plugin to be activated
@@ -148 +163 @@
                 '''
                 
-                plugin_object = plugin()
+                plugin_object = plugin_class()
 
                 success = True
@@ -157 +172 @@
                 if success:
                         self.active_plugins.append(plugin_object)
+                        plugin_class._instance = plugin_object
+                        plugin_class._active = True
 
                 return success
@@ -166 +183 @@
                 for gui_extpoint_name, gui_extpoint_handlers in \
                                 plugin_object.gui_extension_points.iteritems():
-                        for gui_extension_point_args in self.gui_extension_points[gui_extpoint_name]:
-                                gui_extpoint_handlers[1](*gui_extension_point_args)
+                        if gui_extpoint_name in self.gui_extension_points:
+                                for gui_extension_point_args in self.gui_extension_points[gui_extpoint_name]:
+                                        gui_extpoint_handlers[1](*gui_extension_point_args)
                                 
                 # remove GUI extension points handlers (provided by plug-in) from
@@ -177 +195 @@
                 # removing plug-in from active plug-ins list
                 self.active_plugins.remove(plugin_object)
+                plugin_object.__class__._active = False
+                del plugin_object
                 
         def deactivate_all_plugins(self):

branches/plugin-system/src/plugins/plugin.py

@@ -31 +31 @@
         Base class for implementing Gajim plugins.
         '''
-        name = ''
+        name = u''
         '''
         Name of plugin.
@@ -39 +39 @@
         :type: unicode
         '''
-        short_name = ''
+        short_name = u''
         '''
         Short name of plugin.
@@ -50 +50 @@
                 module name) can act as such short name         
         '''
-        version = ''
+        version = u''
         '''
         Version of plugin.
@@ -62 +62 @@
                 one to be active - is such policy good?
         '''
-        description = ''
+        description = u''
         '''
         Plugin description.
@@ -79 +79 @@
                 Especially: should we force format of giving author's e-mail?
         '''
+        homepage = u''
+        '''
+        URL to plug-in's homepage.
+        
+        :type: unicode
+        
+        :todo: should we check whether provided string is valid URI? (Maybe
+        using 'property')
+        '''
         gui_extension_points = {}
         '''

branches/plugin-system/src/roster_window.py

@@ -45 +45 @@
 import notify
 import features_window
+import plugins
+import plugins.gui
 
 from common import gajim
@@ -3130 +3132 @@
                 else:
                         gajim.interface.instances['preferences'] = config.PreferencesWindow()
+                        
+        def on_plugins_menuitem_activate(self, widget):
+                if gajim.interface.instances.has_key('plugins'):
+                        gajim.interface.instances['plugins'].window.present()
+                else:
+                        gajim.interface.instances['plugins'] = plugins.gui.PluginsWindow()
 
         def on_publish_tune_checkbutton_toggled(self, widget, account):