mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-16 08:43:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clean the Configuration mess

Browse Source
This commit is contained in:
lasers 2016-11-18 13:45:10 -06:00
parent 204454c967
commit 6265d1e90a
24 changed files with 54 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
intl/msg_hash_chs.c
View File

@ -2008,7 +2008,7 @@ static const char *menu_hash_to_str_chs_label_enum(enum msg_hash_enums msg)
return "unload_core"; return "unload_core";
case MENU_ENUM_LABEL_COLLECTION: case MENU_ENUM_LABEL_COLLECTION:
return "collection"; return "collection";
case MENU_ENUM_LABEL_CONFIGURATIONS: case MENU_ENUM_LABEL_CONFIG_LOAD:
return "configurations"; return "configurations";
case MENU_ENUM_LABEL_CONFIGURATION_SETTINGS: case MENU_ENUM_LABEL_CONFIGURATION_SETTINGS:
return "configuration_settings"; return "configuration_settings";
@ -3145,7 +3145,7 @@ const char *msg_hash_to_str_chs(enum msg_hash_enums msg)
return "关闭"; return "关闭";
case MENU_ENUM_LABEL_VALUE_CONFIG: case MENU_ENUM_LABEL_VALUE_CONFIG:
return "配置"; return "配置";
case MENU_ENUM_LABEL_VALUE_CONFIGURATIONS: case MENU_ENUM_LABEL_VALUE_CONFIG_LOAD:
return "加载配置"; return "加载配置";
case MENU_ENUM_LABEL_VALUE_CONFIGURATION_SETTINGS: case MENU_ENUM_LABEL_VALUE_CONFIGURATION_SETTINGS:
return "配置"; return "配置";

2
intl/msg_hash_de.c
View File

@ -508,7 +508,7 @@ const char *msg_hash_to_str_de(enum msg_hash_enums msg)
return "Schließe"; return "Schließe";
case MENU_ENUM_LABEL_VALUE_COLLAPSE_SUBGROUPS_ENABLE: case MENU_ENUM_LABEL_VALUE_COLLAPSE_SUBGROUPS_ENABLE:
return "Untergruppen einklappen"; return "Untergruppen einklappen";
case MENU_ENUM_LABEL_VALUE_CONFIGURATIONS: case MENU_ENUM_LABEL_VALUE_CONFIG_LOAD:
return "Lade Konfigurationsdatei"; /* FIXME/UPDATE */ return "Lade Konfigurationsdatei"; /* FIXME/UPDATE */
case MENU_ENUM_LABEL_VALUE_CONFIGURATION_SETTINGS: case MENU_ENUM_LABEL_VALUE_CONFIGURATION_SETTINGS:
return "Konfigurations-Einstellungen"; return "Konfigurations-Einstellungen";

2
intl/msg_hash_es.c
View File

@ -1587,7 +1587,7 @@ const char *msg_hash_to_str_es(enum msg_hash_enums msg)
return "Pasadas de trucos"; return "Pasadas de trucos";
case MENU_ENUM_LABEL_VALUE_CLOSE_CONTENT: case MENU_ENUM_LABEL_VALUE_CLOSE_CONTENT:
return "Cerrar"; return "Cerrar";
case MENU_ENUM_LABEL_VALUE_CONFIGURATIONS: case MENU_ENUM_LABEL_VALUE_CONFIG_LOAD:
return "Cargar configuración"; return "Cargar configuración";
case MENU_ENUM_LABEL_VALUE_CONFIGURATION_SETTINGS: case MENU_ENUM_LABEL_VALUE_CONFIGURATION_SETTINGS:
return "Configuración"; return "Configuración";

2
intl/msg_hash_fr.c
View File

@ -130,7 +130,7 @@ const char *msg_hash_to_str_fr(enum msg_hash_enums msg)
return "Quitter"; return "Quitter";
case MENU_ENUM_LABEL_VALUE_COLLAPSE_SUBGROUPS_ENABLE: case MENU_ENUM_LABEL_VALUE_COLLAPSE_SUBGROUPS_ENABLE:
return "Fusionner les sous-groupes"; return "Fusionner les sous-groupes";
case MENU_ENUM_LABEL_VALUE_CONFIGURATIONS: case MENU_ENUM_LABEL_VALUE_CONFIG_LOAD:
return "Charger une configuration"; return "Charger une configuration";
case MENU_ENUM_LABEL_VALUE_CONFIGURATION_SETTINGS: case MENU_ENUM_LABEL_VALUE_CONFIGURATION_SETTINGS:
return "Configurations"; return "Configurations";

2
intl/msg_hash_it.c
View File

