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

status/network: Give bluetooth its own category

Browse Source 
In the quick settings future, each device type will use a separate
toggle. We still have a long way to go, but start with giving
bluetooth its own section/category. Baby steps …

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2406>
This commit is contained in:
Florian Müllner 2022-08-01 15:13:06 +02:00
parent 714c0eaea5
commit 73f4bb13d0
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,6 +24,7 @@ const NMConnectionCategory = {
INVALID: 'invalid', INVALID: 'invalid',
WIRED: 'wired', WIRED: 'wired',
WIRELESS: 'wireless', WIRELESS: 'wireless',
BLUETOOTH: 'bluetooth',
WWAN: 'wwan', WWAN: 'wwan',
VPN: 'vpn', VPN: 'vpn',
}; };
@ -564,7 +565,7 @@ var NMBluetoothDeviceItem = class extends NMDeviceItem {
} }
get category() { get category() {
return NMConnectionCategory.WWAN; return NMConnectionCategory.BLUETOOTH;
} }
_getDescription() { _getDescription() {
@ -1544,6 +1545,7 @@ var DeviceCategory = class extends PopupMenu.PopupMenuSection {
case NMConnectionCategory.WIRED: case NMConnectionCategory.WIRED:
return 'network-wired-symbolic'; return 'network-wired-symbolic';
case NMConnectionCategory.WIRELESS: case NMConnectionCategory.WIRELESS:
case NMConnectionCategory.BLUETOOTH:
case NMConnectionCategory.WWAN: case NMConnectionCategory.WWAN:
return 'network-wireless-symbolic'; return 'network-wireless-symbolic';
} }
@ -1560,6 +1562,11 @@ var DeviceCategory = class extends PopupMenu.PopupMenuSection {
return ngettext("%s Wi-Fi Connection", return ngettext("%s Wi-Fi Connection",
"%s Wi-Fi Connections", "%s Wi-Fi Connections",
nDevices).format(nDevices); nDevices).format(nDevices);
case NMConnectionCategory.BLUETOOTH:
return ngettext(
'%s Bluetooth Connection',
'%s Bluetooth Connections',
nDevices).format(nDevices);
case NMConnectionCategory.WWAN: case NMConnectionCategory.WWAN:
return ngettext("%s Modem Connection", return ngettext("%s Modem Connection",
"%s Modem Connections", "%s Modem Connections",
@ -1588,7 +1595,7 @@ class Indicator extends PanelMenu.SystemIndicator {
this._ctypes = { }; this._ctypes = { };
this._ctypes[NM.SETTING_WIRED_SETTING_NAME] = NMConnectionCategory.WIRED; this._ctypes[NM.SETTING_WIRED_SETTING_NAME] = NMConnectionCategory.WIRED;
this._ctypes[NM.SETTING_WIRELESS_SETTING_NAME] = NMConnectionCategory.WIRELESS; this._ctypes[NM.SETTING_WIRELESS_SETTING_NAME] = NMConnectionCategory.WIRELESS;
this._ctypes[NM.SETTING_BLUETOOTH_SETTING_NAME] = NMConnectionCategory.WWAN; this._ctypes[NM.SETTING_BLUETOOTH_SETTING_NAME] = NMConnectionCategory.BLUETOOTH;
this._ctypes[NM.SETTING_CDMA_SETTING_NAME] = NMConnectionCategory.WWAN; this._ctypes[NM.SETTING_CDMA_SETTING_NAME] = NMConnectionCategory.WWAN;
this._ctypes[NM.SETTING_GSM_SETTING_NAME] = NMConnectionCategory.WWAN; this._ctypes[NM.SETTING_GSM_SETTING_NAME] = NMConnectionCategory.WWAN;
this._ctypes[NM.SETTING_VPN_SETTING_NAME] = NMConnectionCategory.VPN; this._ctypes[NM.SETTING_VPN_SETTING_NAME] = NMConnectionCategory.VPN;
@ -1614,6 +1621,7 @@ class Indicator extends PanelMenu.SystemIndicator {
const categories = [ const categories = [
NMConnectionCategory.WIRED, NMConnectionCategory.WIRED,
NMConnectionCategory.WIRELESS, NMConnectionCategory.WIRELESS,
NMConnectionCategory.BLUETOOTH,
NMConnectionCategory.WWAN, NMConnectionCategory.WWAN,
]; ];
for (let category of categories) { for (let category of categories) {