Add a WiFi setting group

This commit is contained in:
Jean-André Santoni 2016-09-21 21:58:43 +02:00 committed by twinaphex
parent acf34990fc
commit 850c4beac3
6 changed files with 39 additions and 0 deletions

View File

@ -2170,6 +2170,8 @@ static const char *menu_hash_to_str_us_label_enum(enum msg_hash_enums msg)
return "deferred_retro_achievements_settings_list";
case MENU_ENUM_LABEL_DEFERRED_UPDATER_SETTINGS_LIST:
return "deferred_updater_settings_list";
case MENU_ENUM_LABEL_DEFERRED_WIFI_SETTINGS_LIST:
return "deferred_wifi_settings_list";
case MENU_ENUM_LABEL_DEFERRED_NETWORK_SETTINGS_LIST:
return "deferred_network_settings_list";
case MENU_ENUM_LABEL_DEFERRED_LAKKA_SERVICES_LIST:
@ -2230,6 +2232,8 @@ static const char *menu_hash_to_str_us_label_enum(enum msg_hash_enums msg)
return "updater_settings";
case MENU_ENUM_LABEL_NETWORK_SETTINGS:
return "network_settings";
case MENU_ENUM_LABEL_WIFI_SETTINGS:
return "wifi_settings";
case MENU_ENUM_LABEL_USER_SETTINGS:
return "user_settings";
case MENU_ENUM_LABEL_LAKKA_SERVICES:
@ -4467,6 +4471,8 @@ const char *msg_hash_to_str_us(enum msg_hash_enums msg)
return "Updater";
case MENU_ENUM_LABEL_VALUE_NETWORK_SETTINGS:
return "Network";
case MENU_ENUM_LABEL_VALUE_WIFI_SETTINGS:
return "WiFi";
case MENU_ENUM_LABEL_VALUE_LAKKA_SERVICES:
return "Lakka Services";
case MENU_ENUM_LABEL_VALUE_PLAYLIST_SETTINGS:

View File

