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

NetworkMenu: show the device name instead of Bluetooth

Browse Source 
To distinguish the bluetooth network menu from the bluetooth
menu proper, use the device name as the label.
Also, replace Connect with "Use as Internet connection"

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

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

@ -131,7 +131,7 @@ const NMConnectionItem = new Lang.Class({
_sync: function() { _sync: function() {
let isActive = this.isActive(); let isActive = this.isActive();
this.labelItem.label.text = isActive ? _("Turn Off") : _("Connect"); this.labelItem.label.text = isActive ? _("Turn Off") : this._section.getConnectLabel();
this.switchItem.setToggleState(isActive); this.switchItem.setToggleState(isActive);
this.switchItem.setStatus(this._getStatus()); this.switchItem.setStatus(this._getStatus());
this.emit('icon-changed'); this.emit('icon-changed');
@ -223,6 +223,10 @@ const NMConnectionSection = new Lang.Class({
return _("Off"); return _("Off");
}, },
getConnectLabel: function() {
return _("Connect");
},
_hasConnection: function(connection) { _hasConnection: function(connection) {
return this._connectionItems.has(connection.get_uuid()); return this._connectionItems.has(connection.get_uuid());
}, },
@ -566,6 +570,14 @@ const NMDeviceBluetooth = new Lang.Class({
return 'network-cellular-signal-none-symbolic'; return 'network-cellular-signal-none-symbolic';
}, },
_getDescription: function() {
return this._device.name;
},
getConnectLabel: function() {
return _("Use as Internet connection");
},
getIndicatorIcon: function() { getIndicatorIcon: function() {
let state = this._device.active_connection.state; let state = this._device.active_connection.state;
if (state == NetworkManager.ActiveConnectionState.ACTIVATING) if (state == NetworkManager.ActiveConnectionState.ACTIVATING)