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

status/network: Always use toggles in VPN section

Browse Source 
Let's keep things simple and use the same appearance regardless
of the number of configured VPNs. Also unlike for device items,
every connection item in the VPN section is a toplevel item, so
there isn't a real need for different presentations.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2407>
This commit is contained in:
Florian Müllner 2022-08-08 00:28:12 +02:00 committed by Marge Bot
parent 7357a80d2b
commit 9002344ec6
1 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1472,6 +1472,7 @@ const NMVpnConnectionItem = GObject.registerClass({
super(section, connection);
this._label.x_expand = true;
this.radioMode = true;
this._switch = new PopupMenu.Switch(this.is_active);
this.add_child(this._switch);
@ -1547,7 +1548,6 @@ var NMVpnSection = class extends PopupMenu.PopupMenuSection {
this);
this._loadInitialItems();
this._sync();
}
_loadInitialItems() {
@ -1568,8 +1568,6 @@ var NMVpnSection = class extends PopupMenu.PopupMenuSection {
for (const a of activeConnections)
this._items.get(a.connection)?.setActiveConnection(a);
this._sync();
}
_shouldHandleConnection(connection) {
@ -1619,8 +1617,6 @@ var NMVpnSection = class extends PopupMenu.PopupMenuSection {
this._items.set(connection, item);
const pos = this._itemSorter.upsert(item);
this._section.addMenuItem(item, pos);
this._sync();
}
_removeConnection(connection) {
@ -1632,13 +1628,6 @@ var NMVpnSection = class extends PopupMenu.PopupMenuSection {
this._items.delete(connection);
item.destroy();
this._sync();
}
_sync() {
const nItems = this._items.size;
for (const item of this._items.values())
item.radio_mode = nItems > 1;
}
get category() {