Merge branch 'master' of ssh+git://dev.laptop.org/git/sugar-toolkit

This commit is contained in:
Simon Schampijer 2008-02-26 00:32:37 +01:00
commit ed1aa70636

View File

@ -151,6 +151,7 @@ class Palette(gtk.Window):
self.set_border_width(self.style.xthickness) self.set_border_width(self.style.xthickness)
self.connect('realize', self._realize_cb) self.connect('realize', self._realize_cb)
self.connect('destroy', self.__destroy_cb) self.connect('destroy', self.__destroy_cb)
self.connect('map-event', self.__map_event_cb)
self.palette_state = self.PRIMARY self.palette_state = self.PRIMARY
@ -414,16 +415,11 @@ class Palette(gtk.Window):
self._update_full_request() self._update_full_request()
self._alignment = self._invoker.get_alignment(self._full_request) self._alignment = self._invoker.get_alignment(self._full_request)
self._update_position() self._update_position()
self.set_transient_for(self._invoker.get_toplevel())
self.menu.set_active(True) self.menu.set_active(True)
self.show() self.show()
self._invoker.notify_popup()
self._up = True
_palette_observer.emit('popup', self)
self.emit('popup')
def _hide(self): def _hide(self):
self._secondary_anim.stop() self._secondary_anim.stop()
@ -514,6 +510,13 @@ class Palette(gtk.Window):
if self != palette: if self != palette:
self._hide() self._hide()
def __map_event_cb(self, widget, event):
self._invoker.notify_popup()
self._up = True
_palette_observer.emit('popup', self)
self.emit('popup')
class PaletteActionBar(gtk.HButtonBox): class PaletteActionBar(gtk.HButtonBox):
def add_action(label, icon_name=None): def add_action(label, icon_name=None):
button = Button(label) button = Button(label)