@ -1670,7 +1670,7 @@ const char *msg_hash_to_str_it(enum msg_hash_enums msg)
return "Passaggi dello shader"; return "Passaggi dello shader";
case MENU_ENUM_LABEL_VALUE_RDB_ENTRY_SHA1: case MENU_ENUM_LABEL_VALUE_RDB_ENTRY_SHA1:
return "SHA1"; return "SHA1";
case MENU_ENUM_LABEL_VALUE_CONFIGURATIONS: case MENU_ENUM_LABEL_VALUE_CONFIG_LOAD:
return "Carica Configurazione"; return "Carica Configurazione";
case MENU_ENUM_LABEL_VALUE_REWIND_GRANULARITY: case MENU_ENUM_LABEL_VALUE_REWIND_GRANULARITY:
return "Livello della funzione riavvolgi"; return "Livello della funzione riavvolgi";

6
intl/msg_hash_ja.c
View File

@ -2038,7 +2038,7 @@ static const char *menu_hash_to_str_jp_label_enum(enum msg_hash_enums msg)
return "unload_core"; return "unload_core";
case MENU_ENUM_LABEL_COLLECTION: case MENU_ENUM_LABEL_COLLECTION:
return "collection"; return "collection";
case MENU_ENUM_LABEL_CONFIGURATIONS: case MENU_ENUM_LABEL_CONFIG_LOAD:
return "configurations"; return "configurations";
case MENU_ENUM_LABEL_CONFIGURATION_SETTINGS: case MENU_ENUM_LABEL_CONFIGURATION_SETTINGS:
return "configuration_settings"; return "configuration_settings";
@ -3175,9 +3175,9 @@ const char *msg_hash_to_str_jp(enum msg_hash_enums msg)
return "閉じる"; return "閉じる";
case MENU_ENUM_LABEL_VALUE_CONFIG: case MENU_ENUM_LABEL_VALUE_CONFIG:
return "コンフィグ"; return "コンフィグ";
case MENU_ENUM_LABEL_VALUE_CONFIGURATIONS: case MENU_ENUM_LABEL_VALUE_CONFIG_LOAD:
return "設定をロード"; return "設定をロード";
case MENU_ENUM_LABEL_VALUE_CONFIGURATIONS_LIST: case MENU_ENUM_LABEL_VALUE_CONFIGURATIONS_SETTINGS:
return "設定ファイル"; return "設定ファイル";
case MENU_ENUM_LABEL_VALUE_CONFIGURATION_SETTINGS: case MENU_ENUM_LABEL_VALUE_CONFIGURATION_SETTINGS:
return "設定"; return "設定";

4
intl/msg_hash_lbl.h
View File

@ -10,7 +10,7 @@ MSG_HASH(MENU_ENUM_LABEL_ACHIEVEMENT_LIST_HARDCORE,
"achievement_list_hardcore") "achievement_list_hardcore")
MSG_HASH(MENU_ENUM_LABEL_ADD_CONTENT_LIST, MSG_HASH(MENU_ENUM_LABEL_ADD_CONTENT_LIST,
"add_content") "add_content")
MSG_HASH(MENU_ENUM_LABEL_CONFIGURATIONS_LIST, MSG_HASH(MENU_ENUM_LABEL_CONFIGURATIONS_SETTINGS,
"configurations_list") "configurations_list")
MSG_HASH(MENU_ENUM_LABEL_ADD_TAB, MSG_HASH(MENU_ENUM_LABEL_ADD_TAB,
"add_tab") "add_tab")
@ -144,7 +144,7 @@ MSG_HASH(MENU_ENUM_LABEL_CLOSE_CONTENT,
"unload_core") "unload_core")
MSG_HASH(MENU_ENUM_LABEL_COLLECTION, MSG_HASH(MENU_ENUM_LABEL_COLLECTION,
"collection") "collection")
MSG_HASH(MENU_ENUM_LABEL_CONFIGURATIONS, MSG_HASH(MENU_ENUM_LABEL_CONFIG_LOAD,
"configurations") "configurations")
MSG_HASH(MENU_ENUM_LABEL_CONFIGURATION_SETTINGS, MSG_HASH(MENU_ENUM_LABEL_CONFIGURATION_SETTINGS,
"configuration_settings") "configuration_settings")

2
intl/msg_hash_nl.c
View File

@ -135,7 +135,7 @@ const char *msg_hash_to_str_nl(enum msg_hash_enums msg)
return "Cheat Passes"; return "Cheat Passes";
case MENU_ENUM_LABEL_VALUE_CLOSE_CONTENT: case MENU_ENUM_LABEL_VALUE_CLOSE_CONTENT:
return "Afsluiten"; return "Afsluiten";
case MENU_ENUM_LABEL_VALUE_CONFIGURATIONS: case MENU_ENUM_LABEL_VALUE_CONFIG_LOAD:
return "Laad Configuratie"; return "Laad Configuratie";
case MENU_ENUM_LABEL_VALUE_CONFIGURATION_SETTINGS: case MENU_ENUM_LABEL_VALUE_CONFIGURATION_SETTINGS:
return "Configuratie"; return "Configuratie";

