mirror of
https://github.com/libretro/RetroArch
synced 2025-03-02 19:13:34 +00:00
Add Reset To Defaults setting
This commit is contained in:
parent
d4d9ec97a7
commit
7245cb2732
@ -2439,6 +2439,9 @@ TODO: Add a setting for these tweaks */
|
||||
command_event(CMD_EVENT_QUIT, NULL);
|
||||
#endif
|
||||
break;
|
||||
case CMD_EVENT_MENU_RESET_TO_DEFAULT_CONFIG:
|
||||
config_set_defaults();
|
||||
break;
|
||||
case CMD_EVENT_MENU_SAVE_CURRENT_CONFIG:
|
||||
command_event_save_current_config(OVERRIDE_NONE);
|
||||
break;
|
||||
|
@ -149,6 +149,7 @@ enum event_command
|
||||
/* Unpauses retroArch. */
|
||||
CMD_EVENT_PAUSE,
|
||||
CMD_EVENT_PAUSE_CHECKS,
|
||||
CMD_EVENT_MENU_RESET_TO_DEFAULT_CONFIG,
|
||||
CMD_EVENT_MENU_SAVE_CURRENT_CONFIG,
|
||||
CMD_EVENT_MENU_SAVE_CURRENT_CONFIG_OVERRIDE_CORE,
|
||||
CMD_EVENT_MENU_SAVE_CURRENT_CONFIG_OVERRIDE_CONTENT_DIR,
|
||||
|
@ -1666,7 +1666,7 @@ static struct config_int_setting *populate_settings_int(settings_t *settings, in
|
||||
*
|
||||
* Set 'default' configuration values.
|
||||
**/
|
||||
static void config_set_defaults(void)
|
||||
void config_set_defaults(void)
|
||||
{
|
||||
unsigned i, j;
|
||||
#ifdef HAVE_MENU
|
||||
|
@ -721,6 +721,8 @@ bool config_init(void);
|
||||
|
||||
bool config_overlay_enable_default(void);
|
||||
|
||||
void config_set_defaults(void);
|
||||
|
||||
void config_free(void);
|
||||
|
||||
settings_t *config_get_ptr(void);
|
||||
|
@ -3659,3 +3659,11 @@ MSG_HASH(
|
||||
MENU_ENUM_LABEL_VALUE_INPUT_SPLIT_JOYCON,
|
||||
"Split Joy-Con"
|
||||
)
|
||||
MSG_HASH(
|
||||
MENU_ENUM_LABEL_VALUE_RESET_TO_DEFAULT_CONFIG,
|
||||
"Reset To Defaults"
|
||||
)
|
||||
MSG_HASH(
|
||||
MENU_ENUM_SUBLABEL_RESET_TO_DEFAULT_CONFIG,
|
||||
"Reset the current configuration to default values."
|
||||
)
|
||||
|
@ -3443,3 +3443,11 @@ MSG_HASH(
|
||||
MENU_ENUM_LABEL_VALUE_INPUT_SPLIT_JOYCON,
|
||||
"Split Joy-Con"
|
||||
)
|
||||
MSG_HASH(
|
||||
MENU_ENUM_LABEL_VALUE_RESET_TO_DEFAULT_CONFIG,
|
||||
"Reset To Defaults"
|
||||
)
|
||||
MSG_HASH(
|
||||
MENU_ENUM_SUBLABEL_RESET_TO_DEFAULT_CONFIG,
|
||||
"Reset the current configuration to default values."
|
||||
)
|
||||
|
@ -3435,3 +3435,11 @@ MSG_HASH(
|
||||
MENU_ENUM_LABEL_VALUE_INPUT_SPLIT_JOYCON,
|
||||
"Split Joy-Con"
|
||||
)
|
||||
MSG_HASH(
|
||||
MENU_ENUM_LABEL_VALUE_RESET_TO_DEFAULT_CONFIG,
|
||||
"Reset To Defaults"
|
||||
)
|
||||
MSG_HASH(
|
||||
MENU_ENUM_SUBLABEL_RESET_TO_DEFAULT_CONFIG,
|
||||
"Reset the current configuration to default values."
|
||||
)
|
||||
|
@ -3545,3 +3545,11 @@ MSG_HASH(
|
||||
MENU_ENUM_LABEL_VALUE_INPUT_SPLIT_JOYCON,
|
||||
"Split Joy-Con"
|
||||
)
|
||||
MSG_HASH(
|
||||
MENU_ENUM_LABEL_VALUE_RESET_TO_DEFAULT_CONFIG,
|
||||
"Reset To Defaults"
|
||||
)
|
||||
MSG_HASH(
|
||||
MENU_ENUM_SUBLABEL_RESET_TO_DEFAULT_CONFIG,
|
||||
"Reset the current configuration to default values."
|
||||
)
|
||||
|
@ -3310,3 +3310,11 @@ MSG_HASH(
|
||||
MENU_ENUM_LABEL_VALUE_INPUT_SPLIT_JOYCON,
|
||||
"Split Joy-Con"
|
||||
)
|
||||
MSG_HASH(
|
||||
MENU_ENUM_LABEL_VALUE_RESET_TO_DEFAULT_CONFIG,
|
||||
"Reset To Defaults"
|
||||
)
|
||||
MSG_HASH(
|
||||
MENU_ENUM_SUBLABEL_RESET_TO_DEFAULT_CONFIG,
|
||||
"Reset the current configuration to default values."
|
||||
)
|
||||
|
@ -7594,3 +7594,11 @@ MSG_HASH(
|
||||
MENU_ENUM_LABEL_VALUE_INPUT_SPLIT_JOYCON,
|
||||
"Split Joy-Con"
|
||||
)
|
||||
MSG_HASH(
|
||||
MENU_ENUM_LABEL_VALUE_RESET_TO_DEFAULT_CONFIG,
|
||||
"Reset To Defaults"
|
||||
)
|
||||
MSG_HASH(
|
||||
MENU_ENUM_SUBLABEL_RESET_TO_DEFAULT_CONFIG,
|
||||
"Reset the current configuration to default values."
|
||||
)
|
||||
|
@ -3469,3 +3469,11 @@ MSG_HASH(
|
||||
MENU_ENUM_LABEL_VALUE_INPUT_SPLIT_JOYCON,
|
||||
"Split Joy-Con"
|
||||
)
|
||||
MSG_HASH(
|
||||
MENU_ENUM_LABEL_VALUE_RESET_TO_DEFAULT_CONFIG,
|
||||
"Reset To Defaults"
|
||||
)
|
||||
MSG_HASH(
|
||||
MENU_ENUM_SUBLABEL_RESET_TO_DEFAULT_CONFIG,
|
||||
"Reset the current configuration to default values."
|
||||
)
|
||||
|
@ -3529,3 +3529,11 @@ MSG_HASH(
|
||||
MENU_ENUM_LABEL_VALUE_INPUT_SPLIT_JOYCON,
|
||||
"Split Joy-Con"
|
||||
)
|
||||
MSG_HASH(
|
||||
MENU_ENUM_LABEL_VALUE_RESET_TO_DEFAULT_CONFIG,
|
||||
"Reset To Defaults"
|
||||
)
|
||||
MSG_HASH(
|
||||
MENU_ENUM_SUBLABEL_RESET_TO_DEFAULT_CONFIG,
|
||||
"Reset the current configuration to default values."
|
||||
)
|
||||
|
@ -3932,3 +3932,11 @@ MSG_HASH(
|
||||
MENU_ENUM_LABEL_VALUE_INPUT_SPLIT_JOYCON,
|
||||
"Split Joy-Con"
|
||||
)
|
||||
MSG_HASH(
|
||||
MENU_ENUM_LABEL_VALUE_RESET_TO_DEFAULT_CONFIG,
|
||||
"Reset To Defaults"
|
||||
)
|
||||
MSG_HASH(
|
||||
MENU_ENUM_SUBLABEL_RESET_TO_DEFAULT_CONFIG,
|
||||
"Reset the current configuration to default values."
|
||||
)
|
||||
|
@ -3430,3 +3430,11 @@ MSG_HASH(
|
||||
MENU_ENUM_LABEL_VALUE_INPUT_SPLIT_JOYCON,
|
||||
"Split Joy-Con"
|
||||
)
|
||||
MSG_HASH(
|
||||
MENU_ENUM_LABEL_VALUE_RESET_TO_DEFAULT_CONFIG,
|
||||
"Reset To Defaults"
|
||||
)
|
||||
MSG_HASH(
|
||||
MENU_ENUM_SUBLABEL_RESET_TO_DEFAULT_CONFIG,
|
||||
"Reset the current configuration to default values."
|
||||
)
|
||||
|
@ -1711,3 +1711,5 @@ MSG_HASH(MENU_ENUM_LABEL_STREAMING_MODE,
|
||||
"streaming_mode")
|
||||
MSG_HASH(MENU_ENUM_LABEL_STREAMING_TITLE,
|
||||
"streaming_title")
|
||||
MSG_HASH(MENU_ENUM_LABEL_RESET_TO_DEFAULT_CONFIG,
|
||||
"reset_to_default_config")
|
||||
|
@ -3304,3 +3304,11 @@ MSG_HASH(
|
||||
MENU_ENUM_LABEL_VALUE_INPUT_SPLIT_JOYCON,
|
||||
"Split Joy-Con"
|
||||
)
|
||||
MSG_HASH(
|
||||
MENU_ENUM_LABEL_VALUE_RESET_TO_DEFAULT_CONFIG,
|
||||
"Reset To Defaults"
|
||||
)
|
||||
MSG_HASH(
|
||||
MENU_ENUM_SUBLABEL_RESET_TO_DEFAULT_CONFIG,
|
||||
"Reset the current configuration to default values."
|
||||
)
|
||||
|
@ -3732,3 +3732,11 @@ MSG_HASH(
|
||||
MENU_ENUM_LABEL_VALUE_INPUT_SPLIT_JOYCON,
|
||||
"Split Joy-Con"
|
||||
)
|
||||
MSG_HASH(
|
||||
MENU_ENUM_LABEL_VALUE_RESET_TO_DEFAULT_CONFIG,
|
||||
"Reset To Defaults"
|
||||
)
|
||||
MSG_HASH(
|
||||
MENU_ENUM_SUBLABEL_RESET_TO_DEFAULT_CONFIG,
|
||||
"Reset the current configuration to default values."
|
||||
)
|
||||
|
@ -7548,3 +7548,11 @@ MSG_HASH(
|
||||
MENU_ENUM_LABEL_VALUE_INPUT_SPLIT_JOYCON,
|
||||
"Split Joy-Con"
|
||||
)
|
||||
MSG_HASH(
|
||||
MENU_ENUM_LABEL_VALUE_RESET_TO_DEFAULT_CONFIG,
|
||||
"Reset To Defaults"
|
||||
)
|
||||
MSG_HASH(
|
||||
MENU_ENUM_SUBLABEL_RESET_TO_DEFAULT_CONFIG,
|
||||
"Reset the current configuration to default values."
|
||||
)
|
||||
|
@ -3396,3 +3396,11 @@ MSG_HASH(
|
||||
MENU_ENUM_LABEL_VALUE_INPUT_SPLIT_JOYCON,
|
||||
"Split Joy-Con"
|
||||
)
|
||||
MSG_HASH(
|
||||
MENU_ENUM_LABEL_VALUE_RESET_TO_DEFAULT_CONFIG,
|
||||
"Reset To Defaults"
|
||||
)
|
||||
MSG_HASH(
|
||||
MENU_ENUM_SUBLABEL_RESET_TO_DEFAULT_CONFIG,
|
||||
"Reset the current configuration to default values."
|
||||
)
|
||||
|
@ -3599,3 +3599,11 @@ MSG_HASH(
|
||||
MENU_ENUM_LABEL_VALUE_INPUT_SPLIT_JOYCON,
|
||||
"Split Joy-Con"
|
||||
)
|
||||
MSG_HASH(
|
||||
MENU_ENUM_LABEL_VALUE_RESET_TO_DEFAULT_CONFIG,
|
||||
"Reset To Defaults"
|
||||
)
|
||||
MSG_HASH(
|
||||
MENU_ENUM_SUBLABEL_RESET_TO_DEFAULT_CONFIG,
|
||||
"Reset the current configuration to default values."
|
||||
)
|
||||
|
@ -7618,3 +7618,11 @@ MSG_HASH(
|
||||
MENU_ENUM_LABEL_VALUE_INPUT_SPLIT_JOYCON,
|
||||
"Split Joy-Con"
|
||||
)
|
||||
MSG_HASH(
|
||||
MENU_ENUM_LABEL_VALUE_RESET_TO_DEFAULT_CONFIG,
|
||||
"Reset To Defaults"
|
||||
)
|
||||
MSG_HASH(
|
||||
MENU_ENUM_SUBLABEL_RESET_TO_DEFAULT_CONFIG,
|
||||
"Reset the current configuration to default values."
|
||||
)
|
||||
|
@ -3467,3 +3467,11 @@ MSG_HASH(
|
||||
MENU_ENUM_LABEL_VALUE_INPUT_SPLIT_JOYCON,
|
||||
"Split Joy-Con"
|
||||
)
|
||||
MSG_HASH(
|
||||
MENU_ENUM_LABEL_VALUE_RESET_TO_DEFAULT_CONFIG,
|
||||
"Reset To Defaults"
|
||||
)
|
||||
MSG_HASH(
|
||||
MENU_ENUM_SUBLABEL_RESET_TO_DEFAULT_CONFIG,
|
||||
"Reset the current configuration to default values."
|
||||
)
|
||||
|
@ -66,6 +66,7 @@ default_sublabel_macro(menu_action_sublabel_setting_audio_mixer_stream_remove,
|
||||
MENU_ENUM_SUBLABEL_MIXER_ACTION_REMOVE)
|
||||
default_sublabel_macro(menu_action_sublabel_setting_audio_mixer_stream_volume,
|
||||
MENU_ENUM_SUBLABEL_MIXER_ACTION_VOLUME)
|
||||
default_sublabel_macro(action_bind_sublabel_reset_to_default_config, MENU_ENUM_SUBLABEL_RESET_TO_DEFAULT_CONFIG)
|
||||
default_sublabel_macro(action_bind_sublabel_quick_menu_override_options, MENU_ENUM_SUBLABEL_QUICK_MENU_OVERRIDE_OPTIONS)
|
||||
default_sublabel_macro(action_bind_sublabel_quick_menu_start_streaming, MENU_ENUM_SUBLABEL_QUICK_MENU_START_STREAMING)
|
||||
default_sublabel_macro(action_bind_sublabel_quick_menu_start_recording, MENU_ENUM_SUBLABEL_QUICK_MENU_START_RECORDING)
|
||||
@ -1138,6 +1139,9 @@ int menu_cbs_init_bind_sublabel(menu_file_list_cbs_t *cbs,
|
||||
case MENU_ENUM_LABEL_SHADER_OPTIONS:
|
||||
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_shader_options);
|
||||
break;
|
||||
case MENU_ENUM_LABEL_RESET_TO_DEFAULT_CONFIG:
|
||||
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_reset_to_default_config);
|
||||
break;
|
||||
case MENU_ENUM_LABEL_SAVE_CURRENT_CONFIG_OVERRIDE_GAME:
|
||||
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_save_current_config_override_game);
|
||||
break;
|
||||
|
@ -2994,6 +2994,12 @@ static int menu_displaylist_parse_configurations_list(
|
||||
MENU_ENUM_LABEL_CONFIGURATIONS,
|
||||
MENU_SETTING_ACTION, 0, 0);
|
||||
|
||||
menu_entries_append_enum(info->list,
|
||||
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_RESET_TO_DEFAULT_CONFIG),
|
||||
msg_hash_to_str(MENU_ENUM_LABEL_RESET_TO_DEFAULT_CONFIG),
|
||||
MENU_ENUM_LABEL_RESET_TO_DEFAULT_CONFIG,
|
||||
MENU_SETTING_ACTION, 0, 0);
|
||||
|
||||
menu_entries_append_enum(info->list,
|
||||
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_SAVE_CURRENT_CONFIG),
|
||||
msg_hash_to_str(MENU_ENUM_LABEL_SAVE_CURRENT_CONFIG),
|
||||
|
@ -3548,6 +3548,16 @@ static bool setting_append_list(
|
||||
parent_group);
|
||||
settings_data_list_current_add_flags(list, list_info, SD_FLAG_LAKKA_ADVANCED);
|
||||
|
||||
CONFIG_ACTION(
|
||||
list, list_info,
|
||||
MENU_ENUM_LABEL_RESET_TO_DEFAULT_CONFIG,
|
||||
MENU_ENUM_LABEL_VALUE_RESET_TO_DEFAULT_CONFIG,
|
||||
&group_info,
|
||||
&subgroup_info,
|
||||
parent_group);
|
||||
menu_settings_list_current_add_cmd(list, list_info, CMD_EVENT_MENU_RESET_TO_DEFAULT_CONFIG);
|
||||
settings_data_list_current_add_flags(list, list_info, SD_FLAG_LAKKA_ADVANCED);
|
||||
|
||||
CONFIG_ACTION(
|
||||
list, list_info,
|
||||
MENU_ENUM_LABEL_SAVE_CURRENT_CONFIG,
|
||||
|
@ -1860,6 +1860,7 @@ enum msg_hash_enums
|
||||
|
||||
MENU_ENUM_LABEL_VALUE_HELP_SCANNING_CONTENT_DESC,
|
||||
|
||||
MENU_LABEL(RESET_TO_DEFAULT_CONFIG),
|
||||
MENU_LABEL(SAVE_CURRENT_CONFIG),
|
||||
MENU_LABEL(SAVE_CURRENT_CONFIG_OVERRIDE_CORE),
|
||||
MENU_LABEL(SAVE_CURRENT_CONFIG_OVERRIDE_CONTENT_DIR),
|
||||
|
Loading…
x
Reference in New Issue
Block a user