Rename toolbar.py to toolbarbox.py
This commit is contained in:
parent
b43aa43114
commit
61ab4110fa
@ -1,7 +1,7 @@
|
|||||||
import gtk
|
import gtk
|
||||||
|
|
||||||
from sugar.graphics.toolbutton import ToolButton
|
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
|
from sugar.graphics import style
|
||||||
|
|
||||||
window = gtk.Window()
|
window = gtk.Window()
|
||||||
@ -9,7 +9,7 @@ window = gtk.Window()
|
|||||||
box = gtk.VBox()
|
box = gtk.VBox()
|
||||||
window.add(box)
|
window.add(box)
|
||||||
|
|
||||||
toolbar = Toolbar()
|
toolbar = ToolbarBox()
|
||||||
box.pack_start(toolbar, False)
|
box.pack_start(toolbar, False)
|
||||||
|
|
||||||
tollbarbutton_1 = ToolbarButton(
|
tollbarbutton_1 = ToolbarButton(
|
||||||
|
@ -806,6 +806,10 @@ class Activity(Window, gtk.Container):
|
|||||||
def get_document_path(self, async_cb, async_err_cb):
|
def get_document_path(self, async_cb, async_err_cb):
|
||||||
async_err_cb(NotImplementedError())
|
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
|
# DEPRECATED
|
||||||
_shared_activity = property(lambda self: self.shared_activity, None)
|
_shared_activity = property(lambda self: self.shared_activity, None)
|
||||||
|
|
||||||
|
@ -22,7 +22,7 @@ import gettext
|
|||||||
import gconf
|
import gconf
|
||||||
|
|
||||||
from sugar.graphics.toolbutton import ToolButton
|
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.radiopalette import RadioPalette, RadioMenuButton
|
||||||
from sugar.graphics.radiotoolbutton import RadioToolButton
|
from sugar.graphics.radiotoolbutton import RadioToolButton
|
||||||
from sugar.graphics.toolbox import Toolbox
|
from sugar.graphics.toolbox import Toolbox
|
||||||
|
@ -109,7 +109,7 @@ class ToolbarButton(ToolButton):
|
|||||||
gtk.ToolButton.do_expose_event(self, event)
|
gtk.ToolButton.do_expose_event(self, event)
|
||||||
_paint_arrow(self, event, gtk.ARROW_UP)
|
_paint_arrow(self, event, gtk.ARROW_UP)
|
||||||
|
|
||||||
class Toolbar(gtk.VBox):
|
class ToolbarBox(gtk.VBox):
|
||||||
def __init__(self, padding=style.TOOLBOX_HORIZONTAL_PADDING):
|
def __init__(self, padding=style.TOOLBOX_HORIZONTAL_PADDING):
|
||||||
gtk.VBox.__init__(self)
|
gtk.VBox.__init__(self)
|
||||||
|
|
Loading…
Reference in New Issue
Block a user