NetworkMenu: show the device name instead of Bluetooth
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:
parent
2ddbcb2369
commit
ed53a45228
@ -131,7 +131,7 @@ const NMConnectionItem = new Lang.Class({
|
||||
|
||||
_sync: function() {
|
||||
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.setStatus(this._getStatus());
|
||||
this.emit('icon-changed');
|
||||
@ -223,6 +223,10 @@ const NMConnectionSection = new Lang.Class({
|
||||
return _("Off");
|
||||
},
|
||||
|
||||
getConnectLabel: function() {
|
||||
return _("Connect");
|
||||
},
|
||||
|
||||
_hasConnection: function(connection) {
|
||||
return this._connectionItems.has(connection.get_uuid());
|
||||
},
|
||||
@ -566,6 +570,14 @@ const NMDeviceBluetooth = new Lang.Class({
|
||||
return 'network-cellular-signal-none-symbolic';
|
||||
},
|
||||
|
||||
_getDescription: function() {
|
||||
return this._device.name;
|
||||
},
|
||||
|
||||
getConnectLabel: function() {
|
||||
return _("Use as Internet connection");
|
||||
},
|
||||
|
||||
getIndicatorIcon: function() {
|
||||
let state = this._device.active_connection.state;
|
||||
if (state == NetworkManager.ActiveConnectionState.ACTIVATING)
|
||||
|
Loading…
x
Reference in New Issue
Block a user