Fixup tooltips. Still not working for the home page case, since
the active device logic is pretty broken.
This commit is contained in:
@@ -24,6 +24,8 @@ from hardware import hardwaremanager
|
||||
|
||||
class AccessPointModel(gobject.GObject):
|
||||
__gproperties__ = {
|
||||
'name' : (str, None, None, None,
|
||||
gobject.PARAM_READABLE),
|
||||
'strength' : (int, None, None, 0, 100, 0,
|
||||
gobject.PARAM_READABLE)
|
||||
}
|
||||
@@ -35,16 +37,18 @@ class AccessPointModel(gobject.GObject):
|
||||
|
||||
self._nm_network.connect('strength-changed',
|
||||
self._strength_changed_cb)
|
||||
self._nm_network.connect('essid-changed',
|
||||
self._essid_changed_cb)
|
||||
|
||||
def _strength_changed_cb(self, nm_network):
|
||||
self.notify('strength')
|
||||
|
||||
def _essid_changed_cb(self, nm_network):
|
||||
self.notify('name')
|
||||
|
||||
def get_id(self):
|
||||
return self._nm_network.get_op()
|
||||
|
||||
def get_name(self):
|
||||
return self._nm_network.get_ssid()
|
||||
|
||||
def get_nm_device(self):
|
||||
return self._nm_device
|
||||
|
||||
@@ -54,6 +58,8 @@ class AccessPointModel(gobject.GObject):
|
||||
def do_get_property(self, pspec):
|
||||
if pspec.name == 'strength':
|
||||
return self._nm_network.get_strength()
|
||||
elif pspec.name == 'name':
|
||||
return self._nm_network.get_ssid()
|
||||
|
||||
class ActivityModel:
|
||||
def __init__(self, activity, bundle, service):
|
||||
|
||||
@@ -4,6 +4,8 @@ from model.devices import device
|
||||
|
||||
class Device(device.Device):
|
||||
__gproperties__ = {
|
||||
'name' : (str, None, None, None,
|
||||
gobject.PARAM_READABLE),
|
||||
'strength' : (int, None, None, 0, 100, 0,
|
||||
gobject.PARAM_READABLE)
|
||||
}
|
||||
@@ -14,23 +16,27 @@ class Device(device.Device):
|
||||
|
||||
self._nm_device.connect('strength-changed',
|
||||
self._strength_changed_cb)
|
||||
self._nm_device.connect('essid-changed',
|
||||
self._essid_changed_cb)
|
||||
|
||||
def _strength_changed_cb(self, nm_device, strength):
|
||||
self.notify('strength')
|
||||
|
||||
def _essid_changed_cb(self, nm_device):
|
||||
self.notify('name')
|
||||
|
||||
def do_get_property(self, pspec):
|
||||
if pspec.name == 'strength':
|
||||
return self._nm_device.get_strength()
|
||||
elif pspec.name == 'name':
|
||||
active_net = self._nm_device.get_active_network()
|
||||
if active_net:
|
||||
return active_net.get_ssid()
|
||||
else:
|
||||
return None
|
||||
|
||||
def get_type(self):
|
||||
return 'wirelessnetwork'
|
||||
|
||||
def get_id(self):
|
||||
return self._nm_device.get_op()
|
||||
|
||||
def get_name(self):
|
||||
active_net = self._nm_device.get_active_network()
|
||||
if active_net:
|
||||
return active_net.get_ssid()
|
||||
else:
|
||||
return None
|
||||
|
||||
Reference in New Issue
Block a user