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

Cleanup of sugar device handling code

Browse Source
This commit is contained in:
Dan Williams
2007-04-04 23:48:09 -04:00
parent ba08492778
commit 4b4cf9673c
9 changed files with 129 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
shell/model/devices/network/mesh.py
+4 -14
View File
@@ -20,22 +20,12 @@ import gobject
from model.devices import device
from hardware import nmclient
STATE_ACTIVATING = 0
STATE_ACTIVATED = 1
STATE_INACTIVE = 2
_nm_state_to_state = {
nmclient.DEVICE_STATE_ACTIVATING : STATE_ACTIVATING,
nmclient.DEVICE_STATE_ACTIVATED : STATE_ACTIVATED,
nmclient.DEVICE_STATE_INACTIVE : STATE_INACTIVE
}
class Device(device.Device):
__gproperties__ = {
'strength' : (int, None, None, 0, 100, 0,
gobject.PARAM_READABLE),
'state' : (int, None, None, STATE_ACTIVATING,
STATE_INACTIVE, 0, gobject.PARAM_READABLE)
'state' : (int, None, None, device.STATE_ACTIVATING,
device.STATE_INACTIVE, 0, gobject.PARAM_READABLE)
}
def __init__(self, nm_device):
@@ -58,10 +48,10 @@ class Device(device.Device):
return self._nm_device.get_strength()
elif pspec.name == 'state':
nm_state = self._nm_device.get_state()
return _nm_state_to_state[nm_state]
return device._nm_state_to_state[nm_state]
def get_type(self):
return 'network.mesh'
def get_id(self):
return self._nm_device.get_op()
return str(self._nm_device.get_op())
shell/model/devices/network/wired.py
+1 -1
View File
@@ -6,7 +6,7 @@ class Device(device.Device):
self._nm_device = device
def get_id(self):
return self._nm_device.get_op()
return str(self._nm_device.get_op())
def get_type(self):
return 'network.wired'
shell/model/devices/network/wireless.py
+4 -14
View File
@@ -20,24 +20,14 @@ import gobject
from model.devices import device
from hardware import nmclient
STATE_ACTIVATING = 0
STATE_ACTIVATED = 1
STATE_INACTIVE = 2
_nm_state_to_state = {
nmclient.DEVICE_STATE_ACTIVATING : STATE_ACTIVATING,
nmclient.DEVICE_STATE_ACTIVATED : STATE_ACTIVATED,
nmclient.DEVICE_STATE_INACTIVE : STATE_INACTIVE
}
class Device(device.Device):
__gproperties__ = {
'name' : (str, None, None, None,
gobject.PARAM_READABLE),
'strength' : (int, None, None, 0, 100, 0,
gobject.PARAM_READABLE),
'state' : (int, None, None, STATE_ACTIVATING,
STATE_INACTIVE, 0, gobject.PARAM_READABLE)
'state' : (int, None, None, device.STATE_ACTIVATING,
device.STATE_INACTIVE, 0, gobject.PARAM_READABLE)
}
def __init__(self, nm_device):
@@ -67,10 +57,10 @@ class Device(device.Device):
return self._nm_device.get_ssid()
elif pspec.name == 'state':
nm_state = self._nm_device.get_state()
return _nm_state_to_state[nm_state]
return device._nm_state_to_state[nm_state]
def get_type(self):
return 'network.wireless'
def get_id(self):
return self._nm_device.get_op()
return str(self._nm_device.get_op())