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

BluetoothMenu: show the submenu when active but not connected

Browse Source 
Following the updated designs for system status, show the submenu
but not the indicator when bluetooth radio is on but no device
is connected.

https://bugzilla.gnome.org/show_bug.cgi?id=709353
This commit is contained in:
Giovanni Campagna 2014-01-28 21:47:37 +01:00
parent ed53a45228
commit aa426842f2
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
js/ui/status/bluetooth.js
View File

@ -38,7 +38,10 @@ const Indicator = new Lang.Class({
log(error.message); log(error.message);
return; return;
} }
this._sync();
})); }));
this._proxy.connect('g-properties-changed', Lang.bind(this, this._sync));
// The Bluetooth menu only appears when Bluetooth is in use, // The Bluetooth menu only appears when Bluetooth is in use,
// so just statically build it with a "Turn Off" menu item. // so just statically build it with a "Turn Off" menu item.
@ -90,11 +93,12 @@ const Indicator = new Lang.Class({
_sync: function() { _sync: function() {
let nDevices = this._getNConnectedDevices(); let nDevices = this._getNConnectedDevices();
let on = nDevices > 0; this._indicator.visible = nDevices > 0;
this._indicator.visible = on; this._item.actor.visible = !this._proxy.BluetoothAirplaneMode;
this._item.actor.visible = on;
if (on) if (nDevices > 0)
this._item.status.text = ngettext("%d Connected Device", "%d Connected Devices", nDevices).format(nDevices); this._item.status.text = ngettext("%d Connected Device", "%d Connected Devices", nDevices).format(nDevices);
else
this._item.status.text = _("Not Connected");
}, },
}); });