Skip to content

Commit eaddc9d

Browse files
libretroadminLibretroAdmin
libretroadmin
authored and
LibretroAdmin
committed
settings: migrate a batch of extended-row tables to single-source def files
Each table individually performed and gated by tools/settings_migrate_group.py with the standard battery including the platform-profile lanes and the integrated enum consolidation stage; the batch is squashed for review convenience.
1 parent bc031c6 commit eaddc9d

8 files changed

Lines changed: 518 additions & 336 deletions

File tree

‎configuration.c‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1936,6 +1936,7 @@ static struct config_bool_setting *populate_settings_bool(
19361936
#include "settings/settings_def_video_fullscreen.h"
19371937
#define SETTINGS_DEF_CONFIG_PASS
19381938
#include "settings/settings_def_video_sync.h"
1939+
#include "settings/settings_def_menu_main_lists_4.h"
19391940
#include "settings/settings_def_menu_main_lists_3.h"
19401941
#ifdef HAVE_MENU
19411942
#ifdef HAVE_MATERIALUI
@@ -2611,6 +2612,7 @@ static struct config_float_setting *populate_settings_float(
26112612
#include "settings/settings_def_video_fullscreen.h"
26122613
#define SETTINGS_DEF_CONFIG_PASS
26132614
#include "settings/settings_def_video_sync.h"
2615+
#include "settings/settings_def_menu_main_lists_4.h"
26142616
#include "settings/settings_def_menu_main_lists_3.h"
26152617
#ifdef HAVE_MENU
26162618
#ifdef HAVE_MATERIALUI
@@ -3243,6 +3245,7 @@ static struct config_uint_setting *populate_settings_uint(
32433245
#include "settings/settings_def_video_fullscreen.h"
32443246
#define SETTINGS_DEF_CONFIG_PASS
32453247
#include "settings/settings_def_video_sync.h"
3248+
#include "settings/settings_def_menu_main_lists_4.h"
32463249
#include "settings/settings_def_menu_main_lists_3.h"
32473250
#ifdef HAVE_MENU
32483251
#ifdef HAVE_MATERIALUI
@@ -3877,6 +3880,7 @@ static struct config_int_setting *populate_settings_int(
38773880
#include "settings/settings_def_video_fullscreen.h"
38783881
#define SETTINGS_DEF_CONFIG_PASS
38793882
#include "settings/settings_def_video_sync.h"
3883+
#include "settings/settings_def_menu_main_lists_4.h"
38803884
#include "settings/settings_def_menu_main_lists_3.h"
38813885
#ifdef HAVE_MENU
38823886
#ifdef HAVE_MATERIALUI
@@ -4380,6 +4384,7 @@ static struct config_int_setting *populate_settings_int(
43804384
#include "settings/settings_def_video_fullscreen.h"
43814385
#define SETTINGS_DEF_CONFIG_PASS
43824386
#include "settings/settings_def_video_sync.h"
4387+
#include "settings/settings_def_menu_main_lists_4.h"
43834388
#include "settings/settings_def_menu_main_lists_3.h"
43844389
#ifdef HAVE_MENU
43854390
#ifdef HAVE_MATERIALUI

‎intl/msg_hash_lbl.h‎

Lines changed: 0 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -444,10 +444,6 @@ MSG_HASH(
444444
MENU_ENUM_LABEL_CHEEVOS_USERNAME,
445445
MENU_ENUM_LABEL_CHEEVOS_USERNAME_STR
446446
)
447-
MSG_HASH(
448-
MENU_ENUM_LABEL_CHEEVOS_APPEARANCE_SETTINGS,
449-
MENU_ENUM_LABEL_CHEEVOS_APPEARANCE_SETTINGS_STR
450-
)
451447
MSG_HASH(
452448
MENU_ENUM_LABEL_CHEEVOS_APPEARANCE_ANCHOR,
453449
MENU_ENUM_LABEL_CHEEVOS_APPEARANCE_ANCHOR_STR
@@ -456,10 +452,6 @@ MSG_HASH(
456452
MENU_ENUM_LABEL_CHEEVOS_APPEARANCE_PADDING_AUTO,
457453
MENU_ENUM_LABEL_CHEEVOS_APPEARANCE_PADDING_AUTO_STR
458454
)
459-
MSG_HASH(
460-
MENU_ENUM_LABEL_CHEEVOS_VISIBILITY_SETTINGS,
461-
MENU_ENUM_LABEL_CHEEVOS_VISIBILITY_SETTINGS_STR
462-
)
463455
MSG_HASH(
464456
MENU_ENUM_LABEL_CHEEVOS_VISIBILITY_LBOARD_TRACKERS,
465457
MENU_ENUM_LABEL_CHEEVOS_VISIBILITY_LBOARD_TRACKERS_STR
@@ -1728,20 +1720,6 @@ MSG_HASH(
17281720
MENU_ENUM_LABEL_MENU_DRIVER_XMB,
17291721
MENU_ENUM_LABEL_MENU_DRIVER_XMB_STR
17301722
)
1731-
MSG_HASH(
1732-
MENU_ENUM_LABEL_MENU_FILE_BROWSER_SETTINGS,
1733-
MENU_ENUM_LABEL_MENU_FILE_BROWSER_SETTINGS_STR
1734-
)
1735-
MSG_HASH(
1736-
MENU_ENUM_LABEL_MENU_SETTINGS,
1737-
MENU_ENUM_LABEL_MENU_SETTINGS_STR
1738-
)
1739-
#ifdef _3DS
1740-
MSG_HASH(
1741-
MENU_ENUM_LABEL_MENU_BOTTOM_SETTINGS,
1742-
MENU_ENUM_LABEL_MENU_BOTTOM_SETTINGS_STR
1743-
)
1744-
#endif
17451723
MSG_HASH(
17461724
MENU_ENUM_LABEL_MUSIC_TAB,
17471725
MENU_ENUM_LABEL_MUSIC_TAB_STR
@@ -1922,38 +1900,10 @@ MSG_HASH(
19221900
MENU_ENUM_LABEL_ONLINE,
19231901
MENU_ENUM_LABEL_ONLINE_STR
19241902
)
1925-
MSG_HASH(
1926-
MENU_ENUM_LABEL_ONSCREEN_DISPLAY_SETTINGS,
1927-
MENU_ENUM_LABEL_ONSCREEN_DISPLAY_SETTINGS_STR
1928-
)
1929-
MSG_HASH(
1930-
MENU_ENUM_LABEL_ONSCREEN_OVERLAY_SETTINGS,
1931-
MENU_ENUM_LABEL_ONSCREEN_OVERLAY_SETTINGS_STR
1932-
)
1933-
MSG_HASH(
1934-
MENU_ENUM_LABEL_OVERLAY_LIGHTGUN_SETTINGS,
1935-
MENU_ENUM_LABEL_OVERLAY_LIGHTGUN_SETTINGS_STR
1936-
)
1937-
MSG_HASH(
1938-
MENU_ENUM_LABEL_OVERLAY_MOUSE_SETTINGS,
1939-
MENU_ENUM_LABEL_OVERLAY_MOUSE_SETTINGS_STR
1940-
)
1941-
MSG_HASH(
1942-
MENU_ENUM_LABEL_OSK_OVERLAY_SETTINGS,
1943-
MENU_ENUM_LABEL_OSK_OVERLAY_SETTINGS_STR
1944-
)
19451903
MSG_HASH(
19461904
MENU_ENUM_LABEL_ONSCREEN_VIDEO_LAYOUT_SETTINGS,
19471905
MENU_ENUM_LABEL_ONSCREEN_VIDEO_LAYOUT_SETTINGS_STR
19481906
)
1949-
MSG_HASH(
1950-
MENU_ENUM_LABEL_ONSCREEN_NOTIFICATIONS_SETTINGS,
1951-
MENU_ENUM_LABEL_ONSCREEN_NOTIFICATIONS_SETTINGS_STR
1952-
)
1953-
MSG_HASH(
1954-
MENU_ENUM_LABEL_ONSCREEN_NOTIFICATIONS_VIEWS_SETTINGS,
1955-
MENU_ENUM_LABEL_ONSCREEN_NOTIFICATIONS_VIEWS_SETTINGS_STR
1956-
)
19571907
MSG_HASH(
19581908
MENU_ENUM_LABEL_OPEN_ARCHIVE,
19591909
MENU_ENUM_LABEL_OPEN_ARCHIVE_STR
@@ -2400,10 +2350,6 @@ MSG_HASH(
24002350
MENU_ENUM_LABEL_RESUME_CONTENT,
24012351
MENU_ENUM_LABEL_RESUME_CONTENT_STR
24022352
)
2403-
MSG_HASH(
2404-
MENU_ENUM_LABEL_RETRO_ACHIEVEMENTS_SETTINGS,
2405-
MENU_ENUM_LABEL_RETRO_ACHIEVEMENTS_SETTINGS_STR
2406-
)
24072353
MSG_HASH(
24082354
MENU_ENUM_LABEL_CHEAT_SETTINGS,
24092355
MENU_ENUM_LABEL_CHEAT_SETTINGS_STR
@@ -2809,10 +2755,6 @@ MSG_HASH(
28092755
MENU_ENUM_LABEL_UNDO_SAVE_STATE,
28102756
MENU_ENUM_LABEL_UNDO_SAVE_STATE_STR
28112757
)
2812-
MSG_HASH(
2813-
MENU_ENUM_LABEL_UPDATER_SETTINGS,
2814-
MENU_ENUM_LABEL_UPDATER_SETTINGS_STR
2815-
)
28162758
MSG_HASH(
28172759
MENU_ENUM_LABEL_UPDATE_ASSETS,
28182760
MENU_ENUM_LABEL_UPDATE_ASSETS_STR
@@ -2857,10 +2799,6 @@ MSG_HASH(
28572799
MENU_ENUM_LABEL_URL_ENTRY,
28582800
MENU_ENUM_LABEL_URL_ENTRY_STR
28592801
)
2860-
MSG_HASH(
2861-
MENU_ENUM_LABEL_USER_INTERFACE_SETTINGS,
2862-
MENU_ENUM_LABEL_USER_INTERFACE_SETTINGS_STR
2863-
)
28642802
MSG_HASH(
28652803
MENU_ENUM_LABEL_USER_LANGUAGE,
28662804
MENU_ENUM_LABEL_USER_LANGUAGE_STR
@@ -4079,18 +4017,6 @@ MSG_HASH(
40794017
MENU_ENUM_LABEL_MEMORY_UPDATE_INTERVAL,
40804018
MENU_ENUM_LABEL_MEMORY_UPDATE_INTERVAL_STR
40814019
)
4082-
MSG_HASH(
4083-
MENU_ENUM_LABEL_ACCESSIBILITY_SETTINGS,
4084-
MENU_ENUM_LABEL_ACCESSIBILITY_SETTINGS_STR
4085-
)
4086-
MSG_HASH(
4087-
MENU_ENUM_LABEL_POWER_MANAGEMENT_SETTINGS,
4088-
MENU_ENUM_LABEL_POWER_MANAGEMENT_SETTINGS_STR
4089-
)
4090-
MSG_HASH(
4091-
MENU_ENUM_LABEL_AI_SERVICE_SETTINGS,
4092-
MENU_ENUM_LABEL_AI_SERVICE_SETTINGS_STR
4093-
)
40944020
MSG_HASH(
40954021
MENU_ENUM_LABEL_AI_SERVICE_URL,
40964022
MENU_ENUM_LABEL_AI_SERVICE_URL_STR
@@ -4217,18 +4143,6 @@ MSG_HASH(
42174143
MENU_ENUM_LABEL_INPUT_SENSOR_SETTINGS,
42184144
MENU_ENUM_LABEL_INPUT_SENSOR_SETTINGS_STR
42194145
)
4220-
MSG_HASH(
4221-
MENU_ENUM_LABEL_MENU_VIEWS_SETTINGS,
4222-
MENU_ENUM_LABEL_MENU_VIEWS_SETTINGS_STR
4223-
)
4224-
MSG_HASH(
4225-
MENU_ENUM_LABEL_QUICK_MENU_VIEWS_SETTINGS,
4226-
MENU_ENUM_LABEL_QUICK_MENU_VIEWS_SETTINGS_STR
4227-
)
4228-
MSG_HASH(
4229-
MENU_ENUM_LABEL_SETTINGS_VIEWS_SETTINGS,
4230-
MENU_ENUM_LABEL_SETTINGS_VIEWS_SETTINGS_STR
4231-
)
42324146
MSG_HASH(
42334147
MENU_ENUM_LABEL_MIXER_ACTION_PLAY,
42344148
MENU_ENUM_LABEL_MIXER_ACTION_PLAY_STR

‎intl/msg_hash_us.c‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -559,6 +559,7 @@ static const char *const msg_hash_us_lbl_strs[] = {
559559
#define S_ACTION_EX_NS(T, n, sd, ok, rp, c, us) n,
560560
#include "../settings/settings_def_video_fullscreen.h"
561561
#include "../settings/settings_def_video_sync.h"
562+
#include "../settings/settings_def_menu_main_lists_4.h"
562563
#include "../settings/settings_def_menu_main_lists_3.h"
563564
#include "../settings/settings_def_ozone_extras.h"
564565
#include "../settings/settings_def_menu_main_lists_2.h"
@@ -867,6 +868,7 @@ static const uint32_t msg_hash_us_lbl_ids[] = {
867868
#define S_ACTION_EX_NS(T, n, sd, ok, rp, c, us) (uint32_t)MENU_ENUM_LABEL_##T,
868869
#include "../settings/settings_def_video_fullscreen.h"
869870
#include "../settings/settings_def_video_sync.h"
871+
#include "../settings/settings_def_menu_main_lists_4.h"
870872
#include "../settings/settings_def_menu_main_lists_3.h"
871873
#include "../settings/settings_def_ozone_extras.h"
872874
#include "../settings/settings_def_menu_main_lists_2.h"

0 commit comments

Comments
 (0)