network: Simplify and fix VPN settings menu item
As in commit b2b2f65
and furthermore it doesn't make much sense to
change the menu item according to the number of connections since all
connections here are of the same type.
https://bugzilla.gnome.org/show_bug.cgi?id=786520
This commit is contained in:
parent
0ad9c51d9b
commit
f2a9467f91
@ -1491,36 +1491,7 @@ var NMVPNSection = new Lang.Class({
|
|||||||
_init: function(client) {
|
_init: function(client) {
|
||||||
this.parent(client);
|
this.parent(client);
|
||||||
|
|
||||||
this._vpnSettings = new PopupMenu.PopupMenuItem('');
|
this.item.menu.addSettingsAction(_("VPN Settings"), 'gnome-network-panel.desktop');
|
||||||
this.item.menu.addMenuItem(this._vpnSettings);
|
|
||||||
this._vpnSettings.connect('activate', Lang.bind(this, this._onSettingsActivate));
|
|
||||||
|
|
||||||
this._sync();
|
|
||||||
},
|
|
||||||
|
|
||||||
_sync: function() {
|
|
||||||
let nItems = this._connectionItems.size;
|
|
||||||
this.item.actor.visible = (nItems > 0);
|
|
||||||
|
|
||||||
if (nItems > 1)
|
|
||||||
this._vpnSettings.label.text = _("Network Settings");
|
|
||||||
else
|
|
||||||
this._vpnSettings.label.text = _("VPN Settings");
|
|
||||||
|
|
||||||
this.parent();
|
|
||||||
},
|
|
||||||
|
|
||||||
_onSettingsActivate: function() {
|
|
||||||
let nItems = this._connectionItems.size;
|
|
||||||
if (nItems > 1) {
|
|
||||||
let appSys = Shell.AppSystem.get_default();
|
|
||||||
let app = appSys.lookup_app('gnome-network-panel.desktop');
|
|
||||||
app.launch(0, -1, false);
|
|
||||||
} else {
|
|
||||||
let connection = this._connections[0];
|
|
||||||
Util.spawnApp(['gnome-control-center', 'network', 'show-device',
|
|
||||||
connection.get_path()]);
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
|
|
||||||
_getDescription: function() {
|
_getDescription: function() {
|
||||||
|
Loading…
Reference in New Issue
Block a user