CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2024-12-16 15:27:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

(Menu) Refactor MENU_DISK_OPTIONS

Browse Source
This commit is contained in:
twinaphex 2014-09-04 21:11:53 +02:00
parent d14effc3b0
commit f6625b4edf
5 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2331,7 +2331,6 @@ static void menu_common_setting_set_label(char *type_str,
break;
}
case MENU_SETTINGS_CUSTOM_VIEWPORT:
case MENU_SETTINGS_DISK_OPTIONS:
case MENU_SETTINGS_SHADER_PRESET:
case MENU_SETTINGS_SHADER_PRESET_SAVE:
case MENU_SETTINGS_DISK_APPEND:

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

@ -51,7 +51,7 @@ static void get_title(const char *label, const char *dir,
strlcpy(title, "GENERAL OPTIONS", sizeof_title);
else if (!strcmp(label, "Audio Options"))
strlcpy(title, "AUDIO OPTIONS", sizeof_title);
else if (menu_type == MENU_SETTINGS_DISK_OPTIONS)
else if (!strcmp(label, "disk_options"))
strlcpy(title, "DISK OPTIONS", sizeof_title);
else if (!strcmp(label, "core_options"))
strlcpy(title, "CORE OPTIONS", sizeof_title);

2
frontend/menu/menu_common.c
View File

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

1
frontend/menu/menu_common.h
View File

@ -104,7 +104,6 @@ typedef enum
MENU_SETTINGS_SHADER_PRESET_SAVE,
// settings options are done here too
MENU_SETTINGS_DISK_OPTIONS,
MENU_SETTINGS_DISK_INDEX,
MENU_SETTINGS_DISK_APPEND,

19
frontend/menu/menu_entries.c
View File

@ -452,8 +452,8 @@ int menu_entries_push_list(menu_handle_t *menu,
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);
file_list_push(list, "Disk Options", "disk_options",
MENU_FILE_SWITCH, 0);
}
add_setting_entry(menu,list,"Privacy Options",
MENU_FILE_SWITCH, setting_data);
@ -519,6 +519,14 @@ int menu_entries_push_list(menu_handle_t *menu,
MENU_SETTINGS_SHADER_0_SCALE + 3 * i, 0);
}
}
else if (!strcmp(label, "disk_options"))
{
file_list_clear(list);
file_list_push(list, "Disk Index", "disk_index",
MENU_SETTINGS_DISK_INDEX, 0);
file_list_push(list, "Disk Image Append", "disk_image_append",
MENU_SETTINGS_DISK_APPEND, 0);
}
else
{
switch (menu_type)
@ -539,13 +547,6 @@ int menu_entries_push_list(menu_handle_t *menu,
menu->parameter_shader = shader;
}
break;
case MENU_SETTINGS_DISK_OPTIONS:
file_list_clear(list);
file_list_push(list, "Disk Index", "",
MENU_SETTINGS_DISK_INDEX, 0);
file_list_push(list, "Disk Image Append", "",
MENU_SETTINGS_DISK_APPEND, 0);
break;
}
}