From 02dcbce602d46bb148643b7de3ae6a49d54ae590 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Wed, 27 Jul 2016 16:37:28 +0200 Subject: [PATCH] Add more help messages --- intl/msg_hash_us.c | 24 ++++++++++++++++++++++++ menu/drivers/menu_generic.c | 28 ++++++++++++++++++++-------- msg_hash.h | 6 ++++++ 3 files changed, 50 insertions(+), 8 deletions(-) diff --git a/intl/msg_hash_us.c b/intl/msg_hash_us.c index 245994886c..0003692895 100644 --- a/intl/msg_hash_us.c +++ b/intl/msg_hash_us.c @@ -250,6 +250,30 @@ int menu_hash_get_help_us_enum(enum msg_hash_enums msg, char *s, size_t len) snprintf(s, len, "Go back to the parent directory."); break; + case MENU_ENUM_LABEL_FILE_BROWSER_SHADER_PRESET: + snprintf(s, len, + "Shader preset file."); + break; + case MENU_ENUM_LABEL_FILE_BROWSER_SHADER: + snprintf(s, len, + "Shader file."); + break; + case MENU_ENUM_LABEL_FILE_BROWSER_CHEAT: + snprintf(s, len, + "Cheat file."); + break; + case MENU_ENUM_LABEL_FILE_BROWSER_OVERLAY: + snprintf(s, len, + "Overlay file."); + break; + case MENU_ENUM_LABEL_FILE_BROWSER_RDB: + snprintf(s, len, + "Database file."); + break; + case MENU_ENUM_LABEL_FILE_BROWSER_FONT: + snprintf(s, len, + "TrueType font file."); + break; case MENU_ENUM_LABEL_FILE_BROWSER_PLAIN_FILE: snprintf(s, len, "Plain file."); diff --git a/menu/drivers/menu_generic.c b/menu/drivers/menu_generic.c index fde28b127c..2d198c837a 100644 --- a/menu/drivers/menu_generic.c +++ b/menu/drivers/menu_generic.c @@ -276,7 +276,6 @@ int generic_menu_iterate(void *data, void *userdata, enum menu_action action) enum msg_hash_enums enum_idx = MSG_UNKNOWN; menu_handle_t *menu = (menu_handle_t*)data; file_list_t *menu_stack = menu_entries_get_menu_stack_ptr(0); - file_list_t *selection_buf = menu_entries_get_selection_buf_ptr(0); menu_entries_get_last_stack(NULL, &label, &file_type, &enum_idx, NULL); @@ -325,7 +324,8 @@ int generic_menu_iterate(void *data, void *userdata, enum menu_action action) break; case ITERATE_TYPE_INFO: { - menu_file_list_cbs_t *cbs = + file_list_t *selection_buf = menu_entries_get_selection_buf_ptr(0); + menu_file_list_cbs_t *cbs = menu_entries_get_actiondata_at_offset(selection_buf, selection); if (cbs->enum_idx != MSG_UNKNOWN) @@ -349,16 +349,29 @@ int generic_menu_iterate(void *data, void *userdata, enum menu_action action) switch (type) { - case FILE_TYPE_FONT: /* TODO/FIXME */ - case FILE_TYPE_CHEAT: /* TODO/FIXME */ - case FILE_TYPE_OVERLAY: /* TODO/FIXME */ + case FILE_TYPE_FONT: + enum_idx = MENU_ENUM_LABEL_FILE_BROWSER_FONT; + break; + case FILE_TYPE_RDB: + enum_idx = MENU_ENUM_LABEL_FILE_BROWSER_RDB; + break; + case FILE_TYPE_OVERLAY: + enum_idx = MENU_ENUM_LABEL_FILE_BROWSER_OVERLAY; + break; + case FILE_TYPE_CHEAT: + enum_idx = MENU_ENUM_LABEL_FILE_BROWSER_CHEAT; + break; + case FILE_TYPE_SHADER_PRESET: + enum_idx = MENU_ENUM_LABEL_FILE_BROWSER_SHADER_PRESET; + break; + case FILE_TYPE_SHADER: + enum_idx = MENU_ENUM_LABEL_FILE_BROWSER_SHADER; + break; case FILE_TYPE_RECORD_CONFIG: /* TODO/FIXME */ case FILE_TYPE_CURSOR: /* TODO/FIXME */ case FILE_TYPE_VIDEOFILTER: /* TODO/FIXME */ case FILE_TYPE_AUDIOFILTER: /* TODO/FIXME */ case FILE_TYPE_REMAP: /* TODO/FIXME */ - case FILE_TYPE_SHADER_PRESET: /* TODO/FIXME */ - case FILE_TYPE_SHADER: /* TODO/FIXME */ case FILE_TYPE_SHADER_SLANG: /* TODO/FIXME */ case FILE_TYPE_SHADER_GLSL: /* TODO/FIXME */ case FILE_TYPE_SHADER_HLSL: /* TODO/FIXME */ @@ -367,7 +380,6 @@ int generic_menu_iterate(void *data, void *userdata, enum menu_action action) case FILE_TYPE_SHADER_PRESET_HLSLP: /* TODO/FIXME */ case FILE_TYPE_SHADER_PRESET_CGP: /* TODO/FIXME */ case FILE_TYPE_SHADER_PRESET_SLANGP: /* TODO/FIXME */ - case FILE_TYPE_RDB: /* TODO/FIXME */ case FILE_TYPE_PLAIN: enum_idx = MENU_ENUM_LABEL_FILE_BROWSER_PLAIN_FILE; break; diff --git a/msg_hash.h b/msg_hash.h index c03e15e8af..103749a85e 100644 --- a/msg_hash.h +++ b/msg_hash.h @@ -598,7 +598,13 @@ enum msg_hash_enums MENU_ENUM_LABEL_FILE_BROWSER_DIRECTORY, MENU_ENUM_LABEL_FILE_BROWSER_PLAIN_FILE, + MENU_ENUM_LABEL_FILE_BROWSER_SHADER_PRESET, + MENU_ENUM_LABEL_FILE_BROWSER_SHADER, MENU_ENUM_LABEL_FILE_BROWSER_CORE, + MENU_ENUM_LABEL_FILE_BROWSER_OVERLAY, + MENU_ENUM_LABEL_FILE_BROWSER_CHEAT, + MENU_ENUM_LABEL_FILE_BROWSER_FONT, + MENU_ENUM_LABEL_FILE_BROWSER_RDB, MENU_ENUM_LABEL_FILE_BROWSER_CORE_SELECT_FROM_COLLECTION, MENU_ENUM_LABEL_FILE_BROWSER_CORE_DETECTED, MENU_ENUM_LABEL_FILE_BROWSER_IMAGE,