mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-24 18:39:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

(Menu) Refactor MENU_SETTINGS_OPTIONS

Browse Source
This commit is contained in:
twinaphex 2014-09-04 19:20:14 +02:00
parent 97c0ca344c
commit fb9c3f5555
5 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/menu/backend/menu_common_backend.c
View File

@ -1811,7 +1811,7 @@ static int menu_action_ok(const char *dir,
&& type == MENU_FILE_PLAIN)
{
menu_common_setting_set_current_string_path(setting, dir, path);
menu_flush_stack_type(driver.menu->menu_stack,MENU_SETTINGS_OPTIONS);
menu_flush_stack_label(driver.menu->menu_stack, "settings");
}
else if (setting && !strcmp(setting->name, "game_history_path")
&& type == MENU_FILE_PLAIN)

4
frontend/menu/disp/shared.h
View File

@ -27,7 +27,7 @@ static void get_title(const char *label, const char *dir,
strlcpy(title, "USER OPTIONS", sizeof_title);
else if (menu_type == MENU_SETTINGS_PATH_OPTIONS)
strlcpy(title, "PATH OPTIONS", sizeof_title);
else if (menu_type == MENU_SETTINGS_OPTIONS)
else if (!strcmp(label, "settings"))
strlcpy(title, "SETTINGS", sizeof_title);
else if (!strcmp(label, "Driver Options"))
strlcpy(title, "DRIVER OPTIONS", sizeof_title);
@ -66,7 +66,7 @@ static void get_title(const char *label, const char *dir,
snprintf(title, sizeof_title, "SHADER PRESET %s", dir);
#endif
else if (menu_type == MENU_SETTINGS_PATH_OPTIONS ||
menu_type == MENU_SETTINGS_OPTIONS ||
!strcmp(label, "settings") ||
menu_type == MENU_SETTINGS_CUSTOM_VIEWPORT ||
!strcmp(label, "custom_viewport_2") ||
!strcmp(label, "help") ||

2
frontend/menu/menu_common.c
View File

@ -650,7 +650,7 @@ unsigned menu_common_type_is(const char *label, unsigned type)
!strcmp(label, "Overlay Options") ||
!strcmp(label, "User Options") ||
!strcmp(label, "Netplay Options") ||
type == MENU_SETTINGS_OPTIONS ||
!strcmp(label, "settings") ||
!strcmp(label, "Driver Options") ||
!strcmp(label, "performance_counters") ||
!strcmp(label, "frontend_counters") ||

1
frontend/menu/menu_common.h
View File

@ -106,7 +106,6 @@ typedef enum
// settings options are done here too
MENU_SETTINGS_CONFIG,
MENU_SETTINGS_PATH_OPTIONS,
MENU_SETTINGS_OPTIONS,
MENU_SETTINGS_DISK_OPTIONS,
MENU_SETTINGS_DISK_INDEX,
MENU_SETTINGS_DISK_APPEND,

47
frontend/menu/menu_entries.c
View File

@ -108,7 +108,7 @@ int menu_entries_push_list(menu_handle_t *menu,
add_setting_entry(menu,list,"load_content", MENU_FILE_SWITCH, setting_data);
add_setting_entry(menu,list,"core_options", MENU_FILE_SWITCH, setting_data);
add_setting_entry(menu,list,"core_information", MENU_FILE_SWITCH, setting_data);
add_setting_entry(menu,list,"settings", MENU_SETTINGS_OPTIONS, setting_data);
add_setting_entry(menu,list,"settings", MENU_FILE_SWITCH, setting_data);
add_setting_entry(menu,list,"performance_counters", MENU_FILE_SWITCH, setting_data);
add_setting_entry(menu,list,"savestate", 0, setting_data);
add_setting_entry(menu,list,"loadstate", 0, setting_data);
@ -435,6 +435,29 @@ int menu_entries_push_list(menu_handle_t *menu,
add_setting_entry(menu,list,"video_font_enable", 0, setting_data);
add_setting_entry(menu,list,"video_font_size", 0, setting_data);
}
else if (!strcmp(label, "settings"))
{
file_list_clear(list);
add_setting_entry(menu,list,"Driver Options", MENU_FILE_SWITCH, setting_data);
add_setting_entry(menu,list,"General Options", MENU_FILE_SWITCH, setting_data);
add_setting_entry(menu,list,"Video Options", MENU_FILE_SWITCH, setting_data);
add_setting_entry(menu,list,"Shader Options", MENU_SETTINGS_SHADER_OPTIONS, setting_data);
add_setting_entry(menu,list,"Font Options", MENU_FILE_SWITCH, setting_data);
add_setting_entry(menu,list,"Audio Options", MENU_FILE_SWITCH, setting_data);
add_setting_entry(menu,list,"Input Options", MENU_FILE_SWITCH, setting_data);
add_setting_entry(menu,list,"Overlay Options", MENU_FILE_SWITCH, setting_data);
add_setting_entry(menu,list,"User Options", MENU_FILE_SWITCH, setting_data);
add_setting_entry(menu,list,"Netplay Options", MENU_FILE_SWITCH, setting_data);
add_setting_entry(menu,list,"Path Options", MENU_SETTINGS_PATH_OPTIONS, setting_data);
if (g_extern.main_is_init && !g_extern.libretro_dummy)
{
if (g_extern.system.disk_control.get_num_images)
file_list_push(list, "Disk Options", "",
MENU_SETTINGS_DISK_OPTIONS, 0);
}
add_setting_entry(menu,list,"Privacy Options",
MENU_FILE_SWITCH, setting_data);
}
else
{
switch (menu_type)
@ -496,28 +519,6 @@ int menu_entries_push_list(menu_handle_t *menu,
}
}
break;
case MENU_SETTINGS_OPTIONS:
file_list_clear(list);
add_setting_entry(menu,list,"Driver Options", MENU_FILE_SWITCH, setting_data);
add_setting_entry(menu,list,"General Options", MENU_FILE_SWITCH, setting_data);
add_setting_entry(menu,list,"Video Options", MENU_FILE_SWITCH, setting_data);
add_setting_entry(menu,list,"Shader Options", MENU_SETTINGS_SHADER_OPTIONS, setting_data);
add_setting_entry(menu,list,"Font Options", MENU_FILE_SWITCH, setting_data);
add_setting_entry(menu,list,"Audio Options", MENU_FILE_SWITCH, setting_data);
add_setting_entry(menu,list,"Input Options", MENU_FILE_SWITCH, setting_data);
add_setting_entry(menu,list,"Overlay Options", MENU_FILE_SWITCH, setting_data);
add_setting_entry(menu,list,"User Options", MENU_FILE_SWITCH, setting_data);
add_setting_entry(menu,list,"Netplay Options", MENU_FILE_SWITCH, setting_data);
add_setting_entry(menu,list,"Path Options", MENU_SETTINGS_PATH_OPTIONS, setting_data);
if (g_extern.main_is_init && !g_extern.libretro_dummy)
{
if (g_extern.system.disk_control.get_num_images)
file_list_push(list, "Disk Options", "",
MENU_SETTINGS_DISK_OPTIONS, 0);
}
add_setting_entry(menu,list,"Privacy Options",
MENU_FILE_SWITCH, setting_data);
break;
case MENU_SETTINGS_DISK_OPTIONS:
file_list_clear(list);
file_list_push(list, "Disk Index", "",