diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index 11e922e195..86c3aec250 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -734,11 +734,11 @@ static int menu_displaylist_parse_shader_options(menu_displaylist_info_t *info) menu_hash_to_str(MENU_LABEL_VIDEO_SHADER_PRESET_SAVE_AS), MENU_SETTING_ACTION, 0, 0); menu_list_push(info->list, - "Current Shader Parameters", + menu_hash_to_str(MENU_LABEL_VALUE_VIDEO_SHADER_PARAMETERS), menu_hash_to_str(MENU_LABEL_VIDEO_SHADER_PARAMETERS), MENU_SETTING_ACTION, 0, 0); menu_list_push(info->list, - "Menu Shader Parameters (Menu)", + menu_hash_to_str(MENU_LABEL_VALUE_VIDEO_SHADER_PRESET_PARAMETERS), menu_hash_to_str(MENU_LABEL_VIDEO_SHADER_PRESET_PARAMETERS), MENU_SETTING_ACTION, 0, 0); menu_list_push(info->list, @@ -750,17 +750,17 @@ static int menu_displaylist_parse_shader_options(menu_displaylist_info_t *info) { char buf[64] = {0}; - snprintf(buf, sizeof(buf), "Shader #%u", i); + snprintf(buf, sizeof(buf), "%s #%u", menu_hash_to_str(MENU_VALUE_SHADER), i); menu_list_push(info->list, buf, menu_hash_to_str(MENU_LABEL_VIDEO_SHADER_PASS), MENU_SETTINGS_SHADER_PASS_0 + i, 0, 0); - snprintf(buf, sizeof(buf), "Shader #%u Filter", i); + snprintf(buf, sizeof(buf), "%s #%u Filter", menu_hash_to_str(MENU_VALUE_SHADER), i); menu_list_push(info->list, buf, menu_hash_to_str(MENU_LABEL_VIDEO_SHADER_FILTER_PASS), MENU_SETTINGS_SHADER_PASS_FILTER_0 + i, 0, 0); - snprintf(buf, sizeof(buf), "Shader #%u Scale", i); + snprintf(buf, sizeof(buf), "%s #%u Scale", menu_hash_to_str(MENU_VALUE_SHADER), i); menu_list_push(info->list, buf, menu_hash_to_str(MENU_LABEL_VIDEO_SHADER_SCALE_PASS), MENU_SETTINGS_SHADER_PASS_SCALE_0 + i, 0, 0); @@ -1042,7 +1042,8 @@ static int menu_displaylist_parse_database_entry(menu_displaylist_info_t *info) } if (db_info_entry->edge_magazine_review) { - if (create_string_list_rdb_entry_string("Edge Magazine Review", "rdb_entry_edge_magazine_review", + if (create_string_list_rdb_entry_string("Edge Magazine Review", + menu_hash_to_str(MENU_LABEL_RDB_ENTRY_EDGE_MAGAZINE_REVIEW), db_info_entry->edge_magazine_review, info->path, info->list) == -1) goto error; } @@ -1495,7 +1496,11 @@ static int menu_displaylist_parse_horizontal_content_actions(menu_displaylist_in MENU_SETTING_ACTION_RESET, 0, 0); } else - menu_list_push(info->list, "Run", "file_load_or_resume", MENU_SETTING_ACTION_RUN, 0, 0); + menu_list_push(info->list, + menu_hash_to_str(MENU_LABEL_VALUE_RUN), + "file_load_or_resume", + MENU_SETTING_ACTION_RUN, + 0, 0); return 0; } @@ -1536,7 +1541,7 @@ static int menu_displaylist_parse_options_cheats(menu_displaylist_info_t *info) { char cheat_label[64] = {0}; - snprintf(cheat_label, sizeof(cheat_label), "Cheat #%u: ", i); + snprintf(cheat_label, sizeof(cheat_label), "%s #%u: ", menu_hash_to_str(MENU_VALUE_CHEAT), i); if (cheat->cheats[i].desc) strlcat(cheat_label, cheat->cheats[i].desc, sizeof(cheat_label)); menu_list_push(info->list, cheat_label, "", MENU_SETTINGS_CHEAT_BEGIN + i, 0, 0); @@ -1902,7 +1907,9 @@ int menu_displaylist_push_list(menu_displaylist_info_t *info, unsigned type) case DISPLAYLIST_OPTIONS_VIDEO: menu_list_clear(info->list); #if defined(GEKKO) || defined(__CELLOS_LV2__) - menu_list_push(info->list, "Screen Resolution", "", + menu_list_push(info->list, + menu_hash_to_str(MENU_LABEL_VALUE_SCREEN_RESOLUTION), + menu_hash_to_str(MENU_LABEL_SCREEN_RESOLUTION), MENU_SETTINGS_VIDEO_RESOLUTION, 0, 0); #endif menu_list_push(info->list, diff --git a/menu/menu_hash.c b/menu/menu_hash.c index 6b8486cb33..daeb8b6065 100644 --- a/menu/menu_hash.c +++ b/menu/menu_hash.c @@ -372,6 +372,10 @@ static const char *menu_hash_to_str_english(uint32_t hash) { switch (hash) { + case MENU_VALUE_SHADER: + return "Shader"; + case MENU_VALUE_CHEAT: + return "Cheat"; case MENU_LABEL_VIDEO_FONT_ENABLE: return "video_font_enable"; case MENU_LABEL_VALUE_VIDEO_FONT_ENABLE: @@ -1006,6 +1010,8 @@ static const char *menu_hash_to_str_english(uint32_t hash) return "rdb_entry_name"; case MENU_LABEL_RDB_ENTRY_EDGE_MAGAZINE_RATING: return "rdb_entry_edge_magazine_rating"; + case MENU_LABEL_RDB_ENTRY_EDGE_MAGAZINE_REVIEW: + return "rdb_entry_edge_magazine_review"; case MENU_LABEL_RDB_ENTRY_FAMITSU_MAGAZINE_RATING: return "rdb_entry_famitsu_magazine_rating"; case MENU_LABEL_RDB_ENTRY_EDGE_MAGAZINE_ISSUE: @@ -1326,8 +1332,12 @@ static const char *menu_hash_to_str_english(uint32_t hash) return "shader_options"; case MENU_LABEL_VIDEO_SHADER_PARAMETERS: return "video_shader_parameters"; + case MENU_LABEL_VALUE_VIDEO_SHADER_PARAMETERS: + return "Current Shader Parameters"; case MENU_LABEL_VIDEO_SHADER_PRESET_PARAMETERS: return "video_shader_preset_parameters"; + case MENU_LABEL_VALUE_VIDEO_SHADER_PRESET_PARAMETERS: + return "Menu Shader Parameters (Menu)"; case MENU_LABEL_VALUE_VIDEO_SHADER_PRESET_SAVE_AS: return "Shader Preset Save As"; case MENU_LABEL_VIDEO_SHADER_PRESET_SAVE_AS: diff --git a/menu/menu_hash.h b/menu/menu_hash.h index fa373915e6..c6d473d71f 100644 --- a/menu/menu_hash.h +++ b/menu/menu_hash.h @@ -21,6 +21,8 @@ extern "C" { #endif #define MENU_VALUE_UNKNOWN 0x9b3bb635U +#define MENU_VALUE_CHEAT 0x0cf62beaU +#define MENU_VALUE_SHADER 0xd10c0cfcU #define MENU_VALUE_DIRECTORY_CONTENT 0x89a45bd9U #define MENU_VALUE_DIRECTORY_NONE 0x9996c10fU #define MENU_VALUE_DIRECTORY_DEFAULT 0xdcc3a2e4U @@ -143,6 +145,9 @@ extern "C" { #define MENU_LABEL_VALUE_THREADED_DATA_RUNLOOP_ENABLE 0x04d8c10fU #define MENU_LABEL_VIDEO_THREADED 0x0626179cU #define MENU_LABEL_VALUE_VIDEO_THREADED 0xc7524afdU +#define MENU_LABEL_VALUE_RUN 0x0b881f3aU +#define MENU_LABEL_SCREEN_RESOLUTION 0x5c9b3a58U +#define MENU_LABEL_VALUE_SCREEN_RESOLUTION 0xae3c3b19U #define MENU_LABEL_TITLE_COLOR 0x10059879U #define MENU_LABEL_VALUE_TITLE_COLOR 0xea87e1dbU @@ -374,6 +379,7 @@ extern "C" { #define MENU_LABEL_RDB_ENTRY_CERO_RATING 0x9d436f5aU #define MENU_LABEL_RDB_ENTRY_EDGE_MAGAZINE_RATING 0x9735f631U #define MENU_LABEL_RDB_ENTRY_EDGE_MAGAZINE_ISSUE 0xd5706415U +#define MENU_LABEL_RDB_ENTRY_EDGE_MAGAZINE_REVIEW 0x977f6fdeU #define MENU_LABEL_RDB_ENTRY_FAMITSU_MAGAZINE_RATING 0x01a50315U #define MENU_LABEL_RDB_ENTRY_RELEASE_MONTH 0xad2f2c54U #define MENU_LABEL_RDB_ENTRY_RELEASE_YEAR 0x14c9c6bfU @@ -529,8 +535,10 @@ extern "C" { #define MENU_LABEL_VALUE_SYSTEM_INFORMATION 0xa62fd7f0U #define MENU_LABEL_CORE_INFORMATION 0xb638e0d3U #define MENU_LABEL_VALUE_CORE_INFORMATION 0x781981b4U +#define MENU_LABEL_VALUE_VIDEO_SHADER_PARAMETERS 0x5ace99b3U #define MENU_LABEL_VIDEO_SHADER_PARAMETERS 0x9895c3e5U #define MENU_LABEL_VIDEO_SHADER_PRESET_PARAMETERS 0xd18158d7U +#define MENU_LABEL_VALUE_VIDEO_SHADER_PRESET_PARAMETERS 0x57f696abU #define MENU_LABEL_DISK_OPTIONS 0xc61ab5fbU #define MENU_LABEL_VALUE_DISK_OPTIONS 0xbee508e5U #define MENU_LABEL_CORE_OPTIONS 0xf65e60f9U