diff --git a/intl/msg_hash_chs.c b/intl/msg_hash_chs.c index 8202243c71..319c720b43 100644 --- a/intl/msg_hash_chs.c +++ b/intl/msg_hash_chs.c @@ -2008,9 +2008,9 @@ 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_CONFIG_LOAD: + case MENU_ENUM_LABEL_CONFIGURATIONS: return "configurations"; - case MENU_ENUM_LABEL_CONFIGURATIONS_SETTINGS: + case MENU_ENUM_LABEL_CONFIGURATION_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_CONFIGURATIONS_SETTINGS: + case MENU_ENUM_LABEL_DEFERRED_CONFIGURATION_SETTINGS_LIST: return "deferred_configuration_settings_list"; case MENU_ENUM_LABEL_DEFERRED_CORE_CONTENT_DIRS_LIST: return "deferred_core_content_dirs_list"; @@ -3145,9 +3145,9 @@ 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_CONFIG_LOAD: + case MENU_ENUM_LABEL_VALUE_CONFIGURATIONS: return "加载配置"; - case MENU_ENUM_LABEL_VALUE_CONFIGURATIONS_SETTINGS: + case MENU_ENUM_LABEL_VALUE_CONFIGURATION_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 d65f901c21..f0cd0b9dc8 100644 --- a/intl/msg_hash_de.c +++ b/intl/msg_hash_de.c @@ -508,9 +508,9 @@ 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_CONFIG_LOAD: + case MENU_ENUM_LABEL_VALUE_CONFIGURATIONS: return "Lade Konfigurationsdatei"; /* FIXME/UPDATE */ - case MENU_ENUM_LABEL_VALUE_CONFIGURATIONS_SETTINGS: + case MENU_ENUM_LABEL_VALUE_CONFIGURATION_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 dd85b2a86c..34290b518b 100644 --- a/intl/msg_hash_es.c +++ b/intl/msg_hash_es.c @@ -1587,9 +1587,9 @@ 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_CONFIG_LOAD: + case MENU_ENUM_LABEL_VALUE_CONFIGURATIONS: return "Cargar configuración"; - case MENU_ENUM_LABEL_VALUE_CONFIGURATIONS_SETTINGS: + case MENU_ENUM_LABEL_VALUE_CONFIGURATION_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 b2c27ac126..6d7b370e27 100644 --- a/intl/msg_hash_fr.c +++ b/intl/msg_hash_fr.c @@ -130,9 +130,9 @@ 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_CONFIG_LOAD: + case MENU_ENUM_LABEL_VALUE_CONFIGURATIONS: return "Charger une configuration"; - case MENU_ENUM_LABEL_VALUE_CONFIGURATIONS_SETTINGS: + case MENU_ENUM_LABEL_VALUE_CONFIGURATION_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 f3905ec016..af27b24523 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_CONFIGURATIONS_SETTINGS: + case MENU_ENUM_LABEL_VALUE_CONFIGURATION_SETTINGS: return "Configurazione"; case MENU_ENUM_LABEL_VALUE_CORE_SETTINGS: return "Core"; @@ -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_CONFIG_LOAD: + case MENU_ENUM_LABEL_VALUE_CONFIGURATIONS: 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 0b4769ca2e..370cb425d9 100644 --- a/intl/msg_hash_ja.c +++ b/intl/msg_hash_ja.c @@ -2038,9 +2038,9 @@ 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_CONFIG_LOAD: + case MENU_ENUM_LABEL_CONFIGURATIONS: return "configurations"; - case MENU_ENUM_LABEL_CONFIGURATIONS_SETTINGS: + case MENU_ENUM_LABEL_CONFIGURATION_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_CONFIGURATIONS_SETTINGS: + case MENU_ENUM_LABEL_DEFERRED_CONFIGURATION_SETTINGS_LIST: return "deferred_configuration_settings_list"; case MENU_ENUM_LABEL_DEFERRED_CORE_CONTENT_DIRS_LIST: return "deferred_core_content_dirs_list"; @@ -3175,11 +3175,12 @@ 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_CONFIG_LOAD: + case MENU_ENUM_LABEL_VALUE_CONFIGURATIONS: return "設定をロード"; - case MENU_ENUM_LABEL_VALUE_CONFIGURATIONS_SETTINGS: -/* Is Google Translation okay for "Configurations Settings" */ - return "設定の設定"; + case MENU_ENUM_LABEL_VALUE_CONFIGURATIONS_LIST: + return "設定ファイル"; + case MENU_ENUM_LABEL_VALUE_CONFIGURATION_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 3f838eae9a..6012342fdc 100644 --- a/intl/msg_hash_lbl.h +++ b/intl/msg_hash_lbl.h @@ -10,6 +10,8 @@ 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, + "configurations_list") MSG_HASH(MENU_ENUM_LABEL_ADD_TAB, "add_tab") MSG_HASH(MENU_ENUM_LABEL_ARCHIVE_MODE, @@ -144,10 +146,10 @@ MSG_HASH(MENU_ENUM_LABEL_CLOSE_CONTENT, "unload_core") MSG_HASH(MENU_ENUM_LABEL_COLLECTION, "collection") -MSG_HASH(MENU_ENUM_LABEL_CONFIG_LOAD, - "configurations_load") -MSG_HASH(MENU_ENUM_LABEL_CONFIGURATIONS_SETTINGS, - "configurations_settings") +MSG_HASH(MENU_ENUM_LABEL_CONFIGURATIONS, + "configurations") +MSG_HASH(MENU_ENUM_LABEL_CONFIGURATION_SETTINGS, + "configuration_settings") MSG_HASH(MENU_ENUM_LABEL_CONFIG_SAVE_ON_EXIT, "config_save_on_exit") MSG_HASH(MENU_ENUM_LABEL_CONNECT_WIFI, @@ -224,7 +226,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_CONFIGURATIONS_SETTINGS, +MSG_HASH(MENU_ENUM_LABEL_DEFERRED_CONFIGURATION_SETTINGS_LIST, "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 70f1e30103..39c5b3c3fe 100644 --- a/intl/msg_hash_nl.c +++ b/intl/msg_hash_nl.c @@ -135,9 +135,9 @@ 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_CONFIG_LOAD: + case MENU_ENUM_LABEL_VALUE_CONFIGURATIONS: return "Laad Configuratie"; - case MENU_ENUM_LABEL_VALUE_CONFIGURATIONS_SETTINGS: + case MENU_ENUM_LABEL_VALUE_CONFIGURATION_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 9352fa0258..e53dfa161b 100644 --- a/intl/msg_hash_pl.c +++ b/intl/msg_hash_pl.c @@ -104,9 +104,9 @@ 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_CONFIG_LOAD: + case MENU_ENUM_LABEL_VALUE_CONFIGURATIONS: return "Wczytaj konfigurację"; - case MENU_ENUM_LABEL_VALUE_CONFIGURATIONS_SETTINGS: + case MENU_ENUM_LABEL_VALUE_CONFIGURATION_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 3ccfceae29..1218c80f1d 100644 --- a/intl/msg_hash_pt.c +++ b/intl/msg_hash_pt.c @@ -1042,9 +1042,9 @@ 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_CONFIG_LOAD: + case MENU_ENUM_LABEL_VALUE_CONFIGURATIONS: return "Carregar Configuração"; - case MENU_ENUM_LABEL_VALUE_CONFIGURATIONS_SETTINGS: + case MENU_ENUM_LABEL_VALUE_CONFIGURATION_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 7e485b647f..367eee2caf 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_SETTINGS, + MENU_ENUM_LABEL_VALUE_CONFIGURATIONS_LIST, "Configurations" ) MSG_HASH( @@ -213,11 +213,11 @@ MSG_HASH( ) MSG_HASH( MENU_ENUM_LABEL_VALUE_AUTO_OVERRIDES_ENABLE, - "Load Core Overrides Automatically" + "Load Override Files Automatically" ) MSG_HASH( MENU_ENUM_LABEL_VALUE_AUTO_REMAPS_ENABLE, - "Load Remaps Automatically" + "Load Remap Files Automatically" ) MSG_HASH( MENU_ENUM_LABEL_VALUE_AUTO_SHADERS_ENABLE, @@ -384,16 +384,20 @@ MSG_HASH( "Config" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_CONFIG_LOAD, - "Load Configuration..." + MENU_ENUM_LABEL_VALUE_CONFIGURATIONS, + "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" + "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 +547,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 Overrides Automatically") + "Load Content-specific core options 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, @@ -1159,7 +1163,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, - "Create New Configuration") + "Save New Configuration") MSG_HASH(MENU_ENUM_LABEL_VALUE_SAVE_STATE, "Save State") MSG_HASH(MENU_ENUM_LABEL_VALUE_SAVING_SETTINGS, @@ -1197,7 +1201,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_SHADER_PIPELINE_SNOW, MSG_HASH(MENU_ENUM_LABEL_VALUE_SHOW_ADVANCED_SETTINGS, "Show Advanced Settings") MSG_HASH(MENU_ENUM_LABEL_VALUE_SHOW_HIDDEN_FILES, - "Show Hidden Files & Folders") + "Show Hidden Files and Folders") MSG_HASH(MENU_ENUM_LABEL_VALUE_SHUTDOWN, "Shutdown") MSG_HASH(MENU_ENUM_LABEL_VALUE_SLOWMOTION_RATIO, @@ -1618,8 +1622,6 @@ 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_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.") MSG_HASH(MENU_ENUM_SUBLABEL_RECORDING_SETTINGS, diff --git a/intl/msg_hash_vn.c b/intl/msg_hash_vn.c index 6663dcf8a3..0621cd6f39 100644 --- a/intl/msg_hash_vn.c +++ b/intl/msg_hash_vn.c @@ -2040,9 +2040,9 @@ 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_CONFIG_LOAD: + case MENU_ENUM_LABEL_CONFIGURATIONS: return "configurations"; - case MENU_ENUM_LABEL_CONFIGURATIONS_SETTINGS: + case MENU_ENUM_LABEL_CONFIGURATION_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_CONFIGURATIONS_SETTINGS: + case MENU_ENUM_LABEL_DEFERRED_CONFIGURATION_SETTINGS_LIST: return "deferred_configuration_settings_list"; case MENU_ENUM_LABEL_DEFERRED_CORE_CONTENT_DIRS_LIST: return "deferred_core_content_dirs_list"; @@ -3179,14 +3179,14 @@ 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_CONFIG_LOAD: + case MENU_ENUM_LABEL_VALUE_CONFIGURATIONS: return "Tải Configuration"; - case MENU_ENUM_LABEL_VALUE_CONFIGURATIONS_SETTINGS: + 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 Configuration"; + return "Save Current Config"; 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 "Create New Configuration"; + return "Save New Config"; 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 & Folders"; + return "Show Hidden Files and Folders"; case MENU_ENUM_LABEL_VALUE_SHUTDOWN: return "Tắt Máy"; case MENU_ENUM_LABEL_VALUE_SLOWMOTION_RATIO: diff --git a/menu/cbs/menu_cbs_deferred_push.c b/menu/cbs/menu_cbs_deferred_push.c index 903751e556..bd9f3f8050 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_CONFIGURATIONS_SETTINGS); + return deferred_push_dlist(info, DISPLAYLIST_CONFIGURATION_SETTINGS_LIST); } static int deferred_push_saving_settings_list(menu_displaylist_info_t *info) @@ -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_SETTINGS); + return deferred_push_dlist(info, DISPLAYLIST_CONFIGURATIONS_LIST); } static int deferred_push_load_content_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_CONFIGURATIONS_SETTINGS))) + if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_DEFERRED_CONFIGURATION_SETTINGS_LIST))) { BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_configuration_settings_list); return 0; @@ -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_SETTINGS: + case MENU_ENUM_LABEL_CONFIGURATIONS_LIST: 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_CONFIG_LOAD: + case MENU_ENUM_LABEL_CONFIGURATIONS: BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_configurations); break; case MENU_ENUM_LABEL_VIDEO_SHADER_PRESET: @@ -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_CONFIGURATIONS_SETTINGS: + case MENU_ENUM_LABEL_DEFERRED_CONFIGURATION_SETTINGS_LIST: BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_configuration_settings_list); break; case MENU_ENUM_LABEL_DEFERRED_SAVING_SETTINGS_LIST: @@ -1109,7 +1109,7 @@ static int menu_cbs_init_bind_deferred_push_compare_label( { switch (label_hash) { - case MENU_LABEL_DEFERRED_CONFIGURATIONS_SETTINGS: + case MENU_LABEL_DEFERRED_CONFIGURATIONS_LIST: 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_CONFIG_LOAD: + case MENU_LABEL_CONFIGURATIONS: 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 4270492b85..c1a11ce419 100644 --- a/menu/cbs/menu_cbs_get_value.c +++ b/menu/cbs/menu_cbs_get_value.c @@ -1683,7 +1683,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_CONFIG_LOAD: + case MENU_ENUM_LABEL_CONFIGURATIONS: 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 cf6ab7de05..adfaf6c0f7 100644 --- a/menu/cbs/menu_cbs_ok.c +++ b/menu/cbs/menu_cbs_ok.c @@ -441,8 +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: + case ACTION_OK_DL_CONFIGURATIONS_LIST: info.type = type; info.directory_ptr = idx; if (string_is_empty(settings->directory.menu_config)) @@ -452,7 +451,6 @@ 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; @@ -636,12 +634,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_CONFIGURATIONS_SETTINGS: + case ACTION_OK_DL_CONFIGURATION_SETTINGS_LIST: info.directory_ptr = idx; info.type = type; info_path = path; - info_label = msg_hash_to_str(MENU_ENUM_LABEL_DEFERRED_CONFIGURATIONS_SETTINGS); - info.enum_idx = MENU_ENUM_LABEL_DEFERRED_CONFIGURATIONS_SETTINGS; + info_label = msg_hash_to_str(MENU_ENUM_LABEL_DEFERRED_CONFIGURATION_SETTINGS_LIST); + info.enum_idx = MENU_ENUM_LABEL_DEFERRED_CONFIGURATION_SETTINGS_LIST; dl_type = DISPLAYLIST_GENERIC; break; case ACTION_OK_DL_SAVING_SETTINGS_LIST: @@ -1218,7 +1216,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)); @@ -2140,7 +2138,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); @@ -2820,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_SETTINGS); + entry_idx, ACTION_OK_DL_CONFIGURATIONS_LIST); } static int action_ok_saving_list(const char *path, @@ -3132,7 +3130,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_CONFIGURATIONS_SETTINGS); + ACTION_OK_DL_CONFIGURATION_SETTINGS_LIST); } static int action_ok_push_core_settings_list(const char *path, @@ -3680,7 +3678,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_CONFIGURATIONS_SETTINGS: + case MENU_ENUM_LABEL_CONFIGURATION_SETTINGS: BIND_ACTION_OK(cbs, action_ok_push_configuration_settings_list); break; case MENU_ENUM_LABEL_PLAYLIST_SETTINGS: @@ -3713,6 +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_HELP_LIST: case MENU_ENUM_LABEL_INFORMATION_LIST: case MENU_ENUM_LABEL_CONTENT_SETTINGS: @@ -3770,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_CONFIG_LOAD: + case MENU_ENUM_LABEL_CONFIGURATIONS: 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 fe2257eb1f..cee99f448a 100644 --- a/menu/cbs/menu_cbs_sublabel.c +++ b/menu/cbs/menu_cbs_sublabel.c @@ -413,17 +413,6 @@ 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_CONFIGURATIONS_SETTINGS), len); - return 0; -} - static int action_bind_sublabel_config_save_on_exit( file_list_t *list, unsigned type, unsigned i, @@ -471,9 +460,6 @@ 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_SETTINGS: - 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/menu/cbs/menu_cbs_title.c b/menu/cbs/menu_cbs_title.c index 620d9cfd29..e8e4ecab1d 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_SETTINGS), len); + sanitize_to_string(s, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_CONFIGURATIONS_LIST), len); return 0; } @@ -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_CONFIGURATIONS_SETTINGS), len); + sanitize_to_string(s, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_CONFIGURATION_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_CONFIGURATIONS_SETTINGS))) + if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_DEFERRED_CONFIGURATION_SETTINGS_LIST))) { BIND_ACTION_GET_TITLE(cbs, action_get_configuration_settings_list); 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_CONFIG_LOAD: + case MENU_ENUM_LABEL_CONFIGURATIONS: 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_SETTINGS: + case MENU_ENUM_LABEL_CONFIGURATIONS_LIST: BIND_ACTION_GET_TITLE(cbs, action_get_configurations_list); break; case MENU_ENUM_LABEL_CORE_OPTIONS: @@ -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_CONFIGURATIONS_SETTINGS: + case MENU_ENUM_LABEL_DEFERRED_CONFIGURATION_SETTINGS_LIST: BIND_ACTION_GET_TITLE(cbs, action_get_configuration_settings_list); break; case MENU_ENUM_LABEL_DEFERRED_LOGGING_SETTINGS_LIST: @@ -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_CONFIG_LOAD: + case MENU_LABEL_CONFIGURATIONS: 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_SETTINGS: + case MENU_LABEL_DEFERRED_CONFIGURATIONS_LIST: 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 22de7df940..9434b44995 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_SETTINGS; + entry.enum_idx = MENU_ENUM_LABEL_CONFIGURATIONS_LIST; 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 985ba63d4b..b410a5b64d 100644 --- a/menu/drivers/xmb.c +++ b/menu/drivers/xmb.c @@ -3627,7 +3627,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_SETTINGS; + entry.enum_idx = MENU_ENUM_LABEL_CONFIGURATIONS_LIST; 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 55e922f8e6..6963772151 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_CONFIGURATIONS_SETTINGS, + ACTION_OK_DL_CONFIGURATION_SETTINGS_LIST, ACTION_OK_DL_SAVING_SETTINGS_LIST, ACTION_OK_DL_LOGGING_SETTINGS_LIST, ACTION_OK_DL_FRAME_THROTTLE_SETTINGS_LIST, @@ -69,6 +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_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 34af9753c9..e6aec4b04a 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_CONFIG_LOAD), - msg_hash_to_str(MENU_ENUM_LABEL_CONFIG_LOAD), - MENU_ENUM_LABEL_CONFIG_LOAD, + msg_hash_to_str(MENU_ENUM_LABEL_VALUE_CONFIGURATIONS), + msg_hash_to_str(MENU_ENUM_LABEL_CONFIGURATIONS), + MENU_ENUM_LABEL_CONFIGURATIONS, MENU_SETTING_ACTION, 0, 0); menu_entries_append_enum(info->list, @@ -2901,46 +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_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); - -/* 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), - 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 +4159,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_SETTINGS: + case DISPLAYLIST_CONFIGURATIONS_LIST: case DISPLAYLIST_SCAN_DIRECTORY_LIST: case DISPLAYLIST_LOAD_CONTENT_LIST: case DISPLAYLIST_USER_BINDS_LIST: @@ -4245,6 +4205,7 @@ 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: @@ -4505,7 +4466,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_SETTINGS, + MENU_ENUM_LABEL_CONFIGURATIONS_LIST, PARSE_ACTION, false); menu_displaylist_parse_settings_enum(menu, info, MENU_ENUM_LABEL_HELP_LIST, @@ -4603,6 +4564,29 @@ 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; @@ -5382,6 +5366,8 @@ 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, @@ -5447,7 +5433,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_SETTINGS: + case DISPLAYLIST_CONFIGURATIONS_LIST: ret = menu_displaylist_parse_configurations_list(info); info->need_push = true; diff --git a/menu/menu_displaylist.h b/menu/menu_displaylist.h index f036eab5ab..3efb4063be 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_CONFIGURATIONS_SETTINGS, + DISPLAYLIST_CONFIGURATION_SETTINGS_LIST, DISPLAYLIST_SAVING_SETTINGS_LIST, DISPLAYLIST_LOGGING_SETTINGS_LIST, DISPLAYLIST_FRAME_THROTTLE_SETTINGS_LIST, @@ -145,6 +145,7 @@ enum menu_displaylist_ctl_state DISPLAYLIST_OPTIONS_SHADERS, DISPLAYLIST_NETPLAY, DISPLAYLIST_ADD_CONTENT_LIST, + DISPLAYLIST_CONFIGURATIONS_LIST, 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 3c60071367..9b0e53ce38 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 @@ -2285,16 +2285,16 @@ static bool setting_append_list( CONFIG_ACTION( list, list_info, - MENU_ENUM_LABEL_CONFIGURATIONS_SETTINGS, - MENU_ENUM_LABEL_VALUE_CONFIGURATIONS_SETTINGS, + MENU_ENUM_LABEL_CONFIGURATIONS_LIST, + MENU_ENUM_LABEL_VALUE_CONFIGURATIONS_LIST, &group_info, &subgroup_info, parent_group); CONFIG_ACTION( list, list_info, - MENU_ENUM_LABEL_CONFIG_LOAD, - MENU_ENUM_LABEL_VALUE_CONFIG_LOAD, + MENU_ENUM_LABEL_CONFIGURATIONS, + MENU_ENUM_LABEL_VALUE_CONFIGURATIONS, &group_info, &subgroup_info, parent_group); @@ -2418,6 +2418,14 @@ 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, @@ -2755,9 +2763,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_CONFIGURATIONS_SETTINGS), parent_group); + msg_hash_to_str(MENU_ENUM_LABEL_VALUE_CONFIGURATION_SETTINGS), parent_group); - parent_group = msg_hash_to_str(MENU_ENUM_LABEL_CONFIGURATIONS_SETTINGS); + parent_group = msg_hash_to_str(MENU_ENUM_LABEL_CONFIGURATION_SETTINGS); START_SUB_GROUP(list, list_info, "State", &group_info, &subgroup_info, parent_group); @@ -2858,7 +2866,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); @@ -2967,7 +2975,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 @@ -3092,7 +3100,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); @@ -3161,7 +3169,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")) @@ -3210,7 +3218,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( @@ -3388,7 +3396,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); @@ -3711,7 +3719,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, @@ -3876,7 +3884,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, @@ -4111,7 +4119,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, @@ -4326,7 +4334,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)); } @@ -5475,7 +5483,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, @@ -5489,7 +5497,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, @@ -5853,7 +5861,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 @@ -5918,7 +5926,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 @@ -6409,7 +6417,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 490b2e7e83..c594c1fb57 100644 --- a/msg_hash.h +++ b/msg_hash.h @@ -940,7 +940,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_CONFIGURATIONS_SETTINGS, + MENU_ENUM_LABEL_DEFERRED_CONFIGURATION_SETTINGS_LIST, MENU_ENUM_LABEL_DEFERRED_SAVING_SETTINGS_LIST, MENU_ENUM_LABEL_DEFERRED_FRAME_THROTTLE_SETTINGS_LIST, MENU_ENUM_LABEL_DEFERRED_REWIND_SETTINGS_LIST, @@ -987,6 +987,9 @@ 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_VALUE_DONT_CARE, MENU_ENUM_LABEL_VALUE_LINEAR, MENU_ENUM_LABEL_VALUE_NEAREST, @@ -1656,8 +1659,8 @@ enum msg_hash_enums MENU_ENUM_LABEL_CORE_SETTINGS, MENU_ENUM_LABEL_VALUE_CORE_SETTINGS, - MENU_ENUM_LABEL_CONFIGURATIONS_SETTINGS, - MENU_ENUM_LABEL_VALUE_CONFIGURATIONS_SETTINGS, + MENU_ENUM_LABEL_CONFIGURATION_SETTINGS, + MENU_ENUM_LABEL_VALUE_CONFIGURATION_SETTINGS, MENU_ENUM_LABEL_LOGGING_SETTINGS, MENU_ENUM_LABEL_VALUE_LOGGING_SETTINGS, @@ -1717,8 +1720,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_CONFIG_LOAD, - MENU_ENUM_LABEL_VALUE_CONFIG_LOAD, + MENU_ENUM_LABEL_CONFIGURATIONS, + MENU_ENUM_LABEL_VALUE_CONFIGURATIONS, MENU_ENUM_LABEL_VALUE_CHEAT_FILE_SAVE_AS, MENU_ENUM_LABEL_CHEAT_FILE_SAVE_AS, MENU_ENUM_LABEL_VIDEO_SHADER_PRESET_SAVE_AS, @@ -1955,7 +1958,6 @@ enum msg_hash_enums MENU_ENUM_SUBLABEL_AUDIO_SETTINGS, MENU_ENUM_SUBLABEL_BLUETOOTH_ENABLE, MENU_ENUM_SUBLABEL_CHEEVOS_HARDCORE_MODE_ENABLE, - MENU_ENUM_SUBLABEL_CONFIGURATIONS_SETTINGS, MENU_ENUM_SUBLABEL_CONFIG_SAVE_ON_EXIT, MENU_ENUM_SUBLABEL_CORE_SETTINGS, MENU_ENUM_SUBLABEL_CPU_CORES, @@ -2039,7 +2041,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_SETTINGS 0x679a1b0bU +#define MENU_LABEL_DEFERRED_CONFIGURATIONS_LIST 0x679a1b0bU /* Cheevos settings */ @@ -2197,7 +2199,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_CONFIG_LOAD 0x3e930a50U +#define MENU_LABEL_CONFIGURATIONS 0x3e930a50U #define MENU_LABEL_REMAP_FILE_SAVE_CORE 0x7c9d4c8fU #define MENU_LABEL_REMAP_FILE_SAVE_GAME 0x7c9f41e0U #define MENU_LABEL_CONTENT_COLLECTION_LIST 0x32d1df83U