(Menu) Updates

This commit is contained in:
twinaphex 2015-06-18 09:53:07 +02:00
parent 7741a6fbba
commit 821570cb16
3 changed files with 26 additions and 10 deletions

View File

@ -1145,7 +1145,8 @@ static int deferred_push_video_shader_parameters_common(
if (list_size <= 0)
{
menu_list_push(info->list,
"No shader parameters.", "", 0, 0, 0);
menu_hash_to_str(MENU_LABEL_VALUE_NO_SHADER_PARAMETERS),
"", 0, 0, 0);
return 0;
}
@ -1366,8 +1367,8 @@ static int menu_displaylist_parse_options(menu_displaylist_info_t *info)
MENU_SETTING_ACTION, 0, 0);
#ifdef HAVE_SHADER_MANAGER
menu_list_push(info->list,
"Shader Options",
"shader_options",
menu_hash_to_str(MENU_LABEL_VALUE_SHADER_OPTIONS),
menu_hash_to_str(MENU_LABEL_SHADER_OPTIONS),
MENU_SETTING_ACTION, 0, 0);
#endif
@ -1384,13 +1385,20 @@ static int menu_displaylist_parse_horizontal_content_actions(menu_displaylist_in
if (global->main_is_init && !global->libretro_dummy &&
!strcmp(menu->deferred_path, global->fullpath))
{
menu_list_push(info->list, menu_hash_to_str(MENU_LABEL_RESUME_CONTENT), "file_load_or_resume", MENU_SETTING_ACTION_RUN, 0, 0);
menu_list_push(info->list, menu_hash_to_str(MENU_LABEL_SAVE_STATE), "savestate", MENU_SETTING_ACTION_SAVESTATE, 0, 0);
menu_list_push(info->list, menu_hash_to_str(MENU_LABEL_LOAD_STATE), "loadstate", MENU_SETTING_ACTION_LOADSTATE, 0, 0);
menu_list_push(info->list, menu_hash_to_str(MENU_LABEL_VALUE_CORE_INFORMATION), "core_information", MENU_SETTING_ACTION_CORE_INFORMATION, 0, 0);
menu_list_push(info->list, menu_hash_to_str(MENU_LABEL_VALUE_OPTIONS), "options", MENU_SETTING_ACTION_CORE_OPTIONS, 0, 0);
menu_list_push(info->list, "Take Screenshot", "take_screenshot", MENU_SETTING_ACTION_SCREENSHOT, 0, 0);
menu_list_push(info->list, "Reset", "restart_content", MENU_SETTING_ACTION_RESET, 0, 0);
menu_list_push(info->list, menu_hash_to_str(MENU_LABEL_RESUME_CONTENT),
"file_load_or_resume", MENU_SETTING_ACTION_RUN, 0, 0);
menu_list_push(info->list, menu_hash_to_str(MENU_LABEL_SAVE_STATE),
"savestate", MENU_SETTING_ACTION_SAVESTATE, 0, 0);
menu_list_push(info->list, menu_hash_to_str(MENU_LABEL_LOAD_STATE),
"loadstate", MENU_SETTING_ACTION_LOADSTATE, 0, 0);
menu_list_push(info->list, menu_hash_to_str(MENU_LABEL_VALUE_CORE_INFORMATION),
"core_information", MENU_SETTING_ACTION_CORE_INFORMATION, 0, 0);
menu_list_push(info->list, menu_hash_to_str(MENU_LABEL_VALUE_OPTIONS),
"options", MENU_SETTING_ACTION_CORE_OPTIONS, 0, 0);
menu_list_push(info->list, "Take Screenshot", "take_screenshot",
MENU_SETTING_ACTION_SCREENSHOT, 0, 0);
menu_list_push(info->list, "Reset", "restart_content",
MENU_SETTING_ACTION_RESET, 0, 0);
}
else
menu_list_push(info->list, "Run", "file_load_or_resume", MENU_SETTING_ACTION_RUN, 0, 0);

View File

@ -137,6 +137,12 @@ const char *menu_hash_to_str(uint32_t hash)
return "video_options";
case MENU_LABEL_VALUE_VIDEO_OPTIONS:
return "Video Options";
case MENU_LABEL_VALUE_SHADER_OPTIONS:
return "Shader Options";
case MENU_LABEL_SHADER_OPTIONS:
return "shader_options";
case MENU_LABEL_VALUE_NO_SHADER_PARAMETERS:
return "No shader parameters.";
default:
break;
}

View File

@ -27,8 +27,10 @@ extern "C" {
#define MENU_LABEL_CHEAT_TOGGLE 0xe515e0cbU
#define MENU_LABEL_PAUSE_TOGGLE 0x557634e4U
#define MENU_LABEL_VALUE_SHADER_OPTIONS 0xf3fb0028U
#define MENU_LABEL_VALUE_USE_THIS_DIRECTORY 0xc5fc9ed9U
#define MENU_LABEL_VALUE_CORE_OPTIONS 0x1477b95aU
#define MENU_LABEL_VALUE_NO_SHADER_PARAMETERS 0x8ccc809bU
#define MENU_LABEL_VALUE_NO_CORE_INFORMATION_AVAILABLE 0x2a11fe80U
#define MENU_LABEL_VALUE_NO_CORES_AVAILABLE 0xe16bfd0dU
#define MENU_LABEL_VALUE_NO_PLAYLIST_ENTRIES_AVAILABLE 0xea82695dU