diff options
Diffstat (limited to 'src/sugar3/graphics/palette.py')
| -rw-r--r-- | src/sugar3/graphics/palette.py | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/src/sugar3/graphics/palette.py b/src/sugar3/graphics/palette.py index aed1744..6f6355e 100644 --- a/src/sugar3/graphics/palette.py +++ b/src/sugar3/graphics/palette.py @@ -30,7 +30,6 @@ from sugar3.graphics import animator from sugar3.graphics import style from sugar3.graphics.icon import Icon from sugar3.graphics.palettewindow import PaletteWindow -from gi.repository import SugarExt # DEPRECATED # Import these for backwards compatibility @@ -67,8 +66,7 @@ class Palette(PaletteWindow): primary_box.pack_start(self._icon_box, False, True, 0) labels_box = Gtk.VBox() - self._label_alignment = Gtk.Alignment.new(xalign=0, yalign=0.5, - xscale=1, yscale=0.33) + self._label_alignment = Gtk.Alignment.new(0, 0.5, 1, 0.33) self._label_alignment.set_padding(0, 0, style.DEFAULT_SPACING, style.DEFAULT_SPACING) self._label_alignment.add(labels_box) @@ -350,8 +348,9 @@ class Palette(PaletteWindow): def _update_accept_focus(self): accept_focus = len(self._content.get_children()) - if self.window: - self.window.set_accept_focus(accept_focus) + win = self.get_window() + if win: + win.set_accept_focus(accept_focus) def __realize_cb(self, widget): self._update_accept_focus() @@ -396,7 +395,7 @@ class PaletteActionBar(Gtk.HButtonBox): button.show() -class _Menu(SugarExt.Menu): +class _Menu(Gtk.Menu): __gtype_name__ = 'SugarPaletteMenu' @@ -405,17 +404,23 @@ class _Menu(SugarExt.Menu): } def __init__(self, palette): - SugarExt.Menu.__init__(self) + Gtk.Menu.__init__(self) self._palette = palette + def embed(self, *args): + pass + + def unembed(self, *args): + pass + def do_insert(self, item, position): - SugarExt.Menu.do_insert(self, item, position) + Gtk.Menu.do_insert(self, item, position) self.emit('item-inserted') self.show() def attach(self, child, left_attach, right_attach, top_attach, bottom_attach): - SugarExt.Menu.attach(self, child, left_attach, right_attach, + Gtk.Menu.attach(self, child, left_attach, right_attach, top_attach, bottom_attach) self.emit('item-inserted') self.show() |