libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-10-08 07:03:30 +00:00
Code Issues Actions 23 Packages Projects Releases Wiki Activity

(Menu) Refactor MENU_SETTINGS_PATH_OPTIONS

Browse Source
This commit is contained in:
twinaphex 2014-09-04 19:24:27 +02:00
parent fb9c3f5555
commit 1404dd42d7
5 changed files with 27 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1805,7 +1805,7 @@ static int menu_action_ok(const char *dir,
&& (type == MENU_FILE_USE_DIRECTORY))
{
menu_common_setting_set_current_string(setting, dir);
menu_flush_stack_type(driver.menu->menu_stack,MENU_SETTINGS_PATH_OPTIONS);
menu_flush_stack_label(driver.menu->menu_stack, "Path Options");
}
else if (setting && !strcmp(setting->name, "input_overlay")
&& type == MENU_FILE_PLAIN)
@ -1817,7 +1817,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_PATH_OPTIONS);
menu_flush_stack_label(driver.menu->menu_stack, "Path Options");
}
else if (setting && !strcmp(setting->name, "video_filter")
&& type == MENU_FILE_PLAIN)

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

@ -25,7 +25,7 @@ static void get_title(const char *label, const char *dir,
strlcpy(title, "NETPLAY OPTIONS", sizeof_title);
else if (!strcmp(label, "User Options"))
strlcpy(title, "USER OPTIONS", sizeof_title);
else if (menu_type == MENU_SETTINGS_PATH_OPTIONS)
else if (!strcmp(label, "Path Options"))
strlcpy(title, "PATH OPTIONS", sizeof_title);
else if (!strcmp(label, "settings"))
strlcpy(title, "SETTINGS", sizeof_title);
@ -65,9 +65,7 @@ static void get_title(const char *label, const char *dir,
else if (!strcmp(label, "video_shader_preset"))
snprintf(title, sizeof_title, "SHADER PRESET %s", dir);
#endif
else if (menu_type == MENU_SETTINGS_PATH_OPTIONS ||
!strcmp(label, "settings") ||
menu_type == MENU_SETTINGS_CUSTOM_VIEWPORT ||
else if (menu_type == MENU_SETTINGS_CUSTOM_VIEWPORT ||
!strcmp(label, "custom_viewport_2") ||
!strcmp(label, "help") ||
menu_type == MENU_SETTINGS)

2
frontend/menu/menu_common.c
View File

@ -645,7 +645,7 @@ unsigned menu_common_type_is(const char *label, unsigned type)
type == MENU_SETTINGS_SHADER_PRESET_PARAMETERS ||
!strcmp(label, "Audio Options") ||
type == MENU_SETTINGS_DISK_OPTIONS ||
type == MENU_SETTINGS_PATH_OPTIONS ||
!strcmp(label, "Path Options") ||
!strcmp(label, "Privacy Options") ||
!strcmp(label, "Overlay Options") ||
!strcmp(label, "User Options") ||

1
frontend/menu/menu_common.h
View File

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

43
frontend/menu/menu_entries.c
View File

@ -448,7 +448,7 @@ int menu_entries_push_list(menu_handle_t *menu,
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);
add_setting_entry(menu,list,"Path Options", MENU_FILE_SWITCH, setting_data);
if (g_extern.main_is_init && !g_extern.libretro_dummy)
{
if (g_extern.system.disk_control.get_num_images)
@ -458,6 +458,27 @@ int menu_entries_push_list(menu_handle_t *menu,
add_setting_entry(menu,list,"Privacy Options",
MENU_FILE_SWITCH, setting_data);
}
else if (!strcmp(label, "Path Options"))
{
file_list_clear(list);
add_setting_entry(menu,list,"rgui_browser_directory", 0, setting_data);
add_setting_entry(menu,list,"content_directory", 0, setting_data);
add_setting_entry(menu,list,"assets_directory", 0, setting_data);
add_setting_entry(menu,list,"rgui_config_directory", 0, setting_data);
add_setting_entry(menu,list,"libretro_dir_path", 0, setting_data);
add_setting_entry(menu,list,"libretro_info_path", 0, setting_data);
add_setting_entry(menu,list,"game_history_path", 0, setting_data);
add_setting_entry(menu,list,"video_filter_dir", 0, setting_data);
add_setting_entry(menu,list,"audio_filter_dir", 0, setting_data);
add_setting_entry(menu,list,"video_shader_dir", 0, setting_data);
add_setting_entry(menu,list,"savestate_directory", 0, setting_data);
add_setting_entry(menu,list,"savefile_directory", 0, setting_data);
add_setting_entry(menu,list,"overlay_directory", 0, setting_data);
add_setting_entry(menu,list,"system_directory", 0, setting_data);
add_setting_entry(menu,list,"screenshot_directory", 0, setting_data);
add_setting_entry(menu,list,"joypad_autoconfig_dir", 0, setting_data);
add_setting_entry(menu,list,"extraction_directory", 0, setting_data);
}
else
{
switch (menu_type)
@ -526,26 +547,6 @@ int menu_entries_push_list(menu_handle_t *menu,
file_list_push(list, "Disk Image Append", "",
MENU_SETTINGS_DISK_APPEND, 0);
break;
case MENU_SETTINGS_PATH_OPTIONS:
file_list_clear(list);
add_setting_entry(menu,list,"rgui_browser_directory", 0, setting_data);
add_setting_entry(menu,list,"content_directory", 0, setting_data);
add_setting_entry(menu,list,"assets_directory", 0, setting_data);
add_setting_entry(menu,list,"rgui_config_directory", 0, setting_data);
add_setting_entry(menu,list,"libretro_dir_path", 0, setting_data);
add_setting_entry(menu,list,"libretro_info_path", 0, setting_data);
add_setting_entry(menu,list,"game_history_path", 0, setting_data);
add_setting_entry(menu,list,"video_filter_dir", 0, setting_data);
add_setting_entry(menu,list,"audio_filter_dir", 0, setting_data);
add_setting_entry(menu,list,"video_shader_dir", 0, setting_data);
add_setting_entry(menu,list,"savestate_directory", 0, setting_data);
add_setting_entry(menu,list,"savefile_directory", 0, setting_data);
add_setting_entry(menu,list,"overlay_directory", 0, setting_data);
add_setting_entry(menu,list,"system_directory", 0, setting_data);
add_setting_entry(menu,list,"screenshot_directory", 0, setting_data);
add_setting_entry(menu,list,"joypad_autoconfig_dir", 0, setting_data);
add_setting_entry(menu,list,"extraction_directory", 0, setting_data);
break;
}
}