Changeset 9752

Timestamp:

06/03/08 10:25:16 (6 months ago)

Author:

vardo

Message:

Added mechanism to successfully load plugins after GUI extension points have been created, e.g. when we want to modify ChatControl? behaviour and objects of this class have already been created.

Also: customized IPython console look

Location:

branches/plugin-system/src

Files:

• gajim.py (modified) (2 diffs)
• plugins/pluginmanager.py (modified) (5 diffs)

branches/plugin-system/src/gajim.py

@@ -3209 +3209 @@
                 else:
                         font = 'Luxi Mono 10'
+                font="Terminus 10"
 
                 window = gtk.Window()
@@ -3218 +3219 @@
                 view.modify_font(pango.FontDescription(font))
                 view.set_wrap_mode(gtk.WRAP_CHAR)
+                view.modify_base(gtk.STATE_NORMAL, gtk.gdk.color_parse("black"));
+                view.modify_text(gtk.STATE_NORMAL, gtk.gdk.color_parse("white"));
                 sw.add(view)
                 window.add(sw)

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

@@ -53 +53 @@
         :todo: implement mechanism to dynamically deactive plugins (call plugin's
                    deactivation handler)
-        
         '''
         
@@ -81 +80 @@
                 Registered GUI extension points.
                 '''
+                
+                self.gui_extension_points_handlers = {}
+                '''
+                Registered handlers of GUI extension points.
+                '''
 
                 for path in gajim.PLUGINS_DIRS:
@@ -87 +91 @@
                 log.debug('plugins: %s'%(self.plugins))
 
-                self._activate_all_plugins()
+                #self._activate_all_plugins()
 
                 log.debug('active: %s'%(self.active_plugins))
@@ -116 +120 @@
                 '''
 
-                log.debug(type(args))
-
-                if gui_extpoint_name in self.gui_extension_points:
-                        for handlers in self.gui_extension_points[gui_extpoint_name]:
+                self._add_gui_extension_point_call_to_list(gui_extpoint_name, *args)
+                self._execute_all_handlers_of_gui_extension_point(gui_extpoint_name, *args)
+                                
+        @log_calls('PluginManager')
+        def _add_gui_extension_point_call_to_list(self, gui_extpoint_name, *args):
+                self.gui_extension_points.setdefault(gui_extpoint_name, []).append(args)
+        
+        @log_calls('PluginManager')
+        def _execute_all_handlers_of_gui_extension_point(self, gui_extpoint_name, *args):
+                if gui_extpoint_name in self.gui_extension_points_handlers:
+                        for handlers in self.gui_extension_points_handlers[gui_extpoint_name]:
                                 handlers[0](*args)
 
@@ -133 +144 @@
                 success = True
 
+                self._add_gui_extension_points_handlers_from_plugin(plugin_object)
+                self._handle_all_gui_extension_points_with_plugin(plugin_object)
+
+                if success:
+                        self.active_plugins.append(plugin_object)
+
+                return success
+        
+        @log_calls('PluginManager')
+        def _add_gui_extension_points_handlers_from_plugin(self, plugin_object):
                 for gui_extpoint_name, gui_extpoint_handlers in \
                                 plugin_object.gui_extension_points.iteritems():
-                        self.gui_extension_points.setdefault(gui_extpoint_name, []).append(
+                        self.gui_extension_points_handlers.setdefault(gui_extpoint_name, []).append(
                                         gui_extpoint_handlers)
-
-                if success:
-                        self.active_plugins.append(plugin_object)
-
-                return success
+        
+        @log_calls('PluginManager')
+        def _handle_all_gui_extension_points_with_plugin(self, plugin_object):
+                for gui_extpoint_name, gui_extpoint_handlers in \
+                                plugin_object.gui_extension_points.iteritems():
+                        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[0](*gui_extension_point_args)
 
         @log_calls('PluginManager')