Merge remote-tracking branch 'ajay/0.97.7-as-base' into devel

4 files changed, 124 insertions, 60 deletions

diff --git a/extensions/cpsection/language/view.py b/extensions/cpsection/language/view.py
index 77f7207..99275d4 100644
--- a/extensions/cpsection/language/view.py
+++ b/extensions/cpsection/language/view.py
@@ -136,6 +136,12 @@ class Language(SectionView):
             previous_add_removes = self._add_remove_boxes[-2]
             previous_add_removes.hide()
 
+        # Hide the Remove button if the new added row is the only
+        # language.
+        elif self._selected_lang_count == 1:
+            add_button_, remove_button = add_remove_box.get_children()
+            remove_button.props.visible = False
+
         combobox.show()
 
     def _attach_to_table(self, widget, row, column, padding=20, \
@@ -160,6 +166,15 @@ class Language(SectionView):
 
         self._add_remove_boxes[-1].show_all()
 
+        # Hide or show the Remove button in the new last row,
+        # depending if it is the only language.
+        add_remove_box = self._add_remove_boxes[-1]
+        add_button_, remove_button = add_remove_box.get_children()
+        if self._selected_lang_count == 1:
+            remove_button.props.visible = False
+        else:
+            remove_button.props.visible = True
+
     def _get_last_row(self):
         label = self._labels.pop()
         add_remove_box = self._add_remove_boxes.pop()
diff --git a/extensions/cpsection/network/view.py b/extensions/cpsection/network/view.py
index de47633..c9d2712 100644
--- a/extensions/cpsection/network/view.py
+++ b/extensions/cpsection/network/view.py
@@ -983,6 +983,8 @@ class Network(SectionView):
 
 
     def _setup_hidden_ssid_section(self, workspace):
+        return
+
         separator_hidden_network = Gtk.HSeparator()
         workspace.pack_start(separator_hidden_network, False, False, 0)
         separator_hidden_network.show()
diff --git a/extensions/deviceicon/network.py b/extensions/deviceicon/network.py
index 6312911..42885b2 100644
--- a/extensions/deviceicon/network.py
+++ b/extensions/deviceicon/network.py
@@ -538,6 +538,7 @@ class WirelessDeviceView(ToolButton):
 
     def __state_changed_cb(self, new_state, old_state, reason):
         self._device_state = new_state
+        self._update_color()
         self._update_state()
         self._device_props.Get(network.NM_WIRELESS_IFACE, 'ActiveAccessPoint',
                                reply_handler=self.__get_active_ap_reply_cb,
@@ -625,8 +626,12 @@ class WirelessDeviceView(ToolButton):
 
             self._icon.props.base_color = profile.get_color()
 
-        if (state >= network.NM_DEVICE_STATE_PREPARE) and \
-           (state <= network.NM_DEVICE_STATE_IP_CONFIG):
+        if state == network.NM_DEVICE_STATE_PREPARE or \
+           state == network.NM_DEVICE_STATE_CONFIG or \
+           state == network.NM_DEVICE_STATE_NEED_AUTH or \
+           state == network.NM_DEVICE_STATE_IP_CONFIG or \
+           state == network.NM_DEVICE_STATE_IP_CHECK or \
+           state == network.NM_DEVICE_STATE_SECONDARIES:
             self._palette.set_connecting()
             self._icon.props.pulsing = True
         elif state == network.NM_DEVICE_STATE_ACTIVATED:
diff --git a/src/jarabe/frame/activitiestray.py b/src/jarabe/frame/activitiestray.py
index 1b2a823..d3f69f0 100644
--- a/src/jarabe/frame/activitiestray.py
+++ b/src/jarabe/frame/activitiestray.py
@@ -35,6 +35,9 @@ from sugar3.graphics.toolbutton import ToolButton
 from sugar3.graphics.icon import Icon, get_icon_file_name
 from sugar3.graphics.palette import Palette
 from sugar3.graphics.menuitem import MenuItem
+from sugar3.graphics.palettemenu import PaletteMenuBox
+from sugar3.graphics.palettemenu import PaletteMenuItem
+from sugar3.graphics.palettemenu import PaletteMenuItemSeparator
 from sugar3.datastore import datastore
 from sugar3 import mime
 from sugar3 import env
@@ -597,25 +600,40 @@ class IncomingTransferPalette(BaseTransferPalette):
         self._update()
 
     def _update(self):
+        box = PaletteMenuBox()
+        self.set_content(box)
+        box.show()
+
         logging.debug('_update state: %r', self.file_transfer.props.state)
         if self.file_transfer.props.state == filetransfer.FT_STATE_PENDING:
-            menu_item = MenuItem(_('Accept'), icon_name='dialog-ok')
+            menu_item = PaletteMenuItem(_('Accept'))
+            icon = Icon(icon_name='dialog-ok', icon_size=Gtk.IconSize.MENU)
+            menu_item.set_image(icon)
+            icon.show()
             menu_item.connect('activate', self.__accept_activate_cb)
-            self.menu.append(menu_item)
+            box.append_item(menu_item)
             menu_item.show()
 
-            menu_item = MenuItem(_('Decline'), icon_name='dialog-cancel')
+            menu_item = PaletteMenuItem(_('Decline'))
+            icon = Icon(icon_name='dialog-cancel', icon_size=Gtk.IconSize.MENU)
+            menu_item.set_image(icon)
+            icon.show()
             menu_item.connect('activate', self.__decline_activate_cb)
-            self.menu.append(menu_item)
+            box.append_item(menu_item)
             menu_item.show()
 
-            vbox = Gtk.VBox()
-            self.set_content(vbox)
-            vbox.show()
+            separator = PaletteMenuItemSeparator()
+            box.append_item(separator)
+            separator.show()
+
+            inner_box = Gtk.VBox()
+            inner_box.set_spacing(style.DEFAULT_PADDING)
+            box.append_item(inner_box, vertical_padding=0)
+            inner_box.show()
 
             if self.file_transfer.description:
                 label = Gtk.Label(label=self.file_transfer.description)
-                vbox.add(label)
+                inner_box.add(label)
                 label.show()
 
             mime_type = self.file_transfer.mime_type
@@ -623,59 +641,69 @@ class IncomingTransferPalette(BaseTransferPalette):
 
             size = self._format_size(self.file_transfer.file_size)
             label = Gtk.Label(label='%s (%s)' % (size, type_description))
-            vbox.add(label)
+            inner_box.add(label)
             label.show()
 
         elif self.file_transfer.props.state in \
                 [filetransfer.FT_STATE_ACCEPTED, filetransfer.FT_STATE_OPEN]:
-
-            for item in self.menu.get_children():
-                self.menu.remove(item)
-
-            menu_item = MenuItem(_('Cancel'), icon_name='dialog-cancel')
+            menu_item = PaletteMenuItem(_('Cancel'))
+            icon = Icon(icon_name='dialog-cancel', icon_size=Gtk.IconSize.MENU)
+            menu_item.set_image(icon)
+            icon.show()
             menu_item.connect('activate', self.__cancel_activate_cb)
-            self.menu.append(menu_item)
+            box.append_item(menu_item)
             menu_item.show()
 
-            vbox = Gtk.VBox()
-            self.set_content(vbox)
-            vbox.show()
+            separator = PaletteMenuItemSeparator()
+            box.append_item(separator)
+            separator.show()
+
+            inner_box = Gtk.VBox()
+            inner_box.set_spacing(style.DEFAULT_PADDING)
+            box.append_item(inner_box, vertical_padding=0)
+            inner_box.show()
 
             self.progress_bar = Gtk.ProgressBar()
-            vbox.add(self.progress_bar)
+            inner_box.add(self.progress_bar)
             self.progress_bar.show()
 
             self.progress_label = Gtk.Label(label='')
-            vbox.add(self.progress_label)
+            inner_box.add(self.progress_label)
             self.progress_label.show()
 
             self.update_progress()
 
         elif self.file_transfer.props.state == filetransfer.FT_STATE_COMPLETED:
-
-            for item in self.menu.get_children():
-                self.menu.remove(item)
-
-            menu_item = MenuItem(_('Dismiss'), icon_name='dialog-cancel')
+            menu_item = PaletteMenuItem(_('Dismiss'))
+            icon = Icon(icon_name='dialog-cancel', icon_size=Gtk.IconSize.MENU)
+            menu_item.set_image(icon)
+            icon.show()
             menu_item.connect('activate', self.__dismiss_activate_cb)
-            self.menu.append(menu_item)
+            box.append_item(menu_item)
             menu_item.show()
 
             self.update_progress()
-        elif self.file_transfer.props.state == filetransfer.FT_STATE_CANCELLED:
-
-            for item in self.menu.get_children():
-                self.menu.remove(item)
 
+        elif self.file_transfer.props.state == filetransfer.FT_STATE_CANCELLED:
             if self.file_transfer.reason_last_change == \
                     filetransfer.FT_REASON_REMOTE_STOPPED:
-                menu_item = MenuItem(_('Dismiss'), icon_name='dialog-cancel')
+                menu_item = PaletteMenuItem(_('Dismiss'))
+                icon = Icon(icon_name='dialog-cancel',
+                            icon_size=Gtk.IconSize.MENU)
+                menu_item.set_image(icon)
+                icon.show()
                 menu_item.connect('activate', self.__dismiss_activate_cb)
-                self.menu.append(menu_item)
+                box.append_item(menu_item)
                 menu_item.show()
+
+                inner_box = Gtk.VBox()
+                inner_box.set_spacing(style.DEFAULT_PADDING)
+                box.append_item(inner_box, vertical_padding=0)
+                inner_box.show()
+
                 text = _('The other participant canceled the file transfer')
                 label = Gtk.Label(label=text)
-                self.set_content(label)
+                inner_box.add(label)
                 label.show()
 
     def __accept_activate_cb(self, menu_item):
@@ -732,20 +760,31 @@ class OutgoingTransferPalette(BaseTransferPalette):
     def _update(self):
         new_state = self.file_transfer.props.state
         logging.debug('_update state: %r', new_state)
-        if new_state == filetransfer.FT_STATE_PENDING:
 
-            menu_item = MenuItem(_('Cancel'), icon_name='dialog-cancel')
+        box = PaletteMenuBox()
+        self.set_content(box)
+        box.show()
+        if new_state == filetransfer.FT_STATE_PENDING:
+            menu_item = PaletteMenuItem(_('Cancel'))
+            icon = Icon(icon_name='dialog-cancel', icon_size=Gtk.IconSize.MENU)
+            menu_item.set_image(icon)
+            icon.show()
             menu_item.connect('activate', self.__cancel_activate_cb)
-            self.menu.append(menu_item)
+            box.append_item(menu_item)
             menu_item.show()
 
-            vbox = Gtk.VBox()
-            self.set_content(vbox)
-            vbox.show()
+            separator = PaletteMenuItemSeparator()
+            box.append_item(separator)
+            separator.show()
+
+            inner_box = Gtk.VBox()
+            inner_box.set_spacing(style.DEFAULT_PADDING)
+            box.append_item(inner_box, vertical_padding=0)
+            inner_box.show()
 
             if self.file_transfer.description:
                 label = Gtk.Label(label=self.file_transfer.description)
-                vbox.add(label)
+                inner_box.add(label)
                 label.show()
 
             mime_type = self.file_transfer.mime_type
@@ -753,43 +792,46 @@ class OutgoingTransferPalette(BaseTransferPalette):
 
             size = self._format_size(self.file_transfer.file_size)
             label = Gtk.Label(label='%s (%s)' % (size, type_description))
-            vbox.add(label)
+            inner_box.add(label)
             label.show()
 
         elif new_state in [filetransfer.FT_STATE_ACCEPTED,
                            filetransfer.FT_STATE_OPEN]:
-
-            for item in self.menu.get_children():
-                self.menu.remove(item)
-
-            menu_item = MenuItem(_('Cancel'), icon_name='dialog-cancel')
+            menu_item = PaletteMenuItem(_('Cancel'))
+            icon = Icon(icon_name='dialog-cancel', icon_size=Gtk.IconSize.MENU)
+            menu_item.set_image(icon)
+            icon.show()
             menu_item.connect('activate', self.__cancel_activate_cb)
-            self.menu.append(menu_item)
+            box.append_item(menu_item)
             menu_item.show()
 
-            vbox = Gtk.VBox()
-            self.set_content(vbox)
-            vbox.show()
+            separator = PaletteMenuItemSeparator()
+            box.append_item(separator)
+            separator.show()
+
+            inner_box = Gtk.VBox()
+            inner_box.set_spacing(style.DEFAULT_PADDING)
+            box.append_item(inner_box, vertical_padding=0)
+            inner_box.show()
 
             self.progress_bar = Gtk.ProgressBar()
-            vbox.add(self.progress_bar)
+            inner_box.add(self.progress_bar)
             self.progress_bar.show()
 
             self.progress_label = Gtk.Label(label='')
-            vbox.add(self.progress_label)
+            inner_box.add(self.progress_label)
             self.progress_label.show()
 
             self.update_progress()
 
         elif new_state in [filetransfer.FT_STATE_COMPLETED,
                            filetransfer.FT_STATE_CANCELLED]:
-
-            for item in self.menu.get_children():
-                self.menu.remove(item)
-
-            menu_item = MenuItem(_('Dismiss'), icon_name='dialog-cancel')
+            menu_item = PaletteMenuItem(_('Dismiss'))
+            icon = Icon(icon_name='dialog-cancel', icon_size=Gtk.IconSize.MENU)
+            menu_item.set_image(icon)
+            icon.show()
             menu_item.connect('activate', self.__dismiss_activate_cb)
-            self.menu.append(menu_item)
+            box.append_item(menu_item)
             menu_item.show()
 
             self.update_progress()