From e82a129fef7fb1eab6eced46f7c9b9ea67dcd037 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 25 Jul 2016 18:02:03 +0200 Subject: [PATCH] Add enum_idx for most remaining settings --- frontend/drivers/platform_ctr.c | 3 ++- frontend/drivers/platform_gx.c | 8 ++++---- frontend/drivers/platform_linux.c | 2 +- frontend/drivers/platform_ps3.c | 22 +++++++++++----------- frontend/drivers/platform_psp.c | 8 ++++---- frontend/drivers/platform_win32.c | 2 +- frontend/drivers/platform_xdk.cpp | 12 ++++++------ intl/msg_hash_us.c | 6 ++++++ menu/menu_displaylist.c | 15 ++++++++++----- msg_hash.h | 4 ++++ 10 files changed, 49 insertions(+), 33 deletions(-) diff --git a/frontend/drivers/platform_ctr.c b/frontend/drivers/platform_ctr.c index 7f6d4860d5..d640d473f7 100644 --- a/frontend/drivers/platform_ctr.c +++ b/frontend/drivers/platform_ctr.c @@ -256,7 +256,8 @@ static int frontend_ctr_parse_drive_list(void *data) return -1; menu_entries_append_enum(list, - "sdmc:/", "", MSG_UNKNOWN, FILE_TYPE_DIRECTORY, 0, 0); + "sdmc:/", "", MENU_ENUM_LABEL_FILE_BROWSER_DIRECTORY, + FILE_TYPE_DIRECTORY, 0, 0); #endif return 0; diff --git a/frontend/drivers/platform_gx.c b/frontend/drivers/platform_gx.c index dcd4d2aeee..9c2f260d28 100644 --- a/frontend/drivers/platform_gx.c +++ b/frontend/drivers/platform_gx.c @@ -464,14 +464,14 @@ static int frontend_gx_parse_drive_list(void *data) file_list_t *list = (file_list_t*)data; #ifdef HW_RVL menu_entries_append_enum(list, - "sd:/", "", MSG_UNKNOWN, FILE_TYPE_DIRECTORY, 0, 0); + "sd:/", "", MENU_ENUM_LABEL_FILE_BROWSER_DIRECTORY, FILE_TYPE_DIRECTORY, 0, 0); menu_entries_append_enum(list, - "usb:/", "", MSG_UNKNOWN, FILE_TYPE_DIRECTORY, 0, 0); + "usb:/", "", MENU_ENUM_LABEL_FILE_BROWSER_DIRECTORY, FILE_TYPE_DIRECTORY, 0, 0); #endif menu_entries_append_enum(list, - "carda:/", "", MSG_UNKNOWN, FILE_TYPE_DIRECTORY, 0, 0); + "carda:/", "", MENU_ENUM_LABEL_FILE_BROWSER_DIRECTORY, FILE_TYPE_DIRECTORY, 0, 0); menu_entries_append_enum(list, - "cardb:/", "", MSG_UNKNOWN, FILE_TYPE_DIRECTORY, 0, 0); + "cardb:/", "", MENU_ENUM_LABEL_FILE_BROWSER_DIRECTORY, FILE_TYPE_DIRECTORY, 0, 0); #endif return 0; diff --git a/frontend/drivers/platform_linux.c b/frontend/drivers/platform_linux.c index 7fc0439bc4..10a4133e09 100644 --- a/frontend/drivers/platform_linux.c +++ b/frontend/drivers/platform_linux.c @@ -1858,7 +1858,7 @@ static int frontend_android_parse_drive_list(void *data) MSG_INTERNAL_MEMORY, FILE_TYPE_DIRECTORY, 0, 0); menu_entries_append_enum(list, "/", "", - MSG_UNKNOWN, FILE_TYPE_DIRECTORY, 0, 0); + MENU_ENUM_LABEL_FILE_BROWSER_DIRECTORY, FILE_TYPE_DIRECTORY, 0, 0); return 0; } diff --git a/frontend/drivers/platform_ps3.c b/frontend/drivers/platform_ps3.c index dcc158f8d2..6c9f4aa60b 100644 --- a/frontend/drivers/platform_ps3.c +++ b/frontend/drivers/platform_ps3.c @@ -496,27 +496,27 @@ static int frontend_ps3_parse_drive_list(void *data) file_list_t *list = (file_list_t*)data; menu_entries_append_enum(list, - "/app_home/", "", MSG_UNKNOWN, FILE_TYPE_DIRECTORY, 0, 0); + "/app_home/", "", MENU_ENUM_LABEL_FILE_BROWSER_DIRECTORY, FILE_TYPE_DIRECTORY, 0, 0); menu_entries_append_enum(list, - "/dev_hdd0/", "", MSG_UNKNOWN, FILE_TYPE_DIRECTORY, 0, 0); + "/dev_hdd0/", "", MENU_ENUM_LABEL_FILE_BROWSER_DIRECTORY, FILE_TYPE_DIRECTORY, 0, 0); menu_entries_append_enum(list, - "/dev_hdd1/", "", MSG_UNKNOWN, FILE_TYPE_DIRECTORY, 0, 0); + "/dev_hdd1/", "", MENU_ENUM_LABEL_FILE_BROWSER_DIRECTORY, FILE_TYPE_DIRECTORY, 0, 0); menu_entries_append_enum(list, - "/host_root/", "", MSG_UNKNOWN, FILE_TYPE_DIRECTORY, 0, 0); + "/host_root/", "", MENU_ENUM_LABEL_FILE_BROWSER_DIRECTORY, FILE_TYPE_DIRECTORY, 0, 0); menu_entries_append_enum(list, - "/dev_usb000/", "", MSG_UNKNOWN, FILE_TYPE_DIRECTORY, 0, 0); + "/dev_usb000/", "", MENU_ENUM_LABEL_FILE_BROWSER_DIRECTORY, FILE_TYPE_DIRECTORY, 0, 0); menu_entries_append_enum(list, - "/dev_usb001/", "", MSG_UNKNOWN, FILE_TYPE_DIRECTORY, 0, 0); + "/dev_usb001/", "", MENU_ENUM_LABEL_FILE_BROWSER_DIRECTORY, FILE_TYPE_DIRECTORY, 0, 0); menu_entries_append_enum(list, - "/dev_usb002/", "", MSG_UNKNOWN, FILE_TYPE_DIRECTORY, 0, 0); + "/dev_usb002/", "", MENU_ENUM_LABEL_FILE_BROWSER_DIRECTORY, FILE_TYPE_DIRECTORY, 0, 0); menu_entries_append_enum(list, - "/dev_usb003/", "", MSG_UNKNOWN, FILE_TYPE_DIRECTORY, 0, 0); + "/dev_usb003/", "", MENU_ENUM_LABEL_FILE_BROWSER_DIRECTORY, FILE_TYPE_DIRECTORY, 0, 0); menu_entries_append_enum(list, - "/dev_usb004/", "", MSG_UNKNOWN, FILE_TYPE_DIRECTORY, 0, 0); + "/dev_usb004/", "", MENU_ENUM_LABEL_FILE_BROWSER_DIRECTORY, FILE_TYPE_DIRECTORY, 0, 0); menu_entries_append_enum(list, - "/dev_usb005/", "", MSG_UNKNOWN, FILE_TYPE_DIRECTORY, 0, 0); + "/dev_usb005/", "", MENU_ENUM_LABEL_FILE_BROWSER_DIRECTORY, FILE_TYPE_DIRECTORY, 0, 0); menu_entries_append_enum(list, - "/dev_usb006/", "", MSG_UNKNOWN, FILE_TYPE_DIRECTORY, 0, 0); + "/dev_usb006/", "", MENU_ENUM_LABEL_FILE_BROWSER_DIRECTORY, FILE_TYPE_DIRECTORY, 0, 0); #endif return 0; diff --git a/frontend/drivers/platform_psp.c b/frontend/drivers/platform_psp.c index 25f29522e9..007f962928 100644 --- a/frontend/drivers/platform_psp.c +++ b/frontend/drivers/platform_psp.c @@ -371,14 +371,14 @@ static int frontend_psp_parse_drive_list(void *data) #ifdef VITA menu_entries_append_enum(list, - "cache0:/", "", MSG_UNKNOWN, FILE_TYPE_DIRECTORY, 0, 0); + "cache0:/", "", MENU_ENUM_LABEL_FILE_BROWSER_DIRECTORY, FILE_TYPE_DIRECTORY, 0, 0); #else menu_entries_append_enum(list, - "ms0:/", "", MSG_UNKNOWN, FILE_TYPE_DIRECTORY, 0, 0); + "ms0:/", "", MENU_ENUM_LABEL_FILE_BROWSER_DIRECTORY, FILE_TYPE_DIRECTORY, 0, 0); menu_entries_append_enum(list, - "ef0:/", "", MSG_UNKNOWN, FILE_TYPE_DIRECTORY, 0, 0); + "ef0:/", "", MENU_ENUM_LABEL_FILE_BROWSER_DIRECTORY, FILE_TYPE_DIRECTORY, 0, 0); menu_entries_append_enum(list, - "host0:/", "", MSG_UNKNOWN, FILE_TYPE_DIRECTORY, 0, 0); + "host0:/", "", MENU_ENUM_LABEL_FILE_BROWSER_DIRECTORY, FILE_TYPE_DIRECTORY, 0, 0); #endif #endif diff --git a/frontend/drivers/platform_win32.c b/frontend/drivers/platform_win32.c index b874a4f8d7..f296515fa5 100644 --- a/frontend/drivers/platform_win32.c +++ b/frontend/drivers/platform_win32.c @@ -229,7 +229,7 @@ static int frontend_win32_parse_drive_list(void *data) drive[0] = 'A' + i; if (drives & (1 << i)) menu_entries_append_enum(list, - drive, "", MSG_UNKNOWN, FILE_TYPE_DIRECTORY, 0, 0); + drive, "", MENU_ENUM_LABEL_FILE_BROWSER_DIRECTORY, FILE_TYPE_DIRECTORY, 0, 0); } #endif diff --git a/frontend/drivers/platform_xdk.cpp b/frontend/drivers/platform_xdk.cpp index 2114093b96..68262271c3 100644 --- a/frontend/drivers/platform_xdk.cpp +++ b/frontend/drivers/platform_xdk.cpp @@ -1368,18 +1368,18 @@ static int frontend_xdk_parse_drive_list(void *data) #if defined(_XBOX1) menu_entries_append_enum(list, - "C:", "", MSG_UNKNOWN, FILE_TYPE_DIRECTORY, 0, 0); + "C:", "", MENU_ENUM_LABEL_FILE_BROWSER_DIRECTORY, FILE_TYPE_DIRECTORY, 0, 0); menu_entries_append_enum(list, - "D:", "", MSG_UNKNOWN, FILE_TYPE_DIRECTORY, 0, 0); + "D:", "", MENU_ENUM_LABEL_FILE_BROWSER_DIRECTORY, FILE_TYPE_DIRECTORY, 0, 0); menu_entries_append_enum(list, - "E:", "", MSG_UNKNOWN, FILE_TYPE_DIRECTORY, 0, 0); + "E:", "", MENU_ENUM_LABEL_FILE_BROWSER_DIRECTORY, FILE_TYPE_DIRECTORY, 0, 0); menu_entries_append_enum(list, - "F:", "", MSG_UNKNOWN, FILE_TYPE_DIRECTORY, 0, 0); + "F:", "", MENU_ENUM_LABEL_FILE_BROWSER_DIRECTORY, FILE_TYPE_DIRECTORY, 0, 0); menu_entries_append_enum(list, - "G:", "", MSG_UNKNOWN, FILE_TYPE_DIRECTORY, 0, 0); + "G:", "", MENU_ENUM_LABEL_FILE_BROWSER_DIRECTORY, FILE_TYPE_DIRECTORY, 0, 0); #elif defined(_XBOX360) menu_entries_append_enum(list, - "game:", "", MSG_UNKNOWN, FILE_TYPE_DIRECTORY, 0, 0); + "game:", "", MENU_ENUM_LABEL_FILE_BROWSER_DIRECTORY, FILE_TYPE_DIRECTORY, 0, 0); #endif #endif diff --git a/intl/msg_hash_us.c b/intl/msg_hash_us.c index d1914c7101..3bff976882 100644 --- a/intl/msg_hash_us.c +++ b/intl/msg_hash_us.c @@ -2615,6 +2615,12 @@ static const char *menu_hash_to_str_us_label_enum(enum msg_hash_enums msg) return "input_poll_type_behavior"; case MENU_ENUM_LABEL_MENU_WALLPAPER_OPACITY: return "menu_wallpaper_opacity"; + case MENU_ENUM_LABEL_FILE_BROWSER_DIRECTORY: + return "file_browser_directory"; + case MENU_ENUM_LABEL_FILE_BROWSER_PLAIN_FILE: + return "file_browser_plain_file"; + case MENU_ENUM_LABEL_FILE_BROWSER_CORE: + return "file_browser_core"; default: break; } diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index 9db998bad1..c338608820 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -3150,7 +3150,7 @@ static int menu_displaylist_parse_playlists( { if (frontend_driver_parse_drive_list(info->list) != 0) menu_entries_append_enum(info->list, "/", "", - MSG_UNKNOWN, FILE_TYPE_DIRECTORY, 0, 0); + MENU_ENUM_LABEL_FILE_BROWSER_DIRECTORY, FILE_TYPE_DIRECTORY, 0, 0); return 0; } @@ -3257,7 +3257,7 @@ static int menu_displaylist_parse_cores( { if (frontend_driver_parse_drive_list(info->list) != 0) menu_entries_append_enum(info->list, "/", "", - MSG_UNKNOWN, FILE_TYPE_DIRECTORY, 0, 0); + MENU_ENUM_LABEL_FILE_BROWSER_DIRECTORY, FILE_TYPE_DIRECTORY, 0, 0); return 0; } @@ -3317,6 +3317,7 @@ static int menu_displaylist_parse_cores( bool is_dir; char label[PATH_MAX_LENGTH] = {0}; const char *path = NULL; + enum msg_hash_enums enum_idx = MSG_UNKNOWN; enum msg_file_type file_type = FILE_TYPE_NONE; switch (str_list->elems[i].attr.i) @@ -3333,6 +3334,7 @@ static int menu_displaylist_parse_cores( case RARCH_PLAIN_FILE: default: file_type = (enum msg_file_type)info->type_default; + enum_idx = MENU_ENUM_LABEL_FILE_BROWSER_CORE; break; } @@ -3368,7 +3370,7 @@ static int menu_displaylist_parse_cores( items_found++; menu_entries_append_enum(info->list, path, label, - MSG_UNKNOWN, + enum_idx, file_type, 0, 0); } @@ -3439,7 +3441,7 @@ static int menu_displaylist_parse_generic( { if (frontend_driver_parse_drive_list(info->list) != 0) menu_entries_append_enum(info->list, "/", "", - MSG_UNKNOWN, FILE_TYPE_DIRECTORY, 0, 0); + MENU_ENUM_LABEL_FILE_BROWSER_DIRECTORY, FILE_TYPE_DIRECTORY, 0, 0); return 0; } @@ -3509,12 +3511,14 @@ static int menu_displaylist_parse_generic( bool is_dir; char label[PATH_MAX_LENGTH] = {0}; const char *path = NULL; + enum msg_hash_enums enum_idx = MSG_UNKNOWN; enum msg_file_type file_type = FILE_TYPE_NONE; switch (str_list->elems[i].attr.i) { case RARCH_DIRECTORY: file_type = FILE_TYPE_DIRECTORY; + enum_idx = MENU_ENUM_LABEL_FILE_BROWSER_DIRECTORY; break; case RARCH_COMPRESSED_ARCHIVE: file_type = FILE_TYPE_CARCHIVE; @@ -3525,6 +3529,7 @@ static int menu_displaylist_parse_generic( case RARCH_PLAIN_FILE: default: file_type = (enum msg_file_type)info->type_default; + enum_idx = MENU_ENUM_LABEL_FILE_BROWSER_PLAIN_FILE; switch (type) { case DISPLAYLIST_CORES_DETECTED: @@ -3597,7 +3602,7 @@ static int menu_displaylist_parse_generic( items_found++; menu_entries_append_enum(info->list, path, label, - MSG_UNKNOWN, + enum_idx, file_type, 0, 0); } diff --git a/msg_hash.h b/msg_hash.h index 6d00e9d42c..15f769e6fd 100644 --- a/msg_hash.h +++ b/msg_hash.h @@ -286,6 +286,10 @@ enum msg_hash_enums MSG_EXTRACTING_FILE, MSG_NO_CONTENT_STARTING_DUMMY_CORE, + MENU_ENUM_LABEL_FILE_BROWSER_DIRECTORY, + MENU_ENUM_LABEL_FILE_BROWSER_PLAIN_FILE, + MENU_ENUM_LABEL_FILE_BROWSER_CORE, + MENU_ENUM_LABEL_VALUE_CONTENT_HISTORY_SIZE, MENU_ENUM_LABEL_MENU_TOGGLE, MENU_ENUM_LABEL_VALUE_NO_HISTORY_AVAILABLE,