Skip to content

Commit 4815e9a

Browse files
libretroadminLibretroAdmin
libretroadmin
authored and
LibretroAdmin
committed
settings: migrate the settings tab visibility 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 8eee4f3 commit 4815e9a

8 files changed

Lines changed: 121 additions & 17 deletions

File tree

‎configuration.c‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1960,6 +1960,9 @@ static struct config_bool_setting *populate_settings_bool(
19601960
#include "settings/settings_def_video_fullscreen.h"
19611961
#define SETTINGS_DEF_CONFIG_PASS
19621962
#include "settings/settings_def_video_sync.h"
1963+
#ifdef HAVE_MENU
1964+
#include "settings/settings_def_menu_content_settings_view.h"
1965+
#endif
19631966
#ifdef HAVE_THREADS
19641967
#include "settings/settings_def_menu_threaded_data.h"
19651968
#endif
@@ -2125,7 +2128,6 @@ static struct config_bool_setting *populate_settings_bool(
21252128

21262129
SETTING_BOOL("quick_menu_show_shaders", &settings->bools.quick_menu_show_shaders, true, DEFAULT_QUICK_MENU_SHOW_SHADERS, false);
21272130

2128-
SETTING_BOOL("content_show_settings", &settings->bools.menu_content_show_settings, true, DEFAULT_CONTENT_SHOW_SETTINGS, false);
21292131
SETTING_BOOL("content_show_favorites", &settings->bools.menu_content_show_favorites, true, DEFAULT_CONTENT_SHOW_FAVORITES, false);
21302132
SETTING_BOOL("content_show_favorites_first", &settings->bools.menu_content_show_favorites_first, true, DEFAULT_CONTENT_SHOW_FAVORITES_FIRST, false);
21312133
#ifdef HAVE_IMAGEVIEWER
@@ -2358,6 +2360,9 @@ static struct config_float_setting *populate_settings_float(
23582360
#include "settings/settings_def_video_fullscreen.h"
23592361
#define SETTINGS_DEF_CONFIG_PASS
23602362
#include "settings/settings_def_video_sync.h"
2363+
#ifdef HAVE_MENU
2364+
#include "settings/settings_def_menu_content_settings_view.h"
2365+
#endif
23612366
#ifdef HAVE_THREADS
23622367
#include "settings/settings_def_menu_threaded_data.h"
23632368
#endif
@@ -2703,6 +2708,9 @@ static struct config_uint_setting *populate_settings_uint(
27032708
#include "settings/settings_def_video_fullscreen.h"
27042709
#define SETTINGS_DEF_CONFIG_PASS
27052710
#include "settings/settings_def_video_sync.h"
2711+
#ifdef HAVE_MENU
2712+
#include "settings/settings_def_menu_content_settings_view.h"
2713+
#endif
27062714
#ifdef HAVE_THREADS
27072715
#include "settings/settings_def_menu_threaded_data.h"
27082716
#endif
@@ -3023,6 +3031,9 @@ static struct config_int_setting *populate_settings_int(
30233031
#include "settings/settings_def_video_fullscreen.h"
30243032
#define SETTINGS_DEF_CONFIG_PASS
30253033
#include "settings/settings_def_video_sync.h"
3034+
#ifdef HAVE_MENU
3035+
#include "settings/settings_def_menu_content_settings_view.h"
3036+
#endif
30263037
#ifdef HAVE_THREADS
30273038
#include "settings/settings_def_menu_threaded_data.h"
30283039
#endif

‎intl/msg_hash_lbl.h‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4429,10 +4429,6 @@ MSG_HASH(
44294429
MENU_ENUM_LABEL_CONTENT_SHOW_MUSIC,
44304430
MENU_ENUM_LABEL_CONTENT_SHOW_MUSIC_STR
44314431
)
4432-
MSG_HASH(
4433-
MENU_ENUM_LABEL_CONTENT_SHOW_SETTINGS,
4434-
MENU_ENUM_LABEL_CONTENT_SHOW_SETTINGS_STR
4435-
)
44364432
MSG_HASH(
44374433
MENU_ENUM_LABEL_CONTENT_SHOW_SETTINGS_PASSWORD,
44384434
MENU_ENUM_LABEL_CONTENT_SHOW_SETTINGS_PASSWORD_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_content_settings_view.h"
540541
#include "../settings/settings_def_menu_threaded_data.h"
541542
#include "../settings/settings_def_menu_wraparound.h"
542543
#include "../settings/settings_def_menu_horizontal_animation.h"
@@ -610,6 +611,7 @@ static const uint32_t msg_hash_us_lbl_ids[] = {
610611
#define S_FLOAT_NS(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us) (uint32_t)MENU_ENUM_LABEL_##T,
611612
#include "../settings/settings_def_video_fullscreen.h"
612613
#include "../settings/settings_def_video_sync.h"
614+
#include "../settings/settings_def_menu_content_settings_view.h"
613615
#include "../settings/settings_def_menu_threaded_data.h"
614616
#include "../settings/settings_def_menu_wraparound.h"
615617
#include "../settings/settings_def_menu_horizontal_animation.h"

‎intl/msg_hash_us.h‎

Lines changed: 32 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7022,14 +7022,38 @@ MSG_HASH(
70227022
MENU_ENUM_SUBLABEL_MENU_SHOW_RESTART_RETROARCH,
70237023
"Show the 'Restart RetroArch' option in the Main Menu."
70247024
)
7025-
MSG_HASH(
7026-
MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_SETTINGS,
7027-
"Show 'Settings'"
7028-
)
7029-
MSG_HASH(
7030-
MENU_ENUM_SUBLABEL_CONTENT_SHOW_SETTINGS,
7031-
"Show the 'Settings' menu."
7032-
)
7025+
/* GENERATED REGION: settings tab visibility setting (see settings_def_menu_content_settings_view.h). */
7026+
#define SETTINGS_DEF_STRINGS_PASS
7027+
#define S_BOOL(f, T, n, d, sd, df, c, us, sub) \
7028+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
7029+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
7030+
#define S_BOOL_NS(f, T, n, d, sd, df, c, us) \
7031+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
7032+
#define S_UINT(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us, sub) \
7033+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
7034+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
7035+
#define S_UINT_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us) \
7036+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
7037+
#define S_INT(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us, sub) \
7038+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
7039+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
7040+
#define S_INT_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us) \
7041+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
7042+
#define S_FLOAT(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us, sub) \
7043+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
7044+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
7045+
#define S_FLOAT_NS(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us) \
7046+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
7047+
#include "../settings/settings_def_menu_content_settings_view.h"
7048+
#undef S_BOOL
7049+
#undef S_BOOL_NS
7050+
#undef S_UINT
7051+
#undef S_UINT_NS
7052+
#undef S_INT
7053+
#undef S_INT_NS
7054+
#undef S_FLOAT
7055+
#undef S_FLOAT_NS
7056+
#undef SETTINGS_DEF_STRINGS_PASS
70337057
MSG_HASH(
70347058
MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_SETTINGS_PASSWORD,
70357059
"Set Password For Enabling 'Settings'"

‎menu/menu_setting.c‎

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

1748317483
{
1748417484
static const setting_desc_t menu_desc_28[] = {
17485-
SDESC_BOOL_ROW(menu_content_show_settings, CONTENT_SHOW_SETTINGS,
17486-
DEFAULT_CONTENT_SHOW_SETTINGS, SD_FLAG_LAKKA_ADVANCED, 0, 0),
17485+
/* GENERATED: rows come from settings_def_menu_content_settings_view.h in order. */
17486+
#define S_BOOL(f, T, n, d, sd, df, c, us, sub) \
17487+
SDESC_BOOL_ROW(f, T, d, sd, df, c),
17488+
#define S_BOOL_NS(f, T, n, d, sd, df, c, us) \
17489+
SDESC_BOOL_ROW(f, T, d, sd, df, c),
17490+
#define S_UINT(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us, sub) \
17491+
SDESC_UINT_ROW(f, T, d, sd, df, c, mn, mx, st, ob, ok, rp),
17492+
#define S_UINT_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us) \
17493+
SDESC_UINT_ROW(f, T, d, sd, df, c, mn, mx, st, ob, ok, rp),
17494+
#define S_INT(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us, sub) \
17495+
SDESC_INT_ROW(f, T, d, sd, df, c, mn, mx, st, ob, ok, rp),
17496+
#define S_INT_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us) \
17497+
SDESC_INT_ROW(f, T, d, sd, df, c, mn, mx, st, ob, ok, rp),
17498+
#define S_FLOAT(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us, sub) \
17499+
SDESC_FLOAT_ROW(f, T, d, rnd, sd, df, c, mn, mx, st, ok, rp),
17500+
#define S_FLOAT_NS(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us) \
17501+
SDESC_FLOAT_ROW(f, T, d, rnd, sd, df, c, mn, mx, st, ok, rp),
17502+
#include "../settings/settings_def_menu_content_settings_view.h"
17503+
#undef S_BOOL
17504+
#undef S_BOOL_NS
17505+
#undef S_UINT
17506+
#undef S_UINT_NS
17507+
#undef S_INT
17508+
#undef S_INT_NS
17509+
#undef S_FLOAT
17510+
#undef S_FLOAT_NS
1748717511
};
1748817512
settings_list_add_desc(list, list_info, settings,
1748917513
menu_desc_28, ARRAY_SIZE(menu_desc_28),

‎msg_hash.h‎

Lines changed: 38 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2449,7 +2449,44 @@ enum msg_hash_enums
24492449
MENU_LABEL(XMB_SHADOWS_ENABLE),
24502450
MENU_LABEL(XMB_RIBBON_ENABLE),
24512451
MENU_LABEL(CONTENT_SHOW_VIDEO_LAYOUT),
2452-
MENU_LABEL(CONTENT_SHOW_SETTINGS),
2452+
/* GENERATED REGION: settings tab visibility setting enum rows (see settings/settings_def_menu_content_settings_view.h). */
2453+
#define SETTINGS_DEF_ENUM_PASS
2454+
#define SETTINGS_DEF_STRINGS_PASS
2455+
#define S_BOOL(f, T, n, d, sd, df, c, us, sub) MENU_LABEL(T),
2456+
#define S_BOOL_NS(f, T, n, d, sd, df, c, us) MENU_LABEL(T),
2457+
#define S_UINT(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us, sub) MENU_LABEL(T),
2458+
#define S_UINT_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us) MENU_LABEL(T),
2459+
#define S_INT(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us, sub) MENU_LABEL(T),
2460+
#define S_INT_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us) MENU_LABEL(T),
2461+
#define S_FLOAT(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us, sub) MENU_LABEL(T),
2462+
#define S_FLOAT_NS(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us) MENU_LABEL(T),
2463+
#define S_BOOL_H(f, T, n, d, sd, df, c, us, sub) MENU_LBL_H(T),
2464+
#define S_UINT_H(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us, sub) MENU_LBL_H(T),
2465+
#define S_BOOL_NS_H(f, T, n, d, sd, df, c, us) MENU_LBL_H(T),
2466+
#define S_INT_H(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us, sub) MENU_LBL_H(T),
2467+
#define S_FLOAT_H(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us, sub) MENU_LBL_H(T),
2468+
#define S_UINT_NS_H(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us) MENU_LBL_H(T),
2469+
#define S_INT_NS_H(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us) MENU_LBL_H(T),
2470+
#define S_FLOAT_NS_H(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us) MENU_LBL_H(T),
2471+
#include "settings/settings_def_menu_content_settings_view.h"
2472+
#undef S_BOOL
2473+
#undef S_BOOL_NS
2474+
#undef S_UINT
2475+
#undef S_UINT_NS
2476+
#undef S_INT
2477+
#undef S_INT_NS
2478+
#undef S_FLOAT
2479+
#undef S_FLOAT_NS
2480+
#undef S_BOOL_H
2481+
#undef S_UINT_H
2482+
#undef S_BOOL_NS_H
2483+
#undef S_INT_H
2484+
#undef S_FLOAT_H
2485+
#undef S_UINT_NS_H
2486+
#undef S_INT_NS_H
2487+
#undef S_FLOAT_NS_H
2488+
#undef SETTINGS_DEF_STRINGS_PASS
2489+
#undef SETTINGS_DEF_ENUM_PASS
24532490
MENU_LABEL(CONTENT_SHOW_SETTINGS_PASSWORD),
24542491
MENU_LABEL(CONTENT_SHOW_FAVORITES),
24552492
MENU_LABEL(CONTENT_SHOW_FAVORITES_FIRST),

‎msg_hash_lbl_str.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1111,7 +1111,6 @@
11111111
#define MENU_ENUM_LABEL_CONTENT_SHOW_FAVORITES_FIRST_STR "content_show_favorites_first"
11121112
#define MENU_ENUM_LABEL_CONTENT_SHOW_IMAGES_STR "content_show_images"
11131113
#define MENU_ENUM_LABEL_CONTENT_SHOW_MUSIC_STR "content_show_music"
1114-
#define MENU_ENUM_LABEL_CONTENT_SHOW_SETTINGS_STR "content_show_settings"
11151114
#define MENU_ENUM_LABEL_CONTENT_SHOW_SETTINGS_PASSWORD_STR "content_show_settings_password"
11161115
#define MENU_ENUM_LABEL_CONTENT_SHOW_VIDEO_STR "content_show_video"
11171116
#define MENU_ENUM_LABEL_CONTENT_SHOW_NETPLAY_STR "content_show_netplay"

‎settings/settings_def_menu_content_settings_view.h‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
/* Single-source definitions: settings tab visibility 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+
S_BOOL(menu_content_show_settings, CONTENT_SHOW_SETTINGS,
8+
"content_show_settings",
9+
DEFAULT_CONTENT_SHOW_SETTINGS, SD_FLAG_LAKKA_ADVANCED, 0, 0,
10+
"Show 'Settings'",
11+
"Show the 'Settings' menu.")

0 commit comments

Comments
 (0)