Add sublabels

This commit is contained in:
twinaphex 2016-11-22 08:48:37 +01:00
parent fd6f448709
commit 7873c5967a
4 changed files with 36 additions and 7 deletions

View File

@ -342,7 +342,7 @@ int menu_hash_get_help_us_enum(enum msg_hash_enums msg, char *s, size_t len)
break;
case MENU_ENUM_LABEL_DUMMY_ON_CORE_SHUTDOWN:
snprintf(s, len,
"Some libretro cores might have \n"
"Some cores might have \n"
"a shutdown feature. \n"
" \n"
"If this option is left disabled, \n"

View File

@ -1529,7 +1529,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_SMOOTH,
MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_SOFT_FILTER,
"Soft Filter Enable")
MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_SWAP_INTERVAL,
"VSync Swap Interval")
"Vertical Sync (Vsync) Swap Interval")
MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_TAB,
"Video")
MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_THREADED,
@ -1547,7 +1547,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_VIEWPORT_CUSTOM_Y,
MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_VI_WIDTH,
"Set VI Screen Width")
MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_VSYNC,
"VSync")
"Vertical Sync (Vsync)")
MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_WINDOWED_FULLSCREEN,
"Windowed Fullscreen Mode")
MSG_HASH(MENU_ENUM_LABEL_VALUE_WIFI_DRIVER,
@ -2134,3 +2134,15 @@ MSG_HASH(
MENU_ENUM_SUBLABEL_INPUT_DUTY_CYCLE,
"Describes how long the period of a turbo-enabled button should be. Numbers are described in frames."
)
MSG_HASH(
MENU_ENUM_SUBLABEL_VIDEO_VSYNC,
"Synchronizes the output video of the graphics card to the refresh rate of the monitor. Recommended."
)
MSG_HASH(
MENU_ENUM_SUBLABEL_VIDEO_ALLOW_ROTATE,
"Allow cores to set rotation. When disabled, rotation requests are ignored. Useful for setups where one manually rotates the monitor."
)
MSG_HASH(
MENU_ENUM_SUBLABEL_DUMMY_ON_CORE_SHUTDOWN,
"Some cores might have a shutdown feature. If enabled, it will prevent the core from shutting RetroArch down. Instead, it loads a dummy core."
)

View File

@ -97,6 +97,9 @@ default_sublabel_macro(action_bind_sublabel_audio_sync, MENU_
default_sublabel_macro(action_bind_sublabel_axis_threshold, MENU_ENUM_SUBLABEL_INPUT_AXIS_THRESHOLD)
default_sublabel_macro(action_bind_sublabel_input_turbo_period, MENU_ENUM_SUBLABEL_INPUT_TURBO_PERIOD)
default_sublabel_macro(action_bind_sublabel_input_duty_cycle, MENU_ENUM_SUBLABEL_INPUT_DUTY_CYCLE)
default_sublabel_macro(action_bind_sublabel_video_vertical_sync, MENU_ENUM_SUBLABEL_VIDEO_VSYNC)
default_sublabel_macro(action_bind_sublabel_core_allow_rotate, MENU_ENUM_SUBLABEL_VIDEO_ALLOW_ROTATE)
default_sublabel_macro(action_bind_sublabel_dummy_on_core_shutdown, MENU_ENUM_SUBLABEL_DUMMY_ON_CORE_SHUTDOWN)
static int action_bind_sublabel_cheevos_entry(
file_list_t *list,
@ -138,6 +141,15 @@ int menu_cbs_init_bind_sublabel(menu_file_list_cbs_t *cbs,
{
switch (cbs->enum_idx)
{
case MENU_ENUM_LABEL_DUMMY_ON_CORE_SHUTDOWN:
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_dummy_on_core_shutdown);
break;
case MENU_ENUM_LABEL_VIDEO_ALLOW_ROTATE:
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_core_allow_rotate);
break;
case MENU_ENUM_LABEL_VIDEO_VSYNC:
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_video_vertical_sync);
break;
case MENU_ENUM_LABEL_INPUT_DUTY_CYCLE:
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_input_duty_cycle);
break;

View File

@ -626,6 +626,8 @@ enum msg_hash_enums
MENU_ENUM_SUBLABEL_VIDEO_FRAME_DELAY,
MENU_ENUM_LABEL_VIDEO_VSYNC,
MENU_ENUM_SUBLABEL_VIDEO_VSYNC,
MENU_ENUM_LABEL_VALUE_VIDEO_VSYNC,
MENU_ENUM_LABEL_VALUE_VIDEO_HARD_SYNC,
MENU_ENUM_LABEL_VIDEO_HARD_SYNC,
@ -647,7 +649,10 @@ enum msg_hash_enums
MENU_ENUM_LABEL_VIDEO_VIEWPORT_CUSTOM_WIDTH,
MENU_ENUM_LABEL_VIDEO_VIEWPORT_CUSTOM_HEIGHT,
MENU_ENUM_LABEL_VIDEO_GAMMA,
MENU_ENUM_LABEL_VIDEO_ALLOW_ROTATE,
MENU_ENUM_SUBLABEL_VIDEO_ALLOW_ROTATE,
MENU_ENUM_LABEL_VALUE_VIDEO_ALLOW_ROTATE,
MENU_ENUM_LABEL_VIDEO_SHARED_CONTEXT,
MENU_ENUM_LABEL_VALUE_VIDEO_SHARED_CONTEXT,
@ -667,7 +672,6 @@ enum msg_hash_enums
MENU_ENUM_LABEL_VALUE_VIDEO_FILTER_FLICKER,
MENU_ENUM_LABEL_VALUE_VIDEO_SOFT_FILTER,
MENU_ENUM_LABEL_VALUE_VIDEO_ROTATION,
MENU_ENUM_LABEL_VALUE_VIDEO_VSYNC,
MENU_ENUM_LABEL_VALUE_VIDEO_SWAP_INTERVAL,
MENU_ENUM_LABEL_VALUE_VIDEO_GPU_SCREENSHOT,
MENU_ENUM_LABEL_VALUE_VIDEO_FULLSCREEN,
@ -677,7 +681,6 @@ enum msg_hash_enums
MENU_ENUM_LABEL_VALUE_VIDEO_VFILTER,
MENU_ENUM_LABEL_VALUE_VIDEO_GPU_RECORD,
MENU_ENUM_LABEL_VALUE_VIDEO_GAMMA,
MENU_ENUM_LABEL_VALUE_VIDEO_ALLOW_ROTATE,
MENU_ENUM_LABEL_VALUE_VIDEO_MONITOR_INDEX,
MENU_ENUM_LABEL_VIDEO_MONITOR_INDEX,
@ -1594,6 +1597,10 @@ enum msg_hash_enums
MENU_ENUM_LABEL_NETWORK_REMOTE_USER_LAST_ENABLE = MENU_ENUM_LABEL_NETWORK_REMOTE_USER_1_ENABLE + MAX_USERS,
MENU_ENUM_LABEL_DUMMY_ON_CORE_SHUTDOWN,
MENU_ENUM_SUBLABEL_DUMMY_ON_CORE_SHUTDOWN,
MENU_ENUM_LABEL_VALUE_DUMMY_ON_CORE_SHUTDOWN,
MENU_ENUM_LABEL_VALUE_STDIN_CMD_ENABLE,
MENU_ENUM_LABEL_VALUE_NETWORK_REMOTE_ENABLE,
MENU_ENUM_LABEL_DETECT_CORE_LIST,
@ -1611,8 +1618,6 @@ enum msg_hash_enums
MENU_ENUM_LABEL_VALUE_CORE_UPDATER_BUILDBOT_URL,
MENU_ENUM_LABEL_BUILDBOT_ASSETS_URL,
MENU_ENUM_LABEL_VALUE_BUILDBOT_ASSETS_URL,
MENU_ENUM_LABEL_DUMMY_ON_CORE_SHUTDOWN,
MENU_ENUM_LABEL_VALUE_DUMMY_ON_CORE_SHUTDOWN,
MENU_ENUM_LABEL_CORE_SET_SUPPORTS_NO_CONTENT_ENABLE,
MENU_ENUM_LABEL_VALUE_CORE_SET_SUPPORTS_NO_CONTENT_ENABLE,
MENU_ENUM_LABEL_CLOSE_CONTENT,