CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2025-01-06 18:30:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

(Menu) Refactor more settings

Browse Source
This commit is contained in:
twinaphex 2014-09-04 01:00:11 +02:00
parent 5ef289fe28
commit 3afc55f445
4 changed files with 22 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,9 +21,9 @@ static void get_title(const char *label, const char *dir,
strlcpy(title, "INPUT OPTIONS", sizeof_title);
else if (menu_type == MENU_SETTINGS_OVERLAY_OPTIONS)
strlcpy(title, "OVERLAY OPTIONS", sizeof_title);
else if (menu_type == MENU_SETTINGS_NETPLAY_OPTIONS)
else if (!strcmp(label, "Netplay Options"))
strlcpy(title, "NETPLAY OPTIONS", sizeof_title);
else if (menu_type == MENU_SETTINGS_USER_OPTIONS)
else if (!strcmp(label, "User Options"))
strlcpy(title, "USER OPTIONS", sizeof_title);
else if (menu_type == MENU_SETTINGS_PATH_OPTIONS)
strlcpy(title, "PATH OPTIONS", sizeof_title);

4
frontend/menu/menu_common.c
View File

@ -657,8 +657,8 @@ unsigned menu_common_type_is(const char *label, unsigned type)
type == MENU_SETTINGS_PATH_OPTIONS ||
type == MENU_SETTINGS_PRIVACY_OPTIONS ||
type == MENU_SETTINGS_OVERLAY_OPTIONS ||
type == MENU_SETTINGS_USER_OPTIONS ||
type == MENU_SETTINGS_NETPLAY_OPTIONS ||
!strcmp(label, "User Options") ||
!strcmp(label, "Netplay Options") ||
type == MENU_SETTINGS_OPTIONS ||
type == MENU_SETTINGS_DRIVERS ||
!strcmp(label, "performance_counters") ||

2
frontend/menu/menu_common.h
View File

@ -111,8 +111,6 @@ typedef enum
MENU_SETTINGS_INPUT_OPTIONS,
MENU_SETTINGS_PATH_OPTIONS,
MENU_SETTINGS_OVERLAY_OPTIONS,
MENU_SETTINGS_USER_OPTIONS,
MENU_SETTINGS_NETPLAY_OPTIONS,
MENU_SETTINGS_PRIVACY_OPTIONS,
MENU_SETTINGS_OPTIONS,
MENU_SETTINGS_DRIVERS,

35
frontend/menu/menu_entries.c
View File

@ -287,6 +287,22 @@ int menu_entries_push_list(menu_handle_t *menu,
do_action = true;
}
else if (!strcmp(label, "User Options"))
{
file_list_clear(list);
add_setting_entry(menu,list,"netplay_nickname", 0, setting_data);
add_setting_entry(menu,list,"user_language", 0, setting_data);
}
else if (!strcmp(label, "Netplay Options"))
{
file_list_clear(list);
add_setting_entry(menu,list,"netplay_enable", 0, setting_data);
add_setting_entry(menu,list,"netplay_mode", 0, setting_data);
add_setting_entry(menu,list,"netplay_spectator_mode_enable", 0, setting_data);
add_setting_entry(menu,list,"netplay_ip_address", 0, setting_data);
add_setting_entry(menu,list,"netplay_tcp_udp_port", 0, setting_data);
add_setting_entry(menu,list,"netplay_delay_frames", 0, setting_data);
}
else
{
switch (menu_type)
@ -416,9 +432,8 @@ int menu_entries_push_list(menu_handle_t *menu,
add_setting_entry(menu,list,"Input Options", MENU_SETTINGS_INPUT_OPTIONS, setting_data);
add_setting_entry(menu,list,"Overlay Options", MENU_SETTINGS_OVERLAY_OPTIONS,
setting_data);
add_setting_entry(menu,list,"User Options", MENU_SETTINGS_USER_OPTIONS, setting_data);
add_setting_entry(menu,list,"Netplay Options", MENU_SETTINGS_NETPLAY_OPTIONS,
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)
{
@ -448,20 +463,6 @@ int menu_entries_push_list(menu_handle_t *menu,
add_setting_entry(menu,list,"input_overlay_opacity", 0, setting_data);
add_setting_entry(menu,list,"input_overlay_scale", 0, setting_data);
break;
case MENU_SETTINGS_USER_OPTIONS:
file_list_clear(list);
add_setting_entry(menu,list,"netplay_nickname", 0, setting_data);
add_setting_entry(menu,list,"user_language", 0, setting_data);
break;
case MENU_SETTINGS_NETPLAY_OPTIONS:
file_list_clear(list);
add_setting_entry(menu,list,"netplay_enable", 0, setting_data);
add_setting_entry(menu,list,"netplay_mode", 0, setting_data);
add_setting_entry(menu,list,"netplay_spectator_mode_enable", 0, setting_data);
add_setting_entry(menu,list,"netplay_ip_address", 0, setting_data);
add_setting_entry(menu,list,"netplay_tcp_udp_port", 0, setting_data);
add_setting_entry(menu,list,"netplay_delay_frames", 0, setting_data);
break;
case MENU_SETTINGS_PATH_OPTIONS:
file_list_clear(list);
add_setting_entry(menu,list,"rgui_browser_directory",