Merge branch 'master' of git.sugarlabs.org:sugar/mainline

11 files changed, 109 insertions, 105 deletions

diff --git a/configure.ac b/configure.ac
index a552756..84f70dd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([Sugar],[0.97.8],[],[sugar])
+AC_INIT([Sugar],[0.97.9],[],[sugar])
 
 AC_PREREQ([2.59])
 
diff --git a/extensions/cpsection/aboutme/view.py b/extensions/cpsection/aboutme/view.py
index 3cbd93e..2d4b1e8 100644
--- a/extensions/cpsection/aboutme/view.py
+++ b/extensions/cpsection/aboutme/view.py
@@ -185,10 +185,6 @@ class AboutMe(SectionView):
 
     def _setup_nick(self):
         self._nick_entry = Gtk.Entry()
-        self._nick_entry.modify_bg(Gtk.StateType.INSENSITIVE,
-                                   style.COLOR_WHITE.get_gdk_color())
-        self._nick_entry.modify_base(Gtk.StateType.INSENSITIVE,
-                                     style.COLOR_WHITE.get_gdk_color())
         self._nick_entry.set_width_chars(25)
         self._nick_box.pack_start(self._nick_entry, False, True, 0)
         self._nick_entry.show()
diff --git a/extensions/cpsection/datetime/view.py b/extensions/cpsection/datetime/view.py
index 64789b4..e768e03 100644
--- a/extensions/cpsection/datetime/view.py
+++ b/extensions/cpsection/datetime/view.py
@@ -43,10 +43,6 @@ class TimeZone(SectionView):
         self._entry.set_icon_from_name(iconentry.ICON_ENTRY_PRIMARY,
                                  'system-search')
         self._entry.add_clear_button()
-        self._entry.modify_bg(Gtk.StateType.INSENSITIVE,
-                        style.COLOR_WHITE.get_gdk_color())
-        self._entry.modify_base(Gtk.StateType.INSENSITIVE,
-                          style.COLOR_WHITE.get_gdk_color())
         self.pack_start(self._entry, False, False, 0)
         self._entry.show()
 
diff --git a/extensions/cpsection/network/view.py b/extensions/cpsection/network/view.py
index 9b89375..b360759 100644
--- a/extensions/cpsection/network/view.py
+++ b/extensions/cpsection/network/view.py
@@ -153,10 +153,6 @@ class Network(SectionView):
         label_server.show()
         self._entry = Gtk.Entry()
         self._entry.set_alignment(0)
-        self._entry.modify_bg(Gtk.StateType.INSENSITIVE,
-                        style.COLOR_WHITE.get_gdk_color())
-        self._entry.modify_base(Gtk.StateType.INSENSITIVE,
-                          style.COLOR_WHITE.get_gdk_color())
         self._entry.set_size_request(int(Gdk.Screen.width() / 3), -1)
         box_server.pack_start(self._entry, False, True, 0)
         self._entry.show()
diff --git a/src/jarabe/desktop/activitieslist.py b/src/jarabe/desktop/activitieslist.py
index 4d2eb1a..7b99015 100644
--- a/src/jarabe/desktop/activitieslist.py
+++ b/src/jarabe/desktop/activitieslist.py
@@ -52,8 +52,6 @@ class ActivitiesTreeView(Gtk.TreeView):
 
         self._query = ''
 
-        self.modify_base(Gtk.StateType.NORMAL,
-                         style.COLOR_WHITE.get_gdk_color())
         self.set_headers_visible(False)
         selection = self.get_selection()
         selection.set_mode(Gtk.SelectionMode.NONE)
diff --git a/src/jarabe/desktop/favoritesview.py b/src/jarabe/desktop/favoritesview.py
index 9c7a76e..6e32363 100644
--- a/src/jarabe/desktop/favoritesview.py
+++ b/src/jarabe/desktop/favoritesview.py
@@ -29,7 +29,8 @@ from gi.repository import GdkPixbuf
 from sugar3.graphics import style
 from sugar3.graphics.icon import Icon
 from sugar3.graphics.icon import CanvasIcon
-from sugar3.graphics.menuitem import MenuItem
+from sugar3.graphics.palettemenuitem import PaletteMenuItem
+from sugar3.graphics.palettemenuitem import PaletteMenuItemSeparator
 from sugar3.graphics.alert import Alert
 from sugar3.graphics.xocolor import XoColor
 from sugar3.activity import activityfactory
@@ -488,8 +489,6 @@ class ActivityIcon(CanvasIcon):
 class FavoritePalette(ActivityPalette):
     __gtype_name__ = 'SugarFavoritePalette'
 
-    _PALETTE_LABEL_OFFSET = 2
-
     __gsignals__ = {
         'entry-activate': (GObject.SignalFlags.RUN_FIRST,
                            None, ([object])),
@@ -517,22 +516,20 @@ class FavoritePalette(ActivityPalette):
                 icon_file_name = misc.get_icon_name(entry)
                 color = misc.get_icon_color(entry)
 
-                menu_item = MenuItem(text_label=entry['title'],
-                                     file_name=icon_file_name,
-                                     xo_color=color)
+                menu_item = PaletteMenuItem(text_label=entry['title'],
+                                            file_name=icon_file_name,
+                                            xo_color=color)
                 menu_item.connect('activate', self.__resume_entry_cb, entry)
                 menu_items.append(menu_item)
                 menu_item.show()
 
             if journal_entries:
-                separator = Gtk.SeparatorMenuItem()
+                separator = PaletteMenuItemSeparator()
                 menu_items.append(separator)
                 separator.show()
 
             for i in range(0, len(menu_items)):
-                # the first menu_item is the label and the second is a
-                # separator so we need the offset
-                self.menu.insert(menu_items[i], i + self._PALETTE_LABEL_OFFSET)
+                self.menu_box.pack_start(menu_items[i], True, True, 0)
 
     def __resume_entry_cb(self, menu_item, entry):
         if entry is not None:
@@ -608,13 +605,14 @@ class OwnerIcon(BuddyIcon):
         backup_url = client.get_string('/desktop/sugar/backup_url')
 
         if not backup_url:
-            self._register_menu = MenuItem(_('Register'), 'media-record')
+            self._register_menu = PaletteMenuItem(_('Register'),
+                                                  'media-record')
         else:
-            self._register_menu = MenuItem(_('Register again'),
-                                           'media-record')
+            self._register_menu = PaletteMenuItem(_('Register again'),
+                                                  'media-record')
 
         self._register_menu.connect('activate', self.__register_activate_cb)
-        palette.menu.append(self._register_menu)
+        palette.menu_box.pack_end(self._register_menu, True, True, 0)
         self._register_menu.show()
 
         self.connect_to_palette_pop_events(palette)
@@ -625,10 +623,11 @@ class OwnerIcon(BuddyIcon):
         self.emit('register-activate')
 
     def set_registered(self):
-        self.palette.menu.remove(self._register_menu)
-        self._register_menu = MenuItem(_('Register again'), 'media-record')
+        self.palette.menu_box.remove(self._register_menu)
+        self._register_menu = PaletteMenuItem(_('Register again'),
+                                              'media-record')
         self._register_menu.connect('activate', self.__register_activate_cb)
-        self.palette.menu.append(self._register_menu)
+        self.palette.menu_box.pack_end(self._register_menu, True, True, 0)
         self._register_menu.show()
 
 
diff --git a/src/jarabe/desktop/networkviews.py b/src/jarabe/desktop/networkviews.py
index c7d21c6..f72b2d2 100644
--- a/src/jarabe/desktop/networkviews.py
+++ b/src/jarabe/desktop/networkviews.py
@@ -24,13 +24,16 @@ import uuid
 import dbus
 import glib
 
+from gi.repository import Gtk
+
 from sugar3.graphics.icon import Icon
 from sugar3.graphics.xocolor import XoColor
 from sugar3.graphics import xocolor
 from sugar3.graphics import style
 from sugar3.graphics.icon import get_icon_state
 from sugar3.graphics import palette
-from sugar3.graphics.menuitem import MenuItem
+from sugar3.graphics.palettemenuitem import PaletteMenuItem
+from sugar3.graphics.palettemenuitem import PaletteMenuItemSeparator
 from sugar3 import profile
 
 from jarabe.view.pulsingicon import EventPulsingIcon
@@ -122,14 +125,22 @@ class WirelessNetworkView(EventPulsingIcon):
         label = glib.markup_escape_text(self._display_name)
         p = palette.Palette(primary_text=label, icon=self._palette_icon)
 
-        self._connect_item = MenuItem(_('Connect'), 'dialog-ok')
+        self.menu_box = Gtk.VBox()
+
+        self._connect_item = PaletteMenuItem(_('Connect'))
+        icon = Icon(icon_size=Gtk.IconSize.MENU, icon_name='dialog-ok')
+        self._connect_item.set_image(icon)
         self._connect_item.connect('activate', self.__connect_activate_cb)
-        p.menu.append(self._connect_item)
+        self.menu_box.add(self._connect_item)
+
+        self._disconnect_item = PaletteMenuItem(_('Disconnect'))
+        icon = Icon(icon_size=Gtk.IconSize.MENU, icon_name='media-eject')
+        self._disconnect_item.set_image(icon)
+        self._disconnect_item.connect('activate', self.__disconnect_activate_cb)
+        self.menu_box.add(self._disconnect_item)
 
-        self._disconnect_item = MenuItem(_('Disconnect'), 'media-eject')
-        self._disconnect_item.connect('activate',
-                                        self._disconnect_activate_cb)
-        p.menu.append(self._disconnect_item)
+        p.set_content(self.menu_box)
+        self.menu_box.show_all()
 
         self.connect_to_palette_pop_events(p)
 
@@ -261,7 +272,7 @@ class WirelessNetworkView(EventPulsingIcon):
         else:
             self.props.alpha = 1.0
 
-    def _disconnect_activate_cb(self, item):
+    def __disconnect_activate_cb(self, item):
         ap_paths = self._access_points.keys()
         network.disconnect_access_points(ap_paths)
 
@@ -464,7 +475,6 @@ class SugarAdhocView(EventPulsingIcon):
         get_adhoc_manager_instance().connect('state-changed',
                                              self.__state_changed_cb)
 
-        self.connect('button-release-event', self.__button_release_event_cb)
 
         pulse_color = XoColor('%s,%s' % (style.COLOR_BUTTON_GREY.get_svg(),
                                          style.COLOR_TRANSPARENT.get_svg()))
@@ -473,6 +483,7 @@ class SugarAdhocView(EventPulsingIcon):
                                        (profile.get_color().get_stroke_color(),
                                         style.COLOR_TRANSPARENT.get_svg()))
         self.props.base_color = self._state_color
+        self.palette_invoker.props.toggle_palette = True
         self._palette = self._create_palette()
         self.set_palette(self._palette)
         self._palette_icon.props.xo_color = self._state_color
@@ -486,23 +497,27 @@ class SugarAdhocView(EventPulsingIcon):
         palette_ = palette.Palette(glib.markup_escape_text(text),
                                    icon=self._palette_icon)
 
-        self._connect_item = MenuItem(_('Connect'), 'dialog-ok')
+        self.menu_box = Gtk.VBox()
+
+        self._connect_item = PaletteMenuItem(_('Connect'))
+        icon = Icon(icon_size=Gtk.IconSize.MENU, icon_name='dialog-ok')
+        self._connect_item.set_image(icon)
         self._connect_item.connect('activate', self.__connect_activate_cb)
-        palette_.menu.append(self._connect_item)
-        self._connect_item.show()
+        self.menu_box.add(self._connect_item)
 
-        self._disconnect_item = MenuItem(_('Disconnect'), 'media-eject')
-        self._disconnect_item.connect('activate',
-                                      self.__disconnect_activate_cb)
-        palette_.menu.append(self._disconnect_item)
+        self._disconnect_item = PaletteMenuItem(_('Disconnect'))
+        icon = Icon(icon_size=Gtk.IconSize.MENU, icon_name='media-eject')
+        self._disconnect_item.set_image(icon)
+        self._disconnect_item.connect('activate', self.__disconnect_activate_cb)
+        self.menu_box.add(self._disconnect_item)
 
-        self.connect_to_palette_pop_events(palette)
+        palette_.set_content(self.menu_box)
+        self.menu_box.show_all()
+        self._disconnect_item.hide()
 
-        return palette_
+        self.connect_to_palette_pop_events(palette_)
 
-    def __button_release_event_cb(self, icon, event):
-        self._palette.popup(immediate=True,
-                            state=palette.Palette.SECONDARY)
+        return palette_
 
     def __connect_activate_cb(self, icon):
         get_adhoc_manager_instance().activate_channel(self._channel)
@@ -592,8 +607,6 @@ class OlpcMeshView(EventPulsingIcon):
         self._active = False
         device = mesh_mgr.mesh_device
 
-        self.connect('button-release-event', self.__button_release_event_cb)
-
         interface_props = dbus.Interface(device, dbus.PROPERTIES_IFACE)
         interface_props.Get(network.NM_DEVICE_IFACE, 'State',
                             reply_handler=self.__get_device_state_reply_cb,
@@ -615,6 +628,7 @@ class OlpcMeshView(EventPulsingIcon):
                                          style.COLOR_TRANSPARENT.get_svg()))
         self.props.pulse_color = pulse_color
         self.props.base_color = profile.get_color()
+        self.palette_invoker.props.toggle_palette = True
         self._palette = self._create_palette()
         self.set_palette(self._palette)
 
@@ -622,9 +636,16 @@ class OlpcMeshView(EventPulsingIcon):
         text = _('Mesh Network %d') % (self._channel, )
         _palette = palette.Palette(glib.markup_escape_text(text))
 
-        self._connect_item = MenuItem(_('Connect'), 'dialog-ok')
+        self.menu_box = Gtk.VBox()
+
+        self._connect_item = PaletteMenuItem(_('Connect'))
+        icon = Icon(icon_size=Gtk.IconSize.MENU, icon_name='dialog-ok')
+        self._connect_item.set_image(icon)
         self._connect_item.connect('activate', self.__connect_activate_cb)
-        _palette.menu.append(self._connect_item)
+        self.menu_box.add(self._connect_item)
+
+        _palette_.set_content(self.menu_box)
+        self.menu_box.show_all()
 
         return _palette
 
@@ -691,10 +712,6 @@ class OlpcMeshView(EventPulsingIcon):
     def __connect_activate_cb(self, icon):
         self._connect()
 
-    def __button_release_event_cb(self, icon, event):
-        self._palette.popup(immediate=True,
-                            state=palette.Palette.SECONDARY)
-
     def _connect(self):
         self._mesh_mgr.user_activate_channel(self._channel)
 
diff --git a/src/jarabe/journal/listview.py b/src/jarabe/journal/listview.py
index 5b2c5ab..6d9cc57 100644
--- a/src/jarabe/journal/listview.py
+++ b/src/jarabe/journal/listview.py
@@ -90,8 +90,6 @@ class BaseListView(Gtk.Bin):
         selection = self.tree_view.get_selection()
         selection.set_mode(Gtk.SelectionMode.NONE)
         self.tree_view.props.fixed_height_mode = True
-        self.tree_view.modify_base(Gtk.StateType.NORMAL,
-                                   style.COLOR_WHITE.get_gdk_color())
         self._scrolled_window.add(self.tree_view)
         self.tree_view.show()
 
diff --git a/src/jarabe/view/buddyicon.py b/src/jarabe/view/buddyicon.py
index cd648b1..6320113 100644
--- a/src/jarabe/view/buddyicon.py
+++ b/src/jarabe/view/buddyicon.py
@@ -35,8 +35,7 @@ class BuddyIcon(CanvasIcon):
         self._buddy.connect('notify::present', self.__buddy_notify_present_cb)
         self._buddy.connect('notify::color', self.__buddy_notify_color_cb)
 
-        self.connect('button-release-event', self.__button_release_event_cb)
-
+        self.palette_invoker.props.toggle_palette = True
         self.palette_invoker.cache_palette = False
 
         self._update_color()
@@ -46,9 +45,6 @@ class BuddyIcon(CanvasIcon):
         self.connect_to_palette_pop_events(palette)
         return palette
 
-    def __button_release_event_cb(self, icon, event):
-        self.props.palette.popup(immediate=True, state=Palette.SECONDARY)
-
     def __buddy_notify_present_cb(self, buddy, pspec):
         # Update the icon's color when the buddy comes and goes
         self._update_color()
diff --git a/src/jarabe/view/buddymenu.py b/src/jarabe/view/buddymenu.py
index d17f4ff..f1cc533 100644
--- a/src/jarabe/view/buddymenu.py
+++ b/src/jarabe/view/buddymenu.py
@@ -24,7 +24,7 @@ import glib
 import dbus
 
 from sugar3.graphics.palette import Palette
-from sugar3.graphics.menuitem import MenuItem
+from sugar3.graphics.palettemenuitem import PaletteMenuItem
 from sugar3.graphics.icon import Icon
 
 from jarabe.model import shell
@@ -45,9 +45,13 @@ class BuddyMenu(Palette):
         Palette.__init__(self, None,
                          primary_text=glib.markup_escape_text(nick),
                          icon=buddy_icon)
+        self.menu_box = Gtk.VBox()
+        self.set_content(self.menu_box)
+        self.menu_box.show_all()
         self._invite_menu = None
         self._active_activity_changed_hid = None
-        self.get_menu().connect('destroy', self.__destroy_cb)
+        # Fixme: we need to make the widget accessible through the Palette API
+        self._widget.connect('destroy', self.__destroy_cb)
 
         self._buddy.connect('notify::nick', self.__buddy_notify_nick_cb)
 
@@ -64,18 +68,17 @@ class BuddyMenu(Palette):
 
     def _add_buddy_items(self):
         if friends.get_model().has_buddy(self._buddy):
-            menu_item = MenuItem(_('Remove friend'), 'list-remove')
+            menu_item = PaletteMenuItem(_('Remove friend'), 'list-remove')
             menu_item.connect('activate', self._remove_friend_cb)
         else:
-            menu_item = MenuItem(_('Make friend'), 'list-add')
+            menu_item = PaletteMenuItem(_('Make friend'), 'list-add')
             menu_item.connect('activate', self._make_friend_cb)
 
-        self.menu.append(menu_item)
-        menu_item.show()
+        self.menu_box.pack_start(menu_box, True, True, 0)
 
-        self._invite_menu = MenuItem('')
+        self._invite_menu = PaletteMenuItem('')
         self._invite_menu.connect('activate', self._invite_friend_cb)