2
intl/msg_hash_pl.c
View File

@ -104,7 +104,7 @@ const char *msg_hash_to_str_pl(enum msg_hash_enums msg)
return "Liczba przebiegów cheatów"; return "Liczba przebiegów cheatów";
case MENU_ENUM_LABEL_VALUE_CLOSE_CONTENT: case MENU_ENUM_LABEL_VALUE_CLOSE_CONTENT:
return "Zamknij"; return "Zamknij";
case MENU_ENUM_LABEL_VALUE_CONFIGURATIONS: case MENU_ENUM_LABEL_VALUE_CONFIG_LOAD:
return "Wczytaj konfigurację"; return "Wczytaj konfigurację";
case MENU_ENUM_LABEL_VALUE_CONFIGURATION_SETTINGS: case MENU_ENUM_LABEL_VALUE_CONFIGURATION_SETTINGS:
return "Ustawienia konfiguracji"; return "Ustawienia konfiguracji";

2
intl/msg_hash_pt.c
View File

@ -1042,7 +1042,7 @@ const char *msg_hash_to_str_pt(enum msg_hash_enums msg)
return "Códigos de Cheat"; return "Códigos de Cheat";
case MENU_ENUM_LABEL_VALUE_CLOSE_CONTENT: case MENU_ENUM_LABEL_VALUE_CLOSE_CONTENT:
return "Fechar"; return "Fechar";
case MENU_ENUM_LABEL_VALUE_CONFIGURATIONS: case MENU_ENUM_LABEL_VALUE_CONFIG_LOAD:
return "Carregar Configuração"; return "Carregar Configuração";
case MENU_ENUM_LABEL_VALUE_CONFIGURATION_SETTINGS: case MENU_ENUM_LABEL_VALUE_CONFIGURATION_SETTINGS:
return "Configurações"; return "Configurações";

4
intl/msg_hash_us.h
View File

@ -124,7 +124,7 @@ MSG_HASH(
"Scan Content" "Scan Content"
) )
MSG_HASH( MSG_HASH(
MENU_ENUM_LABEL_VALUE_CONFIGURATIONS_LIST, MENU_ENUM_LABEL_VALUE_CONFIGURATIONS_SETTINGS,
"Configurations" "Configurations"
) )
MSG_HASH( MSG_HASH(
@ -380,7 +380,7 @@ MSG_HASH(
"Config" "Config"
) )
MSG_HASH( MSG_HASH(
MENU_ENUM_LABEL_VALUE_CONFIGURATIONS, MENU_ENUM_LABEL_VALUE_CONFIG_LOAD,
"Load Configuration..." "Load Configuration..."
) )
MSG_HASH( MSG_HASH(

4
intl/msg_hash_vn.c
View File

@ -2040,7 +2040,7 @@ static const char *menu_hash_to_str_vn_label_enum(enum msg_hash_enums msg)
return "unload_core"; return "unload_core";
case MENU_ENUM_LABEL_COLLECTION: case MENU_ENUM_LABEL_COLLECTION:
return "collection"; return "collection";
case MENU_ENUM_LABEL_CONFIGURATIONS: case MENU_ENUM_LABEL_CONFIG_LOAD:
return "configurations"; return "configurations";
case MENU_ENUM_LABEL_CONFIGURATION_SETTINGS: case MENU_ENUM_LABEL_CONFIGURATION_SETTINGS:
return "configuration_settings"; return "configuration_settings";
@ -3179,7 +3179,7 @@ const char *msg_hash_to_str_vn(enum msg_hash_enums msg)
return "Close"; return "Close";
case MENU_ENUM_LABEL_VALUE_CONFIG: case MENU_ENUM_LABEL_VALUE_CONFIG:
return "Config"; return "Config";
case MENU_ENUM_LABEL_VALUE_CONFIGURATIONS: case MENU_ENUM_LABEL_VALUE_CONFIG_LOAD:
return "Tải Configuration"; return "Tải Configuration";
case MENU_ENUM_LABEL_VALUE_CONFIGURATION_SETTINGS: case MENU_ENUM_LABEL_VALUE_CONFIGURATION_SETTINGS:
return "Configuration"; return "Configuration";

10
menu/cbs/menu_cbs_deferred_push.c
View File

@ -314,7 +314,7 @@ static int deferred_push_add_content_list(menu_displaylist_info_t *info)
static int deferred_push_configurations_list(menu_displaylist_info_t *info) static int deferred_push_configurations_list(menu_displaylist_info_t *info)
{ {
return deferred_push_dlist(info, DISPLAYLIST_CONFIGURATIONS_LIST); return deferred_push_dlist(info, DISPLAYLIST_CONFIGURATIONS_SETTINGS);
} }
static int deferred_push_load_content_list(menu_displaylist_info_t *info) static int deferred_push_load_content_list(menu_displaylist_info_t *info)
@ -941,7 +941,7 @@ static int menu_cbs_init_bind_deferred_push_compare_label(
case MENU_ENUM_LABEL_ADD_CONTENT_LIST: case MENU_ENUM_LABEL_ADD_CONTENT_LIST:
BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_add_content_list); BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_add_content_list);
break; break;
case MENU_ENUM_LABEL_CONFIGURATIONS_LIST: case MENU_ENUM_LABEL_CONFIGURATIONS_SETTINGS:
BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_configurations_list); BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_configurations_list);
break; break;
case MENU_ENUM_LABEL_LOAD_CONTENT_LIST: case MENU_ENUM_LABEL_LOAD_CONTENT_LIST:
@ -1034,7 +1034,7 @@ static int menu_cbs_init_bind_deferred_push_compare_label(
case MENU_ENUM_LABEL_CONTENT_COLLECTION_LIST: case MENU_ENUM_LABEL_CONTENT_COLLECTION_LIST:
BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_content_collection_list); BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_content_collection_list);
break; break;
case MENU_ENUM_LABEL_CONFIGURATIONS: case MENU_ENUM_LABEL_CONFIG_LOAD:
BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_configurations); BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_configurations);
break; break;
case MENU_ENUM_LABEL_VIDEO_SHADER_PRESET: case MENU_ENUM_LABEL_VIDEO_SHADER_PRESET:
@ -1109,7 +1109,7 @@ static int menu_cbs_init_bind_deferred_push_compare_label(
{ {
switch (label_hash) switch (label_hash)
{ {
case MENU_LABEL_DEFERRED_CONFIGURATIONS_LIST: case MENU_LABEL_DEFERRED_CONFIGURATIONS_SETTINGS:
BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_configurations_list); BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_configurations_list);
break; break;
case MENU_LABEL_DEFERRED_USER_BINDS_LIST: case MENU_LABEL_DEFERRED_USER_BINDS_LIST:
@ -1297,7 +1297,7 @@ static int menu_cbs_init_bind_deferred_push_compare_label(
case MENU_LABEL_CONTENT_COLLECTION_LIST: case MENU_LABEL_CONTENT_COLLECTION_LIST:
BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_content_collection_list); BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_content_collection_list);
break; break;
case MENU_LABEL_CONFIGURATIONS: case MENU_LABEL_CONFIG_LOAD:
BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_configurations); BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_configurations);
break; break;
case MENU_LABEL_VIDEO_SHADER_PRESET: case MENU_LABEL_VIDEO_SHADER_PRESET:

