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

network: Launch the appropriate settings panels

Browse Source 
The new control-center shell split wifi configuration from the network
panel, and moved all other devices into a flat list. So instead of
manually spawning the app with the 'show-device' subcommand, we can
now simply launch the appropriate settings panel.

https://bugzilla.gnome.org/show_bug.cgi?id=786520
This commit is contained in:
Florian Müllner 2017-08-19 18:08:28 +02:00
parent b5d3c4e165
commit b2b2f65214
1 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -115,17 +115,6 @@ function ensureActiveConnectionProps(active, settings) {
} }
} }
function createSettingsAction(label, device) {
let item = new PopupMenu.PopupMenuItem(label);
item.connect('activate', function() {
Util.spawnApp(['gnome-control-center', 'network', 'show-device',
device.get_path()]);
});
return item;
}
var NMConnectionItem = new Lang.Class({ var NMConnectionItem = new Lang.Class({
Name: 'NMConnectionItem', Name: 'NMConnectionItem',
@ -514,7 +503,7 @@ var NMDeviceWired = new Lang.Class({
_init: function(client, device, settings) { _init: function(client, device, settings) {
this.parent(client, device, settings); this.parent(client, device, settings);
this.item.menu.addMenuItem(createSettingsAction(_("Wired Settings"), device)); this.item.menu.addSettingsAction(_("Wired Settings"), 'gnome-network-panel.desktop');
}, },
_hasCarrier: function() { _hasCarrier: function() {
@ -556,7 +545,7 @@ var NMDeviceModem = new Lang.Class({
_init: function(client, device, settings) { _init: function(client, device, settings) {
this.parent(client, device, settings); this.parent(client, device, settings);
this.item.menu.addMenuItem(createSettingsAction(_("Mobile Broadband Settings"), device)); this.item.menu.addSettingsAction(_("Mobile Broadband Settings"), 'gnome-network-panel.desktop');
this._mobileDevice = null; this._mobileDevice = null;
@ -635,7 +624,7 @@ var NMDeviceBluetooth = new Lang.Class({
_init: function(client, device, settings) { _init: function(client, device, settings) {
this.parent(client, device, settings); this.parent(client, device, settings);
this.item.menu.addMenuItem(createSettingsAction(_("Bluetooth Settings"), device)); this.item.menu.addSettingsAction(_("Bluetooth Settings"), 'gnome-network-panel.desktop');
}, },
_getDescription: function() { _getDescription: function() {
@ -1205,7 +1194,7 @@ var NMDeviceWireless = new Lang.Class({
this._toggleItem.connect('activate', Lang.bind(this, this._toggleWifi)); this._toggleItem.connect('activate', Lang.bind(this, this._toggleWifi));
this.item.menu.addMenuItem(this._toggleItem); this.item.menu.addMenuItem(this._toggleItem);
this.item.menu.addMenuItem(createSettingsAction(_("Wi-Fi Settings"), device)); this.item.menu.addSettingsAction(_("Wi-Fi Settings"), 'gnome-wifi-panel.desktop');
this._wirelessEnabledChangedId = this._client.connect('notify::wireless-enabled', Lang.bind(this, this._sync)); this._wirelessEnabledChangedId = this._client.connect('notify::wireless-enabled', Lang.bind(this, this._sync));
this._wirelessHwEnabledChangedId = this._client.connect('notify::wireless-hardware-enabled', Lang.bind(this, this._sync)); this._wirelessHwEnabledChangedId = this._client.connect('notify::wireless-hardware-enabled', Lang.bind(this, this._sync));