Changeset 161

Timestamp:

14.04.2008 17:37:47 (9 months ago)

Author:

poillubo

Message:

* plugins can fail to load
* plugin dependencies are cleaned up when a plugin fails to load
* no more delay in the drawing of a submenu
* put the XMapWindow back in ShowPos?.start_window

Files:

• trunk/pycawm/menu.py (modified) (2 diffs)
• trunk/pycawm/plugins/__init__.py (modified) (1 diff)
• trunk/pycawm/plugins/musicactionbuttonbox.py (modified) (2 diffs)
• trunk/pycawm/plugins/plugin.py (modified) (1 diff)
• trunk/pycawm/plugins/showpos.py (modified) (2 diffs)
• trunk/pycawm/pycawm.py (modified) (4 diffs)

trunk/pycawm/menu.py

@@ -162 +162 @@
-        self.current = self.get_indice(pointer.win_x, pointer.win_y)
-        self.fill_window_pixmap()
+        self.window.map()
-        self.draw_menu()
-        self.window.map()
-        self.window.set_wm_state(state=Xutil.NormalState, icon=0)
-        self.grabbed = False
@@ -809 +809 @@
-
-    @classmethod
-force=False
+**kwargs
-        plugin_name = name if name is not None else plugin.__name__
-        cls.elements[plugin_name] = \
-            (('Add ' + plugin_name, Menu.python,
-, force=force
-, name=name, force=forc
+
+=params, name=nam
-
-    @classmethod

trunk/pycawm/plugins/__init__.py

@@ -18 +18 @@
-#  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-
-
+ and plugin exception
+, PycaPluginError
-
-# specific plugins

trunk/pycawm/plugins/musicactionbuttonbox.py

@@ -27 +27 @@
-
-from pycawm.button import Button
-
+, PycaPluginError
-
-
@@ -68 +68 @@
-    def __init__(self, wm, player, play_img='plop.png', next_img='plop.png',
-                 volume_step=10, x=0, y=0):
+        if player not in MusicActionButtonBox.players:
+            raise PycaPluginError('%s is not in the available players!' %
+                                  player)
-        self.player = player
-        self.volume_step = volume_step

trunk/pycawm/plugins/plugin.py

@@ -23 +23 @@
-    raise ImportError('plugin module needs at least Python 2.5!')
-
+class PycaPluginError(Exception):
+    def __init__(self, msg):
+        self.msg = msg
+
-class Plugin(object):
-    conflicts = list()

trunk/pycawm/plugins/showpos.py

@@ -78 +78 @@
-            self.end_window(force=True)
-        self.client = client
+        self.window.map()
-
-    def end_window(self, *args, **kwargs):
@@ -91 +92 @@
-                height = extents.overall_ascent + extents.overall_descent + 10
-                width = extents.overall_width + 10
-                self.window.map()
-                self.window.configure(width=width, height=height,
-                                      stack_mode=X.Above)

trunk/pycawm/pycawm.py

@@ -46 +46 @@
-                  is_strict_subclass)
-from patterns import DictWrapper
-
+, PycaPluginError
-from wrappers import DisplayWrapper
-import focuses
@@ -294 +294 @@
-        self.display.sync()
-
-
+
+
-        def build_deps_and_confs(plug):
-
+
+
+
-                if isinstance(dep, tuple):
-                    deps.append(dep[1])
-                else:
-                    deps.append(dep.__name__)
-            for conf in plug.conflicts:
-                confs.append(conf)
-            for dep in plug.depends:
-                build_deps_and_confs(dep[0] if isinstance(dep, tuple) else dep)
+                if load_deps:
+                    deps_to_load.append((dep, dep_params))
+
+        def cleanup_deps():
+            if not load_deps:
+                return
+            print 'cleaning up old dependencies...'
+            for name, inst in reversed(deps_loaded):
+                print ('removed plugin named %s, instance: %s' % (name, inst))
+                self.remove_plugin(name, inst)
-
-        if not plugin.runnable:
-            print "%s is not a runnable plugin!" % plugin
-
-
+
+
+
-        plugin_name = name if name is not None else plugin.__name__
-
-        if not force and plugin_name in self.plugins:
-            print '%s is already loaded!' % plugin_name
-
+ None
-
-        # current plugin has a conflict with an already loaded one?
@@ -321 +332 @@
-                print ("%s which conflicts with %s is already loaded!" %
-                       (plug_name, plugin_name))
-
+ None
-
-        # already loaded plugin has a conflict with current one?
@@ -329 +340 @@
-                    print ("%s which conflicts with %s is already loaded!" %
-                           (plug_name, plugin_name))
-
-
+
+
+
-        deps = list()
-
+
+
-        build_deps_and_confs(plugin)
-    
-last check: 
+
-        for conf_name in confs:
-            if conf_name in deps:
-                print ("there is a conflict with %s in the dependencies of %s!"
-                       % (conf_name, plugin_name))
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    def remove_plugin(self, plugin_name, plugin, remove_deps=False, warn=True):