[gnome-shell] network: Launch the appropriate settings panels
- From: Florian Müllner <fmuellner src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell] network: Launch the appropriate settings panels
- Date: Sun, 20 Aug 2017 16:04:10 +0000 (UTC)
commit b2b2f6521433911e93725f1bd640cd4ab5f11261
Author: Florian Müllner <fmuellner gnome org>
Date: Sat Aug 19 18:08:28 2017 +0200
network: Launch the appropriate settings panels
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
js/ui/status/network.js | 19 ++++---------------
1 files changed, 4 insertions(+), 15 deletions(-)
---
diff --git a/js/ui/status/network.js b/js/ui/status/network.js
index 1237230..831027e 100644
--- a/js/ui/status/network.js
+++ b/js/ui/status/network.js
@@ -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({
Name: 'NMConnectionItem',
@@ -514,7 +503,7 @@ var NMDeviceWired = new Lang.Class({
_init: function(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() {
@@ -556,7 +545,7 @@ var NMDeviceModem = new Lang.Class({
_init: function(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;
@@ -635,7 +624,7 @@ var NMDeviceBluetooth = new Lang.Class({
_init: function(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() {
@@ -1205,7 +1194,7 @@ var NMDeviceWireless = new Lang.Class({
this._toggleItem.connect('activate', Lang.bind(this, this._toggleWifi));
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._wirelessHwEnabledChangedId = this._client.connect('notify::wireless-hardware-enabled',
Lang.bind(this, this._sync));
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]