Ticket #2220: 0001-Accelerators-doesn-t-work-if-toolitems-are-in-sub-pa.patch

src/sugar/graphics/toolbarbox.py

@@ -36 +36 @@
         self.connect('clicked',
                 lambda widget: self.set_expanded(not self.is_expanded()))
 
+    def do_hierarchy_changed(self, previous_toplevel):
+        # XXX Workaround for http://bugs.sugarlabs.org/ticket/2220
+        # until implementing more robust scheme
+
+        def update_accelerator(parent):
+            for child in parent.get_children():
+                if hasattr(child, 'update_accelerator'):
+                    child.update_accelerator(self.get_toplevel())
+                if isinstance(child, gtk.Container):
+                    update_accelerator(child)
+
+        update_accelerator(self.props.page)
+
     def get_toolbar_box(self):
         if not hasattr(self.parent, 'owner'):
             return None

src/sugar/graphics/toolbutton.py

@@ -29 +29 @@
 from sugar.graphics.palette import Palette, ToolInvoker
 
 
-def _add_accelerator(tool_button):
-    if not tool_button.props.accelerator or not tool_button.get_toplevel() or \
+def _add_accelerator(tool_button, toplevel):
+    if not tool_button.props.accelerator or not toplevel or \
             not tool_button.child:
         return
 
     # TODO: should we remove the accelerator from the prev top level?
 
-    accel_group = tool_button.get_toplevel().get_data('sugar-accel-group')
+    accel_group = toplevel.get_data('sugar-accel-group')
     if not accel_group:
         logging.warning('No gtk.AccelGroup in the top level window.')
         return
@@ -49 +49 @@
 
 
 def _hierarchy_changed_cb(tool_button, previous_toplevel):
-    _add_accelerator(tool_button)
+    _add_accelerator(tool_button, tool_button.get_toplevel())
 
 
 def setup_accelerator(tool_button):
-    _add_accelerator(tool_button)
+    _add_accelerator(tool_button, tool_button.get_toplevel())
     tool_button.connect('hierarchy-changed', _hierarchy_changed_cb)
 
 
@@ -105 +105 @@
     tooltip = gobject.property(type=str, setter=set_tooltip,
         getter=get_tooltip)
 
+    def update_accelerator(self, toplevel):
+        # XXX Workaround for http://bugs.sugarlabs.org/ticket/2220
+        # until implementing more robust scheme
+        _add_accelerator(self, toplevel)
+
     def set_accelerator(self, accelerator):
         self._accelerator = accelerator
         setup_accelerator(self)