mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-01-31 06:32:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add sublabels for 'Subsystems' and 'Input Deadzone/Sensitivity' (#13804)

Browse Source
This commit is contained in:
Tony 2022-03-31 17:02:15 +03:00 committed by GitHub
parent 0eb4444ad1
commit caaaaf99f7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 32 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
intl/msg_hash_us.h
View File

@ -2413,16 +2413,24 @@ MSG_HASH(
) )
MSG_HASH( MSG_HASH(
MENU_ENUM_SUBLABEL_INPUT_BUTTON_AXIS_THRESHOLD, MENU_ENUM_SUBLABEL_INPUT_BUTTON_AXIS_THRESHOLD,
"How far an axis must be tilted to result in a button press." "How far an axis must be tilted to result in a button press when using 'Analog to Digital'."
) )
MSG_HASH( MSG_HASH(
MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_DEADZONE, MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_DEADZONE,
"Analog Deadzone" "Analog Deadzone"
) )
MSG_HASH(
MENU_ENUM_SUBLABEL_INPUT_ANALOG_DEADZONE,
"Ignore analog stick movements below deadzone value."
)
MSG_HASH( MSG_HASH(
MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_SENSITIVITY, MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_SENSITIVITY,
"Analog Sensitivity" "Analog Sensitivity"
) )
MSG_HASH(
MENU_ENUM_SUBLABEL_INPUT_ANALOG_SENSITIVITY,
"Adjust the sensitivity of analog sticks."
)
MSG_HASH( MSG_HASH(
MENU_ENUM_LABEL_VALUE_INPUT_BIND_TIMEOUT, MENU_ENUM_LABEL_VALUE_INPUT_BIND_TIMEOUT,
"Bind Timeout" "Bind Timeout"
@ -10639,6 +10647,10 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_SUBSYSTEM_SETTINGS, MENU_ENUM_LABEL_VALUE_SUBSYSTEM_SETTINGS,
"Subsystems" "Subsystems"
) )
MSG_HASH(
MENU_ENUM_SUBLABEL_SUBSYSTEM_SETTINGS,
"Access subsystem settings for current content."
)
MSG_HASH( MSG_HASH(
MENU_ENUM_LABEL_VALUE_NO_NETPLAY_HOSTS_FOUND, MENU_ENUM_LABEL_VALUE_NO_NETPLAY_HOSTS_FOUND,
"No netplay hosts found." "No netplay hosts found."

26
menu/cbs/menu_cbs_sublabel.c
View File

@ -471,10 +471,12 @@ DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_audio_mixer_volume, MENU_
#endif #endif
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_audio_sync, MENU_ENUM_SUBLABEL_AUDIO_SYNC) DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_audio_sync, MENU_ENUM_SUBLABEL_AUDIO_SYNC)
#if defined(GEKKO) #if defined(GEKKO)
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_mouse_scale, MENU_ENUM_SUBLABEL_INPUT_MOUSE_SCALE) DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_mouse_scale, MENU_ENUM_SUBLABEL_INPUT_MOUSE_SCALE)
#endif #endif
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_touch_scale, MENU_ENUM_SUBLABEL_INPUT_TOUCH_SCALE) DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_touch_scale, MENU_ENUM_SUBLABEL_INPUT_TOUCH_SCALE)
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_axis_threshold, MENU_ENUM_SUBLABEL_INPUT_BUTTON_AXIS_THRESHOLD) DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_button_axis_threshold, MENU_ENUM_SUBLABEL_INPUT_BUTTON_AXIS_THRESHOLD)
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_analog_deadzone, MENU_ENUM_SUBLABEL_INPUT_ANALOG_DEADZONE)
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_analog_sensitivity, MENU_ENUM_SUBLABEL_INPUT_ANALOG_SENSITIVITY)
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_turbo_period, MENU_ENUM_SUBLABEL_INPUT_TURBO_PERIOD) 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_input_duty_cycle, MENU_ENUM_SUBLABEL_INPUT_DUTY_CYCLE)
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_turbo_mode, MENU_ENUM_SUBLABEL_INPUT_TURBO_MODE) DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_turbo_mode, MENU_ENUM_SUBLABEL_INPUT_TURBO_MODE)
@ -530,12 +532,13 @@ DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_core_manager_list, MENU_
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_core_manager_steam_list, MENU_ENUM_SUBLABEL_CORE_MANAGER_STEAM_LIST) DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_core_manager_steam_list, MENU_ENUM_SUBLABEL_CORE_MANAGER_STEAM_LIST)
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_menu_show_core_manager_steam, MENU_ENUM_SUBLABEL_MENU_SHOW_CORE_MANAGER_STEAM) DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_menu_show_core_manager_steam, MENU_ENUM_SUBLABEL_MENU_SHOW_CORE_MANAGER_STEAM)
#endif #endif
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_load_disc, MENU_ENUM_SUBLABEL_LOAD_DISC) DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_load_disc, MENU_ENUM_SUBLABEL_LOAD_DISC)
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_dump_disc, MENU_ENUM_SUBLABEL_DUMP_DISC) DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_dump_disc, MENU_ENUM_SUBLABEL_DUMP_DISC)
#ifdef HAVE_LAKKA #ifdef HAVE_LAKKA
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_eject_disc, MENU_ENUM_SUBLABEL_EJECT_DISC) DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_eject_disc, MENU_ENUM_SUBLABEL_EJECT_DISC)
#endif #endif
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_content_list, MENU_ENUM_SUBLABEL_LOAD_CONTENT_LIST) DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_content_list, MENU_ENUM_SUBLABEL_LOAD_CONTENT_LIST)
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_subsystem_settings, MENU_ENUM_SUBLABEL_SUBSYSTEM_SETTINGS)
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_content_special, MENU_ENUM_SUBLABEL_LOAD_CONTENT_SPECIAL) DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_content_special, MENU_ENUM_SUBLABEL_LOAD_CONTENT_SPECIAL)
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_load_content_history, MENU_ENUM_SUBLABEL_LOAD_CONTENT_HISTORY) DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_load_content_history, MENU_ENUM_SUBLABEL_LOAD_CONTENT_HISTORY)
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_network_information, MENU_ENUM_SUBLABEL_NETWORK_INFORMATION) DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_network_information, MENU_ENUM_SUBLABEL_NETWORK_INFORMATION)
@ -546,7 +549,7 @@ DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_quit_retroarch, MENU_
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_quit_retroarch, MENU_ENUM_SUBLABEL_QUIT_RETROARCH) DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_quit_retroarch, MENU_ENUM_SUBLABEL_QUIT_RETROARCH)
#endif #endif
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_restart_retroarch, MENU_ENUM_SUBLABEL_RESTART_RETROARCH) DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_restart_retroarch, MENU_ENUM_SUBLABEL_RESTART_RETROARCH)
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_menu_widgets, MENU_ENUM_SUBLABEL_MENU_WIDGETS_ENABLE) DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_menu_widgets, MENU_ENUM_SUBLABEL_MENU_WIDGETS_ENABLE)
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_menu_show_load_content_animation, MENU_ENUM_SUBLABEL_MENU_SHOW_LOAD_CONTENT_ANIMATION) DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_menu_show_load_content_animation, MENU_ENUM_SUBLABEL_MENU_SHOW_LOAD_CONTENT_ANIMATION)
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_notification_show_autoconfig, MENU_ENUM_SUBLABEL_NOTIFICATION_SHOW_AUTOCONFIG) DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_notification_show_autoconfig, MENU_ENUM_SUBLABEL_NOTIFICATION_SHOW_AUTOCONFIG)
#ifdef HAVE_CHEATS #ifdef HAVE_CHEATS
@ -3733,6 +3736,9 @@ int menu_cbs_init_bind_sublabel(menu_file_list_cbs_t *cbs,
case MENU_ENUM_LABEL_LOAD_CONTENT_LIST: case MENU_ENUM_LABEL_LOAD_CONTENT_LIST:
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_content_list); BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_content_list);
break; break;
case MENU_ENUM_LABEL_SUBSYSTEM_SETTINGS:
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_subsystem_settings);
break;
case MENU_ENUM_LABEL_LOAD_CONTENT_SPECIAL: case MENU_ENUM_LABEL_LOAD_CONTENT_SPECIAL:
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_content_special); BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_content_special);
break; break;
@ -3869,7 +3875,13 @@ int menu_cbs_init_bind_sublabel(menu_file_list_cbs_t *cbs,
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_input_bind_hold); BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_input_bind_hold);
break; break;
case MENU_ENUM_LABEL_INPUT_BUTTON_AXIS_THRESHOLD: case MENU_ENUM_LABEL_INPUT_BUTTON_AXIS_THRESHOLD:
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_axis_threshold); BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_button_axis_threshold);
break;
case MENU_ENUM_LABEL_INPUT_ANALOG_DEADZONE:
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_analog_deadzone);
break;
case MENU_ENUM_LABEL_INPUT_ANALOG_SENSITIVITY:
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_analog_sensitivity);
break; break;
#if defined(GEKKO) #if defined(GEKKO)
case MENU_ENUM_LABEL_INPUT_MOUSE_SCALE: case MENU_ENUM_LABEL_INPUT_MOUSE_SCALE: