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

10 files changed, 73 insertions, 51 deletions

diff --git a/configure.ac b/configure.ac
index 780748c..1b68332 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([Sugar],[0.97.3],[],[sugar])
+AC_INIT([Sugar],[0.97.4],[],[sugar])
 
 AC_PREREQ([2.59])
 
diff --git a/extensions/deviceicon/speech.py b/extensions/deviceicon/speech.py
index d89ad51..c3115f7 100644
--- a/extensions/deviceicon/speech.py
+++ b/extensions/deviceicon/speech.py
@@ -24,8 +24,9 @@ from gi.repository import GObject
 from sugar3.graphics.icon import Icon
 from sugar3.graphics.tray import TrayIcon
 from sugar3.graphics.palette import Palette
+from sugar3.graphics.palettemenuitem import PaletteMenuItem
+from sugar3.graphics.palettemenuitem import PaletteMenuItemSeparator
 from sugar3.graphics.xocolor import XoColor
-from sugar3.graphics.menuitem import MenuItem
 from sugar3.graphics import style
 
 from jarabe.frame.frameinvoker import FrameWidgetInvoker
@@ -71,50 +72,66 @@ class SpeechPalette(Palette):
 
         vbox = Gtk.VBox()
         self.set_content(vbox)
+        vbox.show()
 
         self._play_icon = Icon(icon_name='player_play')
         self._pause_icon = Icon(icon_name='player_pause')
-        self._play_pause_menu = MenuItem(text_label=_('Say selected text'))
+        self._play_pause_menu = PaletteMenuItem(
+            icon_name='player_play',
+            text_label=_('Say selected text'))
         self._play_pause_menu.set_image(self._play_icon)
         self._play_pause_menu.connect('activate', self.__play_activated_cb)
+        vbox.pack_start(self._play_pause_menu, True, True, 0)
         self._play_pause_menu.show()
 
-        self._stop_menu = MenuItem(icon_name='player_stop',
-                text_label=_('Stop playback'))
+        self._stop_menu = PaletteMenuItem(icon_name='player_stop',
+                                          text_label=_('Stop playback'))
         self._stop_menu.connect('activate', self.__stop_activated_cb)
         self._stop_menu.set_sensitive(False)
+        vbox.pack_start(self._stop_menu, True, True, 0)
         self._stop_menu.show()
 
-        self.menu.append(self._play_pause_menu)
-        self.menu.append(self._stop_menu)
+        separator = PaletteMenuItemSeparator()
+        vbox.pack_start(separator, True, True, 0)
+        separator.show()
+
+        pitch_label = Gtk.Label(_('Pitch'))
+        vbox.pack_start(pitch_label, True, True, padding=style.DEFAULT_PADDING)
+        pitch_label.show()
 
         self._adj_pitch = Gtk.Adjustment(value=self._manager.get_pitch(),
-                                          lower=self._manager.MIN_PITCH,
-                                          upper=self._manager.MAX_PITCH)
-        self._hscale_pitch = Gtk.HScale(self._adj_pitch)
+                                         lower=self._manager.MIN_PITCH,
+                                         upper=self._manager.MAX_PITCH)
+        self._hscale_pitch = Gtk.HScale()
+        self._hscale_pitch.set_adjustment(self._adj_pitch)
         self._hscale_pitch.set_draw_value(False)
 
-        vbox.pack_start(Gtk.Label(_('Pitch', True, True, 0)), padding=style.DEFAULT_PADDING)
         vbox.pack_start(self._hscale_pitch, True, True, 0)
+        self._hscale_pitch.show()
+
+        rate_label = Gtk.Label(_('Rate'))
+        vbox.pack_start(rate_label, True, True,
+                        padding=style.DEFAULT_PADDING)
+        rate_label.show()
 
         self._adj_rate = Gtk.Adjustment(value=self._manager.get_rate(),
-                                          lower=self._manager.MIN_RATE,
-                                          upper=self._manager.MAX_RATE)
-        self._hscale_rate = Gtk.HScale(self._adj_rate)
+                                        lower=self._manager.MIN_RATE,
+                                        upper=self._manager.MAX_RATE)
+        self._hscale_rate = Gtk.HScale()
+        self._hscale_rate.set_adjustment(self._adj_rate)
         self._hscale_rate.set_draw_value(False)
 
-        vbox.pack_start(Gtk.Label(_('Rate', True, True, 0)), padding=style.DEFAULT_PADDING)
         vbox.pack_start(self._hscale_rate, True, True, 0)
-        vbox.show_all()
+        self._hscale_rate.show()
 
         self._adj_pitch.connect('value_changed', self.__adj_pitch_changed_cb)
         self._adj_rate.connect('value_changed', self.__adj_rate_changed_cb)
 
-    def __adj_pitch_changed_cb(self, adjustement):
-        self._manager.set_pitch(int(adjustement.value))
+    def __adj_pitch_changed_cb(self, adjustment):
+        self._manager.set_pitch(int(adjustment.get_value()))
 
-    def __adj_rate_changed_cb(self, adjustement):
-        self._manager.set_rate(int(adjustement.value))
+    def __adj_rate_changed_cb(self, adjustment):
+        self._manager.set_rate(int(adjustment.get_value()))
 
     def __play_activated_cb(self, widget):
         if self._manager.is_paused:
diff --git a/extensions/deviceicon/volume.py b/extensions/deviceicon/volume.py
index 11a8cc9..ec7b2e2 100644
--- a/extensions/deviceicon/volume.py
+++ b/extensions/deviceicon/volume.py
@@ -24,7 +24,8 @@ from gi.repository import GConf
 
 from sugar3.graphics.tray import TrayIcon
 from sugar3.graphics.xocolor import XoColor
-from sugar3.graphics.menuitem import MenuItem
+from sugar3.graphics.palettemenuitem import PaletteMenuItem
+from sugar3.graphics.palettemenuitem import PaletteMenuItemSeparator
 from sugar3.graphics.icon import Icon
 
 from jarabe.journal import journalactivity
@@ -69,7 +70,7 @@ class DeviceView(TrayIcon):
         palette = VolumePalette(self._mount)
         palette.set_group_id('frame')
 
-        menu_item = MenuItem(_('Show contents'))
+        menu_item = PaletteMenuItem(_('Show contents'))
         client = GConf.Client.get_default()
         color = XoColor(client.get_string('/desktop/sugar/user/color'))
         icon = Icon(icon_name=self._icon_name, icon_size=Gtk.IconSize.MENU,
@@ -78,7 +79,8 @@ class DeviceView(TrayIcon):
         icon.show()
 
         menu_item.connect('activate', self.__show_contents_cb)
-        palette.menu.insert(menu_item, 0)
+        palette.content_box.pack_start(menu_item, True, True, 0)
+        palette.content_box.reorder_child(menu_item, 0)
         menu_item.show()
 
         return palette
diff --git a/src/jarabe/desktop/viewtoolbar.py b/src/jarabe/desktop/viewtoolbar.py
index 96df68e..09b4512 100644
--- a/src/jarabe/desktop/viewtoolbar.py
+++ b/src/jarabe/desktop/viewtoolbar.py
@@ -74,7 +74,7 @@ class ViewToolbar(Gtk.Toolbar):
                                        _FAVORITES_VIEW)
         self.insert(self._favorites_button, -1)
 
-        self._list_button = RadioToolButton(named_icon='view-list')
+        self._list_button = RadioToolButton(icon_name='view-list')
         self._list_button.props.group = self._favorites_button
         self._list_button.props.tooltip = _('List view')
         self._list_button.props.accelerator = _('<Ctrl>2')
@@ -183,5 +183,4 @@ class FavoritesButton(RadioToolButton):
             self.emit('toggled')
 
     def _update_icon(self):
-        self.props.named_icon = favoritesview.LAYOUT_MAP[self._layout]\
-                                .icon_name
+        self.props.icon_name = favoritesview.LAYOUT_MAP[self._layout].icon_name
diff --git a/src/jarabe/frame/zoomtoolbar.py b/src/jarabe/frame/zoomtoolbar.py
index 5efc772..befca5c 100644
--- a/src/jarabe/frame/zoomtoolbar.py
+++ b/src/jarabe/frame/zoomtoolbar.py
@@ -63,7 +63,7 @@ class ZoomToolbar(Gtk.Toolbar):
         else:
             group = None
 
-        button = RadioToolButton(named_icon=icon_name, group=group,
+        button = RadioToolButton(icon_name=icon_name, group=group,
                                  accelerator=accelerator)
         button.connect('clicked', self.__level_clicked_cb, zoom_level)
         self.add(button)
diff --git a/src/jarabe/intro/window.py b/src/jarabe/intro/window.py
index 3c979fb..252870d 100644
--- a/src/jarabe/intro/window.py
+++ b/src/jarabe/intro/window.py
@@ -34,9 +34,6 @@ from sugar3.graphics.xocolor import XoColor
 from jarabe.intro import colorpicker
 
 
-_BACKGROUND_COLOR = style.COLOR_WHITE
-
-
 def create_profile(name, color=None):
     if not color:
         color = XoColor()
@@ -72,6 +69,7 @@ def create_profile(name, color=None):
 
     logging.debug("User keypair generated")
 
+
 class _Page(Gtk.VBox):
     __gproperties__ = {
         'valid': (bool, None, None, False, GObject.PARAM_READABLE),
diff --git a/src/jarabe/journal/listview.py b/src/jarabe/journal/listview.py
index 369f364..46c3440 100644
--- a/src/jarabe/journal/listview.py
+++ b/src/jarabe/journal/listview.py
@@ -534,7 +534,8 @@ class ListView(BaseListView):
         metadata = model.get(row[ListModel.COLUMN_UID])
         self.cell_title.props.editable = model.is_editable(metadata)
 
-        tree_view.set_cursor_on_cell(path, column, start_editing=True)
+        tree_view.set_cursor_on_cell(path, column, self.cell_title,
+                                     start_editing=True)
 
     def __detail_cell_clicked_cb(self, cell, path):
         row = self.tree_view.get_model()[path]
diff --git a/src/jarabe/journal/volumestoolbar.py b/src/jarabe/journal/volumestoolbar.py
index 1b86cb2..8f4692d 100644
--- a/src/jarabe/journal/volumestoolbar.py
+++ b/src/jarabe/journal/volumestoolbar.py
@@ -334,7 +334,7 @@ class VolumeButton(BaseButton):
         if icon_name is None:
             icon_name = 'drive'
 
-        self.props.named_icon = icon_name
+        self.props.icon_name = icon_name
 
         # TODO: retrieve the colors from the owner of the device
         client = GConf.Client.get_default()
@@ -352,7 +352,7 @@ class JournalButton(BaseButton):
     def __init__(self):
         BaseButton.__init__(self, mount_point='/')
 
-        self.props.named_icon = 'activity-journal'
+        self.props.icon_name = 'activity-journal'
 
         client = GConf.Client.get_default()
         color = XoColor(client.get_string('/desktop/sugar/user/color'))
@@ -398,7 +398,7 @@ class DocumentsButton(BaseButton):
     def __init__(self, documents_path):
         BaseButton.__init__(self, mount_point=documents_path)
 
-        self.props.named_icon = 'user-documents'
+        self.props.icon_name = 'user-documents'
 
         client = GConf.Client.get_default()
         color = XoColor(client.get_string('/desktop/sugar/user/color'))
diff --git a/src/jarabe/model/speech.py b/src/jarabe/model/speech.py
index 864f639..d34237a 100644
--- a/src/jarabe/model/speech.py
+++ b/src/jarabe/model/speech.py
@@ -20,6 +20,7 @@ import logging
 from gi.repository import GConf
 from gi.repository import Gst
 from gi.repository import Gtk
+from gi.repository import Gdk
 from gi.repository import GObject
 
 
@@ -96,8 +97,8 @@ class SpeechManager(GObject.GObject):
             self._player.speak(self._pitch, self._rate, self._voice_name, text)
 
     def say_selected_text(self):
-        clipboard = Gtk.clipboard_get(selection='PRIMARY')
-        clipboard.request_text(self.__primary_selection_cb)
+        clipboard = Gtk.Clipboard.get(Gdk.SELECTION_PRIMARY)
+        clipboard.request_text(self.__primary_selection_cb, None)
 
     def pause(self):
         self._player.pause_sound_device()
diff --git a/src/jarabe/view/palettes.py b/src/jarabe/view/palettes.py
index 50f6c83..35475d0 100644
--- a/src/jarabe/view/palettes.py
+++ b/src/jarabe/view/palettes.py
@@ -216,31 +216,35 @@ class VolumePalette(Palette):
         path = mount.get_root().get_path()
         self.props.secondary_text = glib.markup_escape_text(path)
 
-        vbox = Gtk.VBox()
-        self.set_content(vbox)
-        vbox.show()
+        self.content_box = Gtk.VBox()
+        self.set_content(self.content_box)
+        self.content_box.show()
+
+        menu_item = PaletteMenuItem(pgettext('Volume', 'Remove'))
+
+        icon = Icon(icon_name='media-eject', icon_size=Gtk.IconSize.MENU)
+        menu_item.set_image(icon)
+        icon.show()
+
+        menu_item.connect('activate', self.__unmount_activate_cb)
+        self.content_box.pack_start(menu_item, True, True, 0)
+        menu_item.show()
+
+        separator = PaletteMenuItemSeparator()
+        self.content_box.pack_start(separator, True, True, 0)
+        separator.show()
 
         self._progress_bar = Gtk.ProgressBar()
-        vbox.add(self._progress_bar)
+        self.content_box.pack_start(self._progress_bar, True, True, 0)
         self._progress_bar.show()
 
         self._free_space_label = Gtk.Label()
         self._free_space_label.set_alignment(0.5, 0.5)
-        vbox.add(self._free_space_label)
+        self.content_box.pack_start(self._free_space_label, True, True, 0)
         self._free_space_label.show()
 
         self.connect('popup', self.__popup_cb)
 
-        menu_item = MenuItem(pgettext('Volume', 'Remove'))
-
-        icon = Icon(icon_name='media-eject', icon_size=Gtk.IconSize.MENU)
-        menu_item.set_image(icon)
-        icon.show()
-
-        menu_item.connect('activate', self.__unmount_activate_cb)
-        self.menu.append(menu_item)
-        menu_item.show()
-
     def __unmount_activate_cb(self, menu_item):
         self._mount.unmount(self.__unmount_cb)