2
menu/cbs/menu_cbs_get_value.c
View File

@ -1678,7 +1678,7 @@ static int menu_cbs_init_bind_get_string_representation_compare_label(
BIND_ACTION_GET_VALUE(cbs, BIND_ACTION_GET_VALUE(cbs,
menu_action_setting_disp_set_label_filter); menu_action_setting_disp_set_label_filter);
break; break;
case MENU_ENUM_LABEL_CONFIGURATIONS: case MENU_ENUM_LABEL_CONFIG_LOAD:
BIND_ACTION_GET_VALUE(cbs, BIND_ACTION_GET_VALUE(cbs,
menu_action_setting_disp_set_label_configurations); menu_action_setting_disp_set_label_configurations);
break; break;

8
menu/cbs/menu_cbs_ok.c
View File

@ -441,7 +441,7 @@ int generic_action_ok_displaylist_push(const char *path,
info_path = path; info_path = path;
dl_type = DISPLAYLIST_GENERIC; dl_type = DISPLAYLIST_GENERIC;
break; break;
case ACTION_OK_DL_CONFIGURATIONS_LIST: case ACTION_OK_DL_CONFIGURATIONS_SETTINGS:
info.type = type; info.type = type;
info.directory_ptr = idx; info.directory_ptr = idx;
if (string_is_empty(settings->directory.menu_config)) if (string_is_empty(settings->directory.menu_config))
@ -2818,7 +2818,7 @@ static int action_ok_configurations_list(const char *path,
const char *label, unsigned type, size_t idx, size_t entry_idx) const char *label, unsigned type, size_t idx, size_t entry_idx)
{ {
return generic_action_ok_displaylist_push(path, NULL, label, type, idx, return generic_action_ok_displaylist_push(path, NULL, label, type, idx,
entry_idx, ACTION_OK_DL_CONFIGURATIONS_LIST); entry_idx, ACTION_OK_DL_CONFIGURATIONS_SETTINGS);
} }
static int action_ok_saving_list(const char *path, static int action_ok_saving_list(const char *path,
@ -3711,7 +3711,7 @@ static int menu_cbs_init_bind_ok_compare_label(menu_file_list_cbs_t *cbs,
case MENU_ENUM_LABEL_NETPLAY: case MENU_ENUM_LABEL_NETPLAY:
case MENU_ENUM_LABEL_LOAD_CONTENT_LIST: case MENU_ENUM_LABEL_LOAD_CONTENT_LIST:
case MENU_ENUM_LABEL_ADD_CONTENT_LIST: case MENU_ENUM_LABEL_ADD_CONTENT_LIST:
case MENU_ENUM_LABEL_CONFIGURATIONS_LIST: case MENU_ENUM_LABEL_CONFIGURATIONS_SETTINGS:
case MENU_ENUM_LABEL_HELP_LIST: case MENU_ENUM_LABEL_HELP_LIST:
case MENU_ENUM_LABEL_INFORMATION_LIST: case MENU_ENUM_LABEL_INFORMATION_LIST:
case MENU_ENUM_LABEL_CONTENT_SETTINGS: case MENU_ENUM_LABEL_CONTENT_SETTINGS:
@ -3769,7 +3769,7 @@ static int menu_cbs_init_bind_ok_compare_label(menu_file_list_cbs_t *cbs,
case MENU_ENUM_LABEL_DISK_IMAGE_APPEND: case MENU_ENUM_LABEL_DISK_IMAGE_APPEND:
BIND_ACTION_OK(cbs, action_ok_disk_image_append_list); BIND_ACTION_OK(cbs, action_ok_disk_image_append_list);
break; break;
case MENU_ENUM_LABEL_CONFIGURATIONS: case MENU_ENUM_LABEL_CONFIG_LOAD:
BIND_ACTION_OK(cbs, action_ok_configurations_list); BIND_ACTION_OK(cbs, action_ok_configurations_list);
break; break;
case MENU_ENUM_LABEL_SAVING_SETTINGS: case MENU_ENUM_LABEL_SAVING_SETTINGS:

2
menu/cbs/menu_cbs_sublabel.c
View File

@ -471,7 +471,7 @@ int menu_cbs_init_bind_sublabel(menu_file_list_cbs_t *cbs,
case MENU_ENUM_LABEL_CONFIG_SAVE_ON_EXIT: case MENU_ENUM_LABEL_CONFIG_SAVE_ON_EXIT:
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_config_save_on_exit); BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_config_save_on_exit);
break; break;
case MENU_ENUM_LABEL_CONFIGURATIONS_LIST: case MENU_ENUM_LABEL_CONFIGURATIONS_SETTINGS:
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_configurations_settings_list); BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_configurations_settings_list);
break; break;
case MENU_ENUM_LABEL_VIDEO_THREADED: case MENU_ENUM_LABEL_VIDEO_THREADED:

10
menu/cbs/menu_cbs_title.c
View File

@ -119,7 +119,7 @@ static int action_get_add_content_list(const char *path, const char *label,
static int action_get_configurations_list(const char *path, const char *label, static int action_get_configurations_list(const char *path, const char *label,
unsigned menu_type, char *s, size_t len) unsigned menu_type, char *s, size_t len)
{ {
sanitize_to_string(s, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_CONFIGURATIONS_LIST), len); sanitize_to_string(s, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_CONFIGURATIONS_SETTINGS), len);
return 0; return 0;
} }
@ -1091,7 +1091,7 @@ static int menu_cbs_init_bind_title_compare_label(menu_file_list_cbs_t *cbs,
case MENU_ENUM_LABEL_DEFERRED_CORE_LIST: case MENU_ENUM_LABEL_DEFERRED_CORE_LIST:
BIND_ACTION_GET_TITLE(cbs, action_get_title_deferred_core_list); BIND_ACTION_GET_TITLE(cbs, action_get_title_deferred_core_list);
break; break;
case MENU_ENUM_LABEL_CONFIGURATIONS: case MENU_ENUM_LABEL_CONFIG_LOAD:
BIND_ACTION_GET_TITLE(cbs, action_get_title_configurations); BIND_ACTION_GET_TITLE(cbs, action_get_title_configurations);
break; break;
case MENU_ENUM_LABEL_JOYPAD_AUTOCONFIG_DIR: case MENU_ENUM_LABEL_JOYPAD_AUTOCONFIG_DIR:
@ -1205,7 +1205,7 @@ static int menu_cbs_init_bind_title_compare_label(menu_file_list_cbs_t *cbs,
case MENU_ENUM_LABEL_ADD_CONTENT_LIST: case MENU_ENUM_LABEL_ADD_CONTENT_LIST:
BIND_ACTION_GET_TITLE(cbs, action_get_add_content_list); BIND_ACTION_GET_TITLE(cbs, action_get_add_content_list);
break; break;
case MENU_ENUM_LABEL_CONFIGURATIONS_LIST: case MENU_ENUM_LABEL_CONFIGURATIONS_SETTINGS:
BIND_ACTION_GET_TITLE(cbs, action_get_configurations_list); BIND_ACTION_GET_TITLE(cbs, action_get_configurations_list);
break; break;
case MENU_ENUM_LABEL_CORE_OPTIONS: case MENU_ENUM_LABEL_CORE_OPTIONS:
@ -1401,7 +1401,7 @@ static int menu_cbs_init_bind_title_compare_label(menu_file_list_cbs_t *cbs,
case MENU_LABEL_DEFERRED_CORE_LIST: case MENU_LABEL_DEFERRED_CORE_LIST:
BIND_ACTION_GET_TITLE(cbs, action_get_title_deferred_core_list); BIND_ACTION_GET_TITLE(cbs, action_get_title_deferred_core_list);
break; break;
case MENU_LABEL_CONFIGURATIONS: case MENU_LABEL_CONFIG_LOAD:
BIND_ACTION_GET_TITLE(cbs, action_get_title_configurations); BIND_ACTION_GET_TITLE(cbs, action_get_title_configurations);
break; break;
case MENU_LABEL_JOYPAD_AUTOCONFIG_DIR: case MENU_LABEL_JOYPAD_AUTOCONFIG_DIR:
@ -1512,7 +1512,7 @@ static int menu_cbs_init_bind_title_compare_label(menu_file_list_cbs_t *cbs,
case MENU_LABEL_DEFERRED_CORE_UPDATER_LIST: case MENU_LABEL_DEFERRED_CORE_UPDATER_LIST:
BIND_ACTION_GET_TITLE(cbs, action_get_core_updater_list); BIND_ACTION_GET_TITLE(cbs, action_get_core_updater_list);
break; break;
case MENU_LABEL_DEFERRED_CONFIGURATIONS_LIST: case MENU_LABEL_DEFERRED_CONFIGURATIONS_SETTINGS:
BIND_ACTION_GET_TITLE(cbs, action_get_configurations_list); BIND_ACTION_GET_TITLE(cbs, action_get_configurations_list);
break; break;
case MENU_LABEL_ADD_CONTENT_LIST: case MENU_LABEL_ADD_CONTENT_LIST:

2
menu/drivers/materialui.c
View File

@ -1738,7 +1738,7 @@ static int mui_list_push(void *data, void *userdata,
entry.enum_idx = MENU_ENUM_LABEL_RESTART_RETROARCH; entry.enum_idx = MENU_ENUM_LABEL_RESTART_RETROARCH;
menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry); menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry);
#endif #endif
entry.enum_idx = MENU_ENUM_LABEL_CONFIGURATIONS_LIST; entry.enum_idx = MENU_ENUM_LABEL_CONFIGURATIONS_SETTINGS;
menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry); menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry);
entry.enum_idx = MENU_ENUM_LABEL_HELP_LIST; entry.enum_idx = MENU_ENUM_LABEL_HELP_LIST;

2
menu/drivers/xmb.c
View File

@ -3596,7 +3596,7 @@ static int xmb_list_push(void *data, void *userdata,
entry.enum_idx = MENU_ENUM_LABEL_RESTART_RETROARCH; entry.enum_idx = MENU_ENUM_LABEL_RESTART_RETROARCH;
menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry); menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry);
#endif #endif
entry.enum_idx = MENU_ENUM_LABEL_CONFIGURATIONS_LIST; entry.enum_idx = MENU_ENUM_LABEL_CONFIGURATIONS_SETTINGS;
menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry); menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry);
entry.enum_idx = MENU_ENUM_LABEL_HELP_LIST; entry.enum_idx = MENU_ENUM_LABEL_HELP_LIST;

