diff options
| author | Simon Schampijer <simon@laptop.org> | 2012-09-12 19:50:46 (GMT) |
|---|---|---|
| committer | Simon Schampijer <simon@laptop.org> | 2012-09-13 15:25:04 (GMT) |
| commit | aaa963cfae51a56c15f7f5075a7c41039ea61e72 (patch) | |
| tree | 683849f756b5177c80a3f9ca3ca24b0def57ef22 /src | |
| parent | 71ef2eb1411c0cb4c32ad9818001e3b2cf626ee1 (diff) | |
Port Sugar Palettes with mixed content to new API
As Palettes can either include a Gtk.Menu or a Gtk.Window we
have to use a "false" menu when we want to have both
functionality in a Palette. There is a new class PaletteMenuItem
in the toolkit for that.
Ported from the Frame: Journal Palette, Network Wireless Palette,
Speaker Palette
Signed-off-by: Simon Schampijer <simon@laptop.org>
Acked-by: Manuel Quiñones <manuq@laptop.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/jarabe/view/palettes.py | 29 |
1 files changed, 17 insertions, 12 deletions
diff --git a/src/jarabe/view/palettes.py b/src/jarabe/view/palettes.py index 2d13cbd..50f6c83 100644 --- a/src/jarabe/view/palettes.py +++ b/src/jarabe/view/palettes.py @@ -25,6 +25,8 @@ from gi.repository import Gtk from sugar3 import env from sugar3.graphics.palette import Palette +from sugar3.graphics.palettemenuitem import PaletteMenuItem +from sugar3.graphics.palettemenuitem import PaletteMenuItemSeparator from sugar3.graphics.menuitem import MenuItem from sugar3.graphics.icon import Icon from sugar3.graphics import style @@ -166,6 +168,21 @@ class JournalPalette(BasePalette): self.set_content(vbox) vbox.show() + menu_item = PaletteMenuItem(_('Show contents')) + icon = Icon(file=self._home_activity.get_icon_path(), + icon_size=Gtk.IconSize.MENU, + xo_color=self._home_activity.get_icon_color()) + menu_item.set_image(icon) + icon.show() + + menu_item.connect('activate', self.__open_activate_cb) + vbox.add(menu_item) + menu_item.show() + + separator = PaletteMenuItemSeparator() + vbox.pack_start(separator, True, True, 0) + separator.show() + self._progress_bar = Gtk.ProgressBar() vbox.add(self._progress_bar) self._progress_bar.show() @@ -177,18 +194,6 @@ class JournalPalette(BasePalette): self.connect('popup', self.__popup_cb) - menu_item = MenuItem(_('Show contents')) - - icon = Icon(file=self._home_activity.get_icon_path(), - icon_size=Gtk.IconSize.MENU, - xo_color=self._home_activity.get_icon_color()) - menu_item.set_image(icon) - icon.show() - - menu_item.connect('activate', self.__open_activate_cb) - self.menu.append(menu_item) - menu_item.show() - def __open_activate_cb(self, menu_item): self._home_activity.get_window().activate(Gtk.get_current_event_time()) |