Skip to content

Commit f8d9539

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 0716b66 commit f8d9539

9 files changed

Lines changed: 1056 additions & 490 deletions

‎configuration.c‎

Lines changed: 30 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1935,6 +1935,12 @@ static struct config_bool_setting *populate_settings_bool(
19351935
#include "settings/settings_def_video_fullscreen.h"
19361936
#define SETTINGS_DEF_CONFIG_PASS
19371937
#include "settings/settings_def_video_sync.h"
1938+
#ifdef HAVE_MENU
1939+
#ifdef HAVE_MATERIALUI
1940+
#include "settings/settings_def_ozone_extras.h"
1941+
#endif
1942+
#endif
1943+
#include "settings/settings_def_menu_main_lists_2.h"
19381944
#ifdef HAVE_OVERLAY
19391945
#include "settings/settings_def_overlay_mouse.h"
19401946
#endif
@@ -2451,15 +2457,6 @@ static struct config_bool_setting *populate_settings_bool(
24512457

24522458
SETTING_BOOL("menu_show_quit_retroarch", &settings->bools.menu_show_quit_retroarch, true, DEFAULT_MENU_SHOW_QUIT, false);
24532459
SETTING_BOOL("filter_by_current_core", &settings->bools.filter_by_current_core, true, DEFAULT_FILTER_BY_CURRENT_CORE, false);
2454-
#ifdef HAVE_MATERIALUI
2455-
SETTING_BOOL("materialui_icons_enable", &settings->bools.menu_materialui_icons_enable, true, DEFAULT_MATERIALUI_ICONS_ENABLE, false);
2456-
SETTING_BOOL("materialui_switch_icons", &settings->bools.menu_materialui_switch_icons, true, DEFAULT_MATERIALUI_SWITCH_ICONS, false);
2457-
SETTING_BOOL("materialui_playlist_icons_enable", &settings->bools.menu_materialui_playlist_icons_enable, true, DEFAULT_MATERIALUI_PLAYLIST_ICONS_ENABLE, false);
2458-
SETTING_BOOL("materialui_show_nav_bar", &settings->bools.menu_materialui_show_nav_bar, true, DEFAULT_MATERIALUI_SHOW_NAV_BAR, false);
2459-
SETTING_BOOL("materialui_auto_rotate_nav_bar", &settings->bools.menu_materialui_auto_rotate_nav_bar, true, DEFAULT_MATERIALUI_AUTO_ROTATE_NAV_BAR, false);
2460-
SETTING_BOOL("materialui_dual_thumbnail_list_view_enable", &settings->bools.menu_materialui_dual_thumbnail_list_view_enable, true, DEFAULT_MATERIALUI_DUAL_THUMBNAIL_LIST_VIEW_ENABLE, false);
2461-
SETTING_BOOL("materialui_thumbnail_background_enable", &settings->bools.menu_materialui_thumbnail_background_enable, true, DEFAULT_MATERIALUI_THUMBNAIL_BACKGROUND_ENABLE, false);
2462-
#endif
24632460
#ifdef HAVE_RGUI
24642461
SETTING_BOOL("rgui_background_filler_thickness_enable", &settings->bools.menu_rgui_background_filler_thickness_enable, true, true, false);
24652462
SETTING_BOOL("rgui_border_filler_thickness_enable", &settings->bools.menu_rgui_border_filler_thickness_enable, true, true, false);
@@ -2612,6 +2609,12 @@ static struct config_float_setting *populate_settings_float(
26122609
#include "settings/settings_def_video_fullscreen.h"
26132610
#define SETTINGS_DEF_CONFIG_PASS
26142611
#include "settings/settings_def_video_sync.h"
2612+
#ifdef HAVE_MENU
2613+
#ifdef HAVE_MATERIALUI
2614+
#include "settings/settings_def_ozone_extras.h"
2615+
#endif
2616+
#endif
2617+
#include "settings/settings_def_menu_main_lists_2.h"
26152618
#ifdef HAVE_OVERLAY
26162619
#include "settings/settings_def_overlay_mouse.h"
26172620
#endif
@@ -3166,13 +3169,6 @@ static struct config_uint_setting *populate_settings_uint(
31663169
SETTING_UINT("menu_xmb_thumbnail_scale_factor", &settings->uints.menu_xmb_thumbnail_scale_factor, true, DEFAULT_XMB_THUMBNAIL_SCALE_FACTOR, false);
31673170
SETTING_UINT("menu_shader_pipeline", &settings->uints.menu_xmb_shader_pipeline, true, DEFAULT_MENU_SHADER_PIPELINE, false);
31683171
#endif
3169-
#ifdef HAVE_MATERIALUI
3170-
SETTING_UINT("materialui_menu_color_theme", &settings->uints.menu_materialui_color_theme, true, DEFAULT_MATERIALUI_THEME, false);
3171-
SETTING_UINT("materialui_menu_transition_animation", &settings->uints.menu_materialui_transition_animation, true, DEFAULT_MATERIALUI_TRANSITION_ANIM, false);
3172-
SETTING_UINT("materialui_thumbnail_view_portrait", &settings->uints.menu_materialui_thumbnail_view_portrait, true, DEFAULT_MATERIALUI_THUMBNAIL_VIEW_PORTRAIT, false);
3173-
SETTING_UINT("materialui_thumbnail_view_landscape", &settings->uints.menu_materialui_thumbnail_view_landscape, true, DEFAULT_MATERIALUI_THUMBNAIL_VIEW_LANDSCAPE, false);
3174-
SETTING_UINT("materialui_landscape_layout_optimization", &settings->uints.menu_materialui_landscape_layout_optimization, true, DEFAULT_MATERIALUI_LANDSCAPE_LAYOUT_OPTIMIZATION, false);
3175-
#endif
31763172
#ifdef HAVE_OZONE
31773173
SETTING_UINT("ozone_header_icon", &settings->uints.menu_ozone_header_icon, true, DEFAULT_OZONE_HEADER_ICON, false);
31783174
SETTING_UINT("ozone_header_separator", &settings->uints.menu_ozone_header_separator, true, DEFAULT_OZONE_HEADER_SEPARATOR, false);
@@ -3244,6 +3240,12 @@ static struct config_uint_setting *populate_settings_uint(
32443240
#include "settings/settings_def_video_fullscreen.h"
32453241
#define SETTINGS_DEF_CONFIG_PASS
32463242
#include "settings/settings_def_video_sync.h"
3243+
#ifdef HAVE_MENU
3244+
#ifdef HAVE_MATERIALUI
3245+
#include "settings/settings_def_ozone_extras.h"
3246+
#endif
3247+
#endif
3248+
#include "settings/settings_def_menu_main_lists_2.h"
32473249
#ifdef HAVE_OVERLAY
32483250
#include "settings/settings_def_overlay_mouse.h"
32493251
#endif
@@ -3871,6 +3873,12 @@ static struct config_int_setting *populate_settings_int(
38713873
#include "settings/settings_def_video_fullscreen.h"
38723874
#define SETTINGS_DEF_CONFIG_PASS
38733875
#include "settings/settings_def_video_sync.h"
3876+
#ifdef HAVE_MENU
3877+
#ifdef HAVE_MATERIALUI
3878+
#include "settings/settings_def_ozone_extras.h"
3879+
#endif
3880+
#endif
3881+
#include "settings/settings_def_menu_main_lists_2.h"
38743882
#ifdef HAVE_OVERLAY
38753883
#include "settings/settings_def_overlay_mouse.h"
38763884
#endif
@@ -4367,6 +4375,12 @@ static struct config_int_setting *populate_settings_int(
43674375
#include "settings/settings_def_video_fullscreen.h"
43684376
#define SETTINGS_DEF_CONFIG_PASS
43694377
#include "settings/settings_def_video_sync.h"
4378+
#ifdef HAVE_MENU
4379+
#ifdef HAVE_MATERIALUI
4380+
#include "settings/settings_def_ozone_extras.h"
4381+
#endif
4382+
#endif
4383+
#include "settings/settings_def_menu_main_lists_2.h"
43704384
#ifdef HAVE_OVERLAY
43714385
#include "settings/settings_def_overlay_mouse.h"
43724386
#endif

‎intl/msg_hash_lbl.h‎

Lines changed: 0 additions & 112 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,6 @@ MSG_HASH(
1111
MENU_ENUM_LABEL_ACCOUNTS_CHEEVOS_USERNAME,
1212
MENU_ENUM_LABEL_ACCOUNTS_CHEEVOS_USERNAME_STR
1313
)
14-
MSG_HASH(
15-
MENU_ENUM_LABEL_SHOW_WIMP,
16-
MENU_ENUM_LABEL_SHOW_WIMP_STR
17-
)
1814
MSG_HASH(
1915
MENU_ENUM_LABEL_ACHIEVEMENT_PAUSE_MENU,
2016
MENU_ENUM_LABEL_ACHIEVEMENT_PAUSE_MENU_STR
@@ -39,10 +35,6 @@ MSG_HASH(
3935
MENU_ENUM_LABEL_ACHIEVEMENT_LIST,
4036
MENU_ENUM_LABEL_ACHIEVEMENT_LIST_STR
4137
)
42-
MSG_HASH(
43-
MENU_ENUM_LABEL_CONFIGURATIONS_LIST,
44-
MENU_ENUM_LABEL_CONFIGURATIONS_LIST_STR
45-
)
4638
MSG_HASH(
4739
MENU_ENUM_LABEL_EXPLORE_TAB,
4840
MENU_ENUM_LABEL_EXPLORE_TAB_STR
@@ -490,10 +482,6 @@ MSG_HASH(
490482
MENU_ENUM_LABEL_COLLECTION,
491483
MENU_ENUM_LABEL_COLLECTION_STR
492484
)
493-
MSG_HASH(
494-
MENU_ENUM_LABEL_CONFIGURATIONS,
495-
MENU_ENUM_LABEL_CONFIGURATIONS_STR
496-
)
497485
MSG_HASH(
498486
MENU_ENUM_LABEL_CONFIGURATION_SETTINGS,
499487
MENU_ENUM_LABEL_CONFIGURATION_SETTINGS_STR
@@ -1464,10 +1452,6 @@ MSG_HASH(
14641452
MENU_ENUM_LABEL_HELP,
14651453
MENU_ENUM_LABEL_HELP_STR
14661454
)
1467-
MSG_HASH(
1468-
MENU_ENUM_LABEL_HELP_LIST,
1469-
MENU_ENUM_LABEL_HELP_LIST_STR
1470-
)
14711455
MSG_HASH(
14721456
MENU_ENUM_LABEL_HISTORY_TAB,
14731457
MENU_ENUM_LABEL_HISTORY_TAB_STR
@@ -1758,22 +1742,6 @@ MSG_HASH(
17581742
MENU_ENUM_LABEL_OZONE_THUMBNAIL_SCALE_FACTOR,
17591743
MENU_ENUM_LABEL_OZONE_THUMBNAIL_SCALE_FACTOR_STR
17601744
)
1761-
MSG_HASH(
1762-
MENU_ENUM_LABEL_MATERIALUI_MENU_COLOR_THEME,
1763-
MENU_ENUM_LABEL_MATERIALUI_MENU_COLOR_THEME_STR
1764-
)
1765-
MSG_HASH(
1766-
MENU_ENUM_LABEL_MATERIALUI_MENU_TRANSITION_ANIMATION,
1767-
MENU_ENUM_LABEL_MATERIALUI_MENU_TRANSITION_ANIMATION_STR
1768-
)
1769-
MSG_HASH(
1770-
MENU_ENUM_LABEL_MATERIALUI_MENU_THUMBNAIL_VIEW_PORTRAIT,
1771-
MENU_ENUM_LABEL_MATERIALUI_MENU_THUMBNAIL_VIEW_PORTRAIT_STR
1772-
)
1773-
MSG_HASH(
1774-
MENU_ENUM_LABEL_MATERIALUI_MENU_THUMBNAIL_VIEW_LANDSCAPE,
1775-
MENU_ENUM_LABEL_MATERIALUI_MENU_THUMBNAIL_VIEW_LANDSCAPE_STR
1776-
)
17771745
MSG_HASH(
17781746
MENU_ENUM_LABEL_MENU_DRIVER,
17791747
MENU_ENUM_LABEL_MENU_DRIVER_STR
@@ -2168,18 +2136,6 @@ MSG_HASH(
21682136
MENU_ENUM_LABEL_PRIVACY_SETTINGS,
21692137
MENU_ENUM_LABEL_PRIVACY_SETTINGS_STR
21702138
)
2171-
MSG_HASH(
2172-
MENU_ENUM_LABEL_CLOUD_SYNC_SYNC_NOW,
2173-
MENU_ENUM_LABEL_CLOUD_SYNC_SYNC_NOW_STR
2174-
)
2175-
MSG_HASH(
2176-
MENU_ENUM_LABEL_CLOUD_SYNC_RESOLVE_KEEP_LOCAL,
2177-
MENU_ENUM_LABEL_CLOUD_SYNC_RESOLVE_KEEP_LOCAL_STR
2178-
)
2179-
MSG_HASH(
2180-
MENU_ENUM_LABEL_CLOUD_SYNC_RESOLVE_KEEP_SERVER,
2181-
MENU_ENUM_LABEL_CLOUD_SYNC_RESOLVE_KEEP_SERVER_STR
2182-
)
21832139
MSG_HASH(
21842140
MENU_ENUM_LABEL_RDB_ENTRY,
21852141
MENU_ENUM_LABEL_RDB_ENTRY_STR
@@ -2624,10 +2580,6 @@ MSG_HASH(
26242580
MENU_ENUM_LABEL_SAVESTATE_DIRECTORY,
26252581
MENU_ENUM_LABEL_SAVESTATE_DIRECTORY_STR
26262582
)
2627-
MSG_HASH(
2628-
MENU_ENUM_LABEL_SAVE_CURRENT_CONFIG,
2629-
MENU_ENUM_LABEL_SAVE_CURRENT_CONFIG_STR
2630-
)
26312583
MSG_HASH(
26322584
MENU_ENUM_LABEL_OVERRIDE_FILE_LOAD,
26332585
MENU_ENUM_LABEL_OVERRIDE_FILE_LOAD_STR
@@ -2640,34 +2592,6 @@ MSG_HASH(
26402592
MENU_ENUM_LABEL_OVERRIDE_UNLOAD,
26412593
MENU_ENUM_LABEL_OVERRIDE_UNLOAD_STR
26422594
)
2643-
MSG_HASH(
2644-
MENU_ENUM_LABEL_SAVE_CURRENT_CONFIG_OVERRIDE_CORE,
2645-
MENU_ENUM_LABEL_SAVE_CURRENT_CONFIG_OVERRIDE_CORE_STR
2646-
)
2647-
MSG_HASH(
2648-
MENU_ENUM_LABEL_SAVE_CURRENT_CONFIG_OVERRIDE_CONTENT_DIR,
2649-
MENU_ENUM_LABEL_SAVE_CURRENT_CONFIG_OVERRIDE_CONTENT_DIR_STR
2650-
)
2651-
MSG_HASH(
2652-
MENU_ENUM_LABEL_SAVE_CURRENT_CONFIG_OVERRIDE_GAME,
2653-
MENU_ENUM_LABEL_SAVE_CURRENT_CONFIG_OVERRIDE_GAME_STR
2654-
)
2655-
MSG_HASH(
2656-
MENU_ENUM_LABEL_REMOVE_CURRENT_CONFIG_OVERRIDE_CORE,
2657-
MENU_ENUM_LABEL_REMOVE_CURRENT_CONFIG_OVERRIDE_CORE_STR
2658-
)
2659-
MSG_HASH(
2660-
MENU_ENUM_LABEL_REMOVE_CURRENT_CONFIG_OVERRIDE_CONTENT_DIR,
2661-
MENU_ENUM_LABEL_REMOVE_CURRENT_CONFIG_OVERRIDE_CONTENT_DIR_STR
2662-
)
2663-
MSG_HASH(
2664-
MENU_ENUM_LABEL_REMOVE_CURRENT_CONFIG_OVERRIDE_GAME,
2665-
MENU_ENUM_LABEL_REMOVE_CURRENT_CONFIG_OVERRIDE_GAME_STR
2666-
)
2667-
MSG_HASH(
2668-
MENU_ENUM_LABEL_SAVE_NEW_CONFIG,
2669-
MENU_ENUM_LABEL_SAVE_NEW_CONFIG_STR
2670-
)
26712595
MSG_HASH(
26722596
MENU_ENUM_LABEL_SAVE_AS_CONFIG,
26732597
MENU_ENUM_LABEL_SAVE_AS_CONFIG_STR
@@ -3521,38 +3445,6 @@ MSG_HASH(
35213445
MENU_ENUM_LABEL_GOTO_CONTENTLESS_CORES,
35223446
MENU_ENUM_LABEL_GOTO_CONTENTLESS_CORES_STR
35233447
)
3524-
MSG_HASH(
3525-
MENU_ENUM_LABEL_MATERIALUI_ICONS_ENABLE,
3526-
MENU_ENUM_LABEL_MATERIALUI_ICONS_ENABLE_STR
3527-
)
3528-
MSG_HASH(
3529-
MENU_ENUM_LABEL_MATERIALUI_SWITCH_ICONS,
3530-
MENU_ENUM_LABEL_MATERIALUI_SWITCH_ICONS_STR
3531-
)
3532-
MSG_HASH(
3533-
MENU_ENUM_LABEL_MATERIALUI_PLAYLIST_ICONS_ENABLE,
3534-
MENU_ENUM_LABEL_MATERIALUI_PLAYLIST_ICONS_ENABLE_STR
3535-
)
3536-
MSG_HASH(
3537-
MENU_ENUM_LABEL_MATERIALUI_LANDSCAPE_LAYOUT_OPTIMIZATION,
3538-
MENU_ENUM_LABEL_MATERIALUI_LANDSCAPE_LAYOUT_OPTIMIZATION_STR
3539-
)
3540-
MSG_HASH(
3541-
MENU_ENUM_LABEL_MATERIALUI_SHOW_NAV_BAR,
3542-
MENU_ENUM_LABEL_MATERIALUI_SHOW_NAV_BAR_STR
3543-
)
3544-
MSG_HASH(
3545-
MENU_ENUM_LABEL_MATERIALUI_AUTO_ROTATE_NAV_BAR,
3546-
MENU_ENUM_LABEL_MATERIALUI_AUTO_ROTATE_NAV_BAR_STR
3547-
)
3548-
MSG_HASH(
3549-
MENU_ENUM_LABEL_MATERIALUI_DUAL_THUMBNAIL_LIST_VIEW_ENABLE,
3550-
MENU_ENUM_LABEL_MATERIALUI_DUAL_THUMBNAIL_LIST_VIEW_ENABLE_STR
3551-
)
3552-
MSG_HASH(
3553-
MENU_ENUM_LABEL_MATERIALUI_THUMBNAIL_BACKGROUND_ENABLE,
3554-
MENU_ENUM_LABEL_MATERIALUI_THUMBNAIL_BACKGROUND_ENABLE_STR
3555-
)
35563448
MSG_HASH(
35573449
MENU_ENUM_LABEL_RENAME_ENTRY,
35583450
MENU_ENUM_LABEL_RENAME_ENTRY_STR
@@ -4135,10 +4027,6 @@ MSG_HASH(
41354027
MENU_ENUM_LABEL_STREAMING_MODE,
41364028
MENU_ENUM_LABEL_STREAMING_MODE_STR
41374029
)
4138-
MSG_HASH(
4139-
MENU_ENUM_LABEL_RESET_TO_DEFAULT_CONFIG,
4140-
MENU_ENUM_LABEL_RESET_TO_DEFAULT_CONFIG_STR
4141-
)
41424030
MSG_HASH(
41434031
MENU_ENUM_LABEL_NO_MUSIC_AVAILABLE,
41444032
MENU_ENUM_LABEL_NO_MUSIC_AVAILABLE_STR

‎intl/msg_hash_us.c‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -559,6 +559,8 @@ 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_ozone_extras.h"
563+
#include "../settings/settings_def_menu_main_lists_2.h"
562564
#include "../settings/settings_def_overlay_mouse.h"
563565
#include "../settings/settings_def_overlay_lightgun.h"
564566
#include "../settings/settings_def_input_turbo_fire.h"
@@ -864,6 +866,8 @@ static const uint32_t msg_hash_us_lbl_ids[] = {
864866
#define S_ACTION_EX_NS(T, n, sd, ok, rp, c, us) (uint32_t)MENU_ENUM_LABEL_##T,
865867
#include "../settings/settings_def_video_fullscreen.h"
866868
#include "../settings/settings_def_video_sync.h"
869+
#include "../settings/settings_def_ozone_extras.h"
870+
#include "../settings/settings_def_menu_main_lists_2.h"
867871
#include "../settings/settings_def_overlay_mouse.h"
868872
#include "../settings/settings_def_overlay_lightgun.h"
869873
#include "../settings/settings_def_input_turbo_fire.h"

0 commit comments

Comments
 (0)