applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

panels: wwan: Add WWAN 5G connection support

Browse source
This commit is contained in:
Dirk Su 2022-08-01 20:06:51 +00:00 • committed by Robert Ancell
parent e0d599bb40
commit 83278d2724
2 changed files with 93 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

88
panels/wwan/cc-wwan-device.c
View file

@ -993,9 +993,28 @@ cc_wwan_device_get_string_from_mode (CcWwanDevice *self,
if (allowed == MM_MODEM_MODE_4G) if (allowed == MM_MODEM_MODE_4G)
return g_strdup (_("4G Only")); return g_strdup (_("4G Only"));
if (allowed == MM_MODEM_MODE_5G)
return g_strdup (_("5G Only"));
str = g_string_sized_new (10); str = g_string_sized_new (10);
if (allowed & MM_MODEM_MODE_2G && if (allowed & MM_MODEM_MODE_2G &&
allowed & MM_MODEM_MODE_3G &&
allowed & MM_MODEM_MODE_4G &&
allowed & MM_MODEM_MODE_5G)
{
if (preferred & MM_MODEM_MODE_5G)
g_string_append (str, _("2G, 3G, 4G, 5G (Preferred)"));
else if (preferred & MM_MODEM_MODE_4G)
g_string_append (str, _("2G, 3G, 4G (Preferred), 5G"));
else if (preferred & MM_MODEM_MODE_3G)
g_string_append (str, _("2G, 3G (Preferred), 4G, 5G"));
else if (preferred & MM_MODEM_MODE_2G)
g_string_append (str, _("2G (Preferred), 3G, 4G, 5G"));
else
g_string_append (str, _("2G, 3G, 4G, 5G"));
}
else if (allowed & MM_MODEM_MODE_2G &&
allowed & MM_MODEM_MODE_3G && allowed & MM_MODEM_MODE_3G &&
allowed & MM_MODEM_MODE_4G) allowed & MM_MODEM_MODE_4G)
{ {
@ -1008,6 +1027,45 @@ cc_wwan_device_get_string_from_mode (CcWwanDevice *self,
else else
g_string_append (str, _("2G, 3G, 4G")); g_string_append (str, _("2G, 3G, 4G"));
} }
else if (allowed & MM_MODEM_MODE_3G &&
allowed & MM_MODEM_MODE_4G &&
allowed & MM_MODEM_MODE_5G)
{
if (preferred & MM_MODEM_MODE_5G)
g_string_append (str, _("3G, 4G, 5G (Preferred)"));
else if (preferred & MM_MODEM_MODE_4G)
g_string_append (str, _("3G, 4G (Preferred), 5G"));
else if (preferred & MM_MODEM_MODE_2G)
g_string_append (str, _("3G (Preferred), 4G, 5G"));
else
g_string_append (str, _("3G, 4G, 5G"));
}
else if (allowed & MM_MODEM_MODE_2G &&
allowed & MM_MODEM_MODE_4G &&
allowed & MM_MODEM_MODE_5G)
{
if (preferred & MM_MODEM_MODE_5G)
g_string_append (str, _("2G, 4G, 5G (Preferred)"));
else if (preferred & MM_MODEM_MODE_4G)
g_string_append (str, _("2G, 4G (Preferred), 5G"));
else if (preferred & MM_MODEM_MODE_2G)
g_string_append (str, _("2G (Preferred), 4G, 5G"));
else
g_string_append (str, _("2G, 4G, 5G"));
}
else if (allowed & MM_MODEM_MODE_2G &&
allowed & MM_MODEM_MODE_3G &&
allowed & MM_MODEM_MODE_5G)
{
if (preferred & MM_MODEM_MODE_5G)
g_string_append (str, _("2G, 3G, 5G (Preferred)"));
else if (preferred & MM_MODEM_MODE_3G)
g_string_append (str, _("2G, 3G (Preferred), 5G"));
else if (preferred & MM_MODEM_MODE_2G)
g_string_append (str, _("2G (Preferred), 3G, 5G"));
else
g_string_append (str, _("2G, 3G, 5G"));
}
else if (allowed & MM_MODEM_MODE_3G && else if (allowed & MM_MODEM_MODE_3G &&
allowed & MM_MODEM_MODE_4G) allowed & MM_MODEM_MODE_4G)
{ {
@ -1038,6 +1096,36 @@ cc_wwan_device_get_string_from_mode (CcWwanDevice *self,
else else
g_string_append (str, _("2G, 3G")); g_string_append (str, _("2G, 3G"));
} }
else if (allowed & MM_MODEM_MODE_2G &&
allowed & MM_MODEM_MODE_5G)
{
if (preferred & MM_MODEM_MODE_5G)
g_string_append (str, _("2G, 5G (Preferred)"));
else if (preferred & MM_MODEM_MODE_2G)
g_string_append (str, _("2G (Preferred), 5G"));
else
g_string_append (str, _("2G, 5G"));
}
else if (allowed & MM_MODEM_MODE_3G &&
allowed & MM_MODEM_MODE_5G)
{
if (preferred & MM_MODEM_MODE_5G)
g_string_append (str, _("3G, 5G (Preferred)"));
else if (preferred & MM_MODEM_MODE_3G)
g_string_append (str, _("3G (Preferred), 5G"));
else
g_string_append (str, _("3G, 5G"));
}
else if (allowed & MM_MODEM_MODE_4G &&
allowed & MM_MODEM_MODE_5G)
{
if (preferred & MM_MODEM_MODE_5G)
g_string_append (str, _("4G, 5G (Preferred)"));
else if (preferred & MM_MODEM_MODE_4G)
g_string_append (str, _("4G (Preferred), 5G"));
else
g_string_append (str, _("4G, 5G"));
}
if (!str->len) if (!str->len)
g_string_append (str, C_("Network mode", "Unknown")); g_string_append (str, C_("Network mode", "Unknown"));

5
panels/wwan/cc-wwan-mode-dialog.c
View file

@ -167,12 +167,17 @@ cc_wwan_mode_dialog_update (CcWwanModeDialog *self)
{ {
MMModemMode allowed; MMModemMode allowed;
MMModemMode modes[][2] = { MMModemMode modes[][2] = {
{MM_MODEM_MODE_2G | MM_MODEM_MODE_3G | MM_MODEM_MODE_4G | MM_MODEM_MODE_5G, MM_MODEM_MODE_5G},
{MM_MODEM_MODE_2G | MM_MODEM_MODE_3G | MM_MODEM_MODE_4G | MM_MODEM_MODE_5G, 0},
{MM_MODEM_MODE_3G | MM_MODEM_MODE_4G | MM_MODEM_MODE_5G, MM_MODEM_MODE_5G},
{MM_MODEM_MODE_3G | MM_MODEM_MODE_4G | MM_MODEM_MODE_5G, 0},
{MM_MODEM_MODE_2G | MM_MODEM_MODE_3G | MM_MODEM_MODE_4G, MM_MODEM_MODE_4G}, {MM_MODEM_MODE_2G | MM_MODEM_MODE_3G | MM_MODEM_MODE_4G, MM_MODEM_MODE_4G},
{MM_MODEM_MODE_2G | MM_MODEM_MODE_3G | MM_MODEM_MODE_4G, 0}, {MM_MODEM_MODE_2G | MM_MODEM_MODE_3G | MM_MODEM_MODE_4G, 0},
{MM_MODEM_MODE_3G | MM_MODEM_MODE_4G, MM_MODEM_MODE_4G}, {MM_MODEM_MODE_3G | MM_MODEM_MODE_4G, MM_MODEM_MODE_4G},
{MM_MODEM_MODE_3G | MM_MODEM_MODE_4G, 0}, {MM_MODEM_MODE_3G | MM_MODEM_MODE_4G, 0},
{MM_MODEM_MODE_2G | MM_MODEM_MODE_3G, MM_MODEM_MODE_3G}, {MM_MODEM_MODE_2G | MM_MODEM_MODE_3G, MM_MODEM_MODE_3G},
{MM_MODEM_MODE_2G | MM_MODEM_MODE_3G, 0}, {MM_MODEM_MODE_2G | MM_MODEM_MODE_3G, 0},
{MM_MODEM_MODE_5G, 0},
{MM_MODEM_MODE_4G, 0}, {MM_MODEM_MODE_4G, 0},
{MM_MODEM_MODE_3G, 0}, {MM_MODEM_MODE_3G, 0},
{MM_MODEM_MODE_2G, 0}, {MM_MODEM_MODE_2G, 0},