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

status/network: Port to quick settings

Browse Source 
… and just like that, we've reached the end of the journey.

There's little else to say, except how remarkably unremarkable
the change is (not in terms of UI of course).

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2408>
This commit is contained in:
Florian Müllner 2022-08-03 06:03:40 +02:00 committed by Marge Bot
parent dc09f990c4
commit 81eb7db5a0
2 changed files with 60 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
js/ui/panel.js
View File

@ -372,17 +372,6 @@ class AggregateMenu extends PanelMenu.Button {
this._indicators = new St.BoxLayout({ style_class: 'panel-status-indicators-box' }); this._indicators = new St.BoxLayout({ style_class: 'panel-status-indicators-box' });
this.add_child(this._indicators); this.add_child(this._indicators);
if (Config.HAVE_NETWORKMANAGER)
this._network = new imports.ui.status.network.NMApplet();
else
this._network = null;
if (this._network)
this._indicators.add_child(this._network);
if (this._network)
this.menu.addMenuItem(this._network.menu);
} }
}); });
@ -398,6 +387,11 @@ class QuickSettings extends PanelMenu.Button {
this.setMenu(new QuickSettingsMenu(this, N_QUICK_SETTINGS_COLUMNS)); this.setMenu(new QuickSettingsMenu(this, N_QUICK_SETTINGS_COLUMNS));
if (Config.HAVE_NETWORKMANAGER)
this._network = new imports.ui.status.network.Indicator();
else
this._network = null;
if (Config.HAVE_BLUETOOTH) if (Config.HAVE_BLUETOOTH)
this._bluetooth = new imports.ui.status.bluetooth.Indicator(); this._bluetooth = new imports.ui.status.bluetooth.Indicator();
else else
@ -421,6 +415,8 @@ class QuickSettings extends PanelMenu.Button {
this._indicators.add_child(this._thunderbolt); this._indicators.add_child(this._thunderbolt);
this._indicators.add_child(this._location); this._indicators.add_child(this._location);
this._indicators.add_child(this._nightLight); this._indicators.add_child(this._nightLight);
if (this._network)
this._indicators.add_child(this._network);
this._indicators.add_child(this._darkMode); this._indicators.add_child(this._darkMode);
this._indicators.add_child(this._powerProfiles); this._indicators.add_child(this._powerProfiles);
if (this._bluetooth) if (this._bluetooth)
@ -438,6 +434,8 @@ class QuickSettings extends PanelMenu.Button {
this._addItems(this._remoteAccess.quickSettingsItems); this._addItems(this._remoteAccess.quickSettingsItems);
this._addItems(this._thunderbolt.quickSettingsItems); this._addItems(this._thunderbolt.quickSettingsItems);
this._addItems(this._location.quickSettingsItems); this._addItems(this._location.quickSettingsItems);
if (this._network)
this._addItems(this._network.quickSettingsItems);
if (this._bluetooth) if (this._bluetooth)
this._addItems(this._bluetooth.quickSettingsItems); this._addItems(this._bluetooth.quickSettingsItems);
this._addItems(this._powerProfiles.quickSettingsItems); this._addItems(this._powerProfiles.quickSettingsItems);

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

@ -1,14 +1,15 @@
// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*- // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
/* exported NMApplet */ /* exported Indicator */
const {Atk, Clutter, Gio, GLib, GObject, NM, Polkit, St} = imports.gi; const {Atk, Clutter, Gio, GLib, GObject, NM, Polkit, St} = imports.gi;
const Main = imports.ui.main; const Main = imports.ui.main;
const PanelMenu = imports.ui.panelMenu;
const PopupMenu = imports.ui.popupMenu; const PopupMenu = imports.ui.popupMenu;
const MessageTray = imports.ui.messageTray; const MessageTray = imports.ui.messageTray;
const ModemManager = imports.misc.modemManager; const ModemManager = imports.misc.modemManager;
const Util = imports.misc.util; const Util = imports.misc.util;
const {QuickMenuToggle, SystemIndicator} = imports.ui.quickSettings;
const {loadInterfaceXML} = imports.misc.fileUtils; const {loadInterfaceXML} = imports.misc.fileUtils;
const {registerDestroyableType} = imports.misc.signalTracker; const {registerDestroyableType} = imports.misc.signalTracker;
@ -1298,27 +1299,14 @@ const NMVpnConnectionItem = GObject.registerClass({
} }
}); });
const NMSection = GObject.registerClass({ const NMToggle = GObject.registerClass({
Properties: {
'checked': GObject.ParamSpec.boolean('checked', '', '',
GObject.ParamFlags.READWRITE,
false),
'icon-name': GObject.ParamSpec.string('icon-name', '', '',
GObject.ParamFlags.READWRITE,
''),
'label': GObject.ParamSpec.string('label', '', '',
GObject.ParamFlags.READWRITE,
''),
},
Signals: { Signals: {
'activation-failed': {}, 'activation-failed': {},
}, },
}, class NMSection extends GObject.Object { }, class NMToggle extends QuickMenuToggle {
constructor() { constructor() {
super(); super();
this.menu = new PopupMenu.PopupMenuSection();
this._items = new Map(); this._items = new Map();
this._itemSorter = new ItemSorter({trackMru: true}); this._itemSorter = new ItemSorter({trackMru: true});
@ -1334,6 +1322,8 @@ const NMSection = GObject.registerClass({
this, 'label', GObject.BindingFlags.DEFAULT, this, 'label', GObject.BindingFlags.DEFAULT,
(bind, source) => [true, this._transformLabel(source)], (bind, source) => [true, this._transformLabel(source)],
null); null);
this.connect('clicked', () => this.activate());
} }
setClient(client) { setClient(client) {
@ -1354,10 +1344,6 @@ const NMSection = GObject.registerClass({
this._sync(); this._sync();
} }
set visible(visible) {
this.menu.actor.visible = visible;
}
activate() { activate() {
const activeItems = [...this._getActiveItems()]; const activeItems = [...this._getActiveItems()];
@ -1472,11 +1458,12 @@ const NMSection = GObject.registerClass({
} }
}); });
const NMVpnSection = GObject.registerClass( const NMVpnToggle = GObject.registerClass(
class NMVpnSection extends NMSection { class NMVpnToggle extends NMToggle {
constructor() { constructor() {
super(); super();
this.menu.setHeader('network-vpn-symbolic', _('VPN'));
this.menu.addSettingsAction(_('VPN Settings'), this.menu.addSettingsAction(_('VPN Settings'),
'gnome-network-panel.desktop'); 'gnome-network-panel.desktop');
} }
@ -1567,8 +1554,8 @@ class NMVpnSection extends NMSection {
} }
}); });
const NMDeviceSection = GObject.registerClass( const NMDeviceToggle = GObject.registerClass(
class NMDeviceSection extends NMSection { class NMDeviceToggle extends NMToggle {
constructor(deviceType) { constructor(deviceType) {
super(); super();
@ -1702,13 +1689,8 @@ class NMDeviceSection extends NMSection {
} }
}); });
const NMWirelessSection = GObject.registerClass({ const NMWirelessToggle = GObject.registerClass(
Properties: { class NMWirelessToggle extends NMDeviceToggle {
'menu-enabled': GObject.ParamSpec.boolean('menu-enabled', '', '',
GObject.ParamFlags.READWRITE,
false),
},
}, class NMWirelessSection extends NMDeviceSection {
constructor() { constructor() {
super(NM.DeviceType.WIFI); super(NM.DeviceType.WIFI);
@ -1716,6 +1698,7 @@ const NMWirelessSection = GObject.registerClass({
this, 'menu-enabled', this, 'menu-enabled',
GObject.BindingFlags.INVERT_BOOLEAN); GObject.BindingFlags.INVERT_BOOLEAN);
this.menu.setHeader('network-wireless-symbolic', _('Wi–Fi'));
this.menu.addSettingsAction(_('All Networks'), this.menu.addSettingsAction(_('All Networks'),
'gnome-wifi-panel.desktop'); 'gnome-wifi-panel.desktop');
} }
@ -1763,11 +1746,12 @@ const NMWirelessSection = GObject.registerClass({
} }
}); });
const NMWiredSection = GObject.registerClass( const NMWiredToggle = GObject.registerClass(
class NMWiredSection extends NMDeviceSection { class NMWiredToggle extends NMDeviceToggle {
constructor() { constructor() {
super(NM.DeviceType.ETHERNET); super(NM.DeviceType.ETHERNET);
this.menu.setHeader('network-wired-symbolic', _('Wired Connections'));
this.menu.addSettingsAction(_('Wired Settings'), this.menu.addSettingsAction(_('Wired Settings'),
'gnome-network-panel.desktop'); 'gnome-network-panel.desktop');
} }
@ -1777,11 +1761,12 @@ class NMWiredSection extends NMDeviceSection {
} }
}); });
const NMBluetoothSection = GObject.registerClass( const NMBluetoothToggle = GObject.registerClass(
class NMBluetoothSection extends NMDeviceSection { class NMBluetoothToggle extends NMDeviceToggle {
constructor() { constructor() {
super(NM.DeviceType.BT); super(NM.DeviceType.BT);
this.menu.setHeader('network-cellular-symbolic', _('Bluetooth Tethers'));
this.menu.addSettingsAction(_('Bluetooth Settings'), this.menu.addSettingsAction(_('Bluetooth Settings'),
'gnome-network-panel.desktop'); 'gnome-network-panel.desktop');
} }
@ -1791,11 +1776,13 @@ class NMBluetoothSection extends NMDeviceSection {
} }
}); });
const NMModemSection = GObject.registerClass( const NMModemToggle = GObject.registerClass(
class NMModemSection extends NMDeviceSection { class NMModemToggle extends NMDeviceToggle {
constructor() { constructor() {
super(NM.DeviceType.MODEM); super(NM.DeviceType.MODEM);
this.menu.setHeader('network-cellular-symbolic', _('Mobile Connections'));
const settingsLabel = _('Mobile Broadband Settings'); const settingsLabel = _('Mobile Broadband Settings');
this._wwanSettings = this.menu.addSettingsAction(settingsLabel, this._wwanSettings = this.menu.addSettingsAction(settingsLabel,
'gnome-wwan-panel.desktop'); 'gnome-wwan-panel.desktop');
@ -1817,8 +1804,8 @@ class NMModemSection extends NMDeviceSection {
} }
}); });
var NMApplet = GObject.registerClass( var Indicator = GObject.registerClass(
class Indicator extends PanelMenu.SystemIndicator { class Indicator extends SystemIndicator {
_init() { _init() {
super._init(); super._init();
@ -1828,28 +1815,25 @@ class Indicator extends PanelMenu.SystemIndicator {
this._notification = null; this._notification = null;
this._allSections = []; this._wiredToggle = new NMWiredToggle();
this._wirelessToggle = new NMWirelessToggle();
this._modemToggle = new NMModemToggle();
this._btToggle = new NMBluetoothToggle();
this._vpnToggle = new NMVpnToggle();
this._wiredSection = new NMWiredSection(); this._deviceToggles = new Map([
this._wirelessSection = new NMWirelessSection(); [NM.DeviceType.ETHERNET, this._wiredToggle],
this._modemSection = new NMModemSection(); [NM.DeviceType.WIFI, this._wirelessToggle],
this._btSection = new NMBluetoothSection(); [NM.DeviceType.MODEM, this._modemToggle],
this._vpnSection = new NMVpnSection(); [NM.DeviceType.BT, this._btToggle],
this._deviceSections = new Map([
[NM.DeviceType.ETHERNET, this._wiredSection],
[NM.DeviceType.WIFI, this._wirelessSection],
[NM.DeviceType.MODEM, this._modemSection],
[NM.DeviceType.BT, this._btSection],
]); ]);
this._allSections.push(...this._deviceSections.values()); this.quickSettingsItems.push(...this._deviceToggles.values());
this._allSections.push(this._vpnSection); this.quickSettingsItems.push(this._vpnToggle);
this._allSections.forEach(section => { this.quickSettingsItems.forEach(toggle => {
section.connectObject( toggle.connectObject(
'activation-failed', () => this._onActivationFailed(), 'activation-failed', () => this._onActivationFailed(),
this); this);
this.menu.addMenuItem(section.menu);
}); });
this._primaryIndicator = this._addIndicator(); this._primaryIndicator = this._addIndicator();
@ -1860,10 +1844,10 @@ class Indicator extends PanelMenu.SystemIndicator {
this._primaryIndicator, 'icon-name', this._primaryIndicator, 'icon-name',
GObject.BindingFlags.DEFAULT); GObject.BindingFlags.DEFAULT);
this._vpnSection.bind_property('checked', this._vpnToggle.bind_property('checked',
this._vpnIndicator, 'visible', this._vpnIndicator, 'visible',
GObject.BindingFlags.SYNC_CREATE); GObject.BindingFlags.SYNC_CREATE);
this._vpnSection.bind_property('icon-name', this._vpnToggle.bind_property('icon-name',
this._vpnIndicator, 'icon-name', this._vpnIndicator, 'icon-name',
GObject.BindingFlags.SYNC_CREATE); GObject.BindingFlags.SYNC_CREATE);
@ -1873,8 +1857,8 @@ class Indicator extends PanelMenu.SystemIndicator {
async _getClient() { async _getClient() {
this._client = await NM.Client.new_async(null); this._client = await NM.Client.new_async(null);
this._allSections.forEach( this.quickSettingsItems.forEach(
section => section.setClient(this._client)); toggle => toggle.setClient(this._client));
this._client.bind_property('nm-running', this._client.bind_property('nm-running',
this, 'visible', this, 'visible',
@ -1891,9 +1875,9 @@ class Indicator extends PanelMenu.SystemIndicator {
this._configPermission = await Polkit.Permission.new( this._configPermission = await Polkit.Permission.new(
'org.freedesktop.NetworkManager.network-control', null, null); 'org.freedesktop.NetworkManager.network-control', null, null);
this._allSections.forEach(section => { this.quickSettingsItems.forEach(toggle => {
this._configPermission.bind_property('allowed', this._configPermission.bind_property('allowed',
section, 'reactive', toggle, 'reactive',
GObject.BindingFlags.SYNC_CREATE); GObject.BindingFlags.SYNC_CREATE);
}); });
} catch (e) { } catch (e) {
@ -2025,10 +2009,10 @@ class Indicator extends PanelMenu.SystemIndicator {
_updateIcon() { _updateIcon() {
const [dev] = this._mainConnection?.get_devices() ?? []; const [dev] = this._mainConnection?.get_devices() ?? [];
const primarySection = this._deviceSections.get(dev?.device_type) ?? null; const primaryToggle = this._deviceToggles.get(dev?.device_type) ?? null;
this._primaryIndicatorBinding.source = primarySection; this._primaryIndicatorBinding.source = primaryToggle;
if (!primarySection) { if (!primaryToggle) {
if (this._client.connectivity === NM.ConnectivityState.FULL) if (this._client.connectivity === NM.ConnectivityState.FULL)
this._primaryIndicator.icon_name = 'network-wired-symbolic'; this._primaryIndicator.icon_name = 'network-wired-symbolic';
else else
@ -2037,6 +2021,6 @@ class Indicator extends PanelMenu.SystemIndicator {
const state = this._client.get_state(); const state = this._client.get_state();
const connected = state === NM.State.CONNECTED_GLOBAL; const connected = state === NM.State.CONNECTED_GLOBAL;
this._primaryIndicator.visible = (primarySection != null) || connected; this._primaryIndicator.visible = (primaryToggle != null) || connected;
} }
}); });