-        self.menu.append(self._invite_menu)
+        self.menu_box.pack_start(self._invite_menu, True, True, 0)
 
         home_model = shell.get_model()
         self._active_activity_changed_hid = home_model.connect(
@@ -84,28 +87,27 @@ class BuddyMenu(Palette):
         self._update_invite_menu(activity)
 
     def _add_my_items(self):
-        item = MenuItem(_('Shutdown'), 'system-shutdown')
+        item = PaletteMenuItem(_('Shutdown'), 'system-shutdown')
         item.connect('activate', self.__shutdown_activate_cb)
-        self.menu.append(item)
-        item.show()
+        self.menu_box.pack_start(item, True, True, 0)
 
         client = GConf.Client.get_default()
 
         if client.get_bool('/desktop/sugar/show_restart'):
-            item = MenuItem(_('Restart'), 'system-restart')
+            item = PaletteMenuItem(_('Restart'), 'system-restart')
             item.connect('activate', self.__reboot_activate_cb)
-            self.menu.append(item)
+            self.menu_box.pack_start(item, True, True, 0)
             item.show()
 
         if client.get_bool('/desktop/sugar/show_logout'):
-            item = MenuItem(_('Logout'), 'system-logout')
+            item = PaletteMenuItem(_('Logout'), 'system-logout')
             item.connect('activate', self.__logout_activate_cb)
-            self.menu.append(item)
+            self.menu_box.pack_start(item, True, True, 0)
             item.show()
 
-        item = MenuItem(_('My Settings'), 'preferences-system')
+        item = PaletteMenuItem(_('My Settings'), 'preferences-system')
         item.connect('activate', self.__controlpanel_activate_cb)
-        self.menu.append(item)
+        self.menu_box.pack_start(item, True, True, 0)
         item.show()
 
     def _quit(self, action):
@@ -138,8 +140,7 @@ class BuddyMenu(Palette):
             self._invite_menu.hide()
         else:
             title = activity.get_title()
-            label = self._invite_menu.get_children()[0]
-            label.set_text(_('Invite to %s') % title)
+            self._invite_menu.set_label(_('Invite to %s') % title)
 
             icon = Icon(file=activity.get_icon_path())
             icon.props.xo_color = activity.get_icon_color()
diff --git a/src/jarabe/view/palettes.py b/src/jarabe/view/palettes.py
index 10844ea..5448bde 100644
--- a/src/jarabe/view/palettes.py
+++ b/src/jarabe/view/palettes.py
@@ -83,33 +83,35 @@ class CurrentActivityPalette(BasePalette):
         if title and title != activity_name:
             self.props.secondary_text = glib.markup_escape_text(title)
 
-        menu_item = MenuItem(_('Resume'), 'activity-start')
+        self.menu_box = Gtk.VBox()
+
+        menu_item = PaletteMenuItem(_('Resume'), 'activity-start')
         menu_item.connect('activate', self.__resume_activate_cb)
-        self.menu.append(menu_item)
-        menu_item.show()
+        self.menu_box.pack_start(menu_item, True, True, 0)
 
         # TODO: share-with, keep
 
-        menu_item = MenuItem(_('View Source'), 'view-source')
-        # TODO Make this accelerator translatable
-        menu_item.props.accelerator = '<Alt><Shift>v'
+        menu_item = PaletteMenuItem(_('View Source'), 'view-source')
         menu_item.connect('activate', self.__view_source__cb)
-        self.menu.append(menu_item)
-        menu_item.show()
+        self.menu_box.pack_start(menu_item, True, True, 0)
 
-        separator = Gtk.SeparatorMenuItem()
-        self.menu.append(separator)
+        separator = PaletteMenuItemSeparator()
+        self.menu_box.pack_start(menu_item, True, True, 0)
         separator.show()
 
-        menu_item = MenuItem(_('Stop'), 'activity-stop')
+        menu_item = PaletteMenuItem(_('Stop'), 'activity-stop')
         menu_item.connect('activate', self.__stop_activate_cb)
-        self.menu.append(menu_item)
-        menu_item.show()
+        self.menu_box.pack_start(menu_item, True, True, 0)
+
+        self.set_content(self.menu_box)
+        self.menu_box.show_all()
 
     def __resume_activate_cb(self, menu_item):
+        self.popdown(immediate=True)
         self._home_activity.get_window().activate(Gtk.get_current_event_time())
 
     def __view_source__cb(self, menu_item):
+        self.popdown(immediate=True)
         setup_view_source(self._home_activity)
         shell_model = shell.get_model()
         if self._home_activity is not shell_model.get_active_activity():
@@ -117,6 +119,7 @@ class CurrentActivityPalette(BasePalette):
                 Gtk.get_current_event_time())
 
     def __stop_activate_cb(self, menu_item):
+        self.popdown(immediate=True)
         self._home_activity.get_window().close(1)
 
 
@@ -138,12 +141,14 @@ class ActivityPalette(Palette):
 
         xo_color = XoColor('%s,%s' % (style.COLOR_WHITE.get_svg(),
                                       style.COLOR_TRANSPARENT.get_svg()))
-        menu_item = MenuItem(text_label=_('Start new'),
-                             file_name=activity_info.get_icon(),
-                             xo_color=xo_color)
+        self.menu_box = Gtk.VBox()
+        menu_item = PaletteMenuItem(text_label=_('Start new'),
+                                    file_name=activity_info.get_icon(),
+                                    xo_color=xo_color)
         menu_item.connect('activate', self.__start_activate_cb)
-        self.menu.append(menu_item)
-        menu_item.show()
+        self.menu_box.pack_end(menu_item, True, True, 0)
+        self.set_content(self.menu_box)
+        self.menu_box.show_all()
 
         # TODO: start-with
 
@@ -195,6 +200,7 @@ class JournalPalette(BasePalette):
         self.connect('popup', self.__popup_cb)
 
     def __open_activate_cb(self, menu_item):
+        self.popdown(immediate=True)
         self._home_activity.get_window().activate(Gtk.get_current_event_time())
 
     def __popup_cb(self, palette):
@@ -246,6 +252,7 @@ class VolumePalette(Palette):
         self.connect('popup', self.__popup_cb)
 
     def __unmount_activate_cb(self, menu_item):
+        self.popdown(immediate=True)
         flags = 0
         mount_operation = Gtk.MountOperation( \
             parent=self.content_box.get_toplevel())