Create Menu File Browser Settings

This commit is contained in:
twinaphex 2015-06-22 03:07:32 +02:00
parent 74813dc0c5
commit ae229d9005
3 changed files with 42 additions and 43 deletions

View File

@ -2469,7 +2469,7 @@ static const char *menu_hash_to_str_english(uint32_t hash)
case MENU_LABEL_NAVIGATION_BROWSER_FILTER_SUPPORTED_EXTENSIONS_ENABLE: case MENU_LABEL_NAVIGATION_BROWSER_FILTER_SUPPORTED_EXTENSIONS_ENABLE:
return "menu_navigation_browser_filter_supported_extensions_enable"; return "menu_navigation_browser_filter_supported_extensions_enable";
case MENU_LABEL_VALUE_NAVIGATION_BROWSER_FILTER_SUPPORTED_EXTENSIONS_ENABLE: case MENU_LABEL_VALUE_NAVIGATION_BROWSER_FILTER_SUPPORTED_EXTENSIONS_ENABLE:
return "Browser - Filter by supported extensions"; return "Filter by supported extensions";
case MENU_LABEL_CORE_UPDATER_AUTO_EXTRACT_ARCHIVE: case MENU_LABEL_CORE_UPDATER_AUTO_EXTRACT_ARCHIVE:
return "core_updater_auto_extract_archive"; return "core_updater_auto_extract_archive";
case MENU_LABEL_VALUE_CORE_UPDATER_AUTO_EXTRACT_ARCHIVE: case MENU_LABEL_VALUE_CORE_UPDATER_AUTO_EXTRACT_ARCHIVE:

View File

