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

status/network: Tweak connection items

Browse Source 
Always use the plain name as label, and indicate the "(dis)connect"
action in a subtitle.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2631>
This commit is contained in:
Florian Müllner 2023-02-08 16:03:24 +01:00 committed by Marge Bot
parent 6cd39f829f
commit b286a8f55e
2 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/theme/gnome-shell-sass/widgets/_quick-settings.scss
View File

@ -122,3 +122,5 @@
.nm-network-item { .nm-network-item {
.wireless-secure-icon { icon-size: 0.5 * $base_icon_size; } .wireless-secure-icon { icon-size: 0.5 * $base_icon_size; }
} }
.device-subtitle { color: transparentize($fg_color, 0.5); }

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

@ -305,11 +305,18 @@ class NMConnectionItem extends NMMenuItem {
this.add_child(this._icon); this.add_child(this._icon);
this._label = new St.Label({ this._label = new St.Label({
x_expand: true,
y_expand: true, y_expand: true,
y_align: Clutter.ActorAlign.CENTER, y_align: Clutter.ActorAlign.CENTER,
}); });
this.add_child(this._label); this.add_child(this._label);
this.label_actor = this._label;
this._subtitle = new St.Label({
style_class: 'device-subtitle',
y_expand: true,
y_align: Clutter.ActorAlign.CENTER,
});
this.add_child(this._subtitle);
this.bind_property('icon-name', this.bind_property('icon-name',
this._icon, 'icon-name', this._icon, 'icon-name',
@ -350,7 +357,7 @@ class NMConnectionItem extends NMMenuItem {
? PopupMenu.Ornament.DOT : PopupMenu.Ornament.NONE); ? PopupMenu.Ornament.DOT : PopupMenu.Ornament.NONE);
} }
_getRegularLabel() { _getAccessibleName() {
return this.is_active return this.is_active
// Translators: %s is a device name like "MyPhone" // Translators: %s is a device name like "MyPhone"
? _('Disconnect %s').format(this.name) ? _('Disconnect %s').format(this.name)
@ -358,12 +365,20 @@ class NMConnectionItem extends NMMenuItem {
: _('Connect to %s').format(this.name); : _('Connect to %s').format(this.name);
} }
_getSubtitleLabel() {
return this.is_active ? _('Disconnect') : _('Connect');
}
_sync() { _sync() {
this._label.text = this.name;
if (this.radioMode) { if (this.radioMode) {
this._label.text = this.name; this._subtitle.text = null;
this.accessible_name = this.name;
this.accessible_role = Atk.Role.CHECK_MENU_ITEM; this.accessible_role = Atk.Role.CHECK_MENU_ITEM;
} else { } else {
this._label.text = this._getRegularLabel(); this.accessible_name = this._getAccessibleName();
this._subtitle.text = this._getSubtitleLabel();
this.accessible_role = Atk.Role.MENU_ITEM; this.accessible_role = Atk.Role.MENU_ITEM;
} }
this._updateOrnament(); this._updateOrnament();