Changeset 1140:1231dd5d7bc6 for pida/core/actions.py

Timestamp:

04/19/08 21:26:27 (8 months ago)

Author:

Ronny Pfannschmidt <Ronny.Pfannschmidt@…>

Children:

1141:8e72fb661f77, 1147:30ad236e42c0

Message:

code simplifications and unittest fixes/removals

Files:

• pida/core/actions.py (modified) (5 diffs)

pida/core/actions.py

@@ -32 +32 @@
 from pida.core.base import BaseConfig
 from pida.core.options import OptionItem, manager, OTypeString
-
-(
-TYPE_RADIO,
-TYPE_TOGGLE,
-TYPE_NORMAL,
-TYPE_MENUTOOL,
-) = range(4)
+import warnings
 
 
@@ -55 +49 @@
 
 
-_ACTIONS = {
-    TYPE_NORMAL: gtk.Action,
-    TYPE_TOGGLE: gtk.ToggleAction,
-    TYPE_RADIO: gtk.RadioAction,
-    TYPE_MENUTOOL: PidaMenuToolAction,
-}
+TYPE_NORMAL = gtk.Action
+TYPE_TOGGLE = gtk.ToggleAction
+TYPE_RADIO = gtk.RadioAction
+TYPE_MENUTOOL = PidaMenuToolAction
 
 
@@ -107 +99 @@
 
     def create_action(self, name, atype, label, tooltip, stock_id,
-                      callback=None, accel_string='NOACCEL'):
+                      callback=None, accel=None):
         """
         Create an action for this service.
@@ -132 +124 @@
             The callback function to be called when the action is activated.
             This function should take the action as a parameter.
-        :param accel_string:
+        :param accel:
             The accelerator string set as the default accelerator for this
-            action, or 'NOACCEL' for actions that do not need an accelerator.
+            action, or `None` for actions that do not need an accelerator.
             To be used these actions must be proxied as items in one of the
             menus or toolbars.
         """
-        aclass = _ACTIONS[atype]
-        act = aclass(name=name, label=label, tooltip=tooltip, stock_id=stock_id)
+        act = atype(name=name, label=label, tooltip=tooltip, stock_id=stock_id)
         self._actions.add_action(act)
         if callback is None:
@@ -145 +136 @@
         if callback is not None:
             act.connect('activate', callback)
-        if accel_string != 'NOACCEL':
-            self._create_key_option(act, name, label, tooltip, accel_string)
-
-    def _create_key_option(self, act, name, label, tooltip, accel_string):
+        
+        if accel == 'NOACCEL':
+            warnings.warn('the accel `NOACCEL` is deprecated, use None',
+                    DeprecationWarning, 2)
+
+        if accel != 'NOACCEL' and accel is not None:
+            self._create_key_option(act, name, label, tooltip, accel)
+
+    def _create_key_option(self, act, name, label, tooltip, accel):
         opt = OptionItem(self._get_group_name(), name, label, OTypeString,
-                         accel_string, tooltip, self._on_shortcut_notify)
+                         accel, tooltip, self._on_shortcut_notify)
         opt.action = act
         opt.stock_id = act.get_property('stock-id')