diff options
| author | Aleksey Lim <alsroot@member.fsf.org> | 2009-07-30 15:25:30 (GMT) |
|---|---|---|
| committer | Aleksey Lim <alsroot@member.fsf.org> | 2009-07-30 15:25:30 (GMT) |
| commit | 61ab4110faec6032084ed9ec1423004407ff3fb8 (patch) | |
| tree | 08bf020d6cb2b598a7d7f3eb3e0dd5e08fbc06c6 | |
| parent | b43aa43114e329a467207dd3207c4c84f3aa8a26 (diff) | |
Rename toolbar.py to toolbarbox.py
| -rw-r--r-- | examples/toolbar.py | 4 | ||||
| -rw-r--r-- | src/sugar/activity/activity.py | 4 | ||||
| -rw-r--r-- | src/sugar/activity/widgets.py | 2 | ||||
| -rw-r--r-- | src/sugar/graphics/toolbarbox.py (renamed from src/sugar/graphics/toolbar.py) | 2 |
4 files changed, 8 insertions, 4 deletions
diff --git a/examples/toolbar.py b/examples/toolbar.py index 6150be3..6a6c143 100644 --- a/examples/toolbar.py +++ b/examples/toolbar.py @@ -1,7 +1,7 @@ import gtk from sugar.graphics.toolbutton import ToolButton -from sugar.graphics.toolbar import Toolbar, ToolbarButton +from sugar.graphics.toolbarbox import ToolbarBox, ToolbarButton from sugar.graphics import style window = gtk.Window() @@ -9,7 +9,7 @@ window = gtk.Window() box = gtk.VBox() window.add(box) -toolbar = Toolbar() +toolbar = ToolbarBox() box.pack_start(toolbar, False) tollbarbutton_1 = ToolbarButton( diff --git a/src/sugar/activity/activity.py b/src/sugar/activity/activity.py index f20d402..d94cdbe 100644 --- a/src/sugar/activity/activity.py +++ b/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) diff --git a/src/sugar/activity/widgets.py b/src/sugar/activity/widgets.py index ca920aa..ae4abdf 100644 --- a/src/sugar/activity/widgets.py +++ b/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 diff --git a/src/sugar/graphics/toolbar.py b/src/sugar/graphics/toolbarbox.py index 6e3666e..3daca70 100644 --- a/src/sugar/graphics/toolbar.py +++ b/src/sugar/graphics/toolbarbox.py @@ -109,7 +109,7 @@ class ToolbarButton(ToolButton): gtk.ToolButton.do_expose_event(self, event) _paint_arrow(self, event, gtk.ARROW_UP) -class Toolbar(gtk.VBox): +class ToolbarBox(gtk.VBox): def __init__(self, padding=style.TOOLBOX_HORIZONTAL_PADDING): gtk.VBox.__init__(self) |