From 4121adafd5929842cd1158b22faccdcafe54b9e4 Mon Sep 17 00:00:00 2001 From: lasers Date: Thu, 17 Nov 2016 04:36:09 -0600 Subject: [PATCH 1/5] Merge settings for Configurations --- menu/menu_displaylist.c | 84 ++++++++++++++++++++++++++++------------- 1 file changed, 58 insertions(+), 26 deletions(-) diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index 66cd9c9cc9..aaff765601 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -2901,6 +2901,64 @@ static int menu_displaylist_parse_configurations_list( msg_hash_to_str(MENU_ENUM_LABEL_SAVE_NEW_CONFIG), MENU_ENUM_LABEL_SAVE_NEW_CONFIG, MENU_SETTING_ACTION, 0, 0); +/* + menu_displaylist_parse_settings_enum(menu, info, + MENU_ENUM_LABEL_CONFIG_SAVE_ON_EXIT, + PARSE_ONLY_BOOL, false); + menu_displaylist_parse_settings_enum(menu, info, + MENU_ENUM_LABEL_CORE_SPECIFIC_CONFIG, + PARSE_ONLY_BOOL, false); + menu_displaylist_parse_settings_enum(menu, info, + MENU_ENUM_LABEL_GAME_SPECIFIC_OPTIONS, + PARSE_ONLY_BOOL, false); + menu_displaylist_parse_settings_enum(menu, info, + MENU_ENUM_LABEL_AUTO_OVERRIDES_ENABLE, + PARSE_ONLY_BOOL, false); + menu_displaylist_parse_settings_enum(menu, info, + MENU_ENUM_LABEL_AUTO_REMAPS_ENABLE, + PARSE_ONLY_BOOL, false); + menu_displaylist_parse_settings_enum(menu, info, + MENU_ENUM_LABEL_SHOW_HIDDEN_FILES, + PARSE_ONLY_BOOL, false); */ + + menu_entries_append_enum(info->list, + msg_hash_to_str(MENU_ENUM_LABEL_VALUE_CONFIG_SAVE_ON_EXIT), + msg_hash_to_str(MENU_ENUM_LABEL_CONFIG_SAVE_ON_EXIT), + MENU_ENUM_LABEL_CONFIG_SAVE_ON_EXIT, + MENU_SETTING_ACTION, 0, 0); + + menu_entries_append_enum(info->list, + msg_hash_to_str(MENU_ENUM_LABEL_VALUE_CORE_SPECIFIC_CONFIG), + msg_hash_to_str(MENU_ENUM_LABEL_CORE_SPECIFIC_CONFIG), + MENU_ENUM_LABEL_CORE_SPECIFIC_CONFIG, + MENU_SETTING_ACTION, 0, 0); + + menu_entries_append_enum(info->list, + msg_hash_to_str(MENU_ENUM_LABEL_VALUE_GAME_SPECIFIC_OPTIONS), + msg_hash_to_str(MENU_ENUM_LABEL_GAME_SPECIFIC_OPTIONS), + MENU_ENUM_LABEL_GAME_SPECIFIC_OPTIONS, + MENU_SETTING_ACTION, 0, 0); + + menu_entries_append_enum(info->list, + msg_hash_to_str(MENU_ENUM_LABEL_VALUE_AUTO_OVERRIDES_ENABLE), + msg_hash_to_str(MENU_ENUM_LABEL_AUTO_OVERRIDES_ENABLE), + MENU_ENUM_LABEL_AUTO_OVERRIDES_ENABLE, + MENU_SETTING_ACTION, 0, 0); + + menu_entries_append_enum(info->list, + msg_hash_to_str(MENU_ENUM_LABEL_VALUE_AUTO_REMAPS_ENABLE), + msg_hash_to_str(MENU_ENUM_LABEL_AUTO_REMAPS_ENABLE), + MENU_ENUM_LABEL_AUTO_REMAPS_ENABLE, + MENU_SETTING_ACTION, 0, 0); + + menu_entries_append_enum(info->list, + msg_hash_to_str(MENU_ENUM_LABEL_VALUE_SHOW_HIDDEN_FILES), + msg_hash_to_str(MENU_ENUM_LABEL_SHOW_HIDDEN_FILES), + MENU_ENUM_LABEL_SHOW_HIDDEN_FILES, + MENU_SETTING_ACTION, 0, 0); + + info->need_refresh = true; + info->need_push = true; return 0; } @@ -4199,7 +4257,6 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data) case DISPLAYLIST_INPUT_HOTKEY_BINDS_LIST: case DISPLAYLIST_DRIVER_SETTINGS_LIST: case DISPLAYLIST_VIDEO_SETTINGS_LIST: - case DISPLAYLIST_CONFIGURATION_SETTINGS_LIST: case DISPLAYLIST_LOGGING_SETTINGS_LIST: case DISPLAYLIST_SAVING_SETTINGS_LIST: case DISPLAYLIST_FRAME_THROTTLE_SETTINGS_LIST: @@ -4558,29 +4615,6 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data) MENU_ENUM_LABEL_WIFI_DRIVER, PARSE_ONLY_STRING_OPTIONS, false); - info->need_refresh = true; - info->need_push = true; - break; - case DISPLAYLIST_CONFIGURATION_SETTINGS_LIST: - menu_displaylist_parse_settings_enum(menu, info, - MENU_ENUM_LABEL_CONFIG_SAVE_ON_EXIT, - PARSE_ONLY_BOOL, false); - menu_displaylist_parse_settings_enum(menu, info, - MENU_ENUM_LABEL_CORE_SPECIFIC_CONFIG, - PARSE_ONLY_BOOL, false); - menu_displaylist_parse_settings_enum(menu, info, - MENU_ENUM_LABEL_GAME_SPECIFIC_OPTIONS, - PARSE_ONLY_BOOL, false); - menu_displaylist_parse_settings_enum(menu, info, - MENU_ENUM_LABEL_AUTO_OVERRIDES_ENABLE, - PARSE_ONLY_BOOL, false); - menu_displaylist_parse_settings_enum(menu, info, - MENU_ENUM_LABEL_AUTO_REMAPS_ENABLE, - PARSE_ONLY_BOOL, false); - menu_displaylist_parse_settings_enum(menu, info, - MENU_ENUM_LABEL_SHOW_HIDDEN_FILES, - PARSE_ONLY_BOOL, false); - info->need_refresh = true; info->need_push = true; break; @@ -5356,8 +5390,6 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data) MENU_ENUM_LABEL_INPUT_SETTINGS, PARSE_ACTION, false); ret = menu_displaylist_parse_settings_enum(menu, info, MENU_ENUM_LABEL_CORE_SETTINGS, PARSE_ACTION, false); - ret = menu_displaylist_parse_settings_enum(menu, info, - MENU_ENUM_LABEL_CONFIGURATION_SETTINGS, PARSE_ACTION, false); ret = menu_displaylist_parse_settings_enum(menu, info, MENU_ENUM_LABEL_SAVING_SETTINGS, PARSE_ACTION, false); ret = menu_displaylist_parse_settings_enum(menu, info, From 5ff653837374ee39d74bf23a2681d3dad1dc6fb8 Mon Sep 17 00:00:00 2001 From: lasers Date: Thu, 17 Nov 2016 05:22:48 -0600 Subject: [PATCH 2/5] Change labels under Configurations --- intl/msg_hash_us.h | 16 ++++++++-------- intl/msg_hash_vn.c | 10 +++++----- menu/menu_displaylist.c | 25 ------------------------- 3 files changed, 13 insertions(+), 38 deletions(-) diff --git a/intl/msg_hash_us.h b/intl/msg_hash_us.h index 0370a27c0d..5d63bf4d6b 100644 --- a/intl/msg_hash_us.h +++ b/intl/msg_hash_us.h @@ -209,11 +209,11 @@ MSG_HASH( ) MSG_HASH( MENU_ENUM_LABEL_VALUE_AUTO_OVERRIDES_ENABLE, - "Load Override Files Automatically" + "Load Core Overrides Automatically" ) MSG_HASH( MENU_ENUM_LABEL_VALUE_AUTO_REMAPS_ENABLE, - "Load Remap Files Automatically" + "Load Remaps Automatically" ) MSG_HASH( MENU_ENUM_LABEL_VALUE_AUTO_SHADERS_ENABLE, @@ -381,7 +381,7 @@ MSG_HASH( ) MSG_HASH( MENU_ENUM_LABEL_VALUE_CONFIGURATIONS, - "Load Configuration" + "Load Configuration..." ) MSG_HASH( MENU_ENUM_LABEL_VALUE_CONFIGURATION_SETTINGS, @@ -389,11 +389,11 @@ MSG_HASH( ) MSG_HASH( MENU_ENUM_LABEL_VALUE_CONFIG_SAVE_ON_EXIT, - "Save Configuration On Exit" + "Save Configuration on Exit" ) MSG_HASH( MENU_ENUM_LABEL_VALUE_CONFIRM_ON_EXIT, - "Ask For Confirmation On Exit" + "Ask for Confirmation on Exit" ) MSG_HASH( MENU_ENUM_LABEL_VALUE_CONTENT_COLLECTION_LIST, @@ -543,7 +543,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_FRAME_THROTTLE_SETTINGS, MSG_HASH(MENU_ENUM_LABEL_VALUE_FRONTEND_COUNTERS, "Frontend Counters") MSG_HASH(MENU_ENUM_LABEL_VALUE_GAME_SPECIFIC_OPTIONS, - "Load Content-specific core options automatically") + "Load Content Overrides Automatically") MSG_HASH(MENU_ENUM_LABEL_VALUE_GAME_SPECIFIC_OPTIONS_CREATE, "Create game-options file") MSG_HASH(MENU_ENUM_LABEL_VALUE_GAME_SPECIFIC_OPTIONS_IN_USE, @@ -1157,7 +1157,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_SAVE_CURRENT_CONFIG_OVERRIDE_CORE, MSG_HASH(MENU_ENUM_LABEL_VALUE_SAVE_CURRENT_CONFIG_OVERRIDE_GAME, "Save Game Overrides") MSG_HASH(MENU_ENUM_LABEL_VALUE_SAVE_NEW_CONFIG, - "Save New Configuration") + "Create New Configuration") MSG_HASH(MENU_ENUM_LABEL_VALUE_SAVE_STATE, "Save State") MSG_HASH(MENU_ENUM_LABEL_VALUE_SAVING_SETTINGS, @@ -1193,7 +1193,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_SHADER_PIPELINE_RIBBON_SIMPLIFIED, MSG_HASH(MENU_ENUM_LABEL_VALUE_SHOW_ADVANCED_SETTINGS, "Show Advanced Settings") MSG_HASH(MENU_ENUM_LABEL_VALUE_SHOW_HIDDEN_FILES, - "Show Hidden Files and Folders") + "Show Hidden Files & Folders") MSG_HASH(MENU_ENUM_LABEL_VALUE_SHUTDOWN, "Shutdown") MSG_HASH(MENU_ENUM_LABEL_VALUE_SLOWMOTION_RATIO, diff --git a/intl/msg_hash_vn.c b/intl/msg_hash_vn.c index eb70be8783..d4e3590f4a 100644 --- a/intl/msg_hash_vn.c +++ b/intl/msg_hash_vn.c @@ -3184,9 +3184,9 @@ const char *msg_hash_to_str_vn(enum msg_hash_enums msg) case MENU_ENUM_LABEL_VALUE_CONFIGURATION_SETTINGS: return "Configuration"; case MENU_ENUM_LABEL_VALUE_CONFIG_SAVE_ON_EXIT: - return "Save Configuration On Exit"; + return "Save Configuration on Exit"; case MENU_ENUM_LABEL_VALUE_CONFIRM_ON_EXIT: - return "Ask For Confirmation On Exit"; + return "Ask for Confirmation on Exit"; case MENU_ENUM_LABEL_VALUE_CONTENT_COLLECTION_LIST: return "Collections"; case MENU_ENUM_LABEL_VALUE_CONTENT_DATABASE_DIRECTORY: @@ -3934,13 +3934,13 @@ const char *msg_hash_to_str_vn(enum msg_hash_enums msg) case MENU_ENUM_LABEL_VALUE_SAVESTATE_DIRECTORY: return "Savestate Dir"; case MENU_ENUM_LABEL_VALUE_SAVE_CURRENT_CONFIG: - return "Save Current Config"; + return "Save Current Configuration"; case MENU_ENUM_LABEL_VALUE_SAVE_CURRENT_CONFIG_OVERRIDE_CORE: return "Save Core Overrides"; case MENU_ENUM_LABEL_VALUE_SAVE_CURRENT_CONFIG_OVERRIDE_GAME: return "Save Game Overrides"; case MENU_ENUM_LABEL_VALUE_SAVE_NEW_CONFIG: - return "Save New Config"; + return "Create New Configuration"; case MENU_ENUM_LABEL_VALUE_SAVE_STATE: return "Save State"; case MENU_ENUM_LABEL_VALUE_SAVING_SETTINGS: @@ -3976,7 +3976,7 @@ const char *msg_hash_to_str_vn(enum msg_hash_enums msg) case MENU_ENUM_LABEL_VALUE_SHOW_ADVANCED_SETTINGS: return "Show Advanced thiết lập"; case MENU_ENUM_LABEL_VALUE_SHOW_HIDDEN_FILES: - return "Show Hidden Files and Folders"; + return "Show Hidden Files & Folders"; case MENU_ENUM_LABEL_VALUE_SHUTDOWN: return "Tắt Máy"; case MENU_ENUM_LABEL_VALUE_SLOWMOTION_RATIO: diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index aaff765601..887cb2c7ff 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -2901,25 +2901,6 @@ static int menu_displaylist_parse_configurations_list( msg_hash_to_str(MENU_ENUM_LABEL_SAVE_NEW_CONFIG), MENU_ENUM_LABEL_SAVE_NEW_CONFIG, MENU_SETTING_ACTION, 0, 0); -/* - menu_displaylist_parse_settings_enum(menu, info, - MENU_ENUM_LABEL_CONFIG_SAVE_ON_EXIT, - PARSE_ONLY_BOOL, false); - menu_displaylist_parse_settings_enum(menu, info, - MENU_ENUM_LABEL_CORE_SPECIFIC_CONFIG, - PARSE_ONLY_BOOL, false); - menu_displaylist_parse_settings_enum(menu, info, - MENU_ENUM_LABEL_GAME_SPECIFIC_OPTIONS, - PARSE_ONLY_BOOL, false); - menu_displaylist_parse_settings_enum(menu, info, - MENU_ENUM_LABEL_AUTO_OVERRIDES_ENABLE, - PARSE_ONLY_BOOL, false); - menu_displaylist_parse_settings_enum(menu, info, - MENU_ENUM_LABEL_AUTO_REMAPS_ENABLE, - PARSE_ONLY_BOOL, false); - menu_displaylist_parse_settings_enum(menu, info, - MENU_ENUM_LABEL_SHOW_HIDDEN_FILES, - PARSE_ONLY_BOOL, false); */ menu_entries_append_enum(info->list, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_CONFIG_SAVE_ON_EXIT), @@ -2927,12 +2908,6 @@ static int menu_displaylist_parse_configurations_list( MENU_ENUM_LABEL_CONFIG_SAVE_ON_EXIT, MENU_SETTING_ACTION, 0, 0); - menu_entries_append_enum(info->list, - msg_hash_to_str(MENU_ENUM_LABEL_VALUE_CORE_SPECIFIC_CONFIG), - msg_hash_to_str(MENU_ENUM_LABEL_CORE_SPECIFIC_CONFIG), - MENU_ENUM_LABEL_CORE_SPECIFIC_CONFIG, - MENU_SETTING_ACTION, 0, 0); - menu_entries_append_enum(info->list, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_GAME_SPECIFIC_OPTIONS), msg_hash_to_str(MENU_ENUM_LABEL_GAME_SPECIFIC_OPTIONS), From 204454c9676c32cc93f97030dc1ff627583b6734 Mon Sep 17 00:00:00 2001 From: lasers Date: Thu, 17 Nov 2016 05:45:20 -0600 Subject: [PATCH 3/5] Add sublabel for Configurations --- intl/msg_hash_us.h | 2 ++ menu/cbs/menu_cbs_sublabel.c | 14 ++++++++++++++ msg_hash.h | 1 + 3 files changed, 17 insertions(+) diff --git a/intl/msg_hash_us.h b/intl/msg_hash_us.h index 5d63bf4d6b..89be55b5e2 100644 --- a/intl/msg_hash_us.h +++ b/intl/msg_hash_us.h @@ -1614,6 +1614,8 @@ MSG_HASH(MENU_ENUM_SUBLABEL_DRIVER_SETTINGS, "Change drivers for the system.") MSG_HASH(MENU_ENUM_SUBLABEL_RETRO_ACHIEVEMENTS_SETTINGS, "Change settings for the achievements.") +MSG_HASH(MENU_ENUM_SUBLABEL_CONFIGURATION_SETTINGS, + "Change settings for configurations, content overrides, core overrides, remaps and more.") MSG_HASH(MENU_ENUM_SUBLABEL_CORE_SETTINGS, "Change settings for the core.") MSG_HASH(MENU_ENUM_SUBLABEL_RECORDING_SETTINGS, diff --git a/menu/cbs/menu_cbs_sublabel.c b/menu/cbs/menu_cbs_sublabel.c index cee99f448a..8418c9565d 100644 --- a/menu/cbs/menu_cbs_sublabel.c +++ b/menu/cbs/menu_cbs_sublabel.c @@ -413,6 +413,17 @@ static int action_bind_sublabel_cheevos_entry( return 0; } +static int action_bind_sublabel_configurations_settings_list( + file_list_t *list, + unsigned type, unsigned i, + const char *label, const char *path, + char *s, size_t len) +{ + + strlcpy(s, msg_hash_to_str(MENU_ENUM_SUBLABEL_CONFIGURATION_SETTINGS), len); + return 0; +} + static int action_bind_sublabel_config_save_on_exit( file_list_t *list, unsigned type, unsigned i, @@ -460,6 +471,9 @@ int menu_cbs_init_bind_sublabel(menu_file_list_cbs_t *cbs, case MENU_ENUM_LABEL_CONFIG_SAVE_ON_EXIT: BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_config_save_on_exit); break; + case MENU_ENUM_LABEL_CONFIGURATIONS_LIST: + BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_configurations_settings_list); + break; case MENU_ENUM_LABEL_VIDEO_THREADED: BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_video_threaded); break; diff --git a/msg_hash.h b/msg_hash.h index c831603e12..917bf4559e 100644 --- a/msg_hash.h +++ b/msg_hash.h @@ -1953,6 +1953,7 @@ enum msg_hash_enums MENU_ENUM_SUBLABEL_AUDIO_SETTINGS, MENU_ENUM_SUBLABEL_BLUETOOTH_ENABLE, MENU_ENUM_SUBLABEL_CHEEVOS_HARDCORE_MODE_ENABLE, + MENU_ENUM_SUBLABEL_CONFIGURATION_SETTINGS, MENU_ENUM_SUBLABEL_CONFIG_SAVE_ON_EXIT, MENU_ENUM_SUBLABEL_CORE_SETTINGS, MENU_ENUM_SUBLABEL_CPU_CORES, From 6265d1e90a7685560f2b9292d2b79fca0e3f0adf Mon Sep 17 00:00:00 2001 From: lasers Date: Fri, 18 Nov 2016 13:45:10 -0600 Subject: [PATCH 4/5] Clean the Configuration mess --- intl/msg_hash_chs.c | 4 ++-- intl/msg_hash_de.c | 2 +- intl/msg_hash_es.c | 2 +- intl/msg_hash_fr.c | 2 +- intl/msg_hash_it.c | 2 +- intl/msg_hash_ja.c | 6 +++--- intl/msg_hash_lbl.h | 4 ++-- intl/msg_hash_nl.c | 2 +- intl/msg_hash_pl.c | 2 +- intl/msg_hash_pt.c | 2 +- intl/msg_hash_us.h | 4 ++-- intl/msg_hash_vn.c | 4 ++-- menu/cbs/menu_cbs_deferred_push.c | 10 +++++----- menu/cbs/menu_cbs_get_value.c | 2 +- menu/cbs/menu_cbs_ok.c | 8 ++++---- menu/cbs/menu_cbs_sublabel.c | 2 +- menu/cbs/menu_cbs_title.c | 10 +++++----- menu/drivers/materialui.c | 2 +- menu/drivers/xmb.c | 2 +- menu/menu_cbs.h | 2 +- menu/menu_displaylist.c | 12 ++++++------ menu/menu_displaylist.h | 2 +- menu/menu_setting.c | 8 ++++---- msg_hash.h | 12 ++++++------ 24 files changed, 54 insertions(+), 54 deletions(-) diff --git a/intl/msg_hash_chs.c b/intl/msg_hash_chs.c index 319c720b43..c7821b6ab9 100644 --- a/intl/msg_hash_chs.c +++ b/intl/msg_hash_chs.c @@ -2008,7 +2008,7 @@ static const char *menu_hash_to_str_chs_label_enum(enum msg_hash_enums msg) return "unload_core"; case MENU_ENUM_LABEL_COLLECTION: return "collection"; - case MENU_ENUM_LABEL_CONFIGURATIONS: + case MENU_ENUM_LABEL_CONFIG_LOAD: return "configurations"; case MENU_ENUM_LABEL_CONFIGURATION_SETTINGS: return "configuration_settings"; @@ -3145,7 +3145,7 @@ const char *msg_hash_to_str_chs(enum msg_hash_enums msg) return "关闭"; case MENU_ENUM_LABEL_VALUE_CONFIG: return "配置"; - case MENU_ENUM_LABEL_VALUE_CONFIGURATIONS: + case MENU_ENUM_LABEL_VALUE_CONFIG_LOAD: return "加载配置"; case MENU_ENUM_LABEL_VALUE_CONFIGURATION_SETTINGS: return "配置"; diff --git a/intl/msg_hash_de.c b/intl/msg_hash_de.c index f0cd0b9dc8..c50e323a8d 100644 --- a/intl/msg_hash_de.c +++ b/intl/msg_hash_de.c @@ -508,7 +508,7 @@ const char *msg_hash_to_str_de(enum msg_hash_enums msg) return "Schließe"; case MENU_ENUM_LABEL_VALUE_COLLAPSE_SUBGROUPS_ENABLE: return "Untergruppen einklappen"; - case MENU_ENUM_LABEL_VALUE_CONFIGURATIONS: + case MENU_ENUM_LABEL_VALUE_CONFIG_LOAD: return "Lade Konfigurationsdatei"; /* FIXME/UPDATE */ case MENU_ENUM_LABEL_VALUE_CONFIGURATION_SETTINGS: return "Konfigurations-Einstellungen"; diff --git a/intl/msg_hash_es.c b/intl/msg_hash_es.c index 34290b518b..a8463d0481 100644 --- a/intl/msg_hash_es.c +++ b/intl/msg_hash_es.c @@ -1587,7 +1587,7 @@ const char *msg_hash_to_str_es(enum msg_hash_enums msg) return "Pasadas de trucos"; case MENU_ENUM_LABEL_VALUE_CLOSE_CONTENT: return "Cerrar"; - case MENU_ENUM_LABEL_VALUE_CONFIGURATIONS: + case MENU_ENUM_LABEL_VALUE_CONFIG_LOAD: return "Cargar configuración"; case MENU_ENUM_LABEL_VALUE_CONFIGURATION_SETTINGS: return "Configuración"; diff --git a/intl/msg_hash_fr.c b/intl/msg_hash_fr.c index 6d7b370e27..f7b6785aaa 100644 --- a/intl/msg_hash_fr.c +++ b/intl/msg_hash_fr.c @@ -130,7 +130,7 @@ const char *msg_hash_to_str_fr(enum msg_hash_enums msg) return "Quitter"; case MENU_ENUM_LABEL_VALUE_COLLAPSE_SUBGROUPS_ENABLE: return "Fusionner les sous-groupes"; - case MENU_ENUM_LABEL_VALUE_CONFIGURATIONS: + case MENU_ENUM_LABEL_VALUE_CONFIG_LOAD: return "Charger une configuration"; case MENU_ENUM_LABEL_VALUE_CONFIGURATION_SETTINGS: return "Configurations"; diff --git a/intl/msg_hash_it.c b/intl/msg_hash_it.c index af27b24523..2e4a9fce8d 100644 --- a/intl/msg_hash_it.c +++ b/intl/msg_hash_it.c @@ -1670,7 +1670,7 @@ const char *msg_hash_to_str_it(enum msg_hash_enums msg) return "Passaggi dello shader"; case MENU_ENUM_LABEL_VALUE_RDB_ENTRY_SHA1: return "SHA1"; - case MENU_ENUM_LABEL_VALUE_CONFIGURATIONS: + case MENU_ENUM_LABEL_VALUE_CONFIG_LOAD: return "Carica Configurazione"; case MENU_ENUM_LABEL_VALUE_REWIND_GRANULARITY: return "Livello della funzione riavvolgi"; diff --git a/intl/msg_hash_ja.c b/intl/msg_hash_ja.c index 5252682b82..9c87a9fdb4 100644 --- a/intl/msg_hash_ja.c +++ b/intl/msg_hash_ja.c @@ -2038,7 +2038,7 @@ static const char *menu_hash_to_str_jp_label_enum(enum msg_hash_enums msg) return "unload_core"; case MENU_ENUM_LABEL_COLLECTION: return "collection"; - case MENU_ENUM_LABEL_CONFIGURATIONS: + case MENU_ENUM_LABEL_CONFIG_LOAD: return "configurations"; case MENU_ENUM_LABEL_CONFIGURATION_SETTINGS: return "configuration_settings"; @@ -3175,9 +3175,9 @@ const char *msg_hash_to_str_jp(enum msg_hash_enums msg) return "閉じる"; case MENU_ENUM_LABEL_VALUE_CONFIG: return "コンフィグ"; - case MENU_ENUM_LABEL_VALUE_CONFIGURATIONS: + case MENU_ENUM_LABEL_VALUE_CONFIG_LOAD: return "設定をロード"; - case MENU_ENUM_LABEL_VALUE_CONFIGURATIONS_LIST: + case MENU_ENUM_LABEL_VALUE_CONFIGURATIONS_SETTINGS: return "設定ファイル"; case MENU_ENUM_LABEL_VALUE_CONFIGURATION_SETTINGS: return "設定"; diff --git a/intl/msg_hash_lbl.h b/intl/msg_hash_lbl.h index e72af41289..3526d1f9cf 100644 --- a/intl/msg_hash_lbl.h +++ b/intl/msg_hash_lbl.h @@ -10,7 +10,7 @@ MSG_HASH(MENU_ENUM_LABEL_ACHIEVEMENT_LIST_HARDCORE, "achievement_list_hardcore") MSG_HASH(MENU_ENUM_LABEL_ADD_CONTENT_LIST, "add_content") -MSG_HASH(MENU_ENUM_LABEL_CONFIGURATIONS_LIST, +MSG_HASH(MENU_ENUM_LABEL_CONFIGURATIONS_SETTINGS, "configurations_list") MSG_HASH(MENU_ENUM_LABEL_ADD_TAB, "add_tab") @@ -144,7 +144,7 @@ MSG_HASH(MENU_ENUM_LABEL_CLOSE_CONTENT, "unload_core") MSG_HASH(MENU_ENUM_LABEL_COLLECTION, "collection") -MSG_HASH(MENU_ENUM_LABEL_CONFIGURATIONS, +MSG_HASH(MENU_ENUM_LABEL_CONFIG_LOAD, "configurations") MSG_HASH(MENU_ENUM_LABEL_CONFIGURATION_SETTINGS, "configuration_settings") diff --git a/intl/msg_hash_nl.c b/intl/msg_hash_nl.c index 39c5b3c3fe..9737ea1102 100644 --- a/intl/msg_hash_nl.c +++ b/intl/msg_hash_nl.c @@ -135,7 +135,7 @@ const char *msg_hash_to_str_nl(enum msg_hash_enums msg) return "Cheat Passes"; case MENU_ENUM_LABEL_VALUE_CLOSE_CONTENT: return "Afsluiten"; - case MENU_ENUM_LABEL_VALUE_CONFIGURATIONS: + case MENU_ENUM_LABEL_VALUE_CONFIG_LOAD: return "Laad Configuratie"; case MENU_ENUM_LABEL_VALUE_CONFIGURATION_SETTINGS: return "Configuratie"; diff --git a/intl/msg_hash_pl.c b/intl/msg_hash_pl.c index e53dfa161b..45907fe4fd 100644 --- a/intl/msg_hash_pl.c +++ b/intl/msg_hash_pl.c @@ -104,7 +104,7 @@ const char *msg_hash_to_str_pl(enum msg_hash_enums msg) return "Liczba przebiegów cheatów"; case MENU_ENUM_LABEL_VALUE_CLOSE_CONTENT: return "Zamknij"; - case MENU_ENUM_LABEL_VALUE_CONFIGURATIONS: + case MENU_ENUM_LABEL_VALUE_CONFIG_LOAD: return "Wczytaj konfigurację"; case MENU_ENUM_LABEL_VALUE_CONFIGURATION_SETTINGS: return "Ustawienia konfiguracji"; diff --git a/intl/msg_hash_pt.c b/intl/msg_hash_pt.c index 1218c80f1d..2aec323ff3 100644 --- a/intl/msg_hash_pt.c +++ b/intl/msg_hash_pt.c @@ -1042,7 +1042,7 @@ const char *msg_hash_to_str_pt(enum msg_hash_enums msg) return "Códigos de Cheat"; case MENU_ENUM_LABEL_VALUE_CLOSE_CONTENT: return "Fechar"; - case MENU_ENUM_LABEL_VALUE_CONFIGURATIONS: + case MENU_ENUM_LABEL_VALUE_CONFIG_LOAD: return "Carregar Configuração"; case MENU_ENUM_LABEL_VALUE_CONFIGURATION_SETTINGS: return "Configurações"; diff --git a/intl/msg_hash_us.h b/intl/msg_hash_us.h index 89be55b5e2..5c7a6632ea 100644 --- a/intl/msg_hash_us.h +++ b/intl/msg_hash_us.h @@ -124,7 +124,7 @@ MSG_HASH( "Scan Content" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_CONFIGURATIONS_LIST, + MENU_ENUM_LABEL_VALUE_CONFIGURATIONS_SETTINGS, "Configurations" ) MSG_HASH( @@ -380,7 +380,7 @@ MSG_HASH( "Config" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_CONFIGURATIONS, + MENU_ENUM_LABEL_VALUE_CONFIG_LOAD, "Load Configuration..." ) MSG_HASH( diff --git a/intl/msg_hash_vn.c b/intl/msg_hash_vn.c index d4e3590f4a..5705eb8684 100644 --- a/intl/msg_hash_vn.c +++ b/intl/msg_hash_vn.c @@ -2040,7 +2040,7 @@ static const char *menu_hash_to_str_vn_label_enum(enum msg_hash_enums msg) return "unload_core"; case MENU_ENUM_LABEL_COLLECTION: return "collection"; - case MENU_ENUM_LABEL_CONFIGURATIONS: + case MENU_ENUM_LABEL_CONFIG_LOAD: return "configurations"; case MENU_ENUM_LABEL_CONFIGURATION_SETTINGS: return "configuration_settings"; @@ -3179,7 +3179,7 @@ const char *msg_hash_to_str_vn(enum msg_hash_enums msg) return "Close"; case MENU_ENUM_LABEL_VALUE_CONFIG: return "Config"; - case MENU_ENUM_LABEL_VALUE_CONFIGURATIONS: + case MENU_ENUM_LABEL_VALUE_CONFIG_LOAD: return "Tải Configuration"; case MENU_ENUM_LABEL_VALUE_CONFIGURATION_SETTINGS: return "Configuration"; diff --git a/menu/cbs/menu_cbs_deferred_push.c b/menu/cbs/menu_cbs_deferred_push.c index bd9f3f8050..52f8bbad48 100644 --- a/menu/cbs/menu_cbs_deferred_push.c +++ b/menu/cbs/menu_cbs_deferred_push.c @@ -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) { - 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) @@ -941,7 +941,7 @@ static int menu_cbs_init_bind_deferred_push_compare_label( case MENU_ENUM_LABEL_ADD_CONTENT_LIST: BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_add_content_list); break; - case MENU_ENUM_LABEL_CONFIGURATIONS_LIST: + case MENU_ENUM_LABEL_CONFIGURATIONS_SETTINGS: BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_configurations_list); break; 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: BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_content_collection_list); break; - case MENU_ENUM_LABEL_CONFIGURATIONS: + case MENU_ENUM_LABEL_CONFIG_LOAD: BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_configurations); break; case MENU_ENUM_LABEL_VIDEO_SHADER_PRESET: @@ -1109,7 +1109,7 @@ static int menu_cbs_init_bind_deferred_push_compare_label( { switch (label_hash) { - case MENU_LABEL_DEFERRED_CONFIGURATIONS_LIST: + case MENU_LABEL_DEFERRED_CONFIGURATIONS_SETTINGS: BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_configurations_list); break; 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: BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_content_collection_list); break; - case MENU_LABEL_CONFIGURATIONS: + case MENU_LABEL_CONFIG_LOAD: BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_configurations); break; case MENU_LABEL_VIDEO_SHADER_PRESET: diff --git a/menu/cbs/menu_cbs_get_value.c b/menu/cbs/menu_cbs_get_value.c index 4905bfd256..ac24a657b2 100644 --- a/menu/cbs/menu_cbs_get_value.c +++ b/menu/cbs/menu_cbs_get_value.c @@ -1678,7 +1678,7 @@ static int menu_cbs_init_bind_get_string_representation_compare_label( BIND_ACTION_GET_VALUE(cbs, menu_action_setting_disp_set_label_filter); break; - case MENU_ENUM_LABEL_CONFIGURATIONS: + case MENU_ENUM_LABEL_CONFIG_LOAD: BIND_ACTION_GET_VALUE(cbs, menu_action_setting_disp_set_label_configurations); break; diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c index adfaf6c0f7..648d742456 100644 --- a/menu/cbs/menu_cbs_ok.c +++ b/menu/cbs/menu_cbs_ok.c @@ -441,7 +441,7 @@ int generic_action_ok_displaylist_push(const char *path, info_path = path; dl_type = DISPLAYLIST_GENERIC; break; - case ACTION_OK_DL_CONFIGURATIONS_LIST: + case ACTION_OK_DL_CONFIGURATIONS_SETTINGS: info.type = type; info.directory_ptr = idx; 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) { 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, @@ -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_LOAD_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_INFORMATION_LIST: 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: BIND_ACTION_OK(cbs, action_ok_disk_image_append_list); break; - case MENU_ENUM_LABEL_CONFIGURATIONS: + case MENU_ENUM_LABEL_CONFIG_LOAD: BIND_ACTION_OK(cbs, action_ok_configurations_list); break; case MENU_ENUM_LABEL_SAVING_SETTINGS: diff --git a/menu/cbs/menu_cbs_sublabel.c b/menu/cbs/menu_cbs_sublabel.c index 8418c9565d..cf431609a9 100644 --- a/menu/cbs/menu_cbs_sublabel.c +++ b/menu/cbs/menu_cbs_sublabel.c @@ -471,7 +471,7 @@ int menu_cbs_init_bind_sublabel(menu_file_list_cbs_t *cbs, case MENU_ENUM_LABEL_CONFIG_SAVE_ON_EXIT: BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_config_save_on_exit); break; - case MENU_ENUM_LABEL_CONFIGURATIONS_LIST: + case MENU_ENUM_LABEL_CONFIGURATIONS_SETTINGS: BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_configurations_settings_list); break; case MENU_ENUM_LABEL_VIDEO_THREADED: diff --git a/menu/cbs/menu_cbs_title.c b/menu/cbs/menu_cbs_title.c index e8e4ecab1d..8e06e7a080 100644 --- a/menu/cbs/menu_cbs_title.c +++ b/menu/cbs/menu_cbs_title.c @@ -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, 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; } @@ -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: BIND_ACTION_GET_TITLE(cbs, action_get_title_deferred_core_list); break; - case MENU_ENUM_LABEL_CONFIGURATIONS: + case MENU_ENUM_LABEL_CONFIG_LOAD: BIND_ACTION_GET_TITLE(cbs, action_get_title_configurations); break; 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: BIND_ACTION_GET_TITLE(cbs, action_get_add_content_list); break; - case MENU_ENUM_LABEL_CONFIGURATIONS_LIST: + case MENU_ENUM_LABEL_CONFIGURATIONS_SETTINGS: BIND_ACTION_GET_TITLE(cbs, action_get_configurations_list); break; 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: BIND_ACTION_GET_TITLE(cbs, action_get_title_deferred_core_list); break; - case MENU_LABEL_CONFIGURATIONS: + case MENU_LABEL_CONFIG_LOAD: BIND_ACTION_GET_TITLE(cbs, action_get_title_configurations); break; 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: BIND_ACTION_GET_TITLE(cbs, action_get_core_updater_list); break; - case MENU_LABEL_DEFERRED_CONFIGURATIONS_LIST: + case MENU_LABEL_DEFERRED_CONFIGURATIONS_SETTINGS: BIND_ACTION_GET_TITLE(cbs, action_get_configurations_list); break; case MENU_LABEL_ADD_CONTENT_LIST: diff --git a/menu/drivers/materialui.c b/menu/drivers/materialui.c index 9434b44995..22de7df940 100644 --- a/menu/drivers/materialui.c +++ b/menu/drivers/materialui.c @@ -1738,7 +1738,7 @@ static int mui_list_push(void *data, void *userdata, entry.enum_idx = MENU_ENUM_LABEL_RESTART_RETROARCH; menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry); #endif - entry.enum_idx = MENU_ENUM_LABEL_CONFIGURATIONS_LIST; + entry.enum_idx = MENU_ENUM_LABEL_CONFIGURATIONS_SETTINGS; menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry); entry.enum_idx = MENU_ENUM_LABEL_HELP_LIST; diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c index 728e9d34fe..92b0fe16f5 100644 --- a/menu/drivers/xmb.c +++ b/menu/drivers/xmb.c @@ -3596,7 +3596,7 @@ static int xmb_list_push(void *data, void *userdata, entry.enum_idx = MENU_ENUM_LABEL_RESTART_RETROARCH; menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry); #endif - entry.enum_idx = MENU_ENUM_LABEL_CONFIGURATIONS_LIST; + entry.enum_idx = MENU_ENUM_LABEL_CONFIGURATIONS_SETTINGS; menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry); entry.enum_idx = MENU_ENUM_LABEL_HELP_LIST; diff --git a/menu/menu_cbs.h b/menu/menu_cbs.h index 6963772151..6c9c560c88 100644 --- a/menu/menu_cbs.h +++ b/menu/menu_cbs.h @@ -69,7 +69,7 @@ enum ACTION_OK_DL_CHEAT_FILE, ACTION_OK_DL_CORE_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_DETECT_CORE, ACTION_OK_DL_PARENT_DIRECTORY_PUSH, diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index 887cb2c7ff..587720002e 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -2885,9 +2885,9 @@ static int menu_displaylist_parse_configurations_list( menu_displaylist_info_t *info) { menu_entries_append_enum(info->list, - msg_hash_to_str(MENU_ENUM_LABEL_VALUE_CONFIGURATIONS), - msg_hash_to_str(MENU_ENUM_LABEL_CONFIGURATIONS), - MENU_ENUM_LABEL_CONFIGURATIONS, + msg_hash_to_str(MENU_ENUM_LABEL_VALUE_CONFIG_LOAD), + msg_hash_to_str(MENU_ENUM_LABEL_CONFIG_LOAD), + MENU_ENUM_LABEL_CONFIG_LOAD, MENU_SETTING_ACTION, 0, 0); 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_INFORMATION_LIST: case DISPLAYLIST_ADD_CONTENT_LIST: - case DISPLAYLIST_CONFIGURATIONS_LIST: + case DISPLAYLIST_CONFIGURATIONS_SETTINGS: case DISPLAYLIST_SCAN_DIRECTORY_LIST: case DISPLAYLIST_LOAD_CONTENT_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); #endif menu_displaylist_parse_settings_enum(menu, info, - MENU_ENUM_LABEL_CONFIGURATIONS_LIST, + MENU_ENUM_LABEL_CONFIGURATIONS_SETTINGS, PARSE_ACTION, false); menu_displaylist_parse_settings_enum(menu, info, 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_refresh = true; break; - case DISPLAYLIST_CONFIGURATIONS_LIST: + case DISPLAYLIST_CONFIGURATIONS_SETTINGS: ret = menu_displaylist_parse_configurations_list(info); info->need_push = true; diff --git a/menu/menu_displaylist.h b/menu/menu_displaylist.h index 4f3650405e..91fcb3344a 100644 --- a/menu/menu_displaylist.h +++ b/menu/menu_displaylist.h @@ -145,7 +145,7 @@ enum menu_displaylist_ctl_state DISPLAYLIST_OPTIONS_SHADERS, DISPLAYLIST_NETPLAY, DISPLAYLIST_ADD_CONTENT_LIST, - DISPLAYLIST_CONFIGURATIONS_LIST, + DISPLAYLIST_CONFIGURATIONS_SETTINGS, DISPLAYLIST_SCAN_DIRECTORY_LIST, DISPLAYLIST_ARCHIVE_ACTION, DISPLAYLIST_ARCHIVE_ACTION_DETECT_CORE, diff --git a/menu/menu_setting.c b/menu/menu_setting.c index 5b72ce2288..a741cdc09d 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -2285,16 +2285,16 @@ static bool setting_append_list( CONFIG_ACTION( list, list_info, - MENU_ENUM_LABEL_CONFIGURATIONS_LIST, - MENU_ENUM_LABEL_VALUE_CONFIGURATIONS_LIST, + MENU_ENUM_LABEL_CONFIGURATIONS_SETTINGS, + MENU_ENUM_LABEL_VALUE_CONFIGURATIONS_SETTINGS, &group_info, &subgroup_info, parent_group); CONFIG_ACTION( list, list_info, - MENU_ENUM_LABEL_CONFIGURATIONS, - MENU_ENUM_LABEL_VALUE_CONFIGURATIONS, + MENU_ENUM_LABEL_CONFIG_LOAD, + MENU_ENUM_LABEL_VALUE_CONFIG_LOAD, &group_info, &subgroup_info, parent_group); diff --git a/msg_hash.h b/msg_hash.h index 917bf4559e..a7a2d130e3 100644 --- a/msg_hash.h +++ b/msg_hash.h @@ -984,8 +984,8 @@ enum msg_hash_enums MENU_ENUM_LABEL_ADD_CONTENT_LIST, MENU_ENUM_LABEL_VALUE_ADD_CONTENT_LIST, - MENU_ENUM_LABEL_CONFIGURATIONS_LIST, - MENU_ENUM_LABEL_VALUE_CONFIGURATIONS_LIST, + MENU_ENUM_LABEL_CONFIGURATIONS_SETTINGS, + MENU_ENUM_LABEL_VALUE_CONFIGURATIONS_SETTINGS, MENU_ENUM_LABEL_VALUE_DONT_CARE, MENU_ENUM_LABEL_VALUE_LINEAR, @@ -1715,8 +1715,8 @@ enum msg_hash_enums MENU_ENUM_LABEL_VALUE_TAKE_SCREENSHOT, MENU_ENUM_LABEL_DELETE_ENTRY, MENU_ENUM_LABEL_VALUE_DELETE_ENTRY, - MENU_ENUM_LABEL_CONFIGURATIONS, - MENU_ENUM_LABEL_VALUE_CONFIGURATIONS, + MENU_ENUM_LABEL_CONFIG_LOAD, + MENU_ENUM_LABEL_VALUE_CONFIG_LOAD, MENU_ENUM_LABEL_VALUE_CHEAT_FILE_SAVE_AS, MENU_ENUM_LABEL_CHEAT_FILE_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_LAKKA_LIST 0x3db437c4U #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 */ @@ -2195,7 +2195,7 @@ enum msg_hash_enums #define MENU_LABEL_CUSTOM_BIND 0x1e84b3fcU #define MENU_LABEL_CUSTOM_BIND_ALL 0x79ac14f4U #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_GAME 0x7c9f41e0U #define MENU_LABEL_CONTENT_COLLECTION_LIST 0x32d1df83U From 67f1dc38595dc59c25250928e837678fbbe4ff12 Mon Sep 17 00:00:00 2001 From: lasers Date: Sun, 20 Nov 2016 02:08:08 -0600 Subject: [PATCH 5/5] Clean the Configuration mess some more --- intl/msg_hash_chs.c | 6 +-- intl/msg_hash_de.c | 2 +- intl/msg_hash_es.c | 2 +- intl/msg_hash_fr.c | 2 +- intl/msg_hash_it.c | 2 +- intl/msg_hash_ja.c | 9 ++-- intl/msg_hash_lbl.h | 10 ++-- intl/msg_hash_nl.c | 2 +- intl/msg_hash_pl.c | 2 +- intl/msg_hash_pt.c | 2 +- intl/msg_hash_us.h | 6 +-- intl/msg_hash_vn.c | 6 +-- menu/cbs/menu_cbs_deferred_push.c | 6 +-- menu/cbs/menu_cbs_ok.c | 17 +++--- menu/cbs/menu_cbs_sublabel.c | 2 +- menu/cbs/menu_cbs_title.c | 6 +-- menu/menu_cbs.h | 3 +- menu/menu_displaylist.c | 7 +++ menu/menu_displaylist.h | 5 +- menu/menu_setting.c | 86 ++++++++++++++----------------- msg_hash.h | 11 ++-- 21 files changed, 91 insertions(+), 103 deletions(-) diff --git a/intl/msg_hash_chs.c b/intl/msg_hash_chs.c index c7821b6ab9..8202243c71 100644 --- a/intl/msg_hash_chs.c +++ b/intl/msg_hash_chs.c @@ -2010,7 +2010,7 @@ static const char *menu_hash_to_str_chs_label_enum(enum msg_hash_enums msg) return "collection"; case MENU_ENUM_LABEL_CONFIG_LOAD: return "configurations"; - case MENU_ENUM_LABEL_CONFIGURATION_SETTINGS: + case MENU_ENUM_LABEL_CONFIGURATIONS_SETTINGS: return "configuration_settings"; case MENU_ENUM_LABEL_CONFIG_SAVE_ON_EXIT: return "config_save_on_exit"; @@ -2090,7 +2090,7 @@ static const char *menu_hash_to_str_chs_label_enum(enum msg_hash_enums msg) return "deferred_archive_open_detect_core"; case MENU_ENUM_LABEL_DEFERRED_AUDIO_SETTINGS_LIST: return "deferred_audio_settings_list"; - case MENU_ENUM_LABEL_DEFERRED_CONFIGURATION_SETTINGS_LIST: + case MENU_ENUM_LABEL_DEFERRED_CONFIGURATIONS_SETTINGS: return "deferred_configuration_settings_list"; case MENU_ENUM_LABEL_DEFERRED_CORE_CONTENT_DIRS_LIST: return "deferred_core_content_dirs_list"; @@ -3147,7 +3147,7 @@ const char *msg_hash_to_str_chs(enum msg_hash_enums msg) return "配置"; case MENU_ENUM_LABEL_VALUE_CONFIG_LOAD: return "加载配置"; - case MENU_ENUM_LABEL_VALUE_CONFIGURATION_SETTINGS: + case MENU_ENUM_LABEL_VALUE_CONFIGURATIONS_SETTINGS: return "配置"; case MENU_ENUM_LABEL_VALUE_CONFIG_SAVE_ON_EXIT: return "退出时保存配置"; diff --git a/intl/msg_hash_de.c b/intl/msg_hash_de.c index c50e323a8d..d65f901c21 100644 --- a/intl/msg_hash_de.c +++ b/intl/msg_hash_de.c @@ -510,7 +510,7 @@ const char *msg_hash_to_str_de(enum msg_hash_enums msg) return "Untergruppen einklappen"; case MENU_ENUM_LABEL_VALUE_CONFIG_LOAD: return "Lade Konfigurationsdatei"; /* FIXME/UPDATE */ - case MENU_ENUM_LABEL_VALUE_CONFIGURATION_SETTINGS: + case MENU_ENUM_LABEL_VALUE_CONFIGURATIONS_SETTINGS: return "Konfigurations-Einstellungen"; case MENU_ENUM_LABEL_VALUE_CONFIG_SAVE_ON_EXIT: return "Speichere Konfiguration beim Beenden"; diff --git a/intl/msg_hash_es.c b/intl/msg_hash_es.c index a8463d0481..dd85b2a86c 100644 --- a/intl/msg_hash_es.c +++ b/intl/msg_hash_es.c @@ -1589,7 +1589,7 @@ const char *msg_hash_to_str_es(enum msg_hash_enums msg) return "Cerrar"; case MENU_ENUM_LABEL_VALUE_CONFIG_LOAD: return "Cargar configuración"; - case MENU_ENUM_LABEL_VALUE_CONFIGURATION_SETTINGS: + case MENU_ENUM_LABEL_VALUE_CONFIGURATIONS_SETTINGS: return "Configuración"; case MENU_ENUM_LABEL_VALUE_CONFIG_SAVE_ON_EXIT: return "Guardar configuración al salir"; diff --git a/intl/msg_hash_fr.c b/intl/msg_hash_fr.c index f7b6785aaa..b2c27ac126 100644 --- a/intl/msg_hash_fr.c +++ b/intl/msg_hash_fr.c @@ -132,7 +132,7 @@ const char *msg_hash_to_str_fr(enum msg_hash_enums msg) return "Fusionner les sous-groupes"; case MENU_ENUM_LABEL_VALUE_CONFIG_LOAD: return "Charger une configuration"; - case MENU_ENUM_LABEL_VALUE_CONFIGURATION_SETTINGS: + case MENU_ENUM_LABEL_VALUE_CONFIGURATIONS_SETTINGS: return "Configurations"; case MENU_ENUM_LABEL_VALUE_CONFIG_SAVE_ON_EXIT: return "Sauver la config en quittant"; diff --git a/intl/msg_hash_it.c b/intl/msg_hash_it.c index 2e4a9fce8d..f3905ec016 100644 --- a/intl/msg_hash_it.c +++ b/intl/msg_hash_it.c @@ -1270,7 +1270,7 @@ const char *msg_hash_to_str_it(enum msg_hash_enums msg) return "Nessun contatore di performance."; case MENU_ENUM_LABEL_VALUE_DRIVER_SETTINGS: return "Driver"; - case MENU_ENUM_LABEL_VALUE_CONFIGURATION_SETTINGS: + case MENU_ENUM_LABEL_VALUE_CONFIGURATIONS_SETTINGS: return "Configurazione"; case MENU_ENUM_LABEL_VALUE_CORE_SETTINGS: return "Core"; diff --git a/intl/msg_hash_ja.c b/intl/msg_hash_ja.c index 9c87a9fdb4..ac9ca9d437 100644 --- a/intl/msg_hash_ja.c +++ b/intl/msg_hash_ja.c @@ -2040,7 +2040,7 @@ static const char *menu_hash_to_str_jp_label_enum(enum msg_hash_enums msg) return "collection"; case MENU_ENUM_LABEL_CONFIG_LOAD: return "configurations"; - case MENU_ENUM_LABEL_CONFIGURATION_SETTINGS: + case MENU_ENUM_LABEL_CONFIGURATIONS_SETTINGS: return "configuration_settings"; case MENU_ENUM_LABEL_CONFIG_SAVE_ON_EXIT: return "config_save_on_exit"; @@ -2120,7 +2120,7 @@ static const char *menu_hash_to_str_jp_label_enum(enum msg_hash_enums msg) return "deferred_archive_open_detect_core"; case MENU_ENUM_LABEL_DEFERRED_AUDIO_SETTINGS_LIST: return "deferred_audio_settings_list"; - case MENU_ENUM_LABEL_DEFERRED_CONFIGURATION_SETTINGS_LIST: + case MENU_ENUM_LABEL_DEFERRED_CONFIGURATIONS_SETTINGS: return "deferred_configuration_settings_list"; case MENU_ENUM_LABEL_DEFERRED_CORE_CONTENT_DIRS_LIST: return "deferred_core_content_dirs_list"; @@ -3178,9 +3178,8 @@ const char *msg_hash_to_str_jp(enum msg_hash_enums msg) case MENU_ENUM_LABEL_VALUE_CONFIG_LOAD: return "設定をロード"; case MENU_ENUM_LABEL_VALUE_CONFIGURATIONS_SETTINGS: - return "設定ファイル"; - case MENU_ENUM_LABEL_VALUE_CONFIGURATION_SETTINGS: - return "設定"; +/* Is Google Translation okay for "Configurations Settings" */ + return "設定の設定"; case MENU_ENUM_LABEL_VALUE_CONFIG_SAVE_ON_EXIT: return "終了前に設定を自動保存"; case MENU_ENUM_LABEL_VALUE_CONFIRM_ON_EXIT: diff --git a/intl/msg_hash_lbl.h b/intl/msg_hash_lbl.h index 3526d1f9cf..93397c7898 100644 --- a/intl/msg_hash_lbl.h +++ b/intl/msg_hash_lbl.h @@ -10,8 +10,6 @@ MSG_HASH(MENU_ENUM_LABEL_ACHIEVEMENT_LIST_HARDCORE, "achievement_list_hardcore") MSG_HASH(MENU_ENUM_LABEL_ADD_CONTENT_LIST, "add_content") -MSG_HASH(MENU_ENUM_LABEL_CONFIGURATIONS_SETTINGS, - "configurations_list") MSG_HASH(MENU_ENUM_LABEL_ADD_TAB, "add_tab") MSG_HASH(MENU_ENUM_LABEL_ARCHIVE_MODE, @@ -145,9 +143,9 @@ MSG_HASH(MENU_ENUM_LABEL_CLOSE_CONTENT, MSG_HASH(MENU_ENUM_LABEL_COLLECTION, "collection") MSG_HASH(MENU_ENUM_LABEL_CONFIG_LOAD, - "configurations") -MSG_HASH(MENU_ENUM_LABEL_CONFIGURATION_SETTINGS, - "configuration_settings") + "configurations_load") +MSG_HASH(MENU_ENUM_LABEL_CONFIGURATIONS_SETTINGS, + "configurations_settings") MSG_HASH(MENU_ENUM_LABEL_CONFIG_SAVE_ON_EXIT, "config_save_on_exit") MSG_HASH(MENU_ENUM_LABEL_CONNECT_WIFI, @@ -224,7 +222,7 @@ MSG_HASH(MENU_ENUM_LABEL_DEFERRED_ARCHIVE_OPEN_DETECT_CORE, "deferred_archive_open_detect_core") MSG_HASH(MENU_ENUM_LABEL_DEFERRED_AUDIO_SETTINGS_LIST, "deferred_audio_settings_list") -MSG_HASH(MENU_ENUM_LABEL_DEFERRED_CONFIGURATION_SETTINGS_LIST, +MSG_HASH(MENU_ENUM_LABEL_DEFERRED_CONFIGURATIONS_SETTINGS, "deferred_configuration_settings_list") MSG_HASH(MENU_ENUM_LABEL_DEFERRED_CORE_CONTENT_DIRS_LIST, "deferred_core_content_dirs_list") diff --git a/intl/msg_hash_nl.c b/intl/msg_hash_nl.c index 9737ea1102..70f1e30103 100644 --- a/intl/msg_hash_nl.c +++ b/intl/msg_hash_nl.c @@ -137,7 +137,7 @@ const char *msg_hash_to_str_nl(enum msg_hash_enums msg) return "Afsluiten"; case MENU_ENUM_LABEL_VALUE_CONFIG_LOAD: return "Laad Configuratie"; - case MENU_ENUM_LABEL_VALUE_CONFIGURATION_SETTINGS: + case MENU_ENUM_LABEL_VALUE_CONFIGURATIONS_SETTINGS: return "Configuratie"; case MENU_ENUM_LABEL_VALUE_CONFIG_SAVE_ON_EXIT: return "Configuratie Opslaan Tijdens Afsluiten"; diff --git a/intl/msg_hash_pl.c b/intl/msg_hash_pl.c index 45907fe4fd..9352fa0258 100644 --- a/intl/msg_hash_pl.c +++ b/intl/msg_hash_pl.c @@ -106,7 +106,7 @@ const char *msg_hash_to_str_pl(enum msg_hash_enums msg) return "Zamknij"; case MENU_ENUM_LABEL_VALUE_CONFIG_LOAD: return "Wczytaj konfigurację"; - case MENU_ENUM_LABEL_VALUE_CONFIGURATION_SETTINGS: + case MENU_ENUM_LABEL_VALUE_CONFIGURATIONS_SETTINGS: return "Ustawienia konfiguracji"; case MENU_ENUM_LABEL_VALUE_CONFIG_SAVE_ON_EXIT: return "Zapisz konfigurację przy wyjściu"; diff --git a/intl/msg_hash_pt.c b/intl/msg_hash_pt.c index 2aec323ff3..3ccfceae29 100644 --- a/intl/msg_hash_pt.c +++ b/intl/msg_hash_pt.c @@ -1044,7 +1044,7 @@ const char *msg_hash_to_str_pt(enum msg_hash_enums msg) return "Fechar"; case MENU_ENUM_LABEL_VALUE_CONFIG_LOAD: return "Carregar Configuração"; - case MENU_ENUM_LABEL_VALUE_CONFIGURATION_SETTINGS: + case MENU_ENUM_LABEL_VALUE_CONFIGURATIONS_SETTINGS: return "Configurações"; case MENU_ENUM_LABEL_VALUE_CONFIG_SAVE_ON_EXIT: return "Salvar Configuração ao Sair"; diff --git a/intl/msg_hash_us.h b/intl/msg_hash_us.h index 5c7a6632ea..ca10b2366c 100644 --- a/intl/msg_hash_us.h +++ b/intl/msg_hash_us.h @@ -383,10 +383,6 @@ MSG_HASH( MENU_ENUM_LABEL_VALUE_CONFIG_LOAD, "Load Configuration..." ) -MSG_HASH( - MENU_ENUM_LABEL_VALUE_CONFIGURATION_SETTINGS, - "Configuration" - ) MSG_HASH( MENU_ENUM_LABEL_VALUE_CONFIG_SAVE_ON_EXIT, "Save Configuration on Exit" @@ -1614,7 +1610,7 @@ MSG_HASH(MENU_ENUM_SUBLABEL_DRIVER_SETTINGS, "Change drivers for the system.") MSG_HASH(MENU_ENUM_SUBLABEL_RETRO_ACHIEVEMENTS_SETTINGS, "Change settings for the achievements.") -MSG_HASH(MENU_ENUM_SUBLABEL_CONFIGURATION_SETTINGS, +MSG_HASH(MENU_ENUM_SUBLABEL_CONFIGURATIONS_SETTINGS, "Change settings for configurations, content overrides, core overrides, remaps and more.") MSG_HASH(MENU_ENUM_SUBLABEL_CORE_SETTINGS, "Change settings for the core.") diff --git a/intl/msg_hash_vn.c b/intl/msg_hash_vn.c index 5705eb8684..7d406bb57f 100644 --- a/intl/msg_hash_vn.c +++ b/intl/msg_hash_vn.c @@ -2042,7 +2042,7 @@ static const char *menu_hash_to_str_vn_label_enum(enum msg_hash_enums msg) return "collection"; case MENU_ENUM_LABEL_CONFIG_LOAD: return "configurations"; - case MENU_ENUM_LABEL_CONFIGURATION_SETTINGS: + case MENU_ENUM_LABEL_CONFIGURATIONS_SETTINGS: return "configuration_settings"; case MENU_ENUM_LABEL_CONFIG_SAVE_ON_EXIT: return "config_save_on_exit"; @@ -2122,7 +2122,7 @@ static const char *menu_hash_to_str_vn_label_enum(enum msg_hash_enums msg) return "deferred_archive_open_detect_core"; case MENU_ENUM_LABEL_DEFERRED_AUDIO_SETTINGS_LIST: return "deferred_audio_settings_list"; - case MENU_ENUM_LABEL_DEFERRED_CONFIGURATION_SETTINGS_LIST: + case MENU_ENUM_LABEL_DEFERRED_CONFIGURATIONS_SETTINGS: return "deferred_configuration_settings_list"; case MENU_ENUM_LABEL_DEFERRED_CORE_CONTENT_DIRS_LIST: return "deferred_core_content_dirs_list"; @@ -3181,7 +3181,7 @@ const char *msg_hash_to_str_vn(enum msg_hash_enums msg) return "Config"; case MENU_ENUM_LABEL_VALUE_CONFIG_LOAD: return "Tải Configuration"; - case MENU_ENUM_LABEL_VALUE_CONFIGURATION_SETTINGS: + case MENU_ENUM_LABEL_VALUE_CONFIGURATIONS_SETTINGS: return "Configuration"; case MENU_ENUM_LABEL_VALUE_CONFIG_SAVE_ON_EXIT: return "Save Configuration on Exit"; diff --git a/menu/cbs/menu_cbs_deferred_push.c b/menu/cbs/menu_cbs_deferred_push.c index 52f8bbad48..903751e556 100644 --- a/menu/cbs/menu_cbs_deferred_push.c +++ b/menu/cbs/menu_cbs_deferred_push.c @@ -122,7 +122,7 @@ static int deferred_push_video_settings_list(menu_displaylist_info_t *info) static int deferred_push_configuration_settings_list(menu_displaylist_info_t *info) { - return deferred_push_dlist(info, DISPLAYLIST_CONFIGURATION_SETTINGS_LIST); + return deferred_push_dlist(info, DISPLAYLIST_CONFIGURATIONS_SETTINGS); } static int deferred_push_saving_settings_list(menu_displaylist_info_t *info) @@ -717,7 +717,7 @@ static int menu_cbs_init_bind_deferred_push_compare_label( BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_core_settings_list); return 0; } - if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_DEFERRED_CONFIGURATION_SETTINGS_LIST))) + if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_DEFERRED_CONFIGURATIONS_SETTINGS))) { BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_configuration_settings_list); return 0; @@ -1070,7 +1070,7 @@ static int menu_cbs_init_bind_deferred_push_compare_label( case MENU_ENUM_LABEL_DEFERRED_VIDEO_SETTINGS_LIST: BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_video_settings_list); break; - case MENU_ENUM_LABEL_DEFERRED_CONFIGURATION_SETTINGS_LIST: + case MENU_ENUM_LABEL_DEFERRED_CONFIGURATIONS_SETTINGS: BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_configuration_settings_list); break; case MENU_ENUM_LABEL_DEFERRED_SAVING_SETTINGS_LIST: diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c index 648d742456..cf6ab7de05 100644 --- a/menu/cbs/menu_cbs_ok.c +++ b/menu/cbs/menu_cbs_ok.c @@ -441,6 +441,7 @@ int generic_action_ok_displaylist_push(const char *path, info_path = path; dl_type = DISPLAYLIST_GENERIC; break; +/* COMMENTED OUT. case ACTION_OK_DL_CONFIGURATIONS_SETTINGS: info.type = type; info.directory_ptr = idx; @@ -451,6 +452,7 @@ int generic_action_ok_displaylist_push(const char *path, info_label = label; dl_type = DISPLAYLIST_GENERIC; break; +*/ case ACTION_OK_DL_COMPRESSED_ARCHIVE_PUSH_DETECT_CORE: info.type = type; info.directory_ptr = idx; @@ -634,12 +636,12 @@ int generic_action_ok_displaylist_push(const char *path, info.enum_idx = MENU_ENUM_LABEL_DEFERRED_VIDEO_SETTINGS_LIST; dl_type = DISPLAYLIST_GENERIC; break; - case ACTION_OK_DL_CONFIGURATION_SETTINGS_LIST: + case ACTION_OK_DL_CONFIGURATIONS_SETTINGS: info.directory_ptr = idx; info.type = type; info_path = path; - info_label = msg_hash_to_str(MENU_ENUM_LABEL_DEFERRED_CONFIGURATION_SETTINGS_LIST); - info.enum_idx = MENU_ENUM_LABEL_DEFERRED_CONFIGURATION_SETTINGS_LIST; + info_label = msg_hash_to_str(MENU_ENUM_LABEL_DEFERRED_CONFIGURATIONS_SETTINGS); + info.enum_idx = MENU_ENUM_LABEL_DEFERRED_CONFIGURATIONS_SETTINGS; dl_type = DISPLAYLIST_GENERIC; break; case ACTION_OK_DL_SAVING_SETTINGS_LIST: @@ -1216,7 +1218,7 @@ static int action_ok_playlist_entry_start_content(const char *path, new_core_path[0] = new_display_name[0] = '\0'; - found_associated_core = + found_associated_core = menu_content_playlist_find_associated_core( path_base, new_core_path, sizeof(new_core_path)); @@ -2138,7 +2140,7 @@ static int generic_action_ok_network(const char *path, default: break; } - + menu_entries_ctl(MENU_ENTRIES_CTL_SET_REFRESH, &refresh); command_event(CMD_EVENT_NETWORK_INIT, NULL); @@ -3130,7 +3132,7 @@ static int action_ok_push_configuration_settings_list(const char *path, { return generic_action_ok_displaylist_push(path, NULL, label, type, idx, entry_idx, - ACTION_OK_DL_CONFIGURATION_SETTINGS_LIST); + ACTION_OK_DL_CONFIGURATIONS_SETTINGS); } static int action_ok_push_core_settings_list(const char *path, @@ -3678,7 +3680,7 @@ static int menu_cbs_init_bind_ok_compare_label(menu_file_list_cbs_t *cbs, case MENU_ENUM_LABEL_CORE_SETTINGS: BIND_ACTION_OK(cbs, action_ok_push_core_settings_list); break; - case MENU_ENUM_LABEL_CONFIGURATION_SETTINGS: + case MENU_ENUM_LABEL_CONFIGURATIONS_SETTINGS: BIND_ACTION_OK(cbs, action_ok_push_configuration_settings_list); break; case MENU_ENUM_LABEL_PLAYLIST_SETTINGS: @@ -3711,7 +3713,6 @@ static int menu_cbs_init_bind_ok_compare_label(menu_file_list_cbs_t *cbs, case MENU_ENUM_LABEL_NETPLAY: case MENU_ENUM_LABEL_LOAD_CONTENT_LIST: case MENU_ENUM_LABEL_ADD_CONTENT_LIST: - case MENU_ENUM_LABEL_CONFIGURATIONS_SETTINGS: case MENU_ENUM_LABEL_HELP_LIST: case MENU_ENUM_LABEL_INFORMATION_LIST: case MENU_ENUM_LABEL_CONTENT_SETTINGS: diff --git a/menu/cbs/menu_cbs_sublabel.c b/menu/cbs/menu_cbs_sublabel.c index cf431609a9..fe2257eb1f 100644 --- a/menu/cbs/menu_cbs_sublabel.c +++ b/menu/cbs/menu_cbs_sublabel.c @@ -420,7 +420,7 @@ static int action_bind_sublabel_configurations_settings_list( char *s, size_t len) { - strlcpy(s, msg_hash_to_str(MENU_ENUM_SUBLABEL_CONFIGURATION_SETTINGS), len); + strlcpy(s, msg_hash_to_str(MENU_ENUM_SUBLABEL_CONFIGURATIONS_SETTINGS), len); return 0; } diff --git a/menu/cbs/menu_cbs_title.c b/menu/cbs/menu_cbs_title.c index 8e06e7a080..620d9cfd29 100644 --- a/menu/cbs/menu_cbs_title.c +++ b/menu/cbs/menu_cbs_title.c @@ -224,7 +224,7 @@ static int action_get_video_settings_list(const char *path, const char *label, static int action_get_configuration_settings_list(const char *path, const char *label, unsigned menu_type, char *s, size_t len) { - sanitize_to_string(s, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_CONFIGURATION_SETTINGS), len); + sanitize_to_string(s, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_CONFIGURATIONS_SETTINGS), len); return 0; } @@ -913,7 +913,7 @@ static int menu_cbs_init_bind_title_compare_label(menu_file_list_cbs_t *cbs, return 0; } - if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_DEFERRED_CONFIGURATION_SETTINGS_LIST))) + if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_DEFERRED_CONFIGURATIONS_SETTINGS))) { BIND_ACTION_GET_TITLE(cbs, action_get_configuration_settings_list); return 0; @@ -1247,7 +1247,7 @@ static int menu_cbs_init_bind_title_compare_label(menu_file_list_cbs_t *cbs, case MENU_ENUM_LABEL_DEFERRED_VIDEO_SETTINGS_LIST: BIND_ACTION_GET_TITLE(cbs, action_get_video_settings_list); break; - case MENU_ENUM_LABEL_DEFERRED_CONFIGURATION_SETTINGS_LIST: + case MENU_ENUM_LABEL_DEFERRED_CONFIGURATIONS_SETTINGS: BIND_ACTION_GET_TITLE(cbs, action_get_configuration_settings_list); break; case MENU_ENUM_LABEL_DEFERRED_LOGGING_SETTINGS_LIST: diff --git a/menu/menu_cbs.h b/menu/menu_cbs.h index 6c9c560c88..55e922f8e6 100644 --- a/menu/menu_cbs.h +++ b/menu/menu_cbs.h @@ -48,7 +48,7 @@ enum ACTION_OK_DL_DRIVER_SETTINGS_LIST, ACTION_OK_DL_VIDEO_SETTINGS_LIST, ACTION_OK_DL_AUDIO_SETTINGS_LIST, - ACTION_OK_DL_CONFIGURATION_SETTINGS_LIST, + ACTION_OK_DL_CONFIGURATIONS_SETTINGS, ACTION_OK_DL_SAVING_SETTINGS_LIST, ACTION_OK_DL_LOGGING_SETTINGS_LIST, ACTION_OK_DL_FRAME_THROTTLE_SETTINGS_LIST, @@ -69,7 +69,6 @@ enum ACTION_OK_DL_CHEAT_FILE, ACTION_OK_DL_CORE_LIST, ACTION_OK_DL_LAKKA_LIST, - ACTION_OK_DL_CONFIGURATIONS_SETTINGS, ACTION_OK_DL_COMPRESSED_ARCHIVE_PUSH, ACTION_OK_DL_COMPRESSED_ARCHIVE_PUSH_DETECT_CORE, ACTION_OK_DL_PARENT_DIRECTORY_PUSH, diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index 587720002e..c8038fe734 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -2908,6 +2908,13 @@ static int menu_displaylist_parse_configurations_list( MENU_ENUM_LABEL_CONFIG_SAVE_ON_EXIT, MENU_SETTING_ACTION, 0, 0); +/* You may want to check for show_advanced_settings here */ + menu_entries_append_enum(info->list, + msg_hash_to_str(MENU_ENUM_LABEL_VALUE_CORE_SPECIFIC_CONFIG), + msg_hash_to_str(MENU_ENUM_LABEL_CORE_SPECIFIC_CONFIG), + MENU_ENUM_LABEL_CORE_SPECIFIC_CONFIG, + MENU_SETTING_ACTION, 0, 0); + menu_entries_append_enum(info->list, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_GAME_SPECIFIC_OPTIONS), msg_hash_to_str(MENU_ENUM_LABEL_GAME_SPECIFIC_OPTIONS), diff --git a/menu/menu_displaylist.h b/menu/menu_displaylist.h index 91fcb3344a..29923ded26 100644 --- a/menu/menu_displaylist.h +++ b/menu/menu_displaylist.h @@ -45,7 +45,7 @@ enum menu_displaylist_parse_type PARSE_ONLY_STRING_OPTIONS = (1 << 11), PARSE_ONLY_HEX = (1 << 12), PARSE_ONLY_DIR = (1 << 13), - PARSE_SUB_GROUP = (1 << 14) + PARSE_SUB_GROUP = (1 << 14) }; enum menu_displaylist_ctl_state @@ -110,7 +110,7 @@ enum menu_displaylist_ctl_state DISPLAYLIST_ACCOUNTS_LIST, DISPLAYLIST_DRIVER_SETTINGS_LIST, DISPLAYLIST_VIDEO_SETTINGS_LIST, - DISPLAYLIST_CONFIGURATION_SETTINGS_LIST, + DISPLAYLIST_CONFIGURATIONS_SETTINGS, DISPLAYLIST_SAVING_SETTINGS_LIST, DISPLAYLIST_LOGGING_SETTINGS_LIST, DISPLAYLIST_FRAME_THROTTLE_SETTINGS_LIST, @@ -145,7 +145,6 @@ enum menu_displaylist_ctl_state DISPLAYLIST_OPTIONS_SHADERS, DISPLAYLIST_NETPLAY, DISPLAYLIST_ADD_CONTENT_LIST, - DISPLAYLIST_CONFIGURATIONS_SETTINGS, DISPLAYLIST_SCAN_DIRECTORY_LIST, DISPLAYLIST_ARCHIVE_ACTION, DISPLAYLIST_ARCHIVE_ACTION_DETECT_CORE, diff --git a/menu/menu_setting.c b/menu/menu_setting.c index a741cdc09d..59f1f31b4f 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -139,10 +139,10 @@ static void setting_get_string_representation_uint_custom_viewport_width(void *d rarch_setting_t *setting = (rarch_setting_t*)data; if (!setting) return; - + av_info = video_viewport_get_system_av_info(); geom = (struct retro_game_geometry*)&av_info->geometry; - + if (*setting->value.target.unsigned_integer%geom->base_width == 0) snprintf(s, len, "%u (%ux)", *setting->value.target.unsigned_integer, @@ -160,10 +160,10 @@ static void setting_get_string_representation_uint_custom_viewport_height(void * rarch_setting_t *setting = (rarch_setting_t*)data; if (!setting) return; - + av_info = video_viewport_get_system_av_info(); geom = (struct retro_game_geometry*)&av_info->geometry; - + if (*setting->value.target.unsigned_integer%geom->base_height == 0) snprintf(s, len, "%u (%ux)", *setting->value.target.unsigned_integer, @@ -732,7 +732,7 @@ int menu_action_handle_setting(rarch_setting_t *setting, return -1; } -static rarch_setting_t *menu_setting_find_internal(rarch_setting_t *setting, +static rarch_setting_t *menu_setting_find_internal(rarch_setting_t *setting, const char *label) { uint32_t needle = msg_hash_calculate(label); @@ -762,7 +762,7 @@ static rarch_setting_t *menu_setting_find_internal(rarch_setting_t *setting, return NULL; } -static rarch_setting_t *menu_setting_find_internal_enum(rarch_setting_t *setting, +static rarch_setting_t *menu_setting_find_internal_enum(rarch_setting_t *setting, enum msg_hash_enums enum_idx) { rarch_setting_t **list = &setting; @@ -1022,10 +1022,10 @@ static int setting_action_start_libretro_device_type(void *data) devices[types++] = RETRO_DEVICE_NONE; devices[types++] = RETRO_DEVICE_JOYPAD; - if (runloop_ctl(RUNLOOP_CTL_SYSTEM_INFO_GET, &system) + if (runloop_ctl(RUNLOOP_CTL_SYSTEM_INFO_GET, &system) && system) { - /* Only push RETRO_DEVICE_ANALOG as default if we use an + /* Only push RETRO_DEVICE_ANALOG as default if we use an * older core which doesn't use SET_CONTROLLER_INFO. */ if (!system->ports.size) devices[types++] = RETRO_DEVICE_ANALOG; @@ -1129,7 +1129,7 @@ static int setting_action_left_libretro_device_type( if (system) { - /* Only push RETRO_DEVICE_ANALOG as default if we use an + /* Only push RETRO_DEVICE_ANALOG as default if we use an * older core which doesn't use SET_CONTROLLER_INFO. */ if (!system->ports.size) devices[types++] = RETRO_DEVICE_ANALOG; @@ -1193,10 +1193,10 @@ static int setting_action_right_libretro_device_type( devices[types++] = RETRO_DEVICE_NONE; devices[types++] = RETRO_DEVICE_JOYPAD; - if (runloop_ctl(RUNLOOP_CTL_SYSTEM_INFO_GET, &system) + if (runloop_ctl(RUNLOOP_CTL_SYSTEM_INFO_GET, &system) && system) { - /* Only push RETRO_DEVICE_ANALOG as default if we use an + /* Only push RETRO_DEVICE_ANALOG as default if we use an * older core which doesn't use SET_CONTROLLER_INFO. */ if (!system->ports.size) devices[types++] = RETRO_DEVICE_ANALOG; @@ -1337,7 +1337,7 @@ static int setting_action_ok_bind_defaults(void *data, bool wraparound) target = (struct retro_keybind*) &settings->input.binds[setting->index_offset][0]; - def_binds = (setting->index_offset) ? + def_binds = (setting->index_offset) ? retro_keybinds_rest : retro_keybinds_1; if (!target) @@ -1454,7 +1454,7 @@ static void get_string_representation_bind_device(void * data, char *s, * Get associated label of a setting. **/ void menu_setting_get_label(void *data, char *s, - size_t len, unsigned *w, unsigned type, + size_t len, unsigned *w, unsigned type, const char *menu_label, const char *label, unsigned idx) { rarch_setting_t *setting = NULL; @@ -1584,7 +1584,7 @@ void general_write_handler(void *data) { menu_displaylist_info_t info = {0}; info.list = menu_stack; - info.type = 0; + info.type = 0; info.directory_ptr = 0; strlcpy(info.label, msg_hash_to_str(MENU_ENUM_LABEL_HELP), sizeof(info.label)); @@ -1639,14 +1639,14 @@ void general_write_handler(void *data) break; case MENU_ENUM_LABEL_LOG_VERBOSITY: { - if (setting - && setting->value.target.boolean + if (setting + && setting->value.target.boolean && *setting->value.target.boolean) verbosity_enable(); else verbosity_disable(); - if (setting + if (setting && setting->value.target.boolean && *setting->value.target.boolean) retroarch_override_setting_set(RARCH_OVERRIDE_SETTING_VERBOSITY, NULL); @@ -1684,7 +1684,7 @@ void general_write_handler(void *data) { #if defined(__CELLOS_LV2__) && (CELL_SDK_VERSION > 0x340000) cellSysutilEnableBgmPlayback(); -#endif +#endif } else { @@ -1718,7 +1718,7 @@ void general_write_handler(void *data) #ifdef HAVE_NETWORKING { bool val = (settings->netplay.sync_frames > 0); - + if (val) retroarch_override_setting_set(RARCH_OVERRIDE_SETTING_NETPLAY_DELAY_FRAMES, NULL); else @@ -1976,7 +1976,7 @@ static bool setting_append_list_input_player_options( (*list)[list_info->index - 1].action_right = &setting_action_right_libretro_device_type; (*list)[list_info->index - 1].action_select = &setting_action_right_libretro_device_type; (*list)[list_info->index - 1].action_start = &setting_action_start_libretro_device_type; - (*list)[list_info->index - 1].get_string_representation = + (*list)[list_info->index - 1].get_string_representation = &setting_get_string_representation_uint_libretro_device; menu_settings_list_current_add_enum_idx(list, list_info, (enum msg_hash_enums)(MENU_ENUM_LABEL_INPUT_LIBRETRO_DEVICE + user)); @@ -1997,7 +1997,7 @@ static bool setting_append_list_input_player_options( (*list)[list_info->index - 1].action_right = &setting_action_right_analog_dpad_mode; (*list)[list_info->index - 1].action_select = &setting_action_right_analog_dpad_mode; (*list)[list_info->index - 1].action_start = &setting_action_start_analog_dpad_mode; - (*list)[list_info->index - 1].get_string_representation = + (*list)[list_info->index - 1].get_string_representation = &setting_get_string_representation_uint_analog_dpad_mode; menu_settings_list_current_add_enum_idx(list, list_info, (enum msg_hash_enums)(MENU_ENUM_LABEL_INPUT_PLAYER_ANALOG_DPAD_MODE + user)); @@ -2075,7 +2075,7 @@ static bool setting_append_list_input_player_options( ) { if (system->input_desc_btn[user][i]) - strlcat(label, + strlcat(label, system->input_desc_btn[user][i], sizeof(label)); else @@ -2418,14 +2418,6 @@ static bool setting_append_list( parent_group); } - CONFIG_ACTION( - list, list_info, - MENU_ENUM_LABEL_CONFIGURATION_SETTINGS, - MENU_ENUM_LABEL_VALUE_CONFIGURATION_SETTINGS, - &group_info, - &subgroup_info, - parent_group); - CONFIG_ACTION( list, list_info, MENU_ENUM_LABEL_SAVING_SETTINGS, @@ -2763,9 +2755,9 @@ static bool setting_append_list( unsigned i; struct bool_entry bool_entries[6]; START_GROUP(list, list_info, &group_info, - msg_hash_to_str(MENU_ENUM_LABEL_VALUE_CONFIGURATION_SETTINGS), parent_group); + msg_hash_to_str(MENU_ENUM_LABEL_VALUE_CONFIGURATIONS_SETTINGS), parent_group); - parent_group = msg_hash_to_str(MENU_ENUM_LABEL_CONFIGURATION_SETTINGS); + parent_group = msg_hash_to_str(MENU_ENUM_LABEL_CONFIGURATIONS_SETTINGS); START_SUB_GROUP(list, list_info, "State", &group_info, &subgroup_info, parent_group); @@ -2866,7 +2858,7 @@ static bool setting_append_list( general_write_handler, general_read_handler); menu_settings_list_current_add_range(list, list_info, 0, 3, 1.0, true, true); - (*list)[list_info->index - 1].get_string_representation = + (*list)[list_info->index - 1].get_string_representation = &setting_get_string_representation_uint_libretro_log_level; settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED); @@ -2975,7 +2967,7 @@ static bool setting_append_list( menu_settings_list_current_add_cmd(list, list_info, CMD_EVENT_AUTOSAVE_INIT); menu_settings_list_current_add_range(list, list_info, 0, 0, 10, true, false); settings_data_list_current_add_flags(list, list_info, SD_FLAG_CMD_APPLY_AUTO); - (*list)[list_info->index - 1].get_string_representation = + (*list)[list_info->index - 1].get_string_representation = &setting_get_string_representation_uint_autosave_interval; #endif @@ -3100,7 +3092,7 @@ static bool setting_append_list( general_read_handler); menu_settings_list_current_add_cmd(list, list_info, CMD_EVENT_REINIT); menu_settings_list_current_add_range(list, list_info, 0, 1, 1, true, false); - (*list)[list_info->index - 1].get_string_representation = + (*list)[list_info->index - 1].get_string_representation = &setting_get_string_representation_uint_video_monitor_index; settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED); @@ -3169,7 +3161,7 @@ static bool setting_append_list( (*list)[list_info->index - 1].action_start = &setting_action_start_video_refresh_rate_auto; (*list)[list_info->index - 1].action_ok = &setting_action_ok_video_refresh_rate_auto; (*list)[list_info->index - 1].action_select = &setting_action_ok_video_refresh_rate_auto; - (*list)[list_info->index - 1].get_string_representation = + (*list)[list_info->index - 1].get_string_representation = &setting_get_string_representation_st_float_video_refresh_rate_auto; if (string_is_equal(settings->video.driver, "gl")) @@ -3218,7 +3210,7 @@ static bool setting_append_list( true, true); settings_data_list_current_add_flags(list, list_info, SD_FLAG_CMD_APPLY_AUTO); - (*list)[list_info->index - 1].get_string_representation = + (*list)[list_info->index - 1].get_string_representation = &setting_get_string_representation_uint_aspect_ratio_index; CONFIG_INT( @@ -3396,7 +3388,7 @@ static bool setting_append_list( general_write_handler, general_read_handler); menu_settings_list_current_add_range(list, list_info, 0, 3, 1, true, true); - (*list)[list_info->index - 1].get_string_representation = + (*list)[list_info->index - 1].get_string_representation = &setting_get_string_representation_uint_video_rotation; settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED); @@ -3719,7 +3711,7 @@ static bool setting_append_list( &settings->audio.latency, MENU_ENUM_LABEL_AUDIO_LATENCY, MENU_ENUM_LABEL_VALUE_AUDIO_LATENCY, - g_defaults.settings.out_latency ? + g_defaults.settings.out_latency ? g_defaults.settings.out_latency : out_latency, &group_info, &subgroup_info, @@ -3884,7 +3876,7 @@ static bool setting_append_list( general_write_handler, general_read_handler); menu_settings_list_current_add_range(list, list_info, 0, 2, 1, true, true); - + #ifdef VITA CONFIG_BOOL( list, list_info, @@ -4101,7 +4093,7 @@ static bool setting_append_list( general_write_handler, general_read_handler); menu_settings_list_current_add_range(list, list_info, 0, 1.00, 0.001, true, true); - + CONFIG_UINT( list, list_info, &settings->input.bind_timeout, @@ -4316,7 +4308,7 @@ static bool setting_append_list( &retro_keybinds_1[i], &group_info, &subgroup_info, parent_group); (*list)[list_info->index - 1].bind_type = i + MENU_SETTINGS_BIND_BEGIN; - menu_settings_list_current_add_enum_idx(list, list_info, + menu_settings_list_current_add_enum_idx(list, list_info, (enum msg_hash_enums)(MENU_ENUM_LABEL_INPUT_HOTKEY_BIND_BEGIN + i)); } @@ -5465,7 +5457,7 @@ static bool setting_append_list( sizeof(settings->network.buildbot_url), MENU_ENUM_LABEL_CORE_UPDATER_BUILDBOT_URL, MENU_ENUM_LABEL_VALUE_CORE_UPDATER_BUILDBOT_URL, - buildbot_server_url, + buildbot_server_url, &group_info, &subgroup_info, parent_group, @@ -5479,7 +5471,7 @@ static bool setting_append_list( sizeof(settings->network.buildbot_assets_url), MENU_ENUM_LABEL_BUILDBOT_ASSETS_URL, MENU_ENUM_LABEL_VALUE_BUILDBOT_ASSETS_URL, - buildbot_assets_server_url, + buildbot_assets_server_url, &group_info, &subgroup_info, parent_group, @@ -5843,7 +5835,7 @@ static bool setting_append_list( true); settings_data_list_current_add_flags(list, list_info, SD_FLAG_ALLOW_INPUT); menu_settings_list_current_add_cmd(list, list_info, CMD_EVENT_MENU_REFRESH); - (*list)[list_info->index - 1].get_string_representation = + (*list)[list_info->index - 1].get_string_representation = &setting_get_string_representation_uint_user_language; #endif @@ -5908,7 +5900,7 @@ static bool setting_append_list( parent_group, general_write_handler, general_read_handler); - (*list)[list_info->index - 1].get_string_representation = + (*list)[list_info->index - 1].get_string_representation = &setting_get_string_representation_cheevos_password; settings_data_list_current_add_flags(list, list_info, SD_FLAG_ALLOW_INPUT); #endif @@ -6399,7 +6391,7 @@ static rarch_setting_t *menu_setting_new_internal(rarch_setting_info_t *list_inf { unsigned i; rarch_setting_t* resized_list = NULL; - enum settings_list_type list_types[] = + enum settings_list_type list_types[] = { SETTINGS_LIST_MAIN_MENU, SETTINGS_LIST_DRIVERS, diff --git a/msg_hash.h b/msg_hash.h index a7a2d130e3..693e208621 100644 --- a/msg_hash.h +++ b/msg_hash.h @@ -937,7 +937,7 @@ enum msg_hash_enums MENU_ENUM_LABEL_DEFERRED_INPUT_SETTINGS_LIST, MENU_ENUM_LABEL_DEFERRED_DRIVER_SETTINGS_LIST, MENU_ENUM_LABEL_DEFERRED_VIDEO_SETTINGS_LIST, - MENU_ENUM_LABEL_DEFERRED_CONFIGURATION_SETTINGS_LIST, + MENU_ENUM_LABEL_DEFERRED_CONFIGURATIONS_SETTINGS, MENU_ENUM_LABEL_DEFERRED_SAVING_SETTINGS_LIST, MENU_ENUM_LABEL_DEFERRED_FRAME_THROTTLE_SETTINGS_LIST, MENU_ENUM_LABEL_DEFERRED_REWIND_SETTINGS_LIST, @@ -984,9 +984,6 @@ enum msg_hash_enums MENU_ENUM_LABEL_ADD_CONTENT_LIST, MENU_ENUM_LABEL_VALUE_ADD_CONTENT_LIST, - MENU_ENUM_LABEL_CONFIGURATIONS_SETTINGS, - MENU_ENUM_LABEL_VALUE_CONFIGURATIONS_SETTINGS, - MENU_ENUM_LABEL_VALUE_DONT_CARE, MENU_ENUM_LABEL_VALUE_LINEAR, MENU_ENUM_LABEL_VALUE_NEAREST, @@ -1654,8 +1651,8 @@ enum msg_hash_enums MENU_ENUM_LABEL_CORE_SETTINGS, MENU_ENUM_LABEL_VALUE_CORE_SETTINGS, - MENU_ENUM_LABEL_CONFIGURATION_SETTINGS, - MENU_ENUM_LABEL_VALUE_CONFIGURATION_SETTINGS, + MENU_ENUM_LABEL_CONFIGURATIONS_SETTINGS, + MENU_ENUM_LABEL_VALUE_CONFIGURATIONS_SETTINGS, MENU_ENUM_LABEL_LOGGING_SETTINGS, MENU_ENUM_LABEL_VALUE_LOGGING_SETTINGS, @@ -1953,7 +1950,7 @@ enum msg_hash_enums MENU_ENUM_SUBLABEL_AUDIO_SETTINGS, MENU_ENUM_SUBLABEL_BLUETOOTH_ENABLE, MENU_ENUM_SUBLABEL_CHEEVOS_HARDCORE_MODE_ENABLE, - MENU_ENUM_SUBLABEL_CONFIGURATION_SETTINGS, + MENU_ENUM_SUBLABEL_CONFIGURATIONS_SETTINGS, MENU_ENUM_SUBLABEL_CONFIG_SAVE_ON_EXIT, MENU_ENUM_SUBLABEL_CORE_SETTINGS, MENU_ENUM_SUBLABEL_CPU_CORES,