2
menu/menu_cbs.h
View File

@ -69,7 +69,7 @@ enum
ACTION_OK_DL_CHEAT_FILE, ACTION_OK_DL_CHEAT_FILE,
ACTION_OK_DL_CORE_LIST, ACTION_OK_DL_CORE_LIST,
ACTION_OK_DL_LAKKA_LIST, ACTION_OK_DL_LAKKA_LIST,
ACTION_OK_DL_CONFIGURATIONS_LIST, ACTION_OK_DL_CONFIGURATIONS_SETTINGS,
ACTION_OK_DL_COMPRESSED_ARCHIVE_PUSH, ACTION_OK_DL_COMPRESSED_ARCHIVE_PUSH,
ACTION_OK_DL_COMPRESSED_ARCHIVE_PUSH_DETECT_CORE, ACTION_OK_DL_COMPRESSED_ARCHIVE_PUSH_DETECT_CORE,
ACTION_OK_DL_PARENT_DIRECTORY_PUSH, ACTION_OK_DL_PARENT_DIRECTORY_PUSH,

12
menu/menu_displaylist.c
View File

@ -2885,9 +2885,9 @@ static int menu_displaylist_parse_configurations_list(
menu_displaylist_info_t *info) menu_displaylist_info_t *info)
{ {
menu_entries_append_enum(info->list, menu_entries_append_enum(info->list,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_CONFIGURATIONS), msg_hash_to_str(MENU_ENUM_LABEL_VALUE_CONFIG_LOAD),
msg_hash_to_str(MENU_ENUM_LABEL_CONFIGURATIONS), msg_hash_to_str(MENU_ENUM_LABEL_CONFIG_LOAD),
MENU_ENUM_LABEL_CONFIGURATIONS, MENU_ENUM_LABEL_CONFIG_LOAD,
MENU_SETTING_ACTION, 0, 0); MENU_SETTING_ACTION, 0, 0);
menu_entries_append_enum(info->list, menu_entries_append_enum(info->list,
@ -4186,7 +4186,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
case DISPLAYLIST_CONTENT_SETTINGS: case DISPLAYLIST_CONTENT_SETTINGS:
case DISPLAYLIST_INFORMATION_LIST: case DISPLAYLIST_INFORMATION_LIST:
case DISPLAYLIST_ADD_CONTENT_LIST: case DISPLAYLIST_ADD_CONTENT_LIST:
case DISPLAYLIST_CONFIGURATIONS_LIST: case DISPLAYLIST_CONFIGURATIONS_SETTINGS:
case DISPLAYLIST_SCAN_DIRECTORY_LIST: case DISPLAYLIST_SCAN_DIRECTORY_LIST:
case DISPLAYLIST_LOAD_CONTENT_LIST: case DISPLAYLIST_LOAD_CONTENT_LIST:
case DISPLAYLIST_USER_BINDS_LIST: case DISPLAYLIST_USER_BINDS_LIST:
@ -4492,7 +4492,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
PARSE_ACTION, false); PARSE_ACTION, false);
#endif #endif
menu_displaylist_parse_settings_enum(menu, info, menu_displaylist_parse_settings_enum(menu, info,
MENU_ENUM_LABEL_CONFIGURATIONS_LIST, MENU_ENUM_LABEL_CONFIGURATIONS_SETTINGS,
PARSE_ACTION, false); PARSE_ACTION, false);
menu_displaylist_parse_settings_enum(menu, info, menu_displaylist_parse_settings_enum(menu, info,
MENU_ENUM_LABEL_HELP_LIST, MENU_ENUM_LABEL_HELP_LIST,
@ -5432,7 +5432,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
info->need_push = true; info->need_push = true;
info->need_refresh = true; info->need_refresh = true;
break; break;
case DISPLAYLIST_CONFIGURATIONS_LIST: case DISPLAYLIST_CONFIGURATIONS_SETTINGS:
ret = menu_displaylist_parse_configurations_list(info); ret = menu_displaylist_parse_configurations_list(info);
info->need_push = true; info->need_push = true;

2
menu/menu_displaylist.h
View File

@ -145,7 +145,7 @@ enum menu_displaylist_ctl_state
DISPLAYLIST_OPTIONS_SHADERS, DISPLAYLIST_OPTIONS_SHADERS,
DISPLAYLIST_NETPLAY, DISPLAYLIST_NETPLAY,
DISPLAYLIST_ADD_CONTENT_LIST, DISPLAYLIST_ADD_CONTENT_LIST,
DISPLAYLIST_CONFIGURATIONS_LIST, DISPLAYLIST_CONFIGURATIONS_SETTINGS,
DISPLAYLIST_SCAN_DIRECTORY_LIST, DISPLAYLIST_SCAN_DIRECTORY_LIST,
DISPLAYLIST_ARCHIVE_ACTION, DISPLAYLIST_ARCHIVE_ACTION,
DISPLAYLIST_ARCHIVE_ACTION_DETECT_CORE, DISPLAYLIST_ARCHIVE_ACTION_DETECT_CORE,

8
menu/menu_setting.c
View File

@ -2285,16 +2285,16 @@ static bool setting_append_list(
CONFIG_ACTION( CONFIG_ACTION(
list, list_info, list, list_info,
MENU_ENUM_LABEL_CONFIGURATIONS_LIST, MENU_ENUM_LABEL_CONFIGURATIONS_SETTINGS,
MENU_ENUM_LABEL_VALUE_CONFIGURATIONS_LIST, MENU_ENUM_LABEL_VALUE_CONFIGURATIONS_SETTINGS,
&group_info, &group_info,
&subgroup_info, &subgroup_info,
parent_group); parent_group);
CONFIG_ACTION( CONFIG_ACTION(
list, list_info, list, list_info,
MENU_ENUM_LABEL_CONFIGURATIONS, MENU_ENUM_LABEL_CONFIG_LOAD,
MENU_ENUM_LABEL_VALUE_CONFIGURATIONS, MENU_ENUM_LABEL_VALUE_CONFIG_LOAD,
&group_info, &group_info,
&subgroup_info, &subgroup_info,
parent_group); parent_group);

12
msg_hash.h
View File

@ -984,8 +984,8 @@ enum msg_hash_enums
MENU_ENUM_LABEL_ADD_CONTENT_LIST, MENU_ENUM_LABEL_ADD_CONTENT_LIST,
MENU_ENUM_LABEL_VALUE_ADD_CONTENT_LIST, MENU_ENUM_LABEL_VALUE_ADD_CONTENT_LIST,
MENU_ENUM_LABEL_CONFIGURATIONS_LIST, MENU_ENUM_LABEL_CONFIGURATIONS_SETTINGS,
MENU_ENUM_LABEL_VALUE_CONFIGURATIONS_LIST, MENU_ENUM_LABEL_VALUE_CONFIGURATIONS_SETTINGS,
MENU_ENUM_LABEL_VALUE_DONT_CARE, MENU_ENUM_LABEL_VALUE_DONT_CARE,
MENU_ENUM_LABEL_VALUE_LINEAR, MENU_ENUM_LABEL_VALUE_LINEAR,
@ -1715,8 +1715,8 @@ enum msg_hash_enums
MENU_ENUM_LABEL_VALUE_TAKE_SCREENSHOT, MENU_ENUM_LABEL_VALUE_TAKE_SCREENSHOT,
MENU_ENUM_LABEL_DELETE_ENTRY, MENU_ENUM_LABEL_DELETE_ENTRY,
MENU_ENUM_LABEL_VALUE_DELETE_ENTRY, MENU_ENUM_LABEL_VALUE_DELETE_ENTRY,
MENU_ENUM_LABEL_CONFIGURATIONS, MENU_ENUM_LABEL_CONFIG_LOAD,
MENU_ENUM_LABEL_VALUE_CONFIGURATIONS, MENU_ENUM_LABEL_VALUE_CONFIG_LOAD,
MENU_ENUM_LABEL_VALUE_CHEAT_FILE_SAVE_AS, MENU_ENUM_LABEL_VALUE_CHEAT_FILE_SAVE_AS,
MENU_ENUM_LABEL_CHEAT_FILE_SAVE_AS, MENU_ENUM_LABEL_CHEAT_FILE_SAVE_AS,
MENU_ENUM_LABEL_VIDEO_SHADER_PRESET_SAVE_AS, MENU_ENUM_LABEL_VIDEO_SHADER_PRESET_SAVE_AS,
@ -2037,7 +2037,7 @@ enum msg_hash_enums
#define MENU_LABEL_DEFERRED_CORE_CONTENT_LIST 0x76150c63U #define MENU_LABEL_DEFERRED_CORE_CONTENT_LIST 0x76150c63U
#define MENU_LABEL_DEFERRED_LAKKA_LIST 0x3db437c4U #define MENU_LABEL_DEFERRED_LAKKA_LIST 0x3db437c4U
#define MENU_LABEL_DEFERRED_INPUT_HOTKEY_BINDS_LIST 0x10b41d97U #define MENU_LABEL_DEFERRED_INPUT_HOTKEY_BINDS_LIST 0x10b41d97U
#define MENU_LABEL_DEFERRED_CONFIGURATIONS_LIST 0x679a1b0bU #define MENU_LABEL_DEFERRED_CONFIGURATIONS_SETTINGS 0x679a1b0bU
/* Cheevos settings */ /* Cheevos settings */
@ -2195,7 +2195,7 @@ enum msg_hash_enums
#define MENU_LABEL_CUSTOM_BIND 0x1e84b3fcU #define MENU_LABEL_CUSTOM_BIND 0x1e84b3fcU
#define MENU_LABEL_CUSTOM_BIND_ALL 0x79ac14f4U #define MENU_LABEL_CUSTOM_BIND_ALL 0x79ac14f4U
#define MENU_LABEL_CUSTOM_BIND_DEFAULTS 0xe88f7b13U #define MENU_LABEL_CUSTOM_BIND_DEFAULTS 0xe88f7b13U
#define MENU_LABEL_CONFIGURATIONS 0x3e930a50U #define MENU_LABEL_CONFIG_LOAD 0x3e930a50U
#define MENU_LABEL_REMAP_FILE_SAVE_CORE 0x7c9d4c8fU #define MENU_LABEL_REMAP_FILE_SAVE_CORE 0x7c9d4c8fU
#define MENU_LABEL_REMAP_FILE_SAVE_GAME 0x7c9f41e0U #define MENU_LABEL_REMAP_FILE_SAVE_GAME 0x7c9f41e0U
#define MENU_LABEL_CONTENT_COLLECTION_LIST 0x32d1df83U #define MENU_LABEL_CONTENT_COLLECTION_LIST 0x32d1df83U