Skip to content

Commit adc8739

Browse files
sonninnossonninnos
committed
msg_hash reorderings and cleanups
1 parent 1cf24c5 commit adc8739

3 files changed

Lines changed: 131 additions & 131 deletions

File tree

‎intl/msg_hash_lbl.h‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1016,8 +1016,8 @@ MSG_HASH(
10161016
)
10171017
#ifdef ANDROID
10181018
MSG_HASH(
1019-
MENU_ENUM_LABEL_DEFERRED_DROPDOWN_BOX_LIST_INPUT_SELECT_PHYSICAL_KEYBOARD,
1020-
"deferred_dropdown_box_list_input_select_physical_keyboard"
1019+
MENU_ENUM_LABEL_DEFERRED_DROPDOWN_BOX_LIST_INPUT_SELECT_PHYSICAL_KEYBOARD,
1020+
"deferred_dropdown_box_list_input_select_physical_keyboard"
10211021
)
10221022
#endif
10231023
MSG_HASH(
@@ -4150,23 +4150,23 @@ MSG_HASH(
41504150
)
41514151
MSG_HASH(
41524152
MENU_ENUM_LABEL_CRT_SWITCH_RESOLUTION,
4153-
"crt_switch_resolution"
4153+
"crt_switch_resolution"
41544154
)
41554155
MSG_HASH(
41564156
MENU_ENUM_LABEL_CRT_SWITCH_RESOLUTION_SUPER,
4157-
"crt_switch_resolution_super"
4157+
"crt_switch_resolution_super"
41584158
)
41594159
MSG_HASH(
41604160
MENU_ENUM_LABEL_CRT_SWITCH_X_AXIS_CENTERING,
4161-
"crt_switch_horizontal_shift"
4161+
"crt_switch_horizontal_shift"
41624162
)
41634163
MSG_HASH(
41644164
MENU_ENUM_LABEL_CRT_SWITCH_PORCH_ADJUST,
4165-
"crt_switch_horizontal_size"
4165+
"crt_switch_horizontal_size"
41664166
)
41674167
MSG_HASH(
41684168
MENU_ENUM_LABEL_CRT_SWITCH_VERTICAL_ADJUST,
4169-
"crt_switch_vertical_size"
4169+
"crt_switch_vertical_size"
41704170
)
41714171
MSG_HASH(
41724172
MENU_ENUM_LABEL_VIDEO_ASPECT_RATIO,

‎intl/msg_hash_us.h‎

Lines changed: 123 additions & 123 deletions
Original file line numberDiff line numberDiff line change
@@ -3366,7 +3366,7 @@ MSG_HASH(
33663366
#ifdef ANDROID
33673367
MSG_HASH(
33683368
MENU_ENUM_LABEL_VALUE_INPUT_SELECT_PHYSICAL_KEYBOARD,
3369-
"Select physical keyboard"
3369+
"Select Physical Keyboard"
33703370
)
33713371
MSG_HASH(
33723372
MENU_ENUM_SUBLABEL_INPUT_SELECT_PHYSICAL_KEYBOARD,
@@ -3672,38 +3672,6 @@ MSG_HASH(
36723672
MENU_ENUM_SUBLABEL_INPUT_UNIFIED_MENU_CONTROLS,
36733673
"Use the same controls for both the menu and the game. Applies to the keyboard."
36743674
)
3675-
MSG_HASH(
3676-
MENU_ENUM_LABEL_VALUE_INPUT_DISABLE_INFO_BUTTON,
3677-
"Disable Info Button"
3678-
)
3679-
MSG_HASH(
3680-
MENU_ENUM_SUBLABEL_INPUT_DISABLE_INFO_BUTTON,
3681-
"Prevent menu info function."
3682-
)
3683-
MSG_HASH(
3684-
MENU_ENUM_LABEL_VALUE_INPUT_DISABLE_SEARCH_BUTTON,
3685-
"Disable Search Button"
3686-
)
3687-
MSG_HASH(
3688-
MENU_ENUM_SUBLABEL_INPUT_DISABLE_SEARCH_BUTTON,
3689-
"Prevent menu search function."
3690-
)
3691-
MSG_HASH(
3692-
MENU_ENUM_LABEL_VALUE_INPUT_DISABLE_LEFT_ANALOG_IN_MENU,
3693-
"Disable Left Analog in Menu"
3694-
)
3695-
MSG_HASH(
3696-
MENU_ENUM_SUBLABEL_INPUT_DISABLE_LEFT_ANALOG_IN_MENU,
3697-
"Prevent menu left analog stick input."
3698-
)
3699-
MSG_HASH(
3700-
MENU_ENUM_LABEL_VALUE_INPUT_DISABLE_RIGHT_ANALOG_IN_MENU,
3701-
"Disable Right Analog in Menu"
3702-
)
3703-
MSG_HASH(
3704-
MENU_ENUM_SUBLABEL_INPUT_DISABLE_RIGHT_ANALOG_IN_MENU,
3705-
"Prevent menu right analog stick input. Right analog stick cycles thumbnails in playlists."
3706-
)
37073675
MSG_HASH(
37083676
MENU_ENUM_LABEL_VALUE_MENU_INPUT_SWAP_OK_CANCEL,
37093677
"Menu Swap OK and Cancel Buttons"
@@ -3736,6 +3704,54 @@ MSG_HASH(
37363704
MENU_ENUM_SUBLABEL_MENU_ALLOW_TABS_BACK,
37373705
"Return to Main Menu from tabs/sidebar when pressing Back."
37383706
)
3707+
MSG_HASH(
3708+
MENU_ENUM_LABEL_VALUE_MENU_SCROLL_FAST,
3709+
"Menu Scroll Acceleration"
3710+
)
3711+
MSG_HASH(
3712+
MENU_ENUM_SUBLABEL_MENU_SCROLL_FAST,
3713+
"Maximum speed of the cursor when holding a direction to scroll."
3714+
)
3715+
MSG_HASH(
3716+
MENU_ENUM_LABEL_VALUE_MENU_SCROLL_DELAY,
3717+
"Menu Scroll Delay"
3718+
)
3719+
MSG_HASH(
3720+
MENU_ENUM_SUBLABEL_MENU_SCROLL_DELAY,
3721+
"Initial delay in milliseconds when holding a direction to scroll."
3722+
)
3723+
MSG_HASH(
3724+
MENU_ENUM_LABEL_VALUE_INPUT_DISABLE_INFO_BUTTON,
3725+
"Disable Info Button"
3726+
)
3727+
MSG_HASH(
3728+
MENU_ENUM_SUBLABEL_INPUT_DISABLE_INFO_BUTTON,
3729+
"Prevent menu info function."
3730+
)
3731+
MSG_HASH(
3732+
MENU_ENUM_LABEL_VALUE_INPUT_DISABLE_SEARCH_BUTTON,
3733+
"Disable Search Button"
3734+
)
3735+
MSG_HASH(
3736+
MENU_ENUM_SUBLABEL_INPUT_DISABLE_SEARCH_BUTTON,
3737+
"Prevent menu search function."
3738+
)
3739+
MSG_HASH(
3740+
MENU_ENUM_LABEL_VALUE_INPUT_DISABLE_LEFT_ANALOG_IN_MENU,
3741+
"Disable Left Analog in Menu"
3742+
)
3743+
MSG_HASH(
3744+
MENU_ENUM_SUBLABEL_INPUT_DISABLE_LEFT_ANALOG_IN_MENU,
3745+
"Prevent menu left analog stick input."
3746+
)
3747+
MSG_HASH(
3748+
MENU_ENUM_LABEL_VALUE_INPUT_DISABLE_RIGHT_ANALOG_IN_MENU,
3749+
"Disable Right Analog in Menu"
3750+
)
3751+
MSG_HASH(
3752+
MENU_ENUM_SUBLABEL_INPUT_DISABLE_RIGHT_ANALOG_IN_MENU,
3753+
"Prevent menu right analog stick input. Right analog stick cycles thumbnails in playlists."
3754+
)
37393755

37403756
/* Settings > Input > Hotkeys */
37413757

@@ -6128,6 +6144,14 @@ MSG_HASH(
61286144

61296145
/* Settings > User Interface */
61306146

6147+
MSG_HASH(
6148+
MENU_ENUM_LABEL_VALUE_MENU_SETTINGS,
6149+
"Appearance"
6150+
)
6151+
MSG_HASH(
6152+
MENU_ENUM_SUBLABEL_MENU_SETTINGS,
6153+
"Change menu screen appearance settings."
6154+
)
61316155
MSG_HASH(
61326156
MENU_ENUM_LABEL_VALUE_MENU_VIEWS_SETTINGS,
61336157
"Menu Item Visibility"
@@ -6137,31 +6161,53 @@ MSG_HASH(
61376161
"Toggle the visibility of menu items in RetroArch."
61386162
)
61396163
MSG_HASH(
6140-
MENU_ENUM_LABEL_VALUE_MENU_SETTINGS,
6141-
"Appearance"
6164+
MENU_ENUM_LABEL_VALUE_PAUSE_LIBRETRO,
6165+
"Pause Content When Menu Is Active"
61426166
)
61436167
MSG_HASH(
6144-
MENU_ENUM_SUBLABEL_MENU_SETTINGS,
6145-
"Change menu screen appearance settings."
6168+
MENU_ENUM_SUBLABEL_PAUSE_LIBRETRO,
6169+
"Pause the content if the menu is active."
61466170
)
61476171
MSG_HASH(
6148-
MENU_ENUM_LABEL_VALUE_APPICON_SETTINGS,
6149-
"App Icon"
6172+
MENU_ENUM_LABEL_VALUE_PAUSE_NONACTIVE,
6173+
"Pause Content When Not Active"
61506174
)
61516175
MSG_HASH(
6152-
MENU_ENUM_SUBLABEL_APPICON_SETTINGS,
6153-
"Change App Icon."
6176+
MENU_ENUM_SUBLABEL_PAUSE_NONACTIVE,
6177+
"Pause content when RetroArch is not the active window."
61546178
)
6155-
#ifdef _3DS
61566179
MSG_HASH(
6157-
MENU_ENUM_LABEL_VALUE_MENU_BOTTOM_SETTINGS,
6158-
"3DS Bottom Screen Appearance"
6180+
MENU_ENUM_LABEL_VALUE_QUIT_ON_CLOSE_CONTENT,
6181+
"Quit on Close Content"
61596182
)
61606183
MSG_HASH(
6161-
MENU_ENUM_SUBLABEL_MENU_BOTTOM_SETTINGS,
6162-
"Change bottom screen appearance settings."
6184+
MENU_ENUM_SUBLABEL_QUIT_ON_CLOSE_CONTENT,
6185+
"Automatically quit RetroArch when closing content. 'CLI' quits only when content is launched via command line."
6186+
)
6187+
MSG_HASH(
6188+
MENU_ENUM_LABEL_VALUE_MENU_SAVESTATE_RESUME,
6189+
"Resume Content After Using Save States"
6190+
)
6191+
MSG_HASH(
6192+
MENU_ENUM_SUBLABEL_MENU_SAVESTATE_RESUME,
6193+
"Automatically close the menu and resume content after saving or loading a state. Disabling this can improve save state performance on very slow devices."
6194+
)
6195+
MSG_HASH(
6196+
MENU_ENUM_LABEL_VALUE_MENU_INSERT_DISK_RESUME,
6197+
"Resume Content After Changing Discs"
6198+
)
6199+
MSG_HASH(
6200+
MENU_ENUM_SUBLABEL_MENU_INSERT_DISK_RESUME,
6201+
"Automatically close the menu and resume content after inserting or loading a new disc."
6202+
)
6203+
MSG_HASH(
6204+
MENU_ENUM_LABEL_VALUE_NAVIGATION_WRAPAROUND,
6205+
"Navigation Wrap-Around"
6206+
)
6207+
MSG_HASH(
6208+
MENU_ENUM_SUBLABEL_NAVIGATION_WRAPAROUND,
6209+
"Wrap-around to beginning and/or end if boundary of list is reached horizontally or vertically."
61636210
)
6164-
#endif
61656211
MSG_HASH(
61666212
MENU_ENUM_LABEL_VALUE_SHOW_ADVANCED_SETTINGS,
61676213
"Show Advanced Settings"
@@ -6187,44 +6233,28 @@ MSG_HASH(
61876233
"Supplying a password when enabling kiosk mode makes it possible to later disable it from the menu, by going to the Main Menu, selecting Disable Kiosk Mode and entering the password."
61886234
)
61896235
MSG_HASH(
6190-
MENU_ENUM_LABEL_VALUE_NAVIGATION_WRAPAROUND,
6191-
"Navigation Wrap-Around"
6192-
)
6193-
MSG_HASH(
6194-
MENU_ENUM_SUBLABEL_NAVIGATION_WRAPAROUND,
6195-
"Wrap-around to beginning and/or end if boundary of list is reached horizontally or vertically."
6196-
)
6197-
MSG_HASH(
6198-
MENU_ENUM_LABEL_VALUE_PAUSE_LIBRETRO,
6199-
"Pause Content When Menu Is Active"
6200-
)
6201-
MSG_HASH(
6202-
MENU_ENUM_SUBLABEL_PAUSE_LIBRETRO,
6203-
"Pause the content if the menu is active."
6204-
)
6205-
MSG_HASH(
6206-
MENU_ENUM_LABEL_VALUE_MENU_SAVESTATE_RESUME,
6207-
"Resume Content After Using Save States"
6236+
MENU_ENUM_LABEL_VALUE_MOUSE_ENABLE,
6237+
"Mouse Support"
62086238
)
62096239
MSG_HASH(
6210-
MENU_ENUM_SUBLABEL_MENU_SAVESTATE_RESUME,
6211-
"Automatically close the menu and resume content after saving or loading a state. Disabling this can improve save state performance on very slow devices."
6240+
MENU_ENUM_SUBLABEL_MOUSE_ENABLE,
6241+
"Allow the menu to be controlled with a mouse."
62126242
)
62136243
MSG_HASH(
6214-
MENU_ENUM_LABEL_VALUE_MENU_INSERT_DISK_RESUME,
6215-
"Resume Content After Changing Discs"
6244+
MENU_ENUM_LABEL_VALUE_POINTER_ENABLE,
6245+
"Touch Support"
62166246
)
62176247
MSG_HASH(
6218-
MENU_ENUM_SUBLABEL_MENU_INSERT_DISK_RESUME,
6219-
"Automatically close the menu and resume content after inserting or loading a new disc."
6248+
MENU_ENUM_SUBLABEL_POINTER_ENABLE,
6249+
"Allow the menu to be controlled with a touchscreen."
62206250
)
62216251
MSG_HASH(
6222-
MENU_ENUM_LABEL_VALUE_QUIT_ON_CLOSE_CONTENT,
6223-
"Quit on Close Content"
6252+
MENU_ENUM_LABEL_VALUE_THREADED_DATA_RUNLOOP_ENABLE,
6253+
"Threaded Tasks"
62246254
)
62256255
MSG_HASH(
6226-
MENU_ENUM_SUBLABEL_QUIT_ON_CLOSE_CONTENT,
6227-
"Automatically quit RetroArch when closing content. 'CLI' quits only when content is launched via command line."
6256+
MENU_ENUM_SUBLABEL_THREADED_DATA_RUNLOOP_ENABLE,
6257+
"Perform tasks on a separate thread."
62286258
)
62296259
MSG_HASH(
62306260
MENU_ENUM_LABEL_VALUE_MENU_SCREENSAVER_TIMEOUT,
@@ -6262,38 +6292,6 @@ MSG_HASH(
62626292
MENU_ENUM_SUBLABEL_MENU_SCREENSAVER_ANIMATION_SPEED,
62636293
"Adjust speed of menu screensaver animation effect."
62646294
)
6265-
MSG_HASH(
6266-
MENU_ENUM_LABEL_VALUE_MOUSE_ENABLE,
6267-
"Mouse Support"
6268-
)
6269-
MSG_HASH(
6270-
MENU_ENUM_SUBLABEL_MOUSE_ENABLE,
6271-
"Allow the menu to be controlled with a mouse."
6272-
)
6273-
MSG_HASH(
6274-
MENU_ENUM_LABEL_VALUE_POINTER_ENABLE,
6275-
"Touch Support"
6276-
)
6277-
MSG_HASH(
6278-
MENU_ENUM_SUBLABEL_POINTER_ENABLE,
6279-
"Allow the menu to be controlled with a touchscreen."
6280-
)
6281-
MSG_HASH(
6282-
MENU_ENUM_LABEL_VALUE_THREADED_DATA_RUNLOOP_ENABLE,
6283-
"Threaded Tasks"
6284-
)
6285-
MSG_HASH(
6286-
MENU_ENUM_SUBLABEL_THREADED_DATA_RUNLOOP_ENABLE,
6287-
"Perform tasks on a separate thread."
6288-
)
6289-
MSG_HASH(
6290-
MENU_ENUM_LABEL_VALUE_PAUSE_NONACTIVE,
6291-
"Pause Content When Not Active"
6292-
)
6293-
MSG_HASH(
6294-
MENU_ENUM_SUBLABEL_PAUSE_NONACTIVE,
6295-
"Pause content when RetroArch is not the active window."
6296-
)
62976295
MSG_HASH(
62986296
MENU_ENUM_LABEL_VALUE_VIDEO_DISABLE_COMPOSITION,
62996297
"Disable Desktop Composition"
@@ -6306,22 +6304,6 @@ MSG_HASH(
63066304
MENU_ENUM_LABEL_HELP_VIDEO_DISABLE_COMPOSITION,
63076305
"Forcibly disable composition. Disabling is only valid on Windows Vista/7 for now."
63086306
)
6309-
MSG_HASH(
6310-
MENU_ENUM_LABEL_VALUE_MENU_SCROLL_FAST,
6311-
"Menu Scroll Acceleration"
6312-
)
6313-
MSG_HASH(
6314-
MENU_ENUM_SUBLABEL_MENU_SCROLL_FAST,
6315-
"Maximum speed of the cursor when holding a direction to scroll."
6316-
)
6317-
MSG_HASH(
6318-
MENU_ENUM_LABEL_VALUE_MENU_SCROLL_DELAY,
6319-
"Menu Scroll Delay"
6320-
)
6321-
MSG_HASH(
6322-
MENU_ENUM_SUBLABEL_MENU_SCROLL_DELAY,
6323-
"Initial delay in milliseconds when holding a direction to scroll."
6324-
)
63256307
MSG_HASH(
63266308
MENU_ENUM_LABEL_VALUE_UI_COMPANION_ENABLE,
63276309
"UI Companion"
@@ -6342,6 +6324,24 @@ MSG_HASH(
63426324
MENU_ENUM_LABEL_VALUE_UI_COMPANION_TOGGLE,
63436325
"Open Desktop Menu on Startup"
63446326
)
6327+
#ifdef _3DS
6328+
MSG_HASH(
6329+
MENU_ENUM_LABEL_VALUE_MENU_BOTTOM_SETTINGS,
6330+
"3DS Bottom Screen Appearance"
6331+
)
6332+
MSG_HASH(
6333+
MENU_ENUM_SUBLABEL_MENU_BOTTOM_SETTINGS,
6334+
"Change bottom screen appearance settings."
6335+
)
6336+
#endif
6337+
MSG_HASH(
6338+
MENU_ENUM_LABEL_VALUE_APPICON_SETTINGS,
6339+
"App Icon"
6340+
)
6341+
MSG_HASH(
6342+
MENU_ENUM_SUBLABEL_APPICON_SETTINGS,
6343+
"Change App Icon."
6344+
)
63456345

63466346
/* Settings > User Interface > Menu Item Visibility */
63476347

‎menu/menu_displaylist.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9598,7 +9598,6 @@ unsigned menu_displaylist_build_list(
95989598
uico_driver_state_t *uico_st = uico_state_get_ptr();
95999599

96009600
menu_displaylist_build_info_selective_t build_list[] = {
9601-
{MENU_ENUM_LABEL_APPICON_SETTINGS, PARSE_ONLY_STRING_OPTIONS, false},
96029601
{MENU_ENUM_LABEL_MENU_SETTINGS, PARSE_ACTION, true},
96039602
{MENU_ENUM_LABEL_MENU_VIEWS_SETTINGS, PARSE_ACTION, true},
96049603
{MENU_ENUM_LABEL_ONSCREEN_NOTIFICATIONS_SETTINGS, PARSE_ACTION, true},
@@ -9637,6 +9636,7 @@ unsigned menu_displaylist_build_list(
96379636
{MENU_ENUM_LABEL_VIDEO_3DS_DISPLAY_MODE, PARSE_ONLY_UINT, true},
96389637
{MENU_ENUM_LABEL_MENU_BOTTOM_SETTINGS, PARSE_ACTION, true},
96399638
#endif
9639+
{MENU_ENUM_LABEL_APPICON_SETTINGS, PARSE_ONLY_STRING_OPTIONS, false},
96409640
{MENU_ENUM_LABEL_USER_LANGUAGE, PARSE_ONLY_UINT, true},
96419641
{MENU_ENUM_LABEL_MENU_DRIVER, PARSE_ONLY_STRING_OPTIONS, true},
96429642
};

0 commit comments

Comments
 (0)