Rename toolbar.py to toolbarbox.py

src/sugar/activity/activity.py

@@ -806,6 +806,10 @@ class Activity(Window, gtk.Container):
     def get_document_path(self, async_cb, async_err_cb):
         async_err_cb(NotImplementedError())
 
+    def set_toolbar_box(self, toolbar_box):
+        # make more consistent using ToolbarBox instead of Toolbox
+        self.set_toolbox(toolbar_box)
+
     # DEPRECATED
     _shared_activity = property(lambda self: self.shared_activity, None)
 

src/sugar/activity/widgets.py

@@ -22,7 +22,7 @@ import gettext
 import gconf
 
 from sugar.graphics.toolbutton import ToolButton
-from sugar.graphics.toolbar import Toolbar, ToolbarButton
+from sugar.graphics.toolbarbox import ToolbarButton
 from sugar.graphics.radiopalette import RadioPalette, RadioMenuButton
 from sugar.graphics.radiotoolbutton import RadioToolButton
 from sugar.graphics.toolbox import Toolbox