mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-01-30 12:32:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add 'Collapse Subgroups Enable' - should make navigating

Browse Source 
menu a bit easier
This commit is contained in:
twinaphex 2015-01-30 05:58:57 +01:00
parent dfaf63786a
commit a038b72ecb
5 changed files with 176 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
general.h
View File

@ -220,6 +220,7 @@ struct settings
} filter;
} browser;
} navigation;
bool collapse_subgroups_enable;
} menu;
#endif

173
menu/menu_entries_cbs.c
View File

@ -2635,29 +2635,109 @@ static int deferred_push_settings(void *data, void *userdata,
menu_list_clear(list);
for (; setting->type != ST_NONE; setting++)
if (g_settings.menu.collapse_subgroups_enable)
{
for (; setting->type != ST_NONE; setting++)
{
char group_label[PATH_MAX_LENGTH];
char subgroup_label[PATH_MAX_LENGTH];
if (setting->type == ST_GROUP)
{
menu_list_push(list, setting->short_description,
setting->name, menu_entries_setting_set_flags(setting), 0);
}
}
}
else
{
for (; setting->type != ST_NONE; setting++)
{
char group_label[PATH_MAX_LENGTH];
char subgroup_label[PATH_MAX_LENGTH];
if (setting->type == ST_GROUP)
strlcpy(group_label, setting->name, sizeof(group_label));
else if (setting->type == ST_SUB_GROUP)
{
char new_label[PATH_MAX_LENGTH], new_path[PATH_MAX_LENGTH];
strlcpy(subgroup_label, setting->name, sizeof(group_label));
strlcpy(new_label, group_label, sizeof(new_label));
strlcat(new_label, "|", sizeof(new_label));
strlcat(new_label, subgroup_label, sizeof(new_label));
strlcpy(new_path, group_label, sizeof(new_path));
strlcat(new_path, " - ", sizeof(new_path));
strlcat(new_path, setting->short_description, sizeof(new_path));
menu_list_push(list, new_path,
new_label, MENU_SETTING_SUBGROUP, 0);
}
}
}
if (driver.menu_ctx && driver.menu_ctx->populate_entries)
driver.menu_ctx->populate_entries(driver.menu, path, label, type);
return 0;
}
static int deferred_push_settings_subgroup(void *data, void *userdata,
const char *path, const char *label, unsigned type)
{
char elem0[PATH_MAX_LENGTH], elem1[PATH_MAX_LENGTH];
rarch_setting_t *setting = NULL;
struct string_list *str_list = NULL;
file_list_t *list = (file_list_t*)data;
file_list_t *menu_list = (file_list_t*)userdata;
if (!list || !menu_list)
return -1;
str_list = string_split(label, "|");
if (str_list && str_list->size > 0)
strlcpy(elem0, str_list->elems[0].data, sizeof(elem0));
if (str_list && str_list->size > 1)
strlcpy(elem1, str_list->elems[1].data, sizeof(elem1));
if (str_list)
{
string_list_free(str_list);
str_list = NULL;
}
settings_list_free(driver.menu->list_settings);
driver.menu->list_settings = (rarch_setting_t *)setting_data_new(SL_FLAG_ALL_SETTINGS);
setting = menu_action_find_setting(elem0);
menu_list_clear(list);
if (!setting)
return -1;
while (1)
{
if (!setting)
return -1;
if (setting->type == ST_SUB_GROUP)
{
if ((strlen(setting->name) != 0) && !strcmp(setting->name, elem1))
break;
}
setting++;
}
setting++;
for (; setting->type != ST_END_SUB_GROUP; setting++)
{
char group_label[PATH_MAX_LENGTH];
char subgroup_label[PATH_MAX_LENGTH];
if (setting->type == ST_GROUP)
{
strlcpy(group_label, setting->name, sizeof(group_label));
menu_list_push(list, setting->short_description,
group_label, menu_entries_setting_set_flags(setting), 0);
}
#if 0
else if (setting->type == ST_SUB_GROUP)
{
char new_label[PATH_MAX_LENGTH];
strlcpy(subgroup_label, setting->name, sizeof(group_label));
strlcpy(new_label, group_label,sizeof(new_label));
strlcat(new_label, "|", sizeof(new_label));
strlcat(new_label, subgroup_label, sizeof(new_label));
RARCH_LOG("new label: %s\n", new_label);
menu_list_push(list, setting->short_description,
setting->name, menu_entries_setting_set_flags(setting), 0);
}
#endif
strlcpy(group_label, setting->name, sizeof(group_label));
menu_list_push(list, setting->short_description,
group_label, menu_entries_setting_set_flags(setting), 0);
}
if (driver.menu_ctx && driver.menu_ctx->populate_entries)
@ -3868,7 +3948,7 @@ static int action_iterate_main(const char *label, unsigned action)
static int menu_entries_cbs_init_bind_ok_first(menu_file_list_cbs_t *cbs,
const char *path, const char *label, unsigned type, size_t idx)
{
char elem0[PATH_MAX_LENGTH];
char elem0[PATH_MAX_LENGTH], elem1[PATH_MAX_LENGTH];
const char *menu_label = NULL;
struct string_list *str_list = NULL;
@ -3881,6 +3961,8 @@ static int menu_entries_cbs_init_bind_ok_first(menu_file_list_cbs_t *cbs,
str_list = string_split(label, "|");
if (str_list && str_list->size > 0)
strlcpy(elem0, str_list->elems[0].data, sizeof(elem0));
if (str_list && str_list->size > 1)
strlcpy(elem1, str_list->elems[1].data, sizeof(elem1));
if (str_list)
{
@ -4028,6 +4110,7 @@ static int menu_entries_cbs_init_bind_ok_first(menu_file_list_cbs_t *cbs,
break;
case MENU_SETTINGS:
case MENU_SETTING_GROUP:
case MENU_SETTING_SUBGROUP:
cbs->action_ok = action_ok_push_default;
break;
case MENU_SETTINGS_CORE_DISK_OPTIONS_DISK_CYCLE_TRAY_STATUS:
@ -4318,18 +4401,63 @@ static void menu_entries_cbs_init_bind_iterate(menu_file_list_cbs_t *cbs,
static void menu_entries_cbs_init_bind_deferred_push(menu_file_list_cbs_t *cbs,
const char *path, const char *label, unsigned type, size_t idx)
{
char elem0[PATH_MAX_LENGTH], elem1[PATH_MAX_LENGTH];
const char *menu_label = NULL;
struct string_list *str_list = NULL;
if (!cbs || !driver.menu)
return;
menu_list_get_last_stack(driver.menu->menu_list,
NULL, &menu_label, NULL);
str_list = string_split(label, "|");
if (str_list && str_list->size > 0)
strlcpy(elem0, str_list->elems[0].data, sizeof(elem0));
if (str_list && str_list->size > 1)
strlcpy(elem1, str_list->elems[1].data, sizeof(elem1));
if (str_list)
{
string_list_free(str_list);
str_list = NULL;
}
cbs->action_deferred_push = deferred_push_default;
if ((strlen(elem1) != 0) && !!strcmp(elem0, elem1))
{
if ((
!strcmp(elem0, "Driver Options") ||
!strcmp(elem0, "General Options") ||
!strcmp(elem0, "Video Options") ||
!strcmp(elem0, "Shader Options") ||
!strcmp(elem0, "Font Options") ||
!strcmp(elem0, "Audio Options") ||
!strcmp(elem0, "Input Options") ||
!strcmp(elem0, "Overlay Options") ||
!strcmp(elem0, "Menu Options") ||
!strcmp(elem0, "UI Options") ||
!strcmp(elem0, "Patch Options") ||
!strcmp(elem0, "Playlist Options") ||
!strcmp(elem0, "Core Manager Options") ||
!strcmp(elem0, "Network Options") ||
!strcmp(elem0, "Archive Options") ||
!strcmp(elem0, "User Options") ||
!strcmp(elem0, "Path Options") ||
!strcmp(elem0, "Privacy Options"))
)
{
if (!g_settings.menu.collapse_subgroups_enable)
{
cbs->action_deferred_push = deferred_push_settings_subgroup;
return;
}
}
}
if (strstr(label, "deferred_rdb_entry_detail"))
cbs->action_deferred_push = deferred_push_rdb_entry_detail;
if (!strcmp(label, "core_manager_list"))
else if (!strcmp(label, "core_manager_list"))
cbs->action_deferred_push = deferred_push_core_manager_list;
else if (!strcmp(label, "history_list"))
cbs->action_deferred_push = deferred_push_history_list;
@ -4432,6 +4560,7 @@ void menu_entries_cbs_init(void *data,
if (!(cbs = (menu_file_list_cbs_t*)list->list[idx].actiondata))
return;
menu_entries_cbs_init_bind_ok(cbs, path, label, type, idx);
menu_entries_cbs_init_bind_cancel(cbs, path, label, type, idx);
menu_entries_cbs_init_bind_start(cbs, path, label, type, idx);

4
retroarch.cfg
View File

@ -609,6 +609,10 @@
# Filter files being show in 'Load Content' by supported extensions
# menu_navigation_browser_filter_supported_extensions_enable = true
# Collapse subgroup settings into main group to create one big listing of settings
# per category.
# menu_collapse_subgroups_enable = false
#### UI
# Suspends the screensaver if set to true. Is a hint that does not necessarily have to be honored

4
settings.c
View File

@ -489,6 +489,7 @@ static void config_set_defaults(void)
g_settings.menu.navigation.wraparound.horizontal_enable = true;
g_settings.menu.navigation.wraparound.vertical_enable = true;
g_settings.menu.navigation.browser.filter.supported_extensions_enable = true;
g_settings.menu.collapse_subgroups_enable = false;
#endif
g_settings.ui.menubar_enable = true;
@ -1096,6 +1097,7 @@ static bool config_load_file(const char *path, bool set_defaults)
CONFIG_GET_BOOL(menu.navigation.wraparound.horizontal_enable, "menu_navigation_wraparound_horizontal_enable");
CONFIG_GET_BOOL(menu.navigation.wraparound.vertical_enable, "menu_navigation_wraparound_vertical_enable");
CONFIG_GET_BOOL(menu.navigation.browser.filter.supported_extensions_enable, "menu_navigation_browser_filter_supported_extensions_enable");
CONFIG_GET_BOOL(menu.collapse_subgroups_enable, "menu_collapse_subgroups_enable");
CONFIG_GET_PATH(menu.wallpaper, "menu_wallpaper");
if (!strcmp(g_settings.menu.wallpaper, "default"))
*g_settings.menu.wallpaper = '\0';
@ -1960,6 +1962,8 @@ bool config_save_file(const char *path)
g_settings.menu.navigation.wraparound.vertical_enable);
config_set_bool(conf, "menu_navigation_browser_filter_supported_extensions_enable",
g_settings.menu.navigation.browser.filter.supported_extensions_enable);
config_set_bool(conf, "menu_collapse_subgroups_enable",
g_settings.menu.collapse_subgroups_enable);
#endif
config_set_path(conf, "game_history_path", g_settings.content_history_path);

19
settings_data.c
View File

@ -5347,6 +5347,22 @@ static bool setting_data_append_list_menu_options(
END_SUB_GROUP(list, list_info);
START_SUB_GROUP(list, list_info, "Settings View", group_info.name, subgroup_info);
CONFIG_BOOL(
g_settings.menu.collapse_subgroups_enable,
"menu_collapse_subgroups_enable",
"Collapse SubGroups",
true,
"OFF",
"ON",
group_info.name,
subgroup_info.name,
general_write_handler,
general_read_handler);
END_SUB_GROUP(list, list_info);
START_SUB_GROUP(list, list_info, "Browser", group_info.name, subgroup_info);
CONFIG_BOOL(
@ -5783,10 +5799,7 @@ static bool setting_data_append_list_path_options(
rarch_setting_group_info_t subgroup_info;
START_GROUP(group_info, "Path Options");
START_SUB_GROUP(list, list_info, "State", group_info.name, subgroup_info);
END_SUB_GROUP(list, list_info);
START_SUB_GROUP(list, list_info, "Paths", group_info.name, subgroup_info);
#ifdef HAVE_MENU
CONFIG_DIR(