Skip to content

Commit 4544d87

Browse files
libretroadminLibretroAdmin
authored andcommitted
settings: migrate the start screen setting to a single-source def file
Performed by tools/settings_migrate_group.py with the standard battery including the platform-profile lanes and the integrated enum consolidation stage.
1 parent 4815e9a commit 4544d87

8 files changed

Lines changed: 130 additions & 17 deletions

File tree

configuration.c

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1961,6 +1961,11 @@ static struct config_bool_setting *populate_settings_bool(
19611961
#define SETTINGS_DEF_CONFIG_PASS
19621962
#include "settings/settings_def_video_sync.h"
19631963
#ifdef HAVE_MENU
1964+
#ifdef HAVE_RGUI
1965+
#include "settings/settings_def_menu_start_screen.h"
1966+
#endif
1967+
#endif
1968+
#ifdef HAVE_MENU
19641969
#include "settings/settings_def_menu_content_settings_view.h"
19651970
#endif
19661971
#ifdef HAVE_THREADS
@@ -2169,7 +2174,6 @@ static struct config_bool_setting *populate_settings_bool(
21692174
SETTING_BOOL("materialui_thumbnail_background_enable", &settings->bools.menu_materialui_thumbnail_background_enable, true, DEFAULT_MATERIALUI_THUMBNAIL_BACKGROUND_ENABLE, false);
21702175
#endif
21712176
#ifdef HAVE_RGUI
2172-
SETTING_BOOL("rgui_show_start_screen", &settings->bools.menu_show_start_screen, false, false /* TODO */, false);
21732177
SETTING_BOOL("rgui_background_filler_thickness_enable", &settings->bools.menu_rgui_background_filler_thickness_enable, true, true, false);
21742178
SETTING_BOOL("rgui_border_filler_thickness_enable", &settings->bools.menu_rgui_border_filler_thickness_enable, true, true, false);
21752179
SETTING_BOOL("rgui_border_filler_enable", &settings->bools.menu_rgui_border_filler_enable, true, true, false);
@@ -2361,6 +2365,11 @@ static struct config_float_setting *populate_settings_float(
23612365
#define SETTINGS_DEF_CONFIG_PASS
23622366
#include "settings/settings_def_video_sync.h"
23632367
#ifdef HAVE_MENU
2368+
#ifdef HAVE_RGUI
2369+
#include "settings/settings_def_menu_start_screen.h"
2370+
#endif
2371+
#endif
2372+
#ifdef HAVE_MENU
23642373
#include "settings/settings_def_menu_content_settings_view.h"
23652374
#endif
23662375
#ifdef HAVE_THREADS
@@ -2709,6 +2718,11 @@ static struct config_uint_setting *populate_settings_uint(
27092718
#define SETTINGS_DEF_CONFIG_PASS
27102719
#include "settings/settings_def_video_sync.h"
27112720
#ifdef HAVE_MENU
2721+
#ifdef HAVE_RGUI
2722+
#include "settings/settings_def_menu_start_screen.h"
2723+
#endif
2724+
#endif
2725+
#ifdef HAVE_MENU
27122726
#include "settings/settings_def_menu_content_settings_view.h"
27132727
#endif
27142728
#ifdef HAVE_THREADS
@@ -3032,6 +3046,11 @@ static struct config_int_setting *populate_settings_int(
30323046
#define SETTINGS_DEF_CONFIG_PASS
30333047
#include "settings/settings_def_video_sync.h"
30343048
#ifdef HAVE_MENU
3049+
#ifdef HAVE_RGUI
3050+
#include "settings/settings_def_menu_start_screen.h"
3051+
#endif
3052+
#endif
3053+
#ifdef HAVE_MENU
30353054
#include "settings/settings_def_menu_content_settings_view.h"
30363055
#endif
30373056
#ifdef HAVE_THREADS

intl/msg_hash_lbl.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3214,10 +3214,6 @@ MSG_HASH(
32143214
MENU_ENUM_LABEL_RGUI_CONFIG_DIRECTORY,
32153215
MENU_ENUM_LABEL_RGUI_CONFIG_DIRECTORY_STR
32163216
)
3217-
MSG_HASH(
3218-
MENU_ENUM_LABEL_RGUI_SHOW_START_SCREEN,
3219-
MENU_ENUM_LABEL_RGUI_SHOW_START_SCREEN_STR
3220-
)
32213217
MSG_HASH(
32223218
MENU_ENUM_LABEL_ADD_TO_FAVORITES,
32233219
MENU_ENUM_LABEL_ADD_TO_FAVORITES_STR

intl/msg_hash_us.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -537,6 +537,7 @@ static const char *const msg_hash_us_lbl_strs[] = {
537537
#define S_FLOAT_NS(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us) n,
538538
#include "../settings/settings_def_video_fullscreen.h"
539539
#include "../settings/settings_def_video_sync.h"
540+
#include "../settings/settings_def_menu_start_screen.h"
540541
#include "../settings/settings_def_menu_content_settings_view.h"
541542
#include "../settings/settings_def_menu_threaded_data.h"
542543
#include "../settings/settings_def_menu_wraparound.h"
@@ -611,6 +612,7 @@ static const uint32_t msg_hash_us_lbl_ids[] = {
611612
#define S_FLOAT_NS(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us) (uint32_t)MENU_ENUM_LABEL_##T,
612613
#include "../settings/settings_def_video_fullscreen.h"
613614
#include "../settings/settings_def_video_sync.h"
615+
#include "../settings/settings_def_menu_start_screen.h"
614616
#include "../settings/settings_def_menu_content_settings_view.h"
615617
#include "../settings/settings_def_menu_threaded_data.h"
616618
#include "../settings/settings_def_menu_wraparound.h"

intl/msg_hash_us.h

Lines changed: 32 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7234,14 +7234,38 @@ MSG_HASH(
72347234
MENU_ENUM_SUBLABEL_MENU_SHOW_CONFIRM,
72357235
"Ask for confirmation before quitting, resetting or closing content. When disabled these actions happen immediately."
72367236
)
7237-
MSG_HASH( /* FIXME Not RGUI specific */
7238-
MENU_ENUM_LABEL_VALUE_RGUI_SHOW_START_SCREEN,
7239-
"Display Start Screen"
7240-
)
7241-
MSG_HASH( /* FIXME Not RGUI specific */
7242-
MENU_ENUM_SUBLABEL_RGUI_SHOW_START_SCREEN,
7243-
"Show startup screen in menu. This is automatically set to false after the program starts for the first time."
7244-
)
7237+
/* GENERATED REGION: start screen setting (see settings_def_menu_start_screen.h). */
7238+
#define SETTINGS_DEF_STRINGS_PASS
7239+
#define S_BOOL(f, T, n, d, sd, df, c, us, sub) \
7240+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
7241+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
7242+
#define S_BOOL_NS(f, T, n, d, sd, df, c, us) \
7243+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
7244+
#define S_UINT(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us, sub) \
7245+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
7246+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
7247+
#define S_UINT_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us) \
7248+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
7249+
#define S_INT(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us, sub) \
7250+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
7251+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
7252+
#define S_INT_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us) \
7253+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
7254+
#define S_FLOAT(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us, sub) \
7255+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
7256+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
7257+
#define S_FLOAT_NS(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us) \
7258+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
7259+
#include "../settings/settings_def_menu_start_screen.h"
7260+
#undef S_BOOL
7261+
#undef S_BOOL_NS
7262+
#undef S_UINT
7263+
#undef S_UINT_NS
7264+
#undef S_INT
7265+
#undef S_INT_NS
7266+
#undef S_FLOAT
7267+
#undef S_FLOAT_NS
7268+
#undef SETTINGS_DEF_STRINGS_PASS
72457269

72467270
/* Settings > User Interface > Menu Item Visibility > Quick Menu */
72477271

menu/menu_setting.c

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17746,8 +17746,32 @@ static bool setting_append_list(
1774617746

1774717747
{
1774817748
static const setting_desc_t menu_desc_33[] = {
17749-
SDESC_BOOL_ROW(menu_show_start_screen, RGUI_SHOW_START_SCREEN,
17750-
DEFAULT_MENU_SHOW_START_SCREEN, SD_FLAG_ADVANCED, 0, 0),
17749+
/* GENERATED: rows come from settings_def_menu_start_screen.h in order. */
17750+
#define S_BOOL(f, T, n, d, sd, df, c, us, sub) \
17751+
SDESC_BOOL_ROW(f, T, d, sd, df, c),
17752+
#define S_BOOL_NS(f, T, n, d, sd, df, c, us) \
17753+
SDESC_BOOL_ROW(f, T, d, sd, df, c),
17754+
#define S_UINT(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us, sub) \
17755+
SDESC_UINT_ROW(f, T, d, sd, df, c, mn, mx, st, ob, ok, rp),
17756+
#define S_UINT_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us) \
17757+
SDESC_UINT_ROW(f, T, d, sd, df, c, mn, mx, st, ob, ok, rp),
17758+
#define S_INT(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us, sub) \
17759+
SDESC_INT_ROW(f, T, d, sd, df, c, mn, mx, st, ob, ok, rp),
17760+
#define S_INT_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us) \
17761+
SDESC_INT_ROW(f, T, d, sd, df, c, mn, mx, st, ob, ok, rp),
17762+
#define S_FLOAT(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us, sub) \
17763+
SDESC_FLOAT_ROW(f, T, d, rnd, sd, df, c, mn, mx, st, ok, rp),
17764+
#define S_FLOAT_NS(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us) \
17765+
SDESC_FLOAT_ROW(f, T, d, rnd, sd, df, c, mn, mx, st, ok, rp),
17766+
#include "../settings/settings_def_menu_start_screen.h"
17767+
#undef S_BOOL
17768+
#undef S_BOOL_NS
17769+
#undef S_UINT
17770+
#undef S_UINT_NS
17771+
#undef S_INT
17772+
#undef S_INT_NS
17773+
#undef S_FLOAT
17774+
#undef S_FLOAT_NS
1775117775
};
1775217776
settings_list_add_desc(list, list_info, settings,
1775317777
menu_desc_33, ARRAY_SIZE(menu_desc_33),

msg_hash.h

Lines changed: 38 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3592,7 +3592,44 @@ enum msg_hash_enums
35923592
MENU_LABEL(INITIAL_DISK_CHANGE_ENABLE),
35933593
MENU_LABEL(GLOBAL_CORE_OPTIONS),
35943594
MENU_LABEL(AUTO_SHADERS_ENABLE),
3595-
MENU_LABEL(RGUI_SHOW_START_SCREEN),
3595+
/* GENERATED REGION: start screen setting enum rows (see settings/settings_def_menu_start_screen.h). */
3596+
#define SETTINGS_DEF_ENUM_PASS
3597+
#define SETTINGS_DEF_STRINGS_PASS
3598+
#define S_BOOL(f, T, n, d, sd, df, c, us, sub) MENU_LABEL(T),
3599+
#define S_BOOL_NS(f, T, n, d, sd, df, c, us) MENU_LABEL(T),
3600+
#define S_UINT(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us, sub) MENU_LABEL(T),
3601+
#define S_UINT_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us) MENU_LABEL(T),
3602+
#define S_INT(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us, sub) MENU_LABEL(T),
3603+
#define S_INT_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us) MENU_LABEL(T),
3604+
#define S_FLOAT(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us, sub) MENU_LABEL(T),
3605+
#define S_FLOAT_NS(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us) MENU_LABEL(T),
3606+
#define S_BOOL_H(f, T, n, d, sd, df, c, us, sub) MENU_LBL_H(T),
3607+
#define S_UINT_H(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us, sub) MENU_LBL_H(T),
3608+
#define S_BOOL_NS_H(f, T, n, d, sd, df, c, us) MENU_LBL_H(T),
3609+
#define S_INT_H(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us, sub) MENU_LBL_H(T),
3610+
#define S_FLOAT_H(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us, sub) MENU_LBL_H(T),
3611+
#define S_UINT_NS_H(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us) MENU_LBL_H(T),
3612+
#define S_INT_NS_H(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us) MENU_LBL_H(T),
3613+
#define S_FLOAT_NS_H(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us) MENU_LBL_H(T),
3614+
#include "settings/settings_def_menu_start_screen.h"
3615+
#undef S_BOOL
3616+
#undef S_BOOL_NS
3617+
#undef S_UINT
3618+
#undef S_UINT_NS
3619+
#undef S_INT
3620+
#undef S_INT_NS
3621+
#undef S_FLOAT
3622+
#undef S_FLOAT_NS
3623+
#undef S_BOOL_H
3624+
#undef S_UINT_H
3625+
#undef S_BOOL_NS_H
3626+
#undef S_INT_H
3627+
#undef S_FLOAT_H
3628+
#undef S_UINT_NS_H
3629+
#undef S_INT_NS_H
3630+
#undef S_FLOAT_NS_H
3631+
#undef SETTINGS_DEF_STRINGS_PASS
3632+
#undef SETTINGS_DEF_ENUM_PASS
35963633
MENU_LABEL(SCREENSHOT),
35973634
MENU_LABEL(REWIND),
35983635
MENU_LABEL(REWIND_GRANULARITY),

msg_hash_lbl_str.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -809,7 +809,6 @@
809809
#define MENU_ENUM_LABEL_MENU_ENUM_THROTTLE_FRAMERATE_STR "menu_throttle_framerate"
810810
#define MENU_ENUM_LABEL_RGUI_BROWSER_DIRECTORY_STR "rgui_browser_directory"
811811
#define MENU_ENUM_LABEL_RGUI_CONFIG_DIRECTORY_STR "rgui_config_directory"
812-
#define MENU_ENUM_LABEL_RGUI_SHOW_START_SCREEN_STR "rgui_show_start_screen"
813812
#define MENU_ENUM_LABEL_ADD_TO_FAVORITES_STR "favorites_add"
814813
#define MENU_ENUM_LABEL_ADD_TO_FAVORITES_PLAYLIST_STR "favorites_add_playlist"
815814
#define MENU_ENUM_LABEL_ADD_TO_PLAYLIST_STR "playlist_add"
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
/* Single-source definitions: start screen setting.
2+
* Grammar identical to settings_def_video_sync.h plus S_FLOAT and
3+
* the _NS no-sublabel variants; the descriptor argument span
4+
* matches SDESC_<kind>_ROW; row order is menu display order;
5+
* h2json.py parses these rows for the Crowdin source upload. */
6+
7+
/* FIXME Not RGUI specific */ /* FIXME Not RGUI specific */
8+
S_BOOL(menu_show_start_screen, RGUI_SHOW_START_SCREEN,
9+
"rgui_show_start_screen",
10+
DEFAULT_MENU_SHOW_START_SCREEN, SD_FLAG_ADVANCED, 0, 0,
11+
"Display Start Screen",
12+
"Show startup screen in menu. This is automatically set to false after the program starts for the first time.")

0 commit comments

Comments
 (0)