@ -5885,13 +5885,15 @@ static bool setting_append_list_menu_options(
settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED); settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED);
END_SUB_GROUP(list, list_info, parent_group); END_SUB_GROUP(list, list_info, parent_group);
START_SUB_GROUP(list, list_info, "Browser", group_info.name, subgroup_info, parent_group);
START_SUB_GROUP(list, list_info, "Display", group_info.name, subgroup_info, parent_group);
CONFIG_BOOL( CONFIG_BOOL(
settings->menu.navigation.browser.filter.supported_extensions_enable, settings->menu.dpi.override_enable,
menu_hash_to_str(MENU_LABEL_NAVIGATION_BROWSER_FILTER_SUPPORTED_EXTENSIONS_ENABLE), menu_hash_to_str(MENU_LABEL_DPI_OVERRIDE_ENABLE),
menu_hash_to_str(MENU_LABEL_VALUE_NAVIGATION_BROWSER_FILTER_SUPPORTED_EXTENSIONS_ENABLE), menu_hash_to_str(MENU_LABEL_VALUE_DPI_OVERRIDE_ENABLE),
true, menu_dpi_override_enable,
menu_hash_to_str(MENU_VALUE_OFF), menu_hash_to_str(MENU_VALUE_OFF),
menu_hash_to_str(MENU_VALUE_ON), menu_hash_to_str(MENU_VALUE_ON),
group_info.name, group_info.name,
@ -5900,6 +5902,18 @@ static bool setting_append_list_menu_options(
general_write_handler, general_write_handler,
general_read_handler); general_read_handler);
CONFIG_UINT(
settings->menu.dpi.override_value,
menu_hash_to_str(MENU_LABEL_DPI_OVERRIDE_VALUE),
menu_hash_to_str(MENU_LABEL_VALUE_DPI_OVERRIDE_VALUE),
menu_dpi_override_value,
group_info.name,
subgroup_info.name,
parent_group,
general_write_handler,
general_read_handler);
menu_settings_list_current_add_range(list, list_info, 72, 999, 1, true, true);
CONFIG_BOOL( CONFIG_BOOL(
settings->menu_show_start_screen, settings->menu_show_start_screen,
menu_hash_to_str(MENU_LABEL_RGUI_SHOW_START_SCREEN), menu_hash_to_str(MENU_LABEL_RGUI_SHOW_START_SCREEN),
@ -5952,35 +5966,6 @@ static bool setting_append_list_menu_options(
general_write_handler, general_write_handler,
general_read_handler); general_read_handler);
END_SUB_GROUP(list, list_info, parent_group);
START_SUB_GROUP(list, list_info, "Display", group_info.name, subgroup_info, parent_group);
CONFIG_BOOL(
settings->menu.dpi.override_enable,
menu_hash_to_str(MENU_LABEL_DPI_OVERRIDE_ENABLE),
menu_hash_to_str(MENU_LABEL_VALUE_DPI_OVERRIDE_ENABLE),
menu_dpi_override_enable,
menu_hash_to_str(MENU_VALUE_OFF),
menu_hash_to_str(MENU_VALUE_ON),
group_info.name,
subgroup_info.name,
parent_group,
general_write_handler,
general_read_handler);
CONFIG_UINT(
settings->menu.dpi.override_value,
menu_hash_to_str(MENU_LABEL_DPI_OVERRIDE_VALUE),
menu_hash_to_str(MENU_LABEL_VALUE_DPI_OVERRIDE_VALUE),
menu_dpi_override_value,
group_info.name,
subgroup_info.name,
parent_group,
general_write_handler,
general_read_handler);
menu_settings_list_current_add_range(list, list_info, 72, 999, 1, true, true);
END_SUB_GROUP(list, list_info, parent_group); END_SUB_GROUP(list, list_info, parent_group);
END_GROUP(list, list_info, parent_group); END_GROUP(list, list_info, parent_group);
@ -6076,7 +6061,7 @@ static bool setting_append_list_ui_options(
return true; return true;
} }
static bool setting_append_list_archive_options( static bool setting_append_list_menu_file_browser_options(
rarch_setting_t **list, rarch_setting_t **list,
rarch_setting_info_t *list_info, rarch_setting_info_t *list_info,
const char *parent_group) const char *parent_group)
@ -6085,12 +6070,25 @@ static bool setting_append_list_archive_options(
rarch_setting_group_info_t subgroup_info = {0}; rarch_setting_group_info_t subgroup_info = {0};
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
START_GROUP(group_info, "Archive Settings", parent_group); START_GROUP(group_info, "Menu File Browser Settings", parent_group);
parent_group = menu_hash_to_str(MENU_LABEL_VALUE_SETTINGS); parent_group = menu_hash_to_str(MENU_LABEL_VALUE_SETTINGS);
START_SUB_GROUP(list, list_info, "State", group_info.name, subgroup_info, parent_group); START_SUB_GROUP(list, list_info, "State", group_info.name, subgroup_info, parent_group);
CONFIG_BOOL(
settings->menu.navigation.browser.filter.supported_extensions_enable,
menu_hash_to_str(MENU_LABEL_NAVIGATION_BROWSER_FILTER_SUPPORTED_EXTENSIONS_ENABLE),
menu_hash_to_str(MENU_LABEL_VALUE_NAVIGATION_BROWSER_FILTER_SUPPORTED_EXTENSIONS_ENABLE),
true,
menu_hash_to_str(MENU_VALUE_OFF),
menu_hash_to_str(MENU_VALUE_ON),
group_info.name,
subgroup_info.name,
parent_group,
general_write_handler,
general_read_handler);
CONFIG_UINT( CONFIG_UINT(
settings->archive.mode, settings->archive.mode,
menu_hash_to_str(MENU_LABEL_ARCHIVE_MODE), menu_hash_to_str(MENU_LABEL_ARCHIVE_MODE),
@ -7251,6 +7249,12 @@ rarch_setting_t *menu_setting_new(unsigned mask)
goto error; goto error;
} }
if (mask & SL_FLAG_MENU_BROWSER_OPTIONS)
{
if (!setting_append_list_menu_file_browser_options(&list, list_info, root))
goto error;
}
if (mask & SL_FLAG_UI_OPTIONS) if (mask & SL_FLAG_UI_OPTIONS)
{ {
if (!setting_append_list_ui_options(&list, list_info, root)) if (!setting_append_list_ui_options(&list, list_info, root))
@ -7283,11 +7287,6 @@ rarch_setting_t *menu_setting_new(unsigned mask)
goto error; goto error;
} }
if (mask & SL_FLAG_ARCHIVE_OPTIONS)
{
if (!setting_append_list_archive_options(&list, list_info, root))
goto error;
}
if (mask & SL_FLAG_USER_OPTIONS) if (mask & SL_FLAG_USER_OPTIONS)
{ {

View File

@ -89,7 +89,7 @@ enum setting_list_flags
SL_FLAG_DIRECTORY_OPTIONS = (1 << 18), SL_FLAG_DIRECTORY_OPTIONS = (1 << 18),
SL_FLAG_PRIVACY_OPTIONS = (1 << 19), SL_FLAG_PRIVACY_OPTIONS = (1 << 19),
SL_FLAG_PLAYLIST_OPTIONS = (1 << 20), SL_FLAG_PLAYLIST_OPTIONS = (1 << 20),
SL_FLAG_ARCHIVE_OPTIONS = (1 << 21), SL_FLAG_MENU_BROWSER_OPTIONS = (1 << 21),
SL_FLAG_PATCH_OPTIONS = (1 << 22), SL_FLAG_PATCH_OPTIONS = (1 << 22),
SL_FLAG_RECORDING_OPTIONS = (1 << 23), SL_FLAG_RECORDING_OPTIONS = (1 << 23),
SL_FLAG_FRAME_THROTTLE_OPTIONS= (1 << 24), SL_FLAG_FRAME_THROTTLE_OPTIONS= (1 << 24),