From ed53a45228014a50c16dd7ed51ad0f3db16301c4 Mon Sep 17 00:00:00 2001 From: Giovanni Campagna Date: Tue, 28 Jan 2014 21:30:28 +0100 Subject: [PATCH] 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 --- js/ui/status/network.js | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/js/ui/status/network.js b/js/ui/status/network.js index 1d6d7c564..696e898cd 100644 --- a/js/ui/status/network.js +++ b/js/ui/status/network.js @@ -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)