(menu_setting.c) Cleanups

This commit is contained in:
twinaphex 2016-10-26 07:36:23 +02:00
parent 18331f75ee
commit 0bac0022c8

View File

@ -2803,128 +2803,121 @@ static bool setting_append_list(
} }
break; break;
case SETTINGS_LIST_CONFIGURATION: case SETTINGS_LIST_CONFIGURATION:
START_GROUP(list, list_info, &group_info, {
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_CONFIGURATION_SETTINGS), parent_group); unsigned i;
struct bool_entry bool_entries[3];
START_GROUP(list, list_info, &group_info,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_CONFIGURATION_SETTINGS), parent_group);
parent_group = msg_hash_to_str(MENU_ENUM_LABEL_CONFIGURATION_SETTINGS); parent_group = msg_hash_to_str(MENU_ENUM_LABEL_CONFIGURATION_SETTINGS);
START_SUB_GROUP(list, list_info, "State", &group_info, &subgroup_info, START_SUB_GROUP(list, list_info, "State", &group_info, &subgroup_info,
parent_group); parent_group);
CONFIG_BOOL( bool_entries[0].target = &settings->config_save_on_exit;
list, list_info, bool_entries[0].name_enum_idx = MENU_ENUM_LABEL_CONFIG_SAVE_ON_EXIT;
&settings->config_save_on_exit, bool_entries[0].SHORT_enum_idx = MENU_ENUM_LABEL_VALUE_CONFIG_SAVE_ON_EXIT;
MENU_ENUM_LABEL_CONFIG_SAVE_ON_EXIT, bool_entries[0].default_value = config_save_on_exit;
MENU_ENUM_LABEL_VALUE_CONFIG_SAVE_ON_EXIT, bool_entries[0].flags = SD_FLAG_NONE;
config_save_on_exit,
MENU_ENUM_LABEL_VALUE_OFF,
MENU_ENUM_LABEL_VALUE_ON,
&group_info,
&subgroup_info,
parent_group,
general_write_handler,
general_read_handler,
SD_FLAG_NONE);
menu_settings_list_current_add_enum_idx(list, list_info, MENU_ENUM_LABEL_CONFIG_SAVE_ON_EXIT);
CONFIG_BOOL( bool_entries[1].target = &settings->confirm_on_exit;
list, list_info, bool_entries[1].name_enum_idx = MENU_ENUM_LABEL_CONFIRM_ON_EXIT;
&settings->confirm_on_exit, bool_entries[1].SHORT_enum_idx = MENU_ENUM_LABEL_VALUE_CONFIRM_ON_EXIT;
MENU_ENUM_LABEL_CONFIRM_ON_EXIT, bool_entries[1].default_value = confirm_on_exit;
MENU_ENUM_LABEL_VALUE_CONFIRM_ON_EXIT, bool_entries[1].flags = SD_FLAG_NONE;
confirm_on_exit,
MENU_ENUM_LABEL_VALUE_OFF,
MENU_ENUM_LABEL_VALUE_ON,
&group_info,
&subgroup_info,
parent_group,
general_write_handler,
general_read_handler,
SD_FLAG_NONE);
menu_settings_list_current_add_enum_idx(list, list_info, MENU_ENUM_LABEL_CONFIRM_ON_EXIT);
CONFIG_BOOL( bool_entries[2].target = &settings->show_hidden_files;
list, list_info, bool_entries[2].name_enum_idx = MENU_ENUM_LABEL_SHOW_HIDDEN_FILES;
&settings->show_hidden_files, bool_entries[2].SHORT_enum_idx = MENU_ENUM_LABEL_VALUE_SHOW_HIDDEN_FILES;
MENU_ENUM_LABEL_SHOW_HIDDEN_FILES, bool_entries[2].default_value = show_hidden_files;
MENU_ENUM_LABEL_VALUE_SHOW_HIDDEN_FILES, bool_entries[2].flags = SD_FLAG_NONE;
show_hidden_files,
MENU_ENUM_LABEL_VALUE_OFF,
MENU_ENUM_LABEL_VALUE_ON,
&group_info,
&subgroup_info,
parent_group,
general_write_handler,
general_read_handler,
SD_FLAG_NONE);
menu_settings_list_current_add_enum_idx(list, list_info, MENU_ENUM_LABEL_SHOW_HIDDEN_FILES);
CONFIG_BOOL( for (i = 0; i < ARRAY_SIZE(bool_entries); i++)
list, list_info, {
&settings->game_specific_options, CONFIG_BOOL(
MENU_ENUM_LABEL_GAME_SPECIFIC_OPTIONS, list, list_info,
MENU_ENUM_LABEL_VALUE_GAME_SPECIFIC_OPTIONS, bool_entries[i].target,
default_game_specific_options, bool_entries[i].name_enum_idx,
MENU_ENUM_LABEL_VALUE_OFF, bool_entries[i].SHORT_enum_idx,
MENU_ENUM_LABEL_VALUE_ON, bool_entries[i].default_value,
&group_info, MENU_ENUM_LABEL_VALUE_OFF,
&subgroup_info, MENU_ENUM_LABEL_VALUE_ON,
parent_group, &group_info,
general_write_handler, &subgroup_info,
general_read_handler, parent_group,
SD_FLAG_NONE); general_write_handler,
menu_settings_list_current_add_enum_idx(list, list_info, MENU_ENUM_LABEL_GAME_SPECIFIC_OPTIONS); general_read_handler,
bool_entries[i].flags);
menu_settings_list_current_add_enum_idx(list, list_info, bool_entries[i].name_enum_idx);
}
CONFIG_BOOL( CONFIG_BOOL(
list, list_info, list, list_info,
&settings->auto_overrides_enable, &settings->game_specific_options,
MENU_ENUM_LABEL_AUTO_OVERRIDES_ENABLE, MENU_ENUM_LABEL_GAME_SPECIFIC_OPTIONS,
MENU_ENUM_LABEL_VALUE_AUTO_OVERRIDES_ENABLE, MENU_ENUM_LABEL_VALUE_GAME_SPECIFIC_OPTIONS,
default_auto_overrides_enable, default_game_specific_options,
MENU_ENUM_LABEL_VALUE_OFF, MENU_ENUM_LABEL_VALUE_OFF,
MENU_ENUM_LABEL_VALUE_ON, MENU_ENUM_LABEL_VALUE_ON,
&group_info, &group_info,
&subgroup_info, &subgroup_info,
parent_group, parent_group,
general_write_handler, general_write_handler,
general_read_handler, general_read_handler,
SD_FLAG_NONE); SD_FLAG_NONE);
menu_settings_list_current_add_enum_idx(list, list_info, MENU_ENUM_LABEL_AUTO_OVERRIDES_ENABLE); menu_settings_list_current_add_enum_idx(list, list_info, MENU_ENUM_LABEL_GAME_SPECIFIC_OPTIONS);
CONFIG_BOOL( CONFIG_BOOL(
list, list_info, list, list_info,
&settings->auto_remaps_enable, &settings->auto_overrides_enable,
MENU_ENUM_LABEL_AUTO_REMAPS_ENABLE, MENU_ENUM_LABEL_AUTO_OVERRIDES_ENABLE,
MENU_ENUM_LABEL_VALUE_AUTO_REMAPS_ENABLE, MENU_ENUM_LABEL_VALUE_AUTO_OVERRIDES_ENABLE,
default_auto_remaps_enable, default_auto_overrides_enable,
MENU_ENUM_LABEL_VALUE_OFF, MENU_ENUM_LABEL_VALUE_OFF,
MENU_ENUM_LABEL_VALUE_ON, MENU_ENUM_LABEL_VALUE_ON,
&group_info, &group_info,
&subgroup_info, &subgroup_info,
parent_group, parent_group,
general_write_handler, general_write_handler,
general_read_handler, general_read_handler,
SD_FLAG_NONE); SD_FLAG_NONE);
menu_settings_list_current_add_enum_idx(list, list_info, MENU_ENUM_LABEL_AUTO_REMAPS_ENABLE); menu_settings_list_current_add_enum_idx(list, list_info, MENU_ENUM_LABEL_AUTO_OVERRIDES_ENABLE);
CONFIG_BOOL( CONFIG_BOOL(
list, list_info, list, list_info,
&settings->auto_shaders_enable, &settings->auto_remaps_enable,
MENU_ENUM_LABEL_AUTO_SHADERS_ENABLE, MENU_ENUM_LABEL_AUTO_REMAPS_ENABLE,
MENU_ENUM_LABEL_VALUE_AUTO_SHADERS_ENABLE, MENU_ENUM_LABEL_VALUE_AUTO_REMAPS_ENABLE,
default_auto_shaders_enable, default_auto_remaps_enable,
MENU_ENUM_LABEL_VALUE_OFF, MENU_ENUM_LABEL_VALUE_OFF,
MENU_ENUM_LABEL_VALUE_ON, MENU_ENUM_LABEL_VALUE_ON,
&group_info, &group_info,
&subgroup_info, &subgroup_info,
parent_group, parent_group,
general_write_handler, general_write_handler,
general_read_handler, general_read_handler,
SD_FLAG_NONE); SD_FLAG_NONE);
menu_settings_list_current_add_enum_idx(list, list_info, MENU_ENUM_LABEL_AUTO_SHADERS_ENABLE); menu_settings_list_current_add_enum_idx(list, list_info, MENU_ENUM_LABEL_AUTO_REMAPS_ENABLE);
END_SUB_GROUP(list, list_info, parent_group); CONFIG_BOOL(
END_GROUP(list, list_info, parent_group); list, list_info,
&settings->auto_shaders_enable,
MENU_ENUM_LABEL_AUTO_SHADERS_ENABLE,
MENU_ENUM_LABEL_VALUE_AUTO_SHADERS_ENABLE,
default_auto_shaders_enable,
MENU_ENUM_LABEL_VALUE_OFF,
MENU_ENUM_LABEL_VALUE_ON,
&group_info,
&subgroup_info,
parent_group,
general_write_handler,
general_read_handler,
SD_FLAG_NONE);
menu_settings_list_current_add_enum_idx(list, list_info, MENU_ENUM_LABEL_AUTO_SHADERS_ENABLE);
END_SUB_GROUP(list, list_info, parent_group);
END_GROUP(list, list_info, parent_group);
}
break; break;
case SETTINGS_LIST_LOGGING: case SETTINGS_LIST_LOGGING:
{ {