From 13c79732c8869d58a9a1c3f3ecb094cbf7c2778c Mon Sep 17 00:00:00 2001
From: Pootle Translation <pootle@dev.laptop.org>
Date: Fri, 19 Sep 2008 18:08:42 +0000
Subject: Merge branch 'sucrose-0.82' of git+ssh://dev.laptop.org/git/sugar into sucrose-0.82

---
diff --git a/src/view/devices/network/wireless.py b/src/view/devices/network/wireless.py
index f95f5c4..5bef0bb 100644
--- a/src/view/devices/network/wireless.py
+++ b/src/view/devices/network/wireless.py
@@ -101,14 +101,20 @@ class DeviceView(ToolButton):
         self._update_state()
 
     def _state_changed_cb(self, model, pspec):
+        self._update_icon()
         self._update_state()
         self.palette.set_primary_text(self._get_palette_primary_text())
 
     def _update_icon(self):
+        # keep this code in sync with view/home/MeshBox.py
         strength = self._model.props.strength
         if self._model.props.state == device.STATE_INACTIVE:
             strength = 0
-        icon_name = get_icon_state(_ICON_NAME, strength)
+        if self._model.props.state == device.STATE_ACTIVATED:
+            icon_name = '%s-connected' % _ICON_NAME
+        else:
+            icon_name = _ICON_NAME
+        icon_name = get_icon_state(icon_name, strength)
         if icon_name:
             self._icon.props.icon_name = icon_name
 
diff --git a/src/view/home/MeshBox.py b/src/view/home/MeshBox.py
index c2b4efd..8cf8af6 100644
--- a/src/view/home/MeshBox.py
+++ b/src/view/home/MeshBox.py
@@ -125,6 +125,7 @@ class AccessPointView(CanvasPulsingIcon):
         self._update_name()
 
     def _state_changed_cb(self, model, pspec):
+        self._update_icon()
         self._update_state()
 
     def _activate_cb(self, icon):
@@ -138,7 +139,13 @@ class AccessPointView(CanvasPulsingIcon):
         self._palette.props.primary_text = self._model.props.name
 
     def _update_icon(self):
-        icon_name = get_icon_state(_ICON_NAME, self._model.props.strength)
+        # keep this code in sync with view/devices/network/wireless.py
+        strength = self._model.props.strength
+        if self._model.props.state == accesspointmodel.STATE_CONNECTED:
+            icon_name = '%s-connected' % _ICON_NAME
+        else:
+            icon_name = _ICON_NAME
+        icon_name = get_icon_state(icon_name, strength)
         if icon_name:
             self.props.icon_name = icon_name
             icon = self._palette.props.icon
diff --git a/src/view/home/favoritesview.py b/src/view/home/favoritesview.py
index f93b6a2..1af8e87 100644
--- a/src/view/home/favoritesview.py
+++ b/src/view/home/favoritesview.py
@@ -53,8 +53,8 @@ RING_LAYOUT, BOX_LAYOUT, TRIANGLE_LAYOUT, SUNFLOWER_LAYOUT, RANDOM_LAYOUT = \
              xrange(5)
 
 _LAYOUT_MAP = {RING_LAYOUT: favoriteslayout.RingLayout,
-               BOX_LAYOUT: favoriteslayout.BoxLayout,
-               TRIANGLE_LAYOUT: favoriteslayout.TriangleLayout,
+               #BOX_LAYOUT: favoriteslayout.BoxLayout,
+               #TRIANGLE_LAYOUT: favoriteslayout.TriangleLayout,
                SUNFLOWER_LAYOUT: favoriteslayout.SunflowerLayout,
                RANDOM_LAYOUT: favoriteslayout.RandomLayout}
 """Map numeric layout identifiers to uninstantiated subclasses of
--
cgit v0.9.1