@ -708,6 +708,14 @@ int generic_action_ok_displaylist_push(const char *path,
info.enum_idx = MENU_ENUM_LABEL_DEFERRED_NETWORK_SETTINGS_LIST;
dl_type = DISPLAYLIST_GENERIC;
break;
case ACTION_OK_DL_WIFI_SETTINGS_LIST:
info.directory_ptr = idx;
info.type = type;
info_path = path;
info_label = msg_hash_to_str(MENU_ENUM_LABEL_DEFERRED_WIFI_SETTINGS_LIST);
info.enum_idx = MENU_ENUM_LABEL_DEFERRED_WIFI_SETTINGS_LIST;
dl_type = DISPLAYLIST_GENERIC;
break;
case ACTION_OK_DL_LAKKA_SERVICES_LIST:
info.directory_ptr = idx;
info.type = type;
@ -2801,6 +2809,13 @@ static int action_ok_updater_list(const char *path,
entry_idx, ACTION_OK_DL_UPDATER_SETTINGS_LIST);
}
static int action_ok_wifi_list(const char *path,
const char *label, unsigned type, size_t idx, size_t entry_idx)
{
return generic_action_ok_displaylist_push(path, NULL, label, type, idx,
entry_idx, ACTION_OK_DL_WIFI_SETTINGS_LIST);
}
static int action_ok_network_list(const char *path,
const char *label, unsigned type, size_t idx, size_t entry_idx)
{
@ -3559,6 +3574,9 @@ static int menu_cbs_init_bind_ok_compare_label(menu_file_list_cbs_t *cbs,
case MENU_ENUM_LABEL_UPDATER_SETTINGS:
BIND_ACTION_OK(cbs, action_ok_updater_list);
break;
case MENU_ENUM_LABEL_WIFI_SETTINGS:
BIND_ACTION_OK(cbs, action_ok_wifi_list);
break;
case MENU_ENUM_LABEL_NETWORK_SETTINGS:
BIND_ACTION_OK(cbs, action_ok_network_list);
break;

View File

@ -89,6 +89,7 @@ enum
ACTION_OK_DL_MENU_FILE_BROWSER_SETTINGS_LIST,
ACTION_OK_DL_RETRO_ACHIEVEMENTS_SETTINGS_LIST,
ACTION_OK_DL_UPDATER_SETTINGS_LIST,
ACTION_OK_DL_WIFI_SETTINGS_LIST,
ACTION_OK_DL_NETWORK_SETTINGS_LIST,
ACTION_OK_DL_LAKKA_SERVICES_LIST,
ACTION_OK_DL_USER_SETTINGS_LIST,

View File

@ -5141,6 +5141,8 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
#endif
ret = menu_displaylist_parse_settings_enum(menu, info,
MENU_ENUM_LABEL_UPDATER_SETTINGS, PARSE_ACTION, false);
ret = menu_displaylist_parse_settings_enum(menu, info,
MENU_ENUM_LABEL_WIFI_SETTINGS, PARSE_ACTION, false);
ret = menu_displaylist_parse_settings_enum(menu, info,
MENU_ENUM_LABEL_NETWORK_SETTINGS, PARSE_ACTION, false);
ret = menu_displaylist_parse_settings_enum(menu, info,

View File

@ -2480,6 +2480,15 @@ static bool setting_append_list(
parent_group);
menu_settings_list_current_add_enum_idx(list, list_info, MENU_ENUM_LABEL_UPDATER_SETTINGS);
CONFIG_ACTION(
list, list_info,
msg_hash_to_str(MENU_ENUM_LABEL_WIFI_SETTINGS),
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_WIFI_SETTINGS),
&group_info,
&subgroup_info,
parent_group);
menu_settings_list_current_add_enum_idx(list, list_info, MENU_ENUM_LABEL_WIFI_SETTINGS);
CONFIG_ACTION(
list, list_info,
msg_hash_to_str(MENU_ENUM_LABEL_NETWORK_SETTINGS),

View File

@ -717,6 +717,7 @@ enum msg_hash_enums
MENU_ENUM_LABEL_UPDATER_SETTINGS,
MENU_ENUM_LABEL_VALUE_UPDATER_SETTINGS,
MENU_ENUM_LABEL_NETWORK_SETTINGS,
MENU_ENUM_LABEL_WIFI_SETTINGS,
MENU_ENUM_LABEL_USER_SETTINGS,
MENU_ENUM_LABEL_DIRECTORY_SETTINGS,
MENU_ENUM_LABEL_PRIVACY_SETTINGS,
@ -850,6 +851,7 @@ enum msg_hash_enums
MENU_ENUM_LABEL_DEFERRED_MENU_FILE_BROWSER_SETTINGS_LIST,
MENU_ENUM_LABEL_DEFERRED_RETRO_ACHIEVEMENTS_SETTINGS_LIST,
MENU_ENUM_LABEL_DEFERRED_UPDATER_SETTINGS_LIST,
MENU_ENUM_LABEL_DEFERRED_WIFI_SETTINGS_LIST,
MENU_ENUM_LABEL_DEFERRED_NETWORK_SETTINGS_LIST,
MENU_ENUM_LABEL_DEFERRED_LAKKA_SERVICES_LIST,
MENU_ENUM_LABEL_DEFERRED_USER_SETTINGS_LIST,
@ -1568,6 +1570,7 @@ enum msg_hash_enums
MENU_ENUM_LABEL_CORE_UPDATER_SETTINGS,
MENU_ENUM_LABEL_VALUE_CORE_UPDATER_SETTINGS,
MENU_ENUM_LABEL_VALUE_NETWORK_SETTINGS,
MENU_ENUM_LABEL_VALUE_WIFI_SETTINGS,
MENU_ENUM_LABEL_VALUE_LAKKA_SERVICES,
MENU_ENUM_LABEL_LAKKA_SERVICES,
MENU_ENUM_LABEL_ARCHIVE_SETTINGS,