isa/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NetworkMenu: show devices that are unmanaged

Browse Source 
Some users are confused when their devices are not shown in the
network menu, even if they configured them manually. Mark their presence
by showing them in the menu, even if they cannot be otherwise
interacted with.
Also add a status string for deactivating devices (none currently,
soon will appear in NetworkManager).

https://bugzilla.gnome.org/show_bug.cgi?id=646946
This commit is contained in:
Giovanni Campagna 2011-05-09 16:15:03 +02:00
parent 619a44a499
commit dbd629d5d2
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
js/ui/status/network.js
View File

@ -526,11 +526,15 @@ NMDevice.prototype = {
getStatusLabel: function() { getStatusLabel: function() {
switch(this.device.state) { switch(this.device.state) {
case NetworkManager.DeviceState.UNMANAGED:
case NetworkManager.DeviceState.DISCONNECTED: case NetworkManager.DeviceState.DISCONNECTED:
case NetworkManager.DeviceState.DEACTIVATING:
case NetworkManager.DeviceState.ACTIVATED: case NetworkManager.DeviceState.ACTIVATED:
return null; return null;
case NetworkManager.DeviceState.UNMANAGED:
/* Translators: this is for network devices that are physically present but are not
under NetworkManager's control (and thus cannot be used in the menu) */
return _("unmanaged");
case NetworkManager.DeviceState.DEACTIVATING:
return _("disconnecting...");
case NetworkManager.DeviceState.PREPARE: case NetworkManager.DeviceState.PREPARE:
case NetworkManager.DeviceState.CONFIG: case NetworkManager.DeviceState.CONFIG:
case NetworkManager.DeviceState.IP_CONFIG: case NetworkManager.DeviceState.IP_CONFIG:
@ -1691,21 +1695,18 @@ NMApplet.prototype = {
_syncSectionTitle: function(category) { _syncSectionTitle: function(category) {
let devices = this._devices[category].devices; let devices = this._devices[category].devices;
let managedDevices = devices.filter(function(dev) {
return dev.device.state != NetworkManager.DeviceState.UNMANAGED;
});
let item = this._devices[category].item; let item = this._devices[category].item;
let section = this._devices[category].section; let section = this._devices[category].section;
if (managedDevices.length == 0) if (devices.length == 0)
section.actor.hide(); section.actor.hide();
else { else {
section.actor.show(); section.actor.show();
if (managedDevices.length == 1) { if (devices.length == 1) {
let dev = managedDevices[0]; let dev = devices[0];
dev.statusItem.actor.hide(); dev.statusItem.actor.hide();
item.updateForDevice(dev); item.updateForDevice(dev);
} else { } else {
managedDevices.forEach(function(dev) { devices.forEach(function(dev) {
dev.statusItem.actor.show(); dev.statusItem.actor.show();
}); });
// remove status text from the section title item // remove status text from the section title item