sugarlabs/sugar-toolkit-gtk3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar

Browse Source
This commit is contained in:
Marco Pesenti Gritti
2007-04-05 12:45:57 +02:00
parent 3a90cef5b6 396ca0e64e
commit bd3e084805
10 changed files with 132 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
shell/view/devices/network/mesh.py
+4 -4
View File
@@ -18,7 +18,7 @@
from sugar.graphics import canvasicon
from sugar.graphics import color
from sugar.graphics import units
from model.devices.network import mesh
from model.devices import device
class DeviceView(canvasicon.CanvasIcon):
def __init__(self, model):
@@ -35,12 +35,12 @@ class DeviceView(canvasicon.CanvasIcon):
def _update_state(self):
# FIXME Change icon colors once we have real icons
state = self._model.props.state
if state == mesh.STATE_ACTIVATING:
if state == device.STATE_ACTIVATING:
self.props.fill_color = color.ICON_FILL_INACTIVE
self.props.stroke_color = color.ICON_STROKE_INACTIVE
elif state == mesh.STATE_ACTIVATED:
elif state == device.STATE_ACTIVATED:
self.props.fill_color = None
self.props.stroke_color = None
elif state == mesh.STATE_INACTIVE:
elif state == device.STATE_INACTIVE:
self.props.fill_color = color.ICON_FILL_INACTIVE
self.props.stroke_color = color.ICON_STROKE_INACTIVE
shell/view/devices/network/wireless.py
+4 -3
View File
@@ -20,6 +20,7 @@ from sugar.graphics import color
from sugar.graphics import units
from model.devices.network import wireless
from sugar.graphics.canvasicon import CanvasIcon
from model.devices import device
_ICON_NAME = 'device-network-wireless'
@@ -57,12 +58,12 @@ class DeviceView(CanvasIcon):
def _update_state(self):
# FIXME Change icon colors once we have real icons
state = self._model.props.state
if state == wireless.STATE_ACTIVATING:
if state == device.STATE_ACTIVATING:
self.props.fill_color = color.ICON_FILL_INACTIVE
self.props.stroke_color = color.ICON_STROKE_INACTIVE
elif state == wireless.STATE_ACTIVATED:
elif state == device.STATE_ACTIVATED:
self.props.fill_color = None
self.props.stroke_color = None
elif state == wireless.STATE_INACTIVE:
elif state == device.STATE_INACTIVE:
self.props.fill_color = color.ICON_FILL_INACTIVE
self.props.stroke_color = color.ICON_STROKE_INACTIVE
shell/view/home/MeshBox.py
+2 -2
View File
@@ -239,7 +239,7 @@ class MeshBox(SpreadBox):
self._add_mesh_icon(mesh)
def _mesh_removed_cb(self, model):
self._remove_mesh_icon()
self._remove_mesh()
def _buddy_added_cb(self, model, buddy_model):
self._add_alone_buddy(buddy_model)
@@ -270,7 +270,7 @@ class MeshBox(SpreadBox):
self._mesh = MeshDeviceView(mesh)
self.add_item(self._mesh)
def _remove_access_point(self):
def _remove_mesh(self):
if not self._mesh:
return
self.remove_item(